From b277da140a884bc6011f7c34272b1805f51aa5c0 Mon Sep 17 00:00:00 2001 From: ivan2282 Date: Mon, 1 Dec 2025 20:09:12 +0300 Subject: [PATCH] SafeArea --- lib/main.dart | 67 +++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 0185e8a..da5e2b5 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -25,27 +25,19 @@ Future main() async { WidgetsFlutterBinding.ensureInitialized(); await initializeDateFormatting(); - print("Инициализируем сервисы кеширования..."); await CacheService().initialize(); await AvatarCacheService().initialize(); await ChatCacheService().initialize(); await ContactLocalNamesService().initialize(); - print("Сервисы кеширования инициализированы"); - print("Инициализируем AccountManager..."); await AccountManager().initialize(); await AccountManager().migrateOldAccount(); - print("AccountManager инициализирован"); - print("Инициализируем MusicPlayerService..."); await MusicPlayerService().initialize(); - print("MusicPlayerService инициализирован"); final hasToken = await ApiService.instance.hasToken(); - print("При запуске приложения токен ${hasToken ? 'найден' : 'не найден'}"); if (hasToken) { - print("Инициируем подключение к WebSocket при запуске..."); ApiService.instance.connect(); } @@ -110,7 +102,7 @@ class MyApp extends StatelessWidget { color: ColorScheme.fromSeed( seedColor: accentColor, brightness: Brightness.dark, - ).onSurface, // ← Используем цвет onSurface из цветовой схемы + ).onSurface, ), ), ); @@ -148,33 +140,34 @@ class MyApp extends StatelessWidget { ? oledTheme : baseDarkTheme; - return MaterialApp( - title: 'Komet', - navigatorKey: navigatorKey, - builder: (context, child) { - final showHud = themeProvider.debugShowPerformanceOverlay; - return SizedBox.expand( - child: Stack( - children: [ - if (child != null) child, - if (showHud) - const Positioned(top: 8, right: 56, child: _MiniFpsHud()), - ], - ), - ); - }, - theme: baseLightTheme, - darkTheme: activeDarkTheme, - themeMode: themeProvider.themeMode, - localizationsDelegates: const [ - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - ], - supportedLocales: const [Locale('ru'), Locale('en')], - locale: const Locale('ru'), - - home: hasToken ? const HomeScreen() : const PhoneEntryScreen(), + return SafeArea( + child: MaterialApp( + title: 'Komet', + navigatorKey: navigatorKey, + builder: (context, child) { + final showHud = themeProvider.debugShowPerformanceOverlay; + return SizedBox.expand( + child: Stack( + children: [ + if (child != null) child, + if (showHud) + const Positioned(top: 8, right: 56, child: _MiniFpsHud()), + ], + ), + ); + }, + theme: baseLightTheme, + darkTheme: activeDarkTheme, + themeMode: themeProvider.themeMode, + localizationsDelegates: const [ + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + ], + supportedLocales: const [Locale('ru'), Locale('en')], + locale: const Locale('ru'), + home: hasToken ? const HomeScreen() : const PhoneEntryScreen(), + ), ); }, ); @@ -253,4 +246,4 @@ class _MiniFpsHudState extends State<_MiniFpsHud> { ), ); } -} +} \ No newline at end of file