Merge development into feat/adding-ios-VPN-profile: manual conflict resolution, preserve all new changes from both branches

Author: Anton-Dodonov

.github/workflows/quality.yml

@@ -21,10 +21,13 @@ 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 --set-exit-if-changed .
+        run: dart format --output=none .
   matrics:
     name: Code Matrics
     needs: [analyze]

.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 

assets/images/active_home_o.svg

@@ -0,0 +1,41 @@
+{
+ 
+  "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",
+  "settings": "Settings",
+  "version": "Version",
+  "connection": "Connection",
+  "not_connected": "Not connected",
+  "support": "Support",
+  "unavailable": "Unavailable",
+  "your_id": "Your ID",
+  "support_service": "Support Service",
+  "reset_settings": "Reset settings",
+  "connect": "Connect",
+  "are_you_sure_reset": "Are you sure you want to reset all connection settings?",
+  "reset": "Reset",
+  "connection_reset": "Connection settings have been reset",
+  "failed_open_telegram": "Failed to open Telegram bot",
+  "about_app": "About App"
+}

assets/images/active_server_o.svg

@@ -1,5 +1,5 @@
 {
-    "@@locale": "ru",
+    
     "app_name": "VPN Клиент",
     "apps_selection": "Выбор приложений",
     "search": "Поиск",
@@ -22,5 +22,20 @@
     "disconnected": "ОТКЛЮЧЕН",
     "reconnecting": "Повторное подключение",
     "connecting": "ПОДКЛЮЧЕНИЕ",
-    "disconnecting": "ОТКЛЮЧЕНИЕ"
+    "disconnecting": "ОТКЛЮЧЕНИЕ",
+    "settings": "Настройки",
+    "version": "Версия",
+    "connection": "Подключение",
+    "not_connected": "Не подключено",
+    "support": "Поддержка",
+    "unavailable": "Недоступно",
+    "your_id": "Ваш ID",
+    "support_service": "Служба поддержки",
+    "reset_settings": "Сбросить настройки",
+    "connect": "Подключить",
+    "are_you_sure_reset": "Вы уверены, что хотите сбросить все настройки подключения?",
+    "reset": "Сбросить",
+    "connection_reset": "Настройки подключения сброшены",
+    "failed_open_telegram": "Не удалось открыть Telegram бот",
+    "about_app": "О приложении"
   }

assets/images/active_settings_o.svg

@@ -1,5 +1,5 @@
 {
-    "@@locale": "th",
+ 
     "app_name": "VPN Client",
     "apps_selection": "เลือกแอป",
     "search": "ค้นหา",
@@ -22,5 +22,20 @@
     "disconnected": "ไม่ได้เชื่อมต่อ",
     "reconnecting": "กำลังเชื่อมต่อใหม่",
     "connecting": "กำลังเชื่อมต่อ",
-    "disconnecting": "กำลังตัดการเชื่อมต่อ"
+    "disconnecting": "กำลังตัดการเชื่อมต่อ",
+    "settings": "การตั้งค่า",
+    "version": "เวอร์ชัน",
+    "connection": "การเชื่อมต่อ",
+    "not_connected": "ไม่ได้เชื่อมต่อ",
+    "support": "การสนับสนุน",
+    "unavailable": "ไม่พร้อมใช้งาน",
+    "your_id": "รหัสของคุณ",
+    "support_service": "บริการสนับสนุน",
+    "reset_settings": "รีเซ็ตการตั้งค่า",
+    "connect": "เชื่อมต่อ",
+    "are_you_sure_reset": "คุณแน่ใจหรือไม่ว่าต้องการรีเซ็ตการตั้งค่าการเชื่อมต่อทั้งหมด?",
+    "reset": "รีเซ็ต",
+    "connection_reset": "รีเซ็ตการตั้งค่าการเชื่อมต่อแล้ว",
+    "failed_open_telegram": "ไม่สามารถเปิดบอท Telegram ได้",
+    "about_app": "เกี่ยวกับแอป"
 }