로그인 화면 플랫 UI 수정

userfront/lib/main.dart

@@ -26,6 +26,7 @@ import 'core/services/web_window.dart';
 import 'core/notifiers/auth_notifier.dart';
 import 'core/theme/app_theme.dart';
 import 'core/theme/theme_controller.dart';
+import 'core/theme/theme_scope.dart';
 import 'core/i18n/locale_gate.dart';
 import 'core/i18n/locale_registry.dart';
 import 'core/i18n/locale_utils.dart';
@@ -108,7 +109,8 @@ void main() async {
 
   // 0. Initialize Logger
   LoggerService.init();
-  await ThemeController.instance.restore();
+  await ThemeController.app.restore();
+  await ThemeController.auth.restore();
 
   // 폰트를 먼저 로딩해서 렌더링 깨짐(FOIT/FOUT) 최소화
   await _loadBundledFonts();
@@ -180,12 +182,18 @@ final _router = GoRouter(
             GoRoute(
               path: 'dashboard',
               builder: (context, state) {
-                return const DashboardScreen();
+                return ScopedTheme(
+                  controller: ThemeController.app,
+                  child: const DashboardScreen(),
+                );
               },
             ),
             GoRoute(
               path: 'profile',
-              builder: (context, state) => const ProfilePage(),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.app,
+                child: const ProfilePage(),
+              ),
             ),
             GoRoute(
               path: 'signin',
@@ -195,10 +203,13 @@ final _router = GoRouter(
                 final redirectUrl =
                     state.uri.queryParameters['redirect_uri'] ??
                     state.uri.queryParameters['redirect_url'];
-                return LoginScreen(
-                  key: state.pageKey,
-                  loginChallenge: loginChallenge,
-                  redirectUrl: redirectUrl,
+                return ScopedTheme(
+                  controller: ThemeController.auth,
+                  child: LoginScreen(
+                    key: state.pageKey,
+                    loginChallenge: loginChallenge,
+                    redirectUrl: redirectUrl,
+                  ),
                 );
               },
             ),
@@ -211,10 +222,13 @@ final _router = GoRouter(
                 final redirectUrl =
                     state.uri.queryParameters['redirect_uri'] ??
                     state.uri.queryParameters['redirect_url'];
-                return LoginScreen(
-                  key: state.pageKey,
-                  loginChallenge: loginChallenge,
-                  redirectUrl: redirectUrl,
+                return ScopedTheme(
+                  controller: ThemeController.auth,
+                  child: LoginScreen(
+                    key: state.pageKey,
+                    loginChallenge: loginChallenge,
+                    redirectUrl: redirectUrl,
+                  ),
                 );
               },
             ),
@@ -230,88 +244,137 @@ final _router = GoRouter(
                     ),
                   );
                 }
