Merge branch 'main' into jay/releases

Author: jay-418

assets/locales/en.po

@@ -881,6 +881,9 @@ msgstr "Connected"
 msgid "status_off"
 msgstr "Disconnected"
 
+msgid "select_location"
+msgstr "Select Location"
+
 msgid "select_your_server_location"
 msgstr "Select your server location"
 

lib/features/account/account.dart

@@ -31,7 +31,7 @@ class Account extends HookConsumerWidget {
   Widget _buildBody(BuildContext buildContext, WidgetRef ref) {
     final user = sl<LocalStorageService>().getUser();
     final isExpired = ref.watch(isUserExpiredProvider);
-    final appSettings = ref.read(appSettingProvider);
+    final appSettings = ref.watch(appSettingProvider);
     final theme = Theme.of(buildContext).textTheme;
 
     return Column(
@@ -134,6 +134,15 @@ class Account extends HookConsumerWidget {
           ),
         ),
         UserDevices(),
+        SizedBox(height: defaultSize),
+        if (appSettings.userLoggedIn)
+          AppCard(
+            padding: EdgeInsets.zero,
+            child: AppTile(
+                label: 'logout'.i18n,
+                icon: AppImagePaths.signIn,
+                onPressed: () => logoutDialog(buildContext, ref)),
+          ),
         Spacer(),
         Padding(
           padding: const EdgeInsets.only(left: 16),
@@ -301,4 +310,66 @@ class Account extends HookConsumerWidget {
       }
     }
   }
+
+  void logoutDialog(BuildContext context, WidgetRef ref) {
+    final theme = TextTheme.of(context);
+    final isExpired = ref.read(isUserExpiredProvider);
+    AppDialog.customDialog(
+      context: context,
+      action: [
+        AppTextButton(
+          label: 'not_now'.i18n,
+          textColor: AppColors.gray8,
+          onPressed: () {
+            appRouter.pop();
+          },
+        ),
+        AppTextButton(
+          label: 'logout'.i18n,
+          onPressed: () {
+            onLogout(context, ref);
+            appRouter.pop();
+          },
+        ),
+      ],
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          SizedBox(height: defaultSize),
+          Text(
+            'logout'.i18n,
+            style: theme.headlineSmall,
+          ),
+          SizedBox(height: defaultSize),
+          Text(
+            isExpired ? 'logout_message_expired'.i18n : 'logout_message'.i18n,
+            style: theme.bodyMedium!.copyWith(
+              color: AppColors.gray8,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> onLogout(BuildContext context, WidgetRef ref) async {
+    context.showLoadingDialog();
+    final appSetting = ref.read(appSettingProvider);
+    final result =
+        await ref.read(lanternServiceProvider).logout(appSetting.email);
+    result.fold(
+      (l) {
+        context.hideLoadingDialog();
+        appLogger.error('Logout error: ${l.localizedErrorMessage}');
+      },
+      (user) {
+        context.hideLoadingDialog();
+        appRouter.popUntilRoot();
+        ref.read(homeProvider.notifier).clearLogoutData();
+        ref.read(homeProvider.notifier).updateUserData(user);
+
+        appLogger.info('Logout success: $user');
+      },
+    );
+  }
 }

lib/features/macos_extension/macos_extension_dialog.dart

@@ -37,9 +37,11 @@ class _MacOSExtensionDialogState extends ConsumerState<MacOSExtensionDialog> {
       }
       if (systemExtensionStatus.status == SystemExtensionStatus.installed ||
           systemExtensionStatus.status == SystemExtensionStatus.activated) {
-        appLogger.info(
-            "System Extension is installed and activated. Closing dialog.");
-        appRouter.pop();
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          appLogger.info(
+              "System Extension is installed and activated. Closing dialog.");
+          appRouter.pop();
+        });
       }
       return null;
     }, [systemExtensionStatus.status]);

lib/features/onboarding/onboarding.dart

@@ -26,13 +26,17 @@ class _OnboardingState extends ConsumerState<Onboarding> {
 
     void onboardingCompleted() {
       ref.read(appSettingProvider.notifier).setOnboardingCompleted(true);
+      final shouldShowExtensionDialog =
+          appSetting.showSplashScreen && PlatformUtils.isMacOS;
       appRouter.pop();
-      if (appSetting.showSplashScreen && PlatformUtils.isMacOS) {
+      if (shouldShowExtensionDialog) {
         appLogger.info("Showing System Extension Dialog");
-        appRouter.push(const MacOSExtensionDialog());
+        // Defer the push to the next frame to avoid calling setState during build
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          appRouter.push(const MacOSExtensionDialog());
+        });
         // User has seen dialog, do not show again
         appLogger.info("Setting showSplashScreen to false");
-
         ref.read(appSettingProvider.notifier).setSplashScreen(false);
         return;
       }
@@ -48,7 +52,8 @@ class _OnboardingState extends ConsumerState<Onboarding> {
           child: DividerSpace(padding: EdgeInsets.zero),
         ),
       ),
