Support MacOS and refactor code base of all project

README.md

@@ -183,7 +183,7 @@ Need help or have any questions? We're here to assist:
 ## Contributors
 
 - [Jamalianpour](https://github.com/Jamalianpour)
-  Responsible for adding full macOS support and performing a comprehensive refactor, including code cleanup, structural improvements, and cross-platform compatibility enhancements.
+  Responsible for adding full macOS support and refactor.
 
 ---
 

lib/binding.dart

@@ -3,6 +3,7 @@ import 'package:netshift/controller/blocked_apps_controller.dart';
 import 'package:netshift/controller/check_for_update_controller.dart';
 import 'package:netshift/controller/foreground_controller.dart';
 import 'package:netshift/controller/glow_controller.dart';
+import 'package:netshift/controller/main_wrapper_controller.dart';
 import 'package:netshift/controller/netshift_engine_controller.dart';
 import 'package:netshift/controller/splash_controller.dart';
 import 'package:netshift/controller/stop_watch_controller.dart';
@@ -17,6 +18,6 @@ class InitialBindings extends Bindings {
     Get.lazyPut(() => StopWatchController(), fenix: true);
     Get.lazyPut(() => GlowController(), fenix: true);
     Get.lazyPut(() => BlockedAppsController(), fenix: true);
+    Get.lazyPut(() => MainWrapperController(), fenix: true);
   }
 }
-

lib/controller/blocked_apps_controller.dart

@@ -5,9 +5,9 @@ import 'package:installed_apps/app_info.dart';
 import 'package:installed_apps/installed_apps.dart';
 
 class BlockedAppsController extends GetxController {
-  GetStorage box2 = GetStorage();
-  var blockedApps = <String>[].obs;
-  var apps = <AppInfo>[].obs;
+  final GetStorage box2 = GetStorage();
+  RxList<String> blockedApps = <String>[].obs;
+  RxList<AppInfo> apps = <AppInfo>[].obs;
   RxBool isSystemApp = false.obs;
   @override
   void onInit() {

lib/controller/check_for_update_controller.dart

@@ -28,7 +28,9 @@ class CheckForUpdateController extends GetxController {
           log("No update available");
           updateIsAvailable.value = false;
         } else {
-          log("Update available version: ${updateVersion.value} with status code ${response.statusCode}");
+          log(
+            "Update available version: ${updateVersion.value} with status code ${response.statusCode}",
+          );
           updateIsAvailable.value = true;
         }
       } else {
@@ -55,7 +57,9 @@ class CheckForUpdateController extends GetxController {
           log("No update available");
           updateIsAvailable.value = false;
         } else {
-          log("Update available version: ${updateVersion.value} with status code ${response.statusCode}");
+          log(
+            "Update available version: ${updateVersion.value} with status code ${response.statusCode}",
+          );
           updateIsAvailable.value = true;
         }
       } else {
@@ -82,7 +86,9 @@ class CheckForUpdateController extends GetxController {
           log("No update available");
           updateIsAvailable.value = false;
         } else {
-          log("Update available version: ${updateVersion.value} with status code ${response.statusCode}");
+          log(
+            "Update available version: ${updateVersion.value} with status code ${response.statusCode}",
+          );
           updateIsAvailable.value = true;
         }
       } else {

lib/controller/dio_config.dart

@@ -11,4 +11,3 @@ void configureDio() {
   log("Connect timeout: ${dio.options.connectTimeout!.inSeconds} Seconds");
   log("Receive timeout: ${dio.options.receiveTimeout!.inSeconds} Seconds");
 }
-

lib/controller/encrypt_data.dart

@@ -5,7 +5,7 @@
 // class EncryptionData {
 //   static final String keyString = generateRandomKey(32);
 //   static final encrypt.Key key = encrypt.Key.fromUtf8(keyString);
-//   static final encrypt.IV iv = encrypt.IV.fromLength(16); 
+//   static final encrypt.IV iv = encrypt.IV.fromLength(16);
 //   static final encrypt.Encrypter encrypter = encrypt.Encrypter(encrypt.AES(key));
 
 //   static String encryptData(String plainText) {
@@ -23,4 +23,4 @@
 //     final List<int> values = List<int>.generate(length, (i) => random.nextInt(256));
 //     return base64Url.encode(values).substring(0, length);
 //   }
-// }
+// }

lib/controller/foreground_controller.dart

@@ -10,16 +10,18 @@ import 'package:netshift/controller/stop_watch_controller.dart';
 class ForegroundController extends GetxController {
   static const platform = MethodChannel("com.netshift.dnschanger/netdns");
   RxBool isRunning = false.obs;
-  static const EventChannel statusChannel =
-      EventChannel("com.netshift.dnschanger/netdnsStatus");
+  static const EventChannel statusChannel = EventChannel(
+    "com.netshift.dnschanger/netdnsStatus",
+  );
   String foregroundStatus = "none";
   RxString download = "0.00 MB".obs;
   RxString upload = "0.00 MB".obs;
   RxBool serviceStatus = false.obs;
   StreamSubscription? dataUsageSubscription;
   final status = GetStorage();
-  NetshiftEngineController netshiftEngineController =
-      Get.put(NetshiftEngineController());
+  NetshiftEngineController netshiftEngineController = Get.put(
+    NetshiftEngineController(),
+  );
   StopWatchController stopWatchController = Get.put(StopWatchController());
   Future<void> startService(String contextText) async {
     log("Foreground Service Started");
@@ -32,7 +34,6 @@ class ForegroundController extends GetxController {
     }
   }
 
-
   Future<void> stopService() async {
     isRunning.value = false;
     // statusService.write('isServiceRunning', false);
@@ -47,21 +48,19 @@ class ForegroundController extends GetxController {
   }
 
   void listenToServiceStatus() {
-    platform.setMethodCallHandler(
-      (call) async {
-        if (call.method == "serviceStatusUpdate") {
-          serviceStatus.value = call.arguments as bool;
-          log("Service status updated: ${serviceStatus.value}");
-          loadServiceStatus();
-        } else if (call.method == 'dataUsageUpdate') {
-          final Map<dynamic, dynamic> data = call.arguments;
-          download.value =
-              "${(data['download'] / (1024 * 1024)).toStringAsFixed(2)} MB";
-          upload.value =
-              "${(data['upload'] / (1024 * 1024)).toStringAsFixed(2)} MB";
-        }
-      },
-    );
+    platform.setMethodCallHandler((call) async {
+      if (call.method == "serviceStatusUpdate") {
+        serviceStatus.value = call.arguments as bool;
+        log("Service status updated: ${serviceStatus.value}");
+        loadServiceStatus();
+      } else if (call.method == 'dataUsageUpdate') {
+        final Map<dynamic, dynamic> data = call.arguments;
+        download.value =
+            "${(data['download'] / (1024 * 1024)).toStringAsFixed(2)} MB";
+        upload.value =
+            "${(data['upload'] / (1024 * 1024)).toStringAsFixed(2)} MB";
+      }
+    });
   }
 
   Future<bool> serviceStatusKotlin() async {
@@ -78,7 +77,9 @@ class ForegroundController extends GetxController {
     serviceStatus.value = await serviceStatusKotlin();
     loadServiceStatus();
     log("****Service Status ananas : ${serviceStatus.value}****");
-    log("****Service Status ananas1 : ${netshiftEngineController.isActive.value}****");
+    log(
+      "****Service Status ananas1 : ${netshiftEngineController.isActive.value}****",
+    );
   }
 
   void loadServiceStatus() {

lib/controller/glow_controller.dart

@@ -23,4 +23,4 @@ class GlowController extends GetxController with GetTickerProviderStateMixin {
     glowController.dispose();
     super.onClose();
   }
-}
+}

lib/controller/main_wrapper_controller.dart

@@ -7,7 +7,7 @@ import 'package:netshift/screens/home_page.dart';
 import 'package:netshift/screens/settings_page.dart';
 
 class MainWrapperController extends GetxController {
-  final netshiftEngineController =
+  final NetshiftEngineController netshiftEngineController =
       Get.find<NetshiftEngineController>();
   final List<Widget> _pages = [
     HomePage(),
@@ -20,7 +20,8 @@ class MainWrapperController extends GetxController {
     super.onInit();
     netshiftEngineController.getIpAddress();
   }
-  var selectedIndex = 0.obs;
+
+  RxInt selectedIndex = 0.obs;
 
   void onSelectPage(int index) {
     selectedIndex.value = index;