-                return ConsentScreen(consentChallenge: consentChallenge);
+                return ScopedTheme(
+                  controller: ThemeController.auth,
+                  child: ConsentScreen(consentChallenge: consentChallenge),
+                );
               },
             ),
             GoRoute(
               path: 'signup',
-              builder: (context, state) => const SignupScreen(),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.auth,
+                child: const SignupScreen(),
+              ),
             ),
             GoRoute(
               path: 'registration',
-              builder: (context, state) => const SignupScreen(),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.auth,
+                child: const SignupScreen(),
+              ),
             ),
             GoRoute(
               path: 'verify',
-              builder: (context, state) => LoginScreen(key: state.pageKey),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.auth,
+                child: LoginScreen(key: state.pageKey),
+              ),
             ),
             GoRoute(
               path: 'verify/:token',
               builder: (context, state) {
                 final token = state.pathParameters['token'];
-                return LoginScreen(
-                  key: state.pageKey,
-                  verificationToken: token,
+                return ScopedTheme(
+                  controller: ThemeController.auth,
+                  child: LoginScreen(
+                    key: state.pageKey,
+                    verificationToken: token,
+                  ),
                 );
               },
             ),
             GoRoute(
               path: 'verification',
-              builder: (context, state) => LoginScreen(key: state.pageKey),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.auth,
+                child: LoginScreen(key: state.pageKey),
+              ),
             ),
             GoRoute(
               path: 'l/:shortCode',
               builder: (context, state) {
-                return LoginScreen(key: state.pageKey);
+                return ScopedTheme(
+                  controller: ThemeController.auth,
+                  child: LoginScreen(key: state.pageKey),
+                );
               },
             ),
             GoRoute(
               path: 'forgot-password',
-              builder: (context, state) => const ForgotPasswordScreen(),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.auth,
+                child: const ForgotPasswordScreen(),
+              ),
             ),
             GoRoute(
               path: 'recovery',
-              builder: (context, state) => const ForgotPasswordScreen(),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.auth,
+                child: const ForgotPasswordScreen(),
+              ),
             ),
             GoRoute(
               path: 'reset-password',
-              builder: (context, state) => const ResetPasswordScreen(),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.auth,
+                child: const ResetPasswordScreen(),
+              ),
             ),
             GoRoute(
               path: 'error',
               builder: (context, state) {
                 final params = state.uri.queryParameters;
-                return ErrorScreen(
-                  errorId: params['id'],
-                  errorCode: params['error'],
-                  description: params['error_description'] ?? params['message'],
+                return ScopedTheme(
+                  controller: ThemeController.auth,
+                  child: ErrorScreen(
+                    errorId: params['id'],
+                    errorCode: params['error'],
+                    description:
+                        params['error_description'] ?? params['message'],
+                  ),
                 );
               },
             ),
             GoRoute(
               path: 'settings',
-              builder: (context, state) => ErrorScreen(
-                errorCode: 'settings_disabled',
-                description: tr('msg.userfront.settings.disabled'),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.auth,
+                child: ErrorScreen(
+                  errorCode: 'settings_disabled',
+                  description: tr('msg.userfront.settings.disabled'),
+                ),
               ),
             ),
             GoRoute(
               path: 'approve',
-              builder: (context, state) =>
-                  ApproveQrScreen(pendingRef: state.uri.queryParameters['ref']),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.auth,
+                child: ApproveQrScreen(
+                  pendingRef: state.uri.queryParameters['ref'],
+                ),
+              ),
             ),
             GoRoute(
               path: 'ql/:ref',
-              builder: (context, state) =>
-                  ApproveQrScreen(pendingRef: state.pathParameters['ref']),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.auth,
+                child: ApproveQrScreen(pendingRef: state.pathParameters['ref']),
+              ),
             ),
             GoRoute(
               path: 'scan',
-              builder: (context, state) => const QRScanScreen(),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.auth,
+                child: const QRScanScreen(),
+              ),
             ),
             GoRoute(
               path: 'admin/users',
-              builder: (context, state) => const UserManagementScreen(),
+              builder: (context, state) => ScopedTheme(
+                controller: ThemeController.app,
+                child: const UserManagementScreen(),
+              ),
             ),
           ],
         ),
@@ -369,25 +432,20 @@ class BaronSSOApp extends StatelessWidget {
     final locale =
         localization?.currentLocale ?? Locale(resolvePreferredLocaleCode());
 
-    return ValueListenableBuilder<ThemeMode>(
-      valueListenable: ThemeController.instance,
-      builder: (context, themeMode, _) {
-        return MaterialApp.router(
-          title: tr('ui.userfront.app_title'),
-          localizationsDelegates: delegates,
-          supportedLocales: supportedLocales,
-          locale: locale,
-          builder: (context, child) {
-            return Stack(
-              children: [if (child != null) child, const ToastViewport()],
-            );
-          },
-          theme: buildLightTheme(),
-          darkTheme: buildDarkTheme(),
-          themeMode: themeMode,
-          routerConfig: _router,
+    return MaterialApp.router(
+      title: tr('ui.userfront.app_title'),
+      localizationsDelegates: delegates,
+      supportedLocales: supportedLocales,
+      locale: locale,
+      builder: (context, child) {
+        return Stack(
+          children: [if (child != null) child, const ToastViewport()],
         );
       },
+      theme: buildLightTheme(),
+      darkTheme: buildDarkTheme(),
+      themeMode: ThemeMode.light,
+      routerConfig: _router,
     );
   }
 }