Merge development into feat/setting_page+adapter_telegrambot: resolve conflicts by keeping development versions

Author: Anton-Dodonov

.github/workflows/quality.yml

@@ -21,8 +21,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Setup dart
-        uses: dart-lang/setup-dart@v1
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version-file: pubspec.yaml
       - name: Format code
         run: dart format --output=none .
   matrics:

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "IDX.aI.enableInlineCompletion": true,
+    "IDX.aI.enableCodebaseIndexing": true
+}

CHANGELOG.md

@@ -0,0 +1,37 @@
+# Changelog
+
+
+## [Unreleased]
+
+### Added
+- Run scripts for different platforms (Android device/emulator, iOS device/simulator)
+- Flutter Gen integration for better asset management
+- Improved localization with proper l10n configuration
+- Enhanced search dialog UI and state management
+
+### Changed
+- Replaced flutter_v2ray with vpnclient_engine_flutter
+- Updated dependencies and removed unused code
+- Improved UI responsiveness and overflow handling
+- Refactored main.dart for better localization support
+
+### Fixed
+- Resolved potential UI overflow issues in search dialog
+- Enhanced state initialization and lifecycle management
+- Improved layout responsiveness and SafeArea integration
+
+## [1.0.12] - 2025-01-XX
+
+### Added
+- Initial release of VPN Client app
+- Basic VPN functionality
+- Multi-language support (English, Russian, Thai, Chinese)
+- Dark/Light theme support
+- Server selection interface
+- Apps management page
+
+### Changed
+- Initial project structure and architecture
+
+### Fixed
+- Various UI improvements and bug fixes 

ios/Podfile.lock

@@ -26,9 +26,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29
-  flutter_v2ray: 21ee520e013877941e2e67b3b48aed9c6870e8dc
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
+  flutter_v2ray: 1190bb389b67a1dc9f28ece1d4b308101e38395e
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
 
 PODFILE CHECKSUM: f8e15f817b1bf5846cb6aad560a31cf33c165196
 

lib/core/constants/storage_keys.dart

@@ -0,0 +1,8 @@
+// lib/core/constants/storage_keys.dart
+class StorageKeys {
+  static const String selectedApps = 'selected_apps';
+  static const String selectedServers = 'selected_servers';
+  static const String recentlySearchedApps = 'recently_searched_apps';
+  static const String recentlySearchedServers = 'recently_searched_servers';
+  static const String isDarkTheme = 'isDarkTheme';
+}

lib/design/dimensions.dart

@@ -1,72 +1,3 @@
-import 'package:flutter/material.dart';
-
-class CustomString {
-  final BuildContext context;
-  late Locale locale;
-
-  CustomString(this.context) {
-    locale = Localizations.localeOf(context);
-  }
-
-  String get connected {
-    return _localized('connected');
-  }
-
-  String get disconnected {
-    return _localized('disconnected');
-  }
-
-  String get connecting {
-    return _localized('connecting');
-  }
-
-  String get disconnecting {
-    return _localized('disconnecting');
-  }
-
-  String get allapp {
-    return _localized('all_apps');
-  }
-
-  String _localized(String key) {
-    switch (locale.languageCode) {
-      case 'ru':
-        return {
-          'connected': 'ПОДКЛЮЧЕН',
-          'disconnected': 'ОТКЛЮЧЕН',
-          'connecting': 'ПОДКЛЮЧЕНИЕ',
-          'disconnecting': 'ОТКЛЮЧЕНИЕ',
-          "all_apps": "Все приложения",
-        }[key]!;
-      case 'th':
-        return {
-          "connected": "เชื่อมต่อแล้ว",
-          "disconnected": "ไม่ได้เชื่อมต่อ",
-          "connecting": "กำลังเชื่อมต่อ",
-          "disconnecting": "กำลังตัดการเชื่อมต่อ",
-          "all_apps": "แอปทั้งหมด",
-        }[key]!;
-      case 'zh':
-        return {
-          "connected": "已连接",
-          "disconnected": "已断开",
-          "connecting": "正在连接",
-          "disconnecting": "正在断开",
-          "all_apps": "所有应用",
-        }[key]!;
-      case 'en':
-      default:
-        return {
-          'connected': 'CONNECTED',
-          'disconnected': 'DISCONNECTED',
-          'connecting': 'CONNECTING',
-          'disconnecting': 'DISCONNECTING',
-          "all_apps": "All Applications",
-        }[key]!;
-    }
-  }
-}
-
 // style
 const double elevation0 = 0;
 

lib/l10n/app_en.arb

@@ -0,0 +1,26 @@
+{
+ 
+  "app_name": "VPN Client",
+  "apps_selection": "App Selection",
+  "search": "Search",
+  "your_location": "Your Location",
+  "auto_select": "Auto Select",
+  "kazakhstan": "Kazakhstan",
+  "turkey": "Turkey",
+  "poland": "Poland",
+  "fastest": "Fastest",
+  "selected_server": "Selected server",
+  "server_selection": "Server selection",
+  "all_servers": "All servers",
+  "country_name": "Country name",
+  "all_apps": "All Applications",
+  "done": "Done",
+  "cancel": "Cancel",
+  "recently_searched": "Recently searched",
+  "nothing_found": "Nothing found",
+  "connected": "CONNECTED",
+  "disconnected": "DISCONNECTED",
+  "reconnecting": "RECONNECTING",
+  "connecting": "CONNECTING",
+  "disconnecting": "DISCONNECTING"
+}

lib/models/nav_item.dart

@@ -0,0 +1,8 @@
+import 'package:flutter/material.dart';
+
+class NavItem {
+  final Widget inactiveIcon;
+  final Widget activeIcon;
+
+  NavItem({required this.inactiveIcon, required this.activeIcon});
+}

lib/pages/apps/apps_list.dart

@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:vpn_client/design/dimensions.dart';
 import 'apps_list_item.dart';
+import 'package:vpn_client/l10n/app_localizations.dart';
 import 'dart:convert';
+import 'package:vpn_client/core/constants/storage_keys.dart'; // Importar as constantes
 
 class AppsList extends StatefulWidget {
   final Function(List<Map<String, dynamic>>)? onAppsLoaded;
@@ -17,32 +18,28 @@ class AppsList extends StatefulWidget {
 class AppsListState extends State<AppsList> {
   List<Map<String, dynamic>> _apps = [];
   bool _isLoading = true;
+  bool _dataLoaded = false; // Flag para controlar o carregamento inicial
 
   @override
   void initState() {
     super.initState();
     if (widget.apps != null && widget.apps!.isNotEmpty) {
       _apps = widget.apps!;
       _isLoading = false;
-      if (widget.onAppsLoaded != null) {
-        widget.onAppsLoaded!(_apps);
-      }
-    } else {
-      _loadApps();
+      _dataLoaded =
+          true; // Marcar como carregado se dados iniciais foram fornecidos
+      // widget.onAppsLoaded é chamado em didUpdateWidget ou após _loadApps
     }
   }
 
   late String textallapps;
-  bool _initialized = false;
-
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    if (!_initialized) {
-      final statusText = CustomString(context);
-      textallapps = statusText.allapp;
+    if (!_dataLoaded) {
+      // Carregar apenas se os dados não foram carregados via widget.apps ou anteriormente
+      textallapps = AppLocalizations.of(context)!.all_apps;
       _loadApps();
-      _initialized = true;
     }
   }
 
@@ -53,22 +50,41 @@ class AppsListState extends State<AppsList> {
       setState(() {
         _apps = widget.apps!;
         _isLoading = false;
+        _dataLoaded = true;
       });
       _saveSelectedApps();
     }
   }
 
   Future<void> _loadApps() async {
     setState(() {
-      _isLoading = true;
+      // Evitar mostrar loading se já estiver carregando ou já carregou
+      if (!_dataLoaded) _isLoading = true;
     });
 
+    // Simulação de carregamento
+    // Em um app real, aqui viria a lógica de buscar dados de uma API ou DB
+    await Future.delayed(const Duration(milliseconds: 100)); // Simular delay
+
+    // Definir textallapps aqui se ainda não foi definido em didChangeDependencies
+    // Isso é um fallback, idealmente textallapps já está disponível.
+    // Adicionando verificação de 'mounted' para o BuildContext
+    if (!mounted) return;
+    final localizations = AppLocalizations.of(context);
+    textallapps = localizations?.all_apps ?? "All Applications";
+
     try {
+      // Se os dados já foram carregados (ex: por uma busca anterior que atualizou widget.apps), não recarregar do zero
+      if (_dataLoaded && _apps.isNotEmpty) {
+        setState(() => _isLoading = false);
+        return;
+      }
+
       List<Map<String, dynamic>> appsList = [
         {
           'icon': null,
           'image': null,
-          'text': textallapps,
+          'text': textallapps, // Usar a string localizada
           'isSwitch': true,
           'isActive': false,
         },
@@ -106,7 +122,7 @@ class AppsListState extends State<AppsList> {
       ]);
 
       final prefs = await SharedPreferences.getInstance();
-      final String? savedApps = prefs.getString('selected_apps');
+      final String? savedApps = prefs.getString(StorageKeys.selectedApps);
       if (savedApps != null) {
         final List<dynamic> savedAppsList = jsonDecode(savedApps);
         for (var savedApp in savedAppsList) {
@@ -122,6 +138,7 @@ class AppsListState extends State<AppsList> {
       setState(() {
         _apps = appsList;
         _isLoading = false;
+        _dataLoaded = true; // Marcar que os dados foram carregados
       });
 
       if (widget.onAppsLoaded != null) {
@@ -130,6 +147,7 @@ class AppsListState extends State<AppsList> {
     } catch (e) {
       setState(() {
         _isLoading = false;
+        _dataLoaded = true; // Marcar como tentado carregar para evitar loop
       });
       debugPrint('Error loading apps: $e');
     }
@@ -141,7 +159,7 @@ class AppsListState extends State<AppsList> {
         _apps
             .map((app) => {'text': app['text'], 'isActive': app['isActive']})
             .toList();
-    await prefs.setString('selected_apps', jsonEncode(selectedApps));
+    await prefs.setString(StorageKeys.selectedApps, jsonEncode(selectedApps));
   }
 
   List<Map<String, dynamic>> get apps => _apps;
@@ -150,14 +168,19 @@ class AppsListState extends State<AppsList> {
     setState(() {
       if (index == 0 && _apps[index]['isSwitch']) {
         _apps[0]['isActive'] = !_apps[0]['isActive'];
+        // Se "Todos os aplicativos" for ativado, desabilitar os outros itens da lista (visual)
+        // A lógica de 'isEnabled' no AppListItem já cuida disso visualmente.
+        // Aqui, garantimos que os outros não estejam 'isActive' se "Todos" estiver ativo.
         if (_apps[0]['isActive']) {
           for (int i = 1; i < _apps.length; i++) {
-            _apps[i]['isEnabled'] = false;
+            _apps[i]['isActive'] =
+                false; // Desmarcar outros se "Todos" for selecionado
           }
         }
       } else {
         _apps[index]['isActive'] = !_apps[index]['isActive'];
-        if (_apps[index]['isActive']) {
+        // Se um app individual for ativado, "Todos os aplicativos" deve ser desativado
+        if (_apps[index]['isActive'] && index != 0) {
           _apps[0]['isActive'] = false;
         }
       }
@@ -170,6 +193,18 @@ class AppsListState extends State<AppsList> {
 
   @override
   Widget build(BuildContext context) {
+    // Garante que textallapps seja inicializado se didChangeDependencies não for chamado a tempo
+    // ou se o widget for reconstruído antes.
+    textallapps = AppLocalizations.of(context)?.all_apps ?? "All Applications";
+
+    // Atualiza o texto do primeiro item se ele ainda não estiver com o texto localizado
+    // Isso pode acontecer se _loadApps for chamado antes de textallapps ser definido por didChangeDependencies
+    if (_apps.isNotEmpty &&
+        _apps[0]['text'] != textallapps &&
+        _apps[0]['isSwitch'] == true) {
+      _apps[0]['text'] = textallapps;
+    }
+
     return Container(
       width: MediaQuery.of(context).size.width,
       height: MediaQuery.of(context).size.height,
@@ -191,7 +226,9 @@ class AppsListState extends State<AppsList> {
                       text: _apps[index]['text'],
                       isSwitch: _apps[index]['isSwitch'],
                       isActive: _apps[index]['isActive'],
-                      isEnabled: index == 0 || !_apps[0]['isActive'],
+                      isEnabled:
+                          index == 0 ||
+                          !_apps[0]['isActive'], // Item é habilitado se for o switch "Todos" ou se "Todos" não estiver ativo
                       onTap: () => _onItemTapped(index),
                     );
                   }),