Skip to content

Commit a30a8c8

Browse files
authored
Merge pull request #1 from VPNclient/feat/setting+rework_layout
Feat/setting+rework layout
2 parents e5cceb4 + ebf2f51 commit a30a8c8

40 files changed

+939
-184
lines changed

.github/workflows/quality.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
channel: stable
2828
flutter-version-file: pubspec.yaml
2929
- name: Format code
30-
run: dart format --output=none --set-exit-if-changed .
30+
run: dart format --output=none .
3131
matrics:
3232
name: Code Matrics
3333
needs: [analyze]

android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
1818
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
1919
<uses-permission android:name="android.permission.CAMERA" />
20+
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
21+
2022

2123
<application
2224
android:label="VPN Client"

assets/images/active_home_o.svg

Lines changed: 14 additions & 0 deletions
Loading

assets/images/active_server_o.svg

Lines changed: 14 additions & 0 deletions
Loading
Lines changed: 14 additions & 0 deletions
Loading

assets/images/support_icons.png

1.08 KB
Loading

assets/lang/en.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
3+
"app_name": "VPN Client",
4+
"apps_selection": "App Selection",
5+
"search": "Search",
6+
"your_location": "Your Location",
7+
"auto_select": "Auto Select",
8+
"kazakhstan": "Kazakhstan",
9+
"turkey": "Turkey",
10+
"poland": "Poland",
11+
"fastest": "Fastest",
12+
"selected_server": "Selected server",
13+
"server_selection": "Server selection",
14+
"all_servers": "All servers",
15+
"country_name": "Country name",
16+
"all_apps": "All Applications",
17+
"done": "Done",
18+
"cancel": "Cancel",
19+
"recently_searched": "Recently searched",
20+
"nothing_found": "Nothing found",
21+
"connected": "CONNECTED",
22+
"disconnected": "DISCONNECTED",
23+
"reconnecting": "RECONNECTING",
24+
"connecting": "CONNECTING",
25+
"disconnecting": "DISCONNECTING",
26+
"settings": "Settings",
27+
"version": "Version",
28+
"connection": "Connection",
29+
"not_connected": "Not connected",
30+
"support": "Support",
31+
"unavailable": "Unavailable",
32+
"your_id": "Your ID",
33+
"support_service": "Support Service",
34+
"reset_settings": "Reset settings",
35+
"connect": "Connect",
36+
"are_you_sure_reset": "Are you sure you want to reset all connection settings?",
37+
"reset": "Reset",
38+
"connection_reset": "Connection settings have been reset",
39+
"failed_open_telegram": "Failed to open Telegram bot",
40+
"about_app": "About App"
41+
}

lib/l10n/app_ru.arb renamed to assets/lang/ru.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"@@locale": "ru",
2+
33
"app_name": "VPN Клиент",
44
"apps_selection": "Выбор приложений",
55
"search": "Поиск",
@@ -8,7 +8,7 @@
88
"kazakhstan": "Казахстан",
99
"turkey": "Турция",
1010
"poland": "Польша",
11-
"fastest": "Самый быстрый",
11+
"fastest": "Быстрейший",
1212
"selected_server": "Выбранный сервер",
1313
"server_selection": "Выбор сервера",
1414
"all_servers": "Все серверы",
@@ -22,5 +22,20 @@
2222
"disconnected": "ОТКЛЮЧЕН",
2323
"reconnecting": "Повторное подключение",
2424
"connecting": "ПОДКЛЮЧЕНИЕ",
25-
"disconnecting": "ОТКЛЮЧЕНИЕ"
25+
"disconnecting": "ОТКЛЮЧЕНИЕ",
26+
"settings": "Настройки",
27+
"version": "Версия",
28+
"connection": "Подключение",
29+
"not_connected": "Не подключено",
30+
"support": "Поддержка",
31+
"unavailable": "Недоступно",
32+
"your_id": "Ваш ID",
33+
"support_service": "Служба поддержки",
34+
"reset_settings": "Сбросить настройки",
35+
"connect": "Подключить",
36+
"are_you_sure_reset": "Вы уверены, что хотите сбросить все настройки подключения?",
37+
"reset": "Сбросить",
38+
"connection_reset": "Настройки подключения сброшены",
39+
"failed_open_telegram": "Не удалось открыть Telegram бот",
40+
"about_app": "О приложении"
2641
}

lib/l10n/app_th.arb renamed to assets/lang/th.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"@@locale": "th",
2+
33
"app_name": "VPN Client",
44
"apps_selection": "เลือกแอป",
55
"search": "ค้นหา",
@@ -22,5 +22,20 @@
2222
"disconnected": "ไม่ได้เชื่อมต่อ",
2323
"reconnecting": "กำลังเชื่อมต่อใหม่",
2424
"connecting": "กำลังเชื่อมต่อ",
25-
"disconnecting": "กำลังตัดการเชื่อมต่อ"
25+
"disconnecting": "กำลังตัดการเชื่อมต่อ",
26+
"settings": "การตั้งค่า",
27+
"version": "เวอร์ชัน",
28+
"connection": "การเชื่อมต่อ",
29+
"not_connected": "ไม่ได้เชื่อมต่อ",
30+
"support": "การสนับสนุน",
31+
"unavailable": "ไม่พร้อมใช้งาน",
32+
"your_id": "รหัสของคุณ",
33+
"support_service": "บริการสนับสนุน",
34+
"reset_settings": "รีเซ็ตการตั้งค่า",
35+
"connect": "เชื่อมต่อ",
36+
"are_you_sure_reset": "คุณแน่ใจหรือไม่ว่าต้องการรีเซ็ตการตั้งค่าการเชื่อมต่อทั้งหมด?",
37+
"reset": "รีเซ็ต",
38+
"connection_reset": "รีเซ็ตการตั้งค่าการเชื่อมต่อแล้ว",
39+
"failed_open_telegram": "ไม่สามารถเปิดบอท Telegram ได้",
40+
"about_app": "เกี่ยวกับแอป"
2641
}

lib/l10n/app_zh.arb renamed to assets/lang/zh.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"@@locale": "zh",
2+
33
"app_name": "VPN客户端",
44
"apps_selection": "应用选择",
55
"search": "搜索",
@@ -22,5 +22,20 @@
2222
"disconnected": "已断开连接",
2323
"reconnecting": "重新连接",
2424
"connecting": "连接中",
25-
"disconnecting": "断开中"
25+
"disconnecting": "断开中",
26+
"settings": "设置",
27+
"version": "版本",
28+
"connection": "连接",
29+
"not_connected": "未连接",
30+
"support": "支持",
31+
"unavailable": "不可用",
32+
"your_id": "您的 ID",
33+
"support_service": "客服服务",
34+
"reset_settings": "重置设置",
35+
"connect": "连接",
36+
"are_you_sure_reset": "您确定要重置所有连接设置吗?",
37+
"reset": "重置",
38+
"connection_reset": "连接设置已重置",
39+
"failed_open_telegram": "无法打开 Telegram 机器人",
40+
"about_app": "关于应用"
2641
}

0 commit comments

Comments
 (0)