Fix minor visual issues

mastodon · Nov 5, 2024 · 706f888 · 706f888
1 parent fd365b8
commit 706f888
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 24 deletions.
diff --git a/Mastodon/Scene/Donation/DonationCompletionViewController.swift b/Mastodon/Scene/Donation/DonationCompletionViewController.swift
@@ -64,8 +64,8 @@ struct DonationCompletionView: View {
                 topMessage
                 subMessage
                 messageImage
-                buttons
                 Spacer()
+                buttons
             }
             .padding([.leading, .trailing], 30)
             .frame(maxWidth: geometry.size.width)
@@ -74,7 +74,8 @@ struct DonationCompletionView: View {
 
     @ViewBuilder var topMessage: some View {
         Text(L10n.Scene.Donation.Success.title)
-            .font(.title)
+            .font(.largeTitle)
+            .bold()
             .multilineTextAlignment(.center)
     }
     @ViewBuilder var subMessage: some View {
@@ -95,7 +96,6 @@ struct DonationCompletionView: View {
             }) {
                 HStack {
                     Spacer()
-                    Image(systemName: "megaphone.fill")
                     Text(L10n.Scene.Donation.Success.shareButtonTitle)
                     Spacer()
                 }

diff --git a/Mastodon/Scene/Donation/DonationViewController.swift b/Mastodon/Scene/Donation/DonationViewController.swift
@@ -11,11 +11,15 @@ class DonationViewController: UIHostingController<DonationView> {
 
     init(
         campaign: DonationCampaignViewModel?,
-        completion: @escaping (URL) -> Void
+        completion: @escaping (URL?) -> Void
     ) {
         super.init(
             rootView: DonationView(
                 campaign ?? DefaultDonationViewModel(), completion: completion))
+        self.navigationItem.leftBarButtonItem = UIBarButtonItem(systemItem: .done, primaryAction: UIAction(handler: { _ in
+            completion(nil)
+        }))
+        self.navigationItem.title = L10n.Scene.Donation.title
     }
 
     @MainActor required dynamic init?(coder aDecoder: NSCoder) {
@@ -38,7 +42,7 @@ extension DonationFrequency {
 
 struct DonationView: View {
     let campaign: DonationCampaignViewModel
-    let completion: (URL) -> Void
+    let completion: (URL?) -> Void
 
     @State var selectedFrequency: DonationFrequency
     @State var selectedCurrency: String
@@ -52,7 +56,7 @@ struct DonationView: View {
 
     init(
         _ campaign: DonationCampaignViewModel,
-        completion: @escaping (URL) -> Void
+        completion: @escaping (URL?) -> Void
     ) {
         self.completion = completion
         self.campaign = campaign
@@ -64,7 +68,7 @@ struct DonationView: View {
     var body: some View {
         HStack {
             Spacer()
-            VStack(spacing: 36) {
+            VStack(spacing: 30) {
                 topMessage
                 frequencyPicker
                 amountEntry
@@ -73,6 +77,7 @@ struct DonationView: View {
             .frame(maxWidth: 328)
             Spacer()
         }
+        .padding(.top)
     }
 
     @ViewBuilder var topMessage: some View {
@@ -120,9 +125,10 @@ struct DonationView: View {
                     value: $selectedAmount,
                     format: .currency(code: selectedCurrency)
                 ) {}
-                .keyboardType(.numberPad)
-                .multilineTextAlignment(.trailing)
-                .padding(.trailing, 8)
+                    .font(.title3)
+                    .keyboardType(.numberPad)
+                    .multilineTextAlignment(.trailing)
+                    .padding(.trailing, 8)
 
             }
             .background(
@@ -165,10 +171,7 @@ struct DonationView: View {
         }) {
             HStack {
                 Spacer()
-                Image(systemName: "heart.fill")
-                    .foregroundStyle(.white)
                 Text(L10n.Scene.Donation.donateButtonTitle)
-                    .foregroundStyle(.white)
                 Spacer()
             }
             .frame(maxWidth: .infinity)
@@ -192,28 +195,30 @@ struct DonationButtonStyle: ButtonStyle {
         switch (type, filled) {
         case (.amount, true):
             configuration.label
+                .bold()
                 .padding()
-                .background(Color(Asset.Colors.Secondary.container.color))
+                .foregroundStyle(Color.white)
+                .background(Color.indigo)
                 .cornerRadius(cornerRadius)
         case (.amount, false):
             configuration.label
                 .padding()
-                .overlay(
-                    RoundedRectangle(cornerRadius: cornerRadius).stroke(
-                        Color(Asset.Colors.outline.color), lineWidth: 1))
+                .background(Color.indigo.opacity(0.15))
+                .cornerRadius(cornerRadius)
         case (.action, true):
             configuration.label
+                .bold()
                 .foregroundStyle(.white)
                 .padding()
-                .background(Color(Asset.Colors.Primary._300.color))
+                .background(Color.indigo)
                 .cornerRadius(cornerRadius)
         case (.action, false):
             configuration.label
-                .foregroundStyle(Color(Asset.Colors.Primary._300.color))
+                .foregroundStyle(Color.indigo)
                 .padding()
                 .overlay(
                     RoundedRectangle(cornerRadius: cornerRadius).stroke(
-                        Color(Asset.Colors.outline.color), lineWidth: 1))
+                        Color.indigo, lineWidth: 1))
         }
     }
 }

diff --git a/Mastodon/Scene/Donation/NewDonationNavigationFlow.swift b/Mastodon/Scene/Donation/NewDonationNavigationFlow.swift
@@ -34,11 +34,20 @@ class NewDonationNavigationFlow: NavigationFlow {
         let optionsController = DonationViewController(campaign: campaign) {
             [weak self] attemptedDonation in
             guard let s = self else { return }
-            s.showDonationPaymentWebview(
-                attemptedDonation, campaign: s.campaign)
+            if let attemptedDonation {
+                s.showDonationPaymentWebview(
+                    attemptedDonation, campaign: s.campaign)
+            } else {
+                s.dismissFlow()
+            }
+        }
+
+        if flowPresenter is UINavigationController {
+            flowPresenter.show(optionsController, preferredDetents: [.medium()])
+        } else {
+            let navController = UINavigationController(rootViewController: optionsController)
+            flowPresenter.show(navController, preferredDetents: [.medium()])
         }
-
-        flowPresenter.show(optionsController, preferredDetents: [.medium()])
     }
 
     private func showDonationPaymentWebview(

diff --git a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
@@ -813,6 +813,8 @@ public enum L10n {
       public static let currency = L10n.tr("Localizable", "Scene.Donation.Currency", fallback: "Currency")
       /// Donate
       public static let donateButtonTitle = L10n.tr("Localizable", "Scene.Donation.DonateButtonTitle", fallback: "Donate")
+      /// Donate to Mastodon
+      public static let title = L10n.tr("Localizable", "Scene.Donation.Title", fallback: "Donate to Mastodon")
       public enum Picker {
         /// Monthly
         public static let monthlyTitle = L10n.tr("Localizable", "Scene.Donation.Picker.MonthlyTitle", fallback: "Monthly")

diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings
@@ -299,6 +299,7 @@ uploaded to Mastodon.";
 "Scene.FollowedTags.Header.Posts" = "posts";
 "Scene.FollowedTags.Header.PostsToday" = "posts today";
 "Scene.FollowedTags.Title" = "Followed Tags";
+"Scene.Donation.Title" = "Donate to Mastodon";
 "Scene.Donation.Picker.OnceTitle" = "Just once";
 "Scene.Donation.Picker.MonthlyTitle" = "Monthly";
 "Scene.Donation.Picker.YearlyTitle" = "Yearly";