Merge to main

.vscode/settings.json

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

CHANGELOG.md

@@ -0,0 +1,54 @@
+# 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
+
+### Merged
+- Merged branch `development`: updated VPN link configuration to use 5.35.98.91
+- Merged branch `dodonov`: updated dependencies, improved l10n configuration, changed Android status bar style
+- Merged branch `feat/setting_page+adapter_telegrambot`: added settings page adapter, improved localization, updated plugin registrants, switched to JSON localization assets
+- Merged branch `bugfix/localization-no-synthetic-package`: resolved localization package issues, merged latest development changes
+- Merged branch `bugfix/vpnclient-engine-dependency`: improved VPN engine dependency handling, resolved localization and UI conflicts
+- Merged branch `refactoring-branch`: added new functionality including settings page, speed page, VPN provider, and navigation improvements
+- Merged branch `hotfix/temporary-vpn-uri`: updated VPN URI configuration to use temporary server
+- Merged branch `feat/vpn-link-selector`: added VPN link selector functionality
+- Merged branch `feat/dimensions`: added dimension links and UI improvements
+- Merged branch `feat/adding-ios-VPN-profile`: added iOS VPN profile support structure
+- Merged branch `ci/use-flutter-instead-dart-format`: updated CI configuration to use Flutter instead of dart format
+
+### Conflict Resolution
+- Resolved multiple merge conflicts in pubspec.yaml, pubspec.lock, localization files, and generated plugin registrants
+- Kept latest HEAD versions for all major Dart and localization files to ensure stability and consistency
+
+## [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 

android/app/src/main/res/values-night/styles.xml

@@ -14,5 +14,7 @@
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
+        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -14,5 +14,7 @@
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
+        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 </resources>

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
 }

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
 

ios/Runner/AppDelegate.swift

@@ -1,50 +1,75 @@
 import Flutter
 import UIKit
-///VPN
-///import Foundation
 import NetworkExtension
 
-class VpnConfigurator {
-    static func setupTunnel() {
-        let manager = NEVPNManager.shared()
-        manager.loadFromPreferences { error in
-            if let error = error {
-                print("Failed to load VPN preferences: \(error)")
-                return
-            }
+@UIApplicationMain
+@objc class AppDelegate: FlutterAppDelegate {
+    override func application(
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+    ) -> Bool {
+        GeneratedPluginRegistrant.register(with: self)
 
-            let proto = NETunnelProviderProtocol()
-            proto.providerBundleIdentifier = "com.vpnclient.VPNclientTunnel"
-            proto.serverAddress = "VPNclient"
+        let controller = window?.rootViewController as! FlutterViewController
+        let vpnChannel = FlutterMethodChannel(
+            name: "com.vpnclient/vpn_control",
+            binaryMessenger: controller.binaryMessenger
+        )
 
-            manager.protocolConfiguration = proto
-            manager.localizedDescription = "VPNclient"
-            manager.isEnabled = true
+        vpnChannel.setMethodCallHandler { [weak self] (call: FlutterMethodCall, result: @escaping FlutterResult) in
+            guard let self = self else { return }
+            switch call.method {
+            case "setupVPN":
+                guard let args = call.arguments as? [String: String],
+                      let tunAddr = args["tunAddr"],
+                      let tunMask = args["tunMask"],
+                      let tunDns = args["tunDns"],
+                      let socks5Proxy = args["socks5Proxy"] else {
+                    result(FlutterError(code: "INVALID_ARGS", message: "Invalid arguments", details: nil))
+                    return
+                }
+                print("AppDelegate: Setting up VPN with tunAddr=\(tunAddr), socks5Proxy=\(socks5Proxy)")
+                let vpnManager = VPNManager.sharedInstance ?? VPNManager()
+                vpnManager.setupVPNConfiguration(tunAddr: tunAddr, tunMask: tunMask, tunDns: tunDns, socks5Proxy: socks5Proxy) { error in
+                    if let error = error {
+                        print("AppDelegate: Setup VPN failed: \(error.localizedDescription)")
+                        result(FlutterError(code: "SETUP_FAILED", message: error.localizedDescription, details: nil))
+                    } else {
+                        print("AppDelegate: Setup VPN succeeded")
+                        result(nil)
+                    }
+                }
 
-            manager.saveToPreferences { error in
-                if let error = error {
-                    print("Failed to save VPN configuration: \(error)")
-                } else {
-                    print("VPN configuration saved successfully.")
+            case "startVPN":
+                let vpnManager = VPNManager.sharedInstance ?? VPNManager()
+                vpnManager.startVPN { error in
+                    if let error = error {
+                        print("AppDelegate: Start VPN failed: \(error.localizedDescription)")
+                        result(FlutterError(code: "START_FAILED", message: error.localizedDescription, details: nil))
+                    } else {
+                        print("AppDelegate: Start VPN succeeded")
+                        result(nil)
+                    }
                 }
-            }
-        }
-    }
-}
-///VPN
 
+            case "stopVPN":
+                let vpnManager = VPNManager.sharedInstance ?? VPNManager()
+                vpnManager.stopVPN {
+                    print("AppDelegate: Stop VPN succeeded")
+                    result(nil)
+                }
 
+            case "getVPNStatus":
+                let vpnManager = VPNManager.sharedInstance ?? VPNManager()
+                let status = vpnManager.vpnStatus.description
+                print("AppDelegate: VPN status: \(status)")
+                result(status)
 
-@main
-@objc class AppDelegate: FlutterAppDelegate {
-  override func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-  ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
-     ///vpn
-      VpnConfigurator.setupTunnel()
-      ///vpn
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
-  }
-}
+            default:
+                result(FlutterMethodNotImplemented)
+            }
+        }
+
+        return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+    }
+}

ios/Runner/Base.lproj/Main.storyboard

@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Flutter View Controller-->
@@ -14,13 +16,14 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="-16" y="-40"/>
         </scene>
     </scenes>
 </document>

ios/Runner/Info.plist

@@ -33,6 +33,11 @@
 	</dict>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>fetch</string>
+		<string>remote-notification</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -50,5 +55,9 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>com.apple.developer.networking.vpn.api</key>
+	<array>
+		<string>allow-vpn</string>
+	</array>
 </dict>
 </plist>

ios/Runner/Runner.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.developer.networking.networkextension</key>
+	<array>
+		<string>packet-tunnel-provider</string>
+	</array>
+</dict>
+</plist>

ios/Runner/RunnerRelease.entitlements

@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>com.apple.developer.networking.networkextension</key>
-	<array>
-		<string>dns-settings</string>
-		<string>packet-tunnel-provider</string>
-		<string>dns-proxy</string>
-		<string>app-proxy-provider</string>
-		<string>content-filter-provider</string>
-	</array>
-	<key>com.apple.developer.networking.vpn.api</key>
-	<array>
-		<string>allow-vpn</string>
-	</array>
-</dict>
+<dict/>
 </plist>