Refactor localization implementation and remove unused ARB files

Author: WishyutC

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

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

@@ -1,5 +1,5 @@
 {
-    "@@locale": "ru",
+    
     "app_name": "VPN Клиент",
     "apps_selection": "Выбор приложений",
     "search": "Поиск",

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

@@ -1,5 +1,5 @@
 {
-    "@@locale": "th",
+ 
     "app_name": "VPN Client",
     "apps_selection": "เลือกแอป",
     "search": "ค้นหา",

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

@@ -1,5 +1,5 @@
 {
-    "@@locale": "zh",
+    
     "app_name": "VPN客户端",
     "apps_selection": "应用选择",
     "search": "搜索",

l10n.yaml

@@ -0,0 +1,32 @@
+import 'dart:convert';
+import 'package:flutter/services.dart';
+import 'package:flutter/material.dart';
+
+class LocalizationService {
+  static Map<String, dynamic> _localizedStrings = {};
+  static late Locale _currentLocale;
+
+  static Future<void> load(Locale locale) async {
+    _currentLocale = locale;
+    String langCode = locale.languageCode;
+
+    // Try loading the file, fallback to English
+    try {
+      final String jsonString = await rootBundle.loadString(
+        'assets/lang/$langCode.json',
+      );
+      _localizedStrings = json.decode(jsonString);
+    } catch (_) {
+      final String fallback = await rootBundle.loadString(
+        'assets/lang/en.json',
+      );
+      _localizedStrings = json.decode(fallback);
+    }
+  }
+
+  static String to(String key) {
+    return _localizedStrings[key] ?? '[$key]';
+  }
+
+  static Locale get currentLocale => _currentLocale;
+}

lib/l10n/app_en.arb

@@ -1,18 +1,24 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
-
 import 'package:vpn_client/pages/apps/apps_page.dart';
+import 'dart:ui' as ui;
 import 'package:vpn_client/pages/main/main_page.dart';
 import 'package:vpn_client/pages/servers/servers_page.dart';
 import 'package:vpn_client/theme_provider.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:vpn_client/vpn_state.dart';
+import 'package:vpn_client/localization_service.dart';
 
 import 'design/colors.dart';
 import 'nav_bar.dart';
 
-void main() {
+void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+
+  Locale userLocale =
+      ui.PlatformDispatcher.instance.locale; // <-- Get the system locale
+  await LocalizationService.load(userLocale);
+
   runApp(
     MultiProvider(
       providers: [
@@ -36,28 +42,23 @@ class App extends StatelessWidget {
     final Locale? manualLocale = null; // ← use system by default
 
     return MaterialApp(
+      localizationsDelegates: const [
+        GlobalMaterialLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate,
+      ],
       debugShowCheckedModeBanner: false,
       title: 'VPN Client',
       theme: lightTheme,
       darkTheme: darkTheme,
       locale: manualLocale,
-      localeResolutionCallback: (locale, supportedLocales) {
+      localeResolutionCallback: (locale, _) {
         if (locale == null) return const Locale('en');
 
         // Check for exact match
-        for (var supportedLocale in supportedLocales) {
-          if (supportedLocale.languageCode == locale.languageCode &&
-              (supportedLocale.countryCode == null ||
-                  supportedLocale.countryCode == locale.countryCode)) {
-            return supportedLocale;
-          }
-        }
-
-        // If Chinese variants are not supported, fallback to zh
-        if (locale.languageCode == 'zh') {
-          return supportedLocales.contains(const Locale('zh'))
-              ? const Locale('zh')
-              : const Locale('en');
+        final supported = ['en', 'ru', 'th', 'zh'];
+        if (supported.contains(locale.languageCode)) {
+          return Locale(locale.languageCode);
         }
 
         // Fallback to 'en' if not found
@@ -66,19 +67,6 @@ class App extends StatelessWidget {
 
       themeMode: themeProvider.themeMode,
       home: const MainScreen(),
-
-      localizationsDelegates: const [
-        AppLocalizations.delegate,
-        GlobalMaterialLocalizations.delegate,
-        GlobalWidgetsLocalizations.delegate,
-        GlobalCupertinoLocalizations.delegate,
-      ],
-      supportedLocales: const [
-        Locale('en'),
-        Locale('ru'),
-        Locale('th'),
-        Locale('zh'),
-      ],
     );
   }
 }

lib/localization_service.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:vpn_client/pages/apps/apps_list.dart';
 import 'package:vpn_client/search_dialog.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:vpn_client/localization_service.dart';
 
 class AppsPage extends StatefulWidget {
   const AppsPage({super.key});
@@ -19,7 +19,7 @@ class AppsPageState extends State<AppsPage> {
         context: context,
         builder: (BuildContext context) {
           return SearchDialog(
-            placeholder: AppLocalizations.of(context)!.app_name,
+            placeholder: LocalizationService.to('app_name'),
             items: _apps,
             type: 1,
           );
@@ -40,7 +40,7 @@ class AppsPageState extends State<AppsPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(AppLocalizations.of(context)!.apps_selection),
+        title: Text(LocalizationService.to('apps_selection')),
         centerTitle: true,
         titleTextStyle: TextStyle(
           color: Theme.of(context).colorScheme.primary,
@@ -60,7 +60,7 @@ class AppsPageState extends State<AppsPage> {
                   color: Theme.of(context).colorScheme.primary,
                 ),
                 onPressed: () => _showSearchDialog(context),
-                tooltip: AppLocalizations.of(context)!.search,
+                tooltip: LocalizationService.to('search'),
               ),
             ),
           ),

lib/main.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:vpn_client/localization_service.dart';
 
 class LocationWidget extends StatelessWidget {
   final Map<String, dynamic>? selectedServer;
@@ -27,7 +27,7 @@ class LocationWidget extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(
-                AppLocalizations.of(context)!.your_location,
+                LocalizationService.to('your_location'),
                 style: TextStyle(
                   fontSize: 14,
                   fontWeight: FontWeight.w400,