Merge development into main: resolve plugin registrant conflicts, keep HEAD versions

Author: Anton-Dodonov

assets/images/active_home_o.svg

@@ -22,5 +22,20 @@
   "disconnected": "DISCONNECTED",
   "reconnecting": "RECONNECTING",
   "connecting": "CONNECTING",
-  "disconnecting": "DISCONNECTING"
+  "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

@@ -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

@@ -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": "เกี่ยวกับแอป"
 }

assets/images/support_icons.png

@@ -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/lang/en.json

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

assets/lang/ru.json

@@ -2,16 +2,19 @@ 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',
+  'assets/images/active_home_o.svg',
 );
 final SvgPicture appIcon = SvgPicture.asset('assets/images/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',
+  'assets/images/active_server_o.svg',
 );
 final SvgPicture settingsIcon = SvgPicture.asset('assets/images/settings.svg');
+final SvgPicture activeSettingsIcon = SvgPicture.asset(
+  'assets/images/active_settings_o.svg',
+);
 final SvgPicture speedIcon = SvgPicture.asset('assets/images/speed.svg');
 final SvgPicture deFlag = SvgPicture.asset('assets/images/de.svg');