Merge all branches

.github/workflows/quality.yml

@@ -13,6 +13,8 @@ jobs:
       - run: flutter pub get
       - run: dart format --set-exit-if-changed .
       - run: flutter analyze
+      - run: flutter test
       - name: Run Dart Code Metrics
+        run: |
           dart pub global activate dart_code_metrics
           dart pub global run dart_code_metrics:metrics analyze lib

build_android.sh

@@ -1 +1,2 @@
 flutter build appbundle
+flutter build apk

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

ios/Runner.xcodeproj/project.pbxproj

@@ -48,6 +48,7 @@
 		2BABBD1CBB549C229028E3E6 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		3AC403B42DBB3FD400E35EC1 /* RunnerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerRelease.entitlements; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		40D432E32B669D72F284E50A /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		474E7930403F702C7244270A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -143,6 +144,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				3AC403B42DBB3FD400E35EC1 /* RunnerRelease.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -680,6 +682,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = 6XT4R7V83F;
 				ENABLE_BITCODE = NO;
@@ -691,6 +696,7 @@
 				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = vpnclient.click;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

ios/Runner/AppDelegate.swift

@@ -1,5 +1,39 @@
 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
+            }
+
+            let proto = NETunnelProviderProtocol()
+            proto.providerBundleIdentifier = "com.vpnclient.VPNclientTunnel"
+            proto.serverAddress = "VPNclient"
+
+            manager.protocolConfiguration = proto
+            manager.localizedDescription = "VPNclient"
+            manager.isEnabled = true
+
+            manager.saveToPreferences { error in
+                if let error = error {
+                    print("Failed to save VPN configuration: \(error)")
+                } else {
+                    print("VPN configuration saved successfully.")
+                }
+            }
+        }
+    }
+}
+///VPN
+
+
 
 @main
 @objc class AppDelegate: FlutterAppDelegate {
@@ -8,6 +42,9 @@ import UIKit
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
+     ///vpn
+      VpnConfigurator.setupTunnel()
+      ///vpn
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
 }

ios/Runner/RunnerRelease.entitlements

@@ -0,0 +1,18 @@
+<?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>
+</plist>

l10n.yaml

@@ -0,0 +1,4 @@
+synthetic-package: false
+arb-dir: lib/l10n
+template-arb-file: app_en.arb
+output-localization-file: app_localizations.dart

lib/design/colors.dart

@@ -25,5 +25,5 @@ final ThemeData darkTheme = ThemeData(
 final LinearGradient mainGradient = LinearGradient(
   colors: [Color(0xFF00C6FB), Color(0xFF005BEA)],
   begin: Alignment.topCenter,
-  end: Alignment.bottomCenter
+  end: Alignment.bottomCenter,
 );

lib/design/custom_icons.dart

@@ -6,7 +6,19 @@ class CustomIcons {
   static const _kFontFam = 'CustomIcons';
   static const String? _kFontPkg = null;
 
-  static const IconData ping = IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg);
-  static const IconData download = IconData(0xe801, fontFamily: _kFontFam, fontPackage: _kFontPkg);
-  static const IconData upload = IconData(0xe802, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+  static const IconData ping = IconData(
+    0xe800,
+    fontFamily: _kFontFam,
+    fontPackage: _kFontPkg,
+  );
+  static const IconData download = IconData(
+    0xe801,
+    fontFamily: _kFontFam,
+    fontPackage: _kFontPkg,
+  );
+  static const IconData upload = IconData(
+    0xe802,
+    fontFamily: _kFontFam,
+    fontPackage: _kFontPkg,
+  );
 }

lib/design/dimensions.dart

@@ -1,8 +1,71 @@
-// text
-const String connectionStatusConnected = 'ПОДКЛЮЧЕН';
-const String connectionStatusDisconnected = 'ОТКЛЮЧЕН';
-const String connectionStatusConnecting = 'ПОДКЛЮЧЕНИЕ';
-const String connectionStatusDisconnecting = 'ОТКЛЮЧЕНИЕ';
+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/design/images.dart

@@ -1,11 +1,17 @@
 import 'package:flutter_svg/flutter_svg.dart';
 
 final SvgPicture homeIcon = SvgPicture.asset('assets/images/home.svg');
-final SvgPicture activeHomeIcon = SvgPicture.asset('assets/images/active_home.svg');
+final SvgPicture activeHomeIcon = SvgPicture.asset(
+  'assets/images/active_home.svg',
+);
 final SvgPicture appIcon = SvgPicture.asset('assets/images/app.svg');
-final SvgPicture activeAppIcon = SvgPicture.asset('assets/images/active_app.svg');
+final SvgPicture activeAppIcon = SvgPicture.asset(
+  'assets/images/active_app.svg',
+);
 final SvgPicture serverIcon = SvgPicture.asset('assets/images/server.svg');
-final SvgPicture activeServerIcon = SvgPicture.asset('assets/images/active_server.svg');
+final SvgPicture activeServerIcon = SvgPicture.asset(
+  'assets/images/active_server.svg',
+);
 final SvgPicture settingsIcon = SvgPicture.asset('assets/images/settings.svg');
 final SvgPicture speedIcon = SvgPicture.asset('assets/images/speed.svg');
-final SvgPicture deFlag = SvgPicture.asset('assets/images/de.svg');
+final SvgPicture deFlag = SvgPicture.asset('assets/images/de.svg');

lib/l10n/app_en.arb

@@ -0,0 +1,31 @@
+{
+    "@@locale": "en",
+    "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",
+   "connecting": "CONNECTING",
+   "disconnecting": "DISCONNECTING"
+
+
+
+
+
+}
+