Merge branch 'master' into storage-card-bug-fix

lib/theme/text_style.dart

@@ -16,11 +16,7 @@ const TextStyle brandStyleMedium = TextStyle(
   fontFamily: 'Montserrat',
   fontSize: 24,
 );
-const TextStyle brandStyleLarge = TextStyle(
+
-  fontWeight: FontWeight.bold,
-  fontFamily: 'Montserrat',
-  fontSize: 28,
-);
 const TextStyle h1 = TextStyle(
   fontSize: 48,
   height: 48 / 28,
@@ -87,6 +83,8 @@ class EnteTextTheme {
   final TextStyle miniBold;
   final TextStyle tiny;
   final TextStyle tinyBold;
+  final TextStyle brandSmall;
+  final TextStyle brandMedium;
 
   const EnteTextTheme({
     required this.h1,
@@ -105,6 +103,8 @@ class EnteTextTheme {
     required this.miniBold,
     required this.tiny,
     required this.tinyBold,
+    required this.brandSmall,
+    required this.brandMedium,
   });
 }
 
@@ -129,5 +129,7 @@ EnteTextTheme _buildEnteTextStyle(Color color) {
     miniBold: mini.copyWith(color: color, fontWeight: _boldWeight),
     tiny: tiny.copyWith(color: color),
     tinyBold: tiny.copyWith(color: color, fontWeight: _boldWeight),
+    brandSmall: brandStyleSmall.copyWith(color: color),
+    brandMedium: brandStyleMedium.copyWith(color: color),
   );
 }

lib/ui/collections/section_title.dart

@@ -40,18 +40,22 @@ class SectionTitle extends StatelessWidget {
   }
 }
 
-RichText onEnteSection = RichText(
+RichText getOnEnteSection(BuildContext context) {
-  text: const TextSpan(
+  final EnteTextTheme textTheme = getEnteTextTheme(context);
-    children: [
+  return RichText(
-      TextSpan(
+    text: TextSpan(
-        text: "On ",
+      children: [
-        style: TextStyle(
+        TextSpan(
-          fontWeight: FontWeight.w600,
+          text: "On ",
-          fontFamily: 'Inter',
+          style: TextStyle(
-          fontSize: 21,
+            fontWeight: FontWeight.w600,
+            fontFamily: 'Inter',
+            fontSize: 21,
+            color: textTheme.brandSmall.color,
+          ),
         ),
-      ),
+        TextSpan(text: "ente", style: textTheme.brandSmall),
-      TextSpan(text: "ente", style: brandStyleSmall),
+      ],
-    ],
+    ),
-  ),
+  );
-);
+}

lib/ui/collections_gallery_widget.dart

@@ -140,7 +140,7 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               crossAxisAlignment: CrossAxisAlignment.end,
               children: [
-                SectionTitle(titleWithBrand: onEnteSection),
+                SectionTitle(titleWithBrand: getOnEnteSection(context)),
                 _sortMenu(),
               ],
             ),

lib/ui/payment/skip_subscription_widget.dart

@@ -44,7 +44,7 @@ class SkipSubscriptionWidget extends StatelessWidget {
           BillingService.instance
               .verifySubscription(freeProductID, "", paymentProvider: "ente");
         },
-        child: const Text("Continue on free plan"),
+        child: const Text("Continue on free trial"),
       ),
     );
   }

lib/ui/payment/subscription_common_widgets.dart

@@ -94,7 +94,7 @@ class ValidityWidget extends StatelessWidget {
     );
     var message = "Renews on $endDate";
     if (currentSubscription.productID == freeProductID) {
-      message = "Free plan valid till $endDate";
+      message = "Free trial valid till $endDate";
     } else if (currentSubscription.attributes?.isCancelled ?? false) {
       message = "Your subscription will be cancelled on $endDate";
     }

lib/ui/payment/subscription_page.dart

@@ -368,7 +368,7 @@ class _SubscriptionPageState extends State<SubscriptionPage> {
       planWidgets.add(
         SubscriptionPlanWidget(
           storage: _freePlan.storage,
-          price: "free",
+          price: "Free trial",
           period: "",
           isActive: true,
         ),

lib/ui/payment/subscription_plan_widget.dart

@@ -19,7 +19,7 @@ class SubscriptionPlanWidget extends StatelessWidget {
 
   String _displayPrice() {
     final result = price + (period.isNotEmpty ? " / " + period : "");
-    return result.isNotEmpty ? result : "Trial plan";
+    return price.isNotEmpty ? result : "Free trial";
   }
 
   @override

pubspec.lock

@@ -411,7 +411,7 @@ packages:
       name: flutter_inappwebview
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.4.3+7"
+    version: "5.7.1"
   flutter_keyboard_visibility:
     dependency: transitive
     description: