improve sub flow

HabitRPG · Nov 4, 2024 · de17f0d · de17f0d
1 parent 53d7f14
commit de17f0d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/HabitRPG/UI/Purchases/G1G1Banner.swift b/HabitRPG/UI/Purchases/G1G1Banner.swift
@@ -19,21 +19,23 @@ struct G1G1Banner: View {
     }()
 
     var body: some View {
-        HStack {
-            Image(Asset.promoGiftsLeft.name)
-            Spacer()
+        ZStack(alignment: .center) {
+            HStack {
+                Image(Asset.promoGiftsLeft.name)
+                Spacer()
+                Image(Asset.promoGiftsRight.name)
+            }
+            .background(LinearGradient(colors: [Color(UIColor("#3BCAD7")), Color(UIColor("#925CF3"))], startPoint: .topLeading, endPoint: .bottomTrailing))
             VStack(spacing: 5) {
                 Text(L10n.giftOneGetOneTitle)
                     .font(.system(size: 22, weight: .bold))
                 Text(L10n.giftOneGetOneDescriptionDate(formatter.string(from: endDate)))
                     .font(.system(size: 16, weight: .semibold))
                     .lineSpacing(2)
                     .multilineTextAlignment(.center)
-            }.padding(.horizontal, 6)
-            Spacer()
-            Image(Asset.promoGiftsRight.name)
+                    .padding(.horizontal, 50)
+            }
         }
-        .background(LinearGradient(colors: [Color(UIColor("#3BCAD7")), Color(UIColor("#925CF3"))], startPoint: .topLeading, endPoint: .bottomTrailing))
         .onTapGesture {
             RouterHandler.shared.handle(.promoInfo)
         }

diff --git a/HabitRPG/UI/Purchases/SubscriptionDetailViewUI.swift b/HabitRPG/UI/Purchases/SubscriptionDetailViewUI.swift
@@ -237,7 +237,7 @@ struct SubscriptionDetailViewUI: View {
                         }
                         Text(L10n.Subscription.monthsSubscribed)
                             .font(.system(size: 13, weight: .semibold))
-                    }
+                    }.frame(maxHeight: .infinity)
                 }
                 DetailContainer(verticalPadding: 14) {
                     VStack(spacing: 6) {
@@ -248,9 +248,10 @@ struct SubscriptionDetailViewUI: View {
                         }
                         Text(L10n.Subscription.monthlyGems)
                             .font(.system(size: 13, weight: .semibold))
-                    }
+                    }.frame(maxHeight: .infinity)
                 }
-            }
+            }.multilineTextAlignment(.center)
+                .fixedSize(horizontal: false, vertical: true)
             DetailContainer(verticalPadding: 14) {
                 HStack(spacing: 4) {
                     Image(Asset.hourglassBannerLeft.name)

diff --git a/HabitRPG/UI/Purchases/SubscriptionPage.swift b/HabitRPG/UI/Purchases/SubscriptionPage.swift
@@ -165,10 +165,13 @@ class SubscriptionViewModel: BaseSubscriptionViewModel {
         withAnimation {
             isSubscribing = true
         }
-        PurchaseHandler.shared.purchaseSubscription(selectedSubscription) {[weak self] _ in
+        PurchaseHandler.shared.purchaseSubscription(selectedSubscription) {[weak self] success in
             withAnimation {
                 self?.isSubscribing = false
             }
+            if success && self?.presentationPoint != nil {
+                self?.dismiss()
+            }
         }
     }