Merge development into feat/vpn-link-selector: 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 --set-exit-if-changed .
   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 

assets/lang/en.json

@@ -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"
+}

assets/lang/ru.json

@@ -0,0 +1,26 @@
+{
+    
+    "app_name": "VPN Клиент",
+    "apps_selection": "Выбор приложений",
+    "search": "Поиск",
+    "your_location": "Ваша локация",
+    "auto_select": "Автовыбор",
+    "kazakhstan": "Казахстан",
+    "turkey": "Турция",
+    "poland": "Польша",
+    "fastest": "Самый быстрый",
+    "selected_server": "Выбранный сервер",
+    "server_selection": "Выбор сервера",
+    "all_servers": "Все серверы",
+    "country_name": "Название страны",
+    "all_apps": "Все приложения",
+    "done": "Готово",
+    "cancel": "Отмена",
+    "recently_searched": "Недавно искали",
+    "nothing_found": "Ничего не найдено",
+    "connected": "ПОДКЛЮЧЕН",
+    "disconnected": "ОТКЛЮЧЕН",
+    "reconnecting": "Повторное подключение",
+    "connecting": "ПОДКЛЮЧЕНИЕ",
+    "disconnecting": "ОТКЛЮЧЕНИЕ"
+  }

assets/lang/th.json

@@ -0,0 +1,26 @@
+{
+ 
+    "app_name": "VPN Client",
+    "apps_selection": "เลือกแอป",
+    "search": "ค้นหา",
+    "your_location": "ตำแหน่งของคุณ",
+    "auto_select": "เลือกอัตโนมัติ",
+    "kazakhstan": "คาซัคสถาน",
+    "turkey": "ตุรกี",
+    "poland": "โปแลนด์",
+    "fastest": "เร็วที่สุด",
+    "selected_server": "เซิร์ฟเวอร์ที่เลือก",
+    "server_selection": "เลือกเซิร์ฟเวอร์",
+    "all_servers": "เซิร์ฟเวอร์ทั้งหมด",
+    "country_name": "ชื่อประเทศ",
+    "all_apps": "แอปทั้งหมด",
+    "done": "เสร็จสิ้น",
+    "cancel": "ยกเลิก",
+    "recently_searched": "การค้นหาล่าสุด",
+    "nothing_found": "ไม่พบข้อมูล",
+    "connected": "เชื่อมต่อแล้ว",
+    "disconnected": "ไม่ได้เชื่อมต่อ",
+    "reconnecting": "กำลังเชื่อมต่อใหม่",
+    "connecting": "กำลังเชื่อมต่อ",
+    "disconnecting": "กำลังตัดการเชื่อมต่อ"
+}

assets/lang/zh.json

@@ -0,0 +1,26 @@
+{
+    
+    "app_name": "VPN客户端",
+    "apps_selection": "应用选择",
+    "search": "搜索",
+    "your_location": "你的位置",
+    "auto_select": "自动选择",
+    "kazakhstan": "哈萨克斯坦",
+    "turkey": "土耳其",
+    "poland": "波兰",
+    "fastest": "最快",
+    "selected_server": "已选择服务器",
+    "server_selection": "服务器选择",
+    "all_servers": "所有服务器",
+    "country_name": "国家名称",
+    "all_apps": "所有应用",
+    "done": "完成",
+    "cancel": "取消",
+    "recently_searched": "最近搜索",
+    "nothing_found": "未找到内容",
+    "connected": "已连接",
+    "disconnected": "已断开连接",
+    "reconnecting": "重新连接",
+    "connecting": "连接中",
+    "disconnecting": "断开中"
+}

l10n.yaml

@@ -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/core/constants/storage_keys.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;
 
@@ -77,3 +8,6 @@ const double fontSize15 = 15;
 const double fontSize17 = 17;
 const double fontSize24 = 24;
 const double fontSize40 = 40;
+
+const String connectionTgUrl = 't.me/vpn_client_bot';
+const String supportTgUrl = 't.me/vpn_client_support';