-      body: Padding(
+      body: Container(
+        color: AppColors.white,
         padding: const EdgeInsets.symmetric(horizontal: 16.0),
         child: Column(
           children: [
@@ -120,7 +125,6 @@ class _OnboardingState extends ConsumerState<Onboarding> {
                 label: 'skip_connect_now'.i18n,
                 textColor: AppColors.gray9,
                 onPressed: () {
-                  appRouter.pop();
                   onboardingCompleted();
                 },
               )
@@ -243,14 +247,16 @@ class _OnboardingState extends ConsumerState<Onboarding> {
     final routeMode =
         ref.watch(appSettingProvider.select((value) => value.routingMode));
     useEffect(() {
-      final routeMode =
-      ref.read(appSettingProvider.select((v) => v.routingMode));
+      Future(() {
+        final routeMode =
+            ref.read(appSettingProvider.select((v) => v.routingMode));
 
-      if (routeMode == RoutingMode.full) {
-        ref
-            .read(appSettingProvider.notifier)
-            .setRoutingMode(RoutingMode.smart);
-      }
+        if (routeMode == RoutingMode.full) {
+          ref
+              .read(appSettingProvider.notifier)
+              .setRoutingMode(RoutingMode.smart);
+        }
+      });
 
       return null;
     }, const []);
@@ -332,7 +338,12 @@ class RouteModeContainer extends StatelessWidget {
                 value: true,
               ),
               SizedBox(width: 16.0),
-              Text(title()),
+              Text(
+                title(),
+                style: textTheme.titleMedium!.copyWith(
+                  color: AppColors.black,
+                ),
+              ),
               SizedBox(width: 8.0),
               Container(
                   padding:
@@ -352,10 +363,8 @@ class RouteModeContainer extends StatelessWidget {
           SizedBox(height: 4.0),
           Padding(
             padding: const EdgeInsets.only(left: 38),
-            child: Text(
-              description(),
-              style: textTheme.bodyMedium!.copyWith(color: AppColors.gray8),
-            ),
+            child: Text(description(),
+                style: textTheme.bodyMedium!.copyWith(color: AppColors.gray8)),
           )
         ],
       ),

lib/features/setting/setting.dart

@@ -1,7 +1,4 @@
-import 'dart:io';
-
 import 'package:auto_route/auto_route.dart';
-import 'package:auto_updater/auto_updater.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -16,7 +13,6 @@ import 'package:lantern/features/home/provider/app_setting_notifier.dart';
 import 'package:lantern/features/home/provider/home_notifier.dart';
 import 'package:lantern/features/setting/follow_us.dart'
     show showFollowUsBottomSheet;
-import 'package:lantern/lantern/lantern_service_notifier.dart';
 
 import '../../core/services/injection_container.dart';
 
@@ -31,7 +27,6 @@ enum _SettingType {
   getPro,
   downloadLinks,
   checkForUpdates,
-  logout,
   browserUnbounded,
 }
 
@@ -184,19 +179,8 @@ class _SettingState extends ConsumerState<Setting> {
               ],
             ),
           ),
-          if (appSetting.userLoggedIn) ...[
-            const SizedBox(height: defaultSize),
-            AppCard(
-              padding: EdgeInsets.zero,
-              child: AppTile(
-                label: 'logout'.i18n,
-                icon: AppImagePaths.signIn,
-                onPressed: () => settingMenuTap(_SettingType.logout),
-              ),
-            ),
-          ],
-          const SizedBox(height: defaultSize),
           if (kDebugMode || AppBuildInfo.buildType == 'nightly') ...{
+            SizedBox(height: defaultSize),
             AppCard(
               padding: EdgeInsets.zero,
               child: AppTile(
@@ -295,9 +279,6 @@ class _SettingState extends ConsumerState<Setting> {
       case _SettingType.vpnSetting:
         appRouter.push(VPNSetting());
         break;
-      case _SettingType.logout:
-        logoutDialog();
-        break;
       case _SettingType.browserUnbounded:
         // TODO: Handle this case.
         throw UnimplementedError();
@@ -316,66 +297,4 @@ class _SettingState extends ConsumerState<Setting> {
       );
     }
   }
-
-  void logoutDialog() {
-    final theme = Theme.of(context).textTheme;
-    final isExpired = ref.watch(isUserExpiredProvider);
-    AppDialog.customDialog(
-      context: context,
-      action: [
-        AppTextButton(
-          label: 'not_now'.i18n,
-          textColor: AppColors.gray8,
-          onPressed: () {
-            context.maybePop();
-          },
-        ),
-        AppTextButton(
-          label: 'logout'.i18n,
-          onPressed: () {
-            onLogout();
-            context.maybePop();
-          },
-        ),
-      ],
-      content: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: <Widget>[
-          SizedBox(height: defaultSize),
-          Text(
-            'logout'.i18n,
-            style: theme.headlineSmall,
-          ),
-          SizedBox(height: defaultSize),
-          Text(
-            isExpired ? 'logout_message_expired'.i18n : 'logout_message'.i18n,
-            style: theme.bodyMedium!.copyWith(
-              color: AppColors.gray8,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Future<void> onLogout() async {
-    context.showLoadingDialog();
-    final appSetting = ref.read(appSettingProvider);
-    final result =
-        await ref.read(lanternServiceProvider).logout(appSetting.email);
-    result.fold(
-      (l) {
-        context.hideLoadingDialog();
-        appLogger.error('Logout error: ${l.localizedErrorMessage}');
-      },
-      (user) {
-        context.hideLoadingDialog();
-        appRouter.popUntilRoot();
-        ref.read(homeProvider.notifier).clearLogoutData();
-        ref.read(homeProvider.notifier).updateUserData(user);
-
-        appLogger.info('Logout success: $user');
-      },
-    );
-  }
 }