IOS review changes v1 (#8418)

* IOS review changes v1

* Do not snow protocol info on multi country & increase build number

* Fix data cap issue with time.

---------

Co-authored-by: atavism <atavism@users.noreply.github.com>

Author: jigar-f

assets/locales/en.po

@@ -681,7 +681,6 @@ msgstr "Select a region for your Private Server. Closer locations may improve sp
 msgid "gcp_location_options"
 msgstr "Google Cloud Platform Location Options (%d):"
 
-
 msgid "australia_sydney"
 msgstr "Australia - Sydney"
 
@@ -1314,6 +1313,9 @@ msgstr "Daily data cap reached"
 msgid "daily_data_cap_reached_message"
 msgstr "Speed reduced to 128 kb/sec - Resets at %s."
 
+msgid "subscription_renewal_info"
+msgstr "Payment is charged to your Apple ID at purchase. Subscriptions renew automatically unless canceled at least 24 hours before the end of the current period. Manage or cancel in App Store Settings."
+
 
 
 

lib/core/widgets/base_screen.dart

@@ -8,6 +8,7 @@ class BaseScreen extends StatelessWidget {
   final bool padded;
   final AppBar? appBar;
   final Widget? bottomNavigationBar;
+  final Widget? bottomSheet;
   final Color? backgroundColor;
   final bool extendBody;
 
@@ -20,6 +21,7 @@ class BaseScreen extends StatelessWidget {
     this.appBar,
     this.backgroundColor,
     this.extendBody = false,
+    this.bottomSheet,
   });
 
   @override
@@ -34,6 +36,7 @@ class BaseScreen extends StatelessWidget {
         padding: padded ? defaultPadding : EdgeInsets.zero,
         child: body,
       ),
+      bottomSheet: bottomSheet,
       bottomNavigationBar: bottomNavigationBar,
       extendBody: extendBody,
     );

lib/features/home/data_usage.dart

