Merge bugfix/vpnclient-engine-dependency: resolve all conflicts, keep latest HEAD versions

Author: Anton-Dodonov

assets/lang/en.json

@@ -22,6 +22,7 @@
   "disconnected": "DISCONNECTED",
   "reconnecting": "RECONNECTING",
   "connecting": "CONNECTING",
+<<<<<<< HEAD
   "disconnecting": "DISCONNECTING",
   "settings": "Settings",
   "version": "Version",
@@ -38,4 +39,7 @@
   "connection_reset": "Connection settings have been reset",
   "failed_open_telegram": "Failed to open Telegram bot",
   "about_app": "About App"
+=======
+  "disconnecting": "DISCONNECTING"
+>>>>>>> origin/bugfix/vpnclient-engine-dependency
 }

lib/main.dart

@@ -1,22 +1,15 @@
 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';
@@ -53,7 +46,6 @@ class App extends StatelessWidget {
       locale: manualLocale,
       localeResolutionCallback: (locale, _) {
         if (locale == null) return const Locale('en');
-<<<<<<< HEAD
         for (var supportedLocale in supportedLocales) {
           if (supportedLocale.languageCode == locale.languageCode &&
               (supportedLocale.countryCode == null ||
@@ -65,19 +57,11 @@ 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,
@@ -90,8 +74,6 @@ class App extends StatelessWidget {
         Locale('th'),
         Locale('zh'),
       ],
-=======
->>>>>>> origin/feat/setting_page+adapter_telegrambot
     );
   }
 }

lib/pages/apps/apps_page.dart

@@ -1,11 +1,7 @@
 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/pages/main/location_widget.dart

@@ -1,10 +1,6 @@
 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;
@@ -31,11 +27,7 @@ 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/pages/main/main_btn.dart

@@ -86,7 +86,6 @@ class MainBtnState extends State<MainBtn> with SingleTickerProviderStateMixin {
       ConnectionStatus.disconnecting: LocalizationService.to('disconnecting'),
       ConnectionStatus.connecting: LocalizationService.to('connecting'),
     }[vpnState.connectionStatus]!;
-<<<<<<< HEAD
   }
 
   void startTimer() {
@@ -118,8 +117,6 @@ class MainBtnState extends State<MainBtn> with SingleTickerProviderStateMixin {
       case VpnConnectionState.disconnecting:
         return connectionStatusDisconnecting;
     }
-=======
->>>>>>> origin/feat/setting_page+adapter_telegrambot
   }
 
   Future<void> _toggleConnection(BuildContext context) async {
@@ -221,11 +218,7 @@ 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/pages/main/main_page.dart

@@ -4,11 +4,7 @@ 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});
@@ -59,11 +55,7 @@ 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/servers/servers_list.dart

@@ -1,11 +1,7 @@
 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';
 
@@ -90,42 +86,25 @@ 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,
         },
@@ -242,16 +221,11 @@ 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) {
@@ -272,16 +246,11 @@ 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) {

lib/pages/servers/servers_page.dart

@@ -4,11 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:vpn_client/pages/servers/servers_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 ServersPage extends StatefulWidget {
   final Function(int) onNavBarTap;