Merge feat/setting_page+adapter_telegrambot: resolve localization and plugin conflicts, update pubspec and lock files

Author: Anton-Dodonov

lib/l10n/app_en.arb

@@ -1,17 +1,33 @@
 import 'package:flutter/material.dart';
+<<<<<<< HEAD
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:vpn_client/l10n/app_localizations.dart';
+=======
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
 import 'package:provider/provider.dart';
 import 'package:vpn_client/pages/apps/apps_page.dart';
+import 'dart:ui' as ui;
 import 'package:vpn_client/pages/main/main_page.dart';
 import 'package:vpn_client/pages/settings/setting_page.dart';
 import 'package:vpn_client/pages/servers/servers_page.dart';
 import 'package:vpn_client/theme_provider.dart';
+<<<<<<< HEAD
+=======
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:vpn_client/vpn_state.dart';
+import 'package:vpn_client/localization_service.dart';
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
 
 import 'design/colors.dart';
 import 'nav_bar.dart';
 
-void main() {
+void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+
+  Locale userLocale =
+      ui.PlatformDispatcher.instance.locale; // <-- Get the system locale
+  await LocalizationService.load(userLocale);
+
   runApp(
     ChangeNotifierProvider(create: (_) => ThemeProvider(), child: const App()),
   );
@@ -25,13 +41,19 @@ class App extends StatelessWidget {
     final themeProvider = Provider.of<ThemeProvider>(context);
     final Locale? manualLocale = null;
     return MaterialApp(
+      localizationsDelegates: const [
+        GlobalMaterialLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate,
+      ],
       debugShowCheckedModeBanner: false,
       title: 'VPN Client',
       theme: lightTheme,
       darkTheme: darkTheme,
       locale: manualLocale,
-      localeResolutionCallback: (locale, supportedLocales) {
+      localeResolutionCallback: (locale, _) {
         if (locale == null) return const Locale('en');
+<<<<<<< HEAD
         for (var supportedLocale in supportedLocales) {
           if (supportedLocale.languageCode == locale.languageCode &&
               (supportedLocale.countryCode == null ||
@@ -43,11 +65,19 @@ class App extends StatelessWidget {
           return supportedLocales.contains(const Locale('zh'))
               ? const Locale('zh')
               : const Locale('en');
+=======
+
+        // Check for exact match
+        final supported = ['en', 'ru', 'th', 'zh'];
+        if (supported.contains(locale.languageCode)) {
+          return Locale(locale.languageCode);
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
         }
         return const Locale('en');
       },
       themeMode: themeProvider.themeMode,
       home: const MainScreen(),
+<<<<<<< HEAD
       localizationsDelegates: const [
         AppLocalizations.delegate,
         GlobalMaterialLocalizations.delegate,
@@ -60,6 +90,8 @@ class App extends StatelessWidget {
         Locale('th'),
         Locale('zh'),
       ],
+=======
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
     );
   }
 }

lib/l10n/app_ru.arb

@@ -1,7 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:vpn_client/pages/apps/apps_list.dart';
 import 'package:vpn_client/search_dialog.dart';
+<<<<<<< HEAD
 import 'package:vpn_client/l10n/app_localizations.dart';
+=======
+import 'package:vpn_client/localization_service.dart';
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
 
 class AppsPage extends StatefulWidget {
   const AppsPage({super.key});

lib/l10n/app_th.arb

@@ -1,6 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
+<<<<<<< HEAD
 import 'package:vpn_client/l10n/app_localizations.dart';
+=======
+import 'package:vpn_client/localization_service.dart';
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
 
 class LocationWidget extends StatelessWidget {
   final Map<String, dynamic>? selectedServer;
@@ -27,7 +31,11 @@ class LocationWidget extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(
+<<<<<<< HEAD
                 AppLocalizations.of(context).your_location,
+=======
+                LocalizationService.to('your_location'),
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
                 style: TextStyle(
                   fontSize: 14,
                   fontWeight: FontWeight.w400,

lib/l10n/app_zh.arb

@@ -86,6 +86,7 @@ class MainBtnState extends State<MainBtn> with SingleTickerProviderStateMixin {
       ConnectionStatus.disconnecting: LocalizationService.to('disconnecting'),
       ConnectionStatus.connecting: LocalizationService.to('connecting'),
     }[vpnState.connectionStatus]!;
+<<<<<<< HEAD
   }
 
   void startTimer() {
@@ -117,6 +118,8 @@ class MainBtnState extends State<MainBtn> with SingleTickerProviderStateMixin {
       case VpnConnectionState.disconnecting:
         return connectionStatusDisconnecting;
     }
+=======
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
   }
 
   Future<void> _toggleConnection(BuildContext context) async {
@@ -218,7 +221,11 @@ class MainBtnState extends State<MainBtn> with SingleTickerProviderStateMixin {
         ),
         const SizedBox(height: 20),
         Text(
+<<<<<<< HEAD
           currentStatusText,
+=======
+          connectionStatusText(context),
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
           style: TextStyle(
             fontSize: 16,
             fontWeight: FontWeight.w500,

lib/main.dart

@@ -4,7 +4,11 @@ import 'dart:convert';
 import 'package:vpn_client/pages/main/main_btn.dart';
 import 'package:vpn_client/pages/main/location_widget.dart';
 import 'package:vpn_client/pages/main/stat_bar.dart';
+<<<<<<< HEAD
 import 'package:vpn_client/l10n/app_localizations.dart';
+=======
+import 'package:vpn_client/localization_service.dart';
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
 
 class MainPage extends StatefulWidget {
   const MainPage({super.key});
@@ -55,7 +59,11 @@ class MainPageState extends State<MainPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+<<<<<<< HEAD
         title: Text(AppLocalizations.of(context).appName),
+=======
+        title: Text(LocalizationService.to('app_name')),
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
         centerTitle: true,
         titleTextStyle: TextStyle(
           color: Theme.of(context).colorScheme.primary,

lib/pages/apps/apps_page.dart

@@ -1,7 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:vpn_client/pages/servers/servers_list_item.dart';
+<<<<<<< HEAD
 import 'package:vpn_client/l10n/app_localizations.dart';
+=======
+import 'package:vpn_client/localization_service.dart';
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
 import 'dart:convert';
 import 'package:vpn_client/core/constants/storage_keys.dart';
 
@@ -86,25 +90,42 @@ class ServersListState extends State<ServersList> {
       List<Map<String, dynamic>> serversList = [
         {
           'icon': 'assets/images/flags/auto.svg',
+<<<<<<< HEAD
           'text': localizations.auto_select,
           'ping': localizations.fastest,
+=======
+          'text': LocalizationService.to('auto_select'),
+          'ping': LocalizationService.to('fastest'),
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
           'isActive': true,
         },
         {
           'icon': 'assets/images/flags/Kazahstan.svg',
+<<<<<<< HEAD
           'text': localizations.kazakhstan,
+=======
+          'text': LocalizationService.to('kazakhstan'),
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
           'ping': '48',
           'isActive': false,
         },
         {
           'icon': 'assets/images/flags/Turkey.svg',
+<<<<<<< HEAD
           'text': localizations.turkey,
+=======
+          'text': LocalizationService.to('turkey'),
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
           'ping': '142',
           'isActive': false,
         },
         {
           'icon': 'assets/images/flags/Poland.svg',
+<<<<<<< HEAD
           'text': localizations.poland,
+=======
+          'text': LocalizationService.to('poland'),
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
           'ping': '298',
           'isActive': false,
         },
@@ -221,11 +242,16 @@ class ServersListState extends State<ServersList> {
                           bottom: 5,
                         ), // Adicionado espaçamento
                         child: Text(
+<<<<<<< HEAD
                           AppLocalizations.of(context)!.selected_server,
                           style: TextStyle(
                             color: Theme.of(context).colorScheme.secondary,
                             fontSize: 14, // Consistência de tamanho
                           ),
+=======
+                          LocalizationService.to('selected_server'),
+                          style: TextStyle(color: Colors.grey),
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
                         ),
                       ),
                       ...activeServers.map((server) {
@@ -246,11 +272,16 @@ class ServersListState extends State<ServersList> {
                           bottom: 5,
                         ), // Adicionado espaçamento
                         child: Text(
+<<<<<<< HEAD
                           AppLocalizations.of(context)!.all_servers,
                           style: TextStyle(
                             color: Theme.of(context).colorScheme.secondary,
                             fontSize: 14, // Consistência de tamanho
                           ),
+=======
+                          LocalizationService.to('all_servers'),
+                          style: TextStyle(color: Colors.grey),
+>>>>>>> origin/feat/setting_page+adapter_telegrambot
                         ),
                       ),
                       ...inactiveServers.map((server) {