@@ -28,10 +28,16 @@ class DataUsage extends ConsumerWidget {
         final int usedBytes = dataCap.bytesUsed.clamp(0, totalBytes);
         final int remainingBytes = totalBytes - usedBytes;
         final isDataCapReached = usedBytes >= totalBytes;
-
-        final dataCapResetTime = formatDailyResetTime(dataCap.allotmentEndTime);
         appLogger.debug(
             "Data Usage - Bytes: $totalBytes bytes, Used: $usedBytes bytes, Remaining: $remainingBytes bytes");
+        final dataCapResetTime = formatDailyResetTime(dataCap.allotmentEndTime);
+        String dataCapMessage =
+            "daily_data_cap_reached_message".i18n.fill([dataCapResetTime]);
+        ///If parsing fails and returns empty string
+        ///do not show time
+        if (dataCapResetTime.isEmpty) {
+          dataCapMessage = dataCapMessage.split('-').first;
+        }
 
         /// Convert to MB only for display
         final int totalData = (totalBytes.toMB).round();
@@ -92,9 +98,7 @@ class DataUsage extends ConsumerWidget {
                     Padding(
                       padding: const EdgeInsets.only(left: 30),
                       child: AutoSizeText(
-                        "daily_data_cap_reached_message"
-                            .i18n
-                            .fill([dataCapResetTime]),
+                        dataCapMessage,
                         minFontSize: 11,
                         maxFontSize: 12,
                         maxLines: 1,
@@ -144,20 +148,26 @@ class DataUsage extends ConsumerWidget {
 
   /// Formats the daily reset time based on whether it's today or another day.
   String formatDailyResetTime(String serverTime) {
-    if(serverTime.isEmpty){
+    try {
+      if (serverTime.isEmpty) {
+        return "";
+      }
+      final DateTime endTime = DateTime.parse(
+        serverTime,
+      ).toLocal();
+      final DateTime now = DateTime.now();
+      final DateTime today = DateTime(now.year, now.month, now.day);
+      final DateTime endDate =
+          DateTime(endTime.year, endTime.month, endTime.day);
+      if (endDate == today) {
+        return AppDateFormats.time.format(endTime);
+      }
+
+      return '${AppDateFormats.weekday.format(endTime)}, '
+          '${AppDateFormats.time.format(endTime)}';
+    } catch (e) {
+      appLogger.error('Error formatting daily reset time: $e');
       return "";
     }
-    final DateTime endTime = DateTime.parse(
-      '${serverTime.replaceFirst(' ', 'T')}Z',
-    ).toLocal();
-    final DateTime now = DateTime.now();
-    final DateTime today = DateTime(now.year, now.month, now.day);
-    final DateTime endDate = DateTime(endTime.year, endTime.month, endTime.day);
-    if (endDate == today) {
-      return AppDateFormats.time.format(endTime);
-    }
-
-    return '${AppDateFormats.weekday.format(endTime)}, '
-        '${AppDateFormats.time.format(endTime)}';
   }
 }

lib/features/plans/plans.dart

@@ -11,10 +11,10 @@ import 'package:lantern/core/utils/formatter.dart';
 import 'package:lantern/core/utils/screen_utils.dart';
 import 'package:lantern/core/widgets/loading_indicator.dart';
 import 'package:lantern/features/auth/provider/auth_notifier.dart';
-import 'package:lantern/features/plans/provider/payment_notifier.dart';
 import 'package:lantern/features/home/provider/app_setting_notifier.dart';
 import 'package:lantern/features/plans/feature_list.dart';
 import 'package:lantern/features/plans/plans_list.dart';
+import 'package:lantern/features/plans/provider/payment_notifier.dart';
 import 'package:lantern/features/plans/provider/plans_notifier.dart';
 import 'package:lantern/features/plans/provider/referral_notifier.dart';
 
@@ -34,7 +34,6 @@ class _PlansState extends ConsumerState<Plans> {
   @override
   Widget build(BuildContext context) {
     textTheme = Theme.of(context).textTheme;
-
     return BaseScreen(
       backgroundColor: AppColors.white,
       padded: false,
@@ -74,7 +73,7 @@ class _PlansState extends ConsumerState<Plans> {
           padding: EdgeInsets.symmetric(horizontal: defaultSize),
           child: SizedBox(
             height:
-                context.isSmallDevice ? size.height * 0.4 : size.height * 0.4,
+                context.isSmallDevice ? size.height * 0.4 : size.height * 0.39,
             child: SingleChildScrollView(child: FeatureList()),
           ),
         ),
@@ -133,6 +132,47 @@ class _PlansState extends ConsumerState<Plans> {
                     onPressed: onGetLanternProTap,
                   ),
                 ),
+                if (PlatformUtils.isIOS) ...{
+                  SizedBox(height: defaultSize),
+                  Padding(
+                    padding: const EdgeInsets.only(left: 8.0),
+                    child: Text(
+                      'subscription_renewal_info'.i18n,
+                      style: textTheme.labelMedium!.copyWith(
+                        color: AppColors.gray7,
+                      ),
+                    ),
+                  ),
+                  IntrinsicHeight(
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      children: <Widget>[
+                        AppTextButton(
+                          label: 'privacy_policy'.i18n,
+                          fontSize: 12,
+                          textColor: AppColors.gray7,
+                          onPressed: () {
+                            UrlUtils.openWithSystemBrowser(
+                                AppUrls.privacyPolicy);
+                          },
+                        ),
+                        VerticalDivider(
+                          indent: 10,
+                          endIndent: 10,
+                        ),
+                        AppTextButton(
+                          label: 'terms_of_service'.i18n,
+                          fontSize: 12,
+                          textColor: AppColors.gray7,
+                          onPressed: () {
+                            UrlUtils.openWithSystemBrowser(
+                                AppUrls.termsOfService);
+                          },
+                        )
+                      ],
+                    ),
+                  ),
+                },
                 SizedBox(height: size24),
               ],
             ),

lib/features/vpn/server_selection.dart

@@ -521,7 +521,6 @@ class _CountryCityListViewState extends State<_CountryCityListView> {
   Widget build(BuildContext context) {
     final countryCode = widget.locations.first.countryCode;
     final country = widget.locations.first.country;
-    final textTheme = Theme.of(context).textTheme;
     if (PlatformUtils.isDesktop) {
       return Theme(
         data: Theme.of(context).copyWith(dividerColor: Colors.transparent),
@@ -567,19 +566,9 @@ class _CountryCityListViewState extends State<_CountryCityListView> {
         ),
       );
     }
-
-    final location = widget.locations.first;
     return AppTile(
       icon: Flag(countryCode: countryCode),
       label: widget.country,
-      subtitle: location.protocol.isEmpty
-          ? null
-          : Text(
-              location.protocol.capitalize,
-              style: textTheme.labelMedium!.copyWith(
-                color: AppColors.gray7,
-              ),
-            ),
       trailing: AppImage(
         path: AppImagePaths.arrowForward,
         height: 20.0,
@@ -611,6 +600,7 @@ class _CountryCityListViewState extends State<_CountryCityListView> {
               final isSelected = widget.selectedServerTag == loc.tag;
 
               return SingleCityServerView(
+                nested: true,
                 onServerSelected: (selected) {
                   Navigator.of(bottomSheetContext).pop();
                   widget.onServerSelected(selected);

lib/features/vpn/single_city_server_view.dart

@@ -10,12 +10,14 @@ class SingleCityServerView extends StatefulWidget {
   final Location_ location;
   final OnServerSelected onServerSelected;
   final bool isSelected;
+  final bool nested;
 
   const SingleCityServerView({
     super.key,
     required this.onServerSelected,
     required this.location,
     this.isSelected = false,
+    this.nested = false,
   });
 
   @override
@@ -27,9 +29,9 @@ class _SingleCityServerViewState extends State<SingleCityServerView> {
   Widget build(BuildContext context) {
     final textTheme = Theme.of(context).textTheme;
     return AppTile(
-      // minHeight: 55,
-      // contentPadding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-      label: '${widget.location.country} - ${widget.location.city}',
+      label: widget.nested
+          ? widget.location.city
+          : '${widget.location.country} - ${widget.location.city}',
       selected: widget.isSelected,
       subtitle: widget.location.protocol.isEmpty
           ? null

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 9.0.1+84
+version: 9.0.1+85
 
 environment:
   sdk: ^3.6.0