Prechádzať zdrojové kódy

Fix alignment + minor bug fix

Neeraj Gupta 2 rokov pred
rodič
commit
14db193bbb

+ 1 - 1
lib/generated/intl/messages_en.dart

@@ -126,7 +126,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "Unfortunately your payment failed due to ${reason}";
 
   static String m65(endDate) =>
-      "Free trial valid till ${endDate}. You can choose a paid plan afterwards.";
+      "Free trial valid till ${endDate}.\nYou can choose a paid plan afterwards.";
 
   static String m35(toEmail) => "Please email us at ${toEmail}";
 

+ 2 - 2
lib/generated/l10n.dart

@@ -3844,10 +3844,10 @@ class S {
     );
   }
 
-  /// `Free trial valid till {endDate}. You can choose a paid plan afterwards.`
+  /// `Free trial valid till {endDate}.\nYou can choose a paid plan afterwards.`
   String playStoreFreeTrialValidTill(Object endDate) {
     return Intl.message(
-      'Free trial valid till $endDate. You can choose a paid plan afterwards.',
+      'Free trial valid till $endDate.\nYou can choose a paid plan afterwards.',
       name: 'playStoreFreeTrialValidTill',
       desc: '',
       args: [endDate],

+ 1 - 1
lib/l10n/intl_en.arb

@@ -555,7 +555,7 @@
   "faqs": "FAQs",
   "renewsOn": "Renews on {endDate}",
   "freeTrialValidTill": "Free trial valid till {endDate}",
-  "playStoreFreeTrialValidTill": "Free trial valid till {endDate}. You can choose a paid plan afterwards.",
+  "playStoreFreeTrialValidTill": "Free trial valid till {endDate}.\nYou can choose a paid plan afterwards.",
   "subWillBeCancelledOn": "Your subscription will be cancelled on {endDate}",
   "subscription": "Subscription",
   "paymentDetails": "Payment details",

+ 2 - 1
lib/ui/payment/stripe_subscription_page.dart

@@ -9,6 +9,7 @@ import 'package:photos/models/billing_plan.dart';
 import 'package:photos/models/subscription.dart';
 import 'package:photos/models/user_details.dart';
 import 'package:photos/services/billing_service.dart';
+import "package:photos/services/update_service.dart";
 import 'package:photos/services/user_service.dart';
 import "package:photos/theme/colors.dart";
 import 'package:photos/theme/ente_theme.dart';
@@ -541,7 +542,7 @@ class _StripeSubscriptionPageState extends State<StripeSubscriptionPage> {
               ],
             ),
           ),
-          _isFreePlanUser()
+          _isFreePlanUser() && !UpdateService.instance.isPlayStoreFlavor()
               ? Text(
                   S.of(context).twoMonthsFreeOnYearlyPlans,
                   style: getEnteTextTheme(context).miniMuted,

+ 1 - 0
lib/ui/payment/subscription_common_widgets.dart

@@ -113,6 +113,7 @@ class ValidityWidget extends StatelessWidget {
       child: Text(
         message,
         style: Theme.of(context).textTheme.bodySmall,
+        textAlign: TextAlign.center,
       ),
     );
   }