upgrade to run on flutter 3.38.7;

migrate to kotlin dsl;
replace qr scanner package

Author: huycozy

android/app/build.gradle

@@ -0,0 +1,65 @@
+import java.util.Properties
+import java.io.FileInputStream
+
+
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "com.app.netshare"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+    
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "com.app.netshare"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+    signingConfigs {
+        create("release") {
+            keyAlias = keystoreProperties["keyAlias"] as String
+            keyPassword = keystoreProperties["keyPassword"] as String
+            storeFile = keystoreProperties["storeFile"]?.let { file(it) }
+            storePassword = keystoreProperties["storePassword"] as String
+        }
+    }
+    buildTypes {
+        debug {
+            signingConfig = signingConfigs.getByName("debug")
+        }
+        release {
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            // signingConfig signingConfigs.debug
+
+            signingConfig = signingConfigs.getByName("release")
+            isShrinkResources = true
+            isMinifyEnabled = true
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}

android/app/build.gradle.kts

@@ -0,0 +1,24 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory =
+    rootProject.layout.buildDirectory
+        .dir("../../build")
+        .get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}

android/build.gradle

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip

android/build.gradle.kts

@@ -0,0 +1,26 @@
+pluginManagement {
+    val flutterSdkPath =
+        run {
+            val properties = java.util.Properties()
+            file("local.properties").inputStream().use { properties.load(it) }
+            val flutterSdkPath = properties.getProperty("flutter.sdk")
+            require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+            flutterSdkPath
+        }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.11.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+}
+
+include(":app")

android/gradle/wrapper/gradle-wrapper.properties

@@ -7,6 +7,12 @@ class GlobalScopeData {
   String _connectedIPAddress = '';
   String get connectedIPAddress => _connectedIPAddress;
 
+  String _currentDeviceIPAddress = '';
+  String get currentDeviceIPAddress => _currentDeviceIPAddress;
+
+  String _currentServerHostingPort = '';
+  String get currentServerHostingPort => _currentServerHostingPort;
+
   void updateConnectionStatus({required ConnectionStatus newStatus}) {
     _connectionStatus = newStatus;
   }
@@ -15,8 +21,18 @@ class GlobalScopeData {
     _connectedIPAddress = newIpAddress;
   }
 
+  void updateCurrentDeviceIPAddress({required String newIpAddress}) {
+    _currentDeviceIPAddress = newIpAddress;
+  }
+
+  void updateCurrentServerHostingPort({required String newPort}) {
+    _currentServerHostingPort = newPort;
+  }
+
   void resetAllData() {
     _connectedIPAddress = '';
+    _currentDeviceIPAddress = '';
+    _currentServerHostingPort = '';
     _connectionStatus = ConnectionStatus.idle;
   }
 }

android/settings.gradle

@@ -0,0 +1,11 @@
+import 'package:netshare/data/global_scope_data.dart';
+import 'package:netshare/di/di.dart';
+import 'package:netshare/util/utility_functions.dart';
+
+class PreloadData {
+  static Future inject() async {
+    // current device IP address
+    final ip = await UtilityFunctions.getIPAddress() ?? '';
+    getIt.get<GlobalScopeData>().updateCurrentDeviceIPAddress(newIpAddress: ip);
+  }
+}

android/settings.gradle.kts

@@ -21,10 +21,13 @@ import 'package:netshare/util/utility_functions.dart';
 import 'package:netshare/config/constants.dart';
 import 'package:netshare/ui/send/uploading_widget.dart';
 
+import 'data/preload_data.dart';
+
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await initPlugins();
   setupDI();
+  await PreloadData.inject();
   runApp(const MyApp());
 }
 
@@ -41,7 +44,8 @@ class _MyAppState extends State<MyApp> {
 
   final GoRouter _router = GoRouter(
     navigatorKey: _navigatorKey,
-    errorBuilder: (BuildContext context, GoRouterState state) => ErrorWidget(state.error!),
+    errorBuilder: (BuildContext context, GoRouterState state) =>
+        ErrorWidget(state.error!),
     routes: <GoRoute>[
       GoRoute(
         path: mRootPath,
@@ -71,7 +75,8 @@ class _MyAppState extends State<MyApp> {
           GoRoute(
             name: mSendPath,
             path: mSendPath,
-            builder: (BuildContext context, GoRouterState state) => const SendWidget(),
+            builder: (BuildContext context, GoRouterState state) =>
+                const SendWidget(),
             routes: [
               GoRoute(
                 name: mUploadingPath,
@@ -88,7 +93,8 @@ class _MyAppState extends State<MyApp> {
           GoRoute(
             name: mScanningPath,
             path: mScanningPath,
-            builder: (BuildContext context, GoRouterState state) => const ScanQRWidget(),
+            builder: (BuildContext context, GoRouterState state) =>
+                const ScanQRWidget(),
           ),
         ],
       ),
@@ -110,29 +116,36 @@ class _MyAppState extends State<MyApp> {
         theme: ThemeData(
           useMaterial3: true,
           appBarTheme: const AppBarTheme(color: backgroundColor),
-          colorScheme: ColorScheme.fromSeed(seedColor: seedColor, background: backgroundColor),
+          colorScheme: ColorScheme.fromSeed(
+              seedColor: seedColor, background: backgroundColor),
+          iconButtonTheme: const IconButtonThemeData(
+            style: ButtonStyle(
+              iconColor: MaterialStatePropertyAll<Color>(textIconButtonColor),
+            ),
+          ),
         ),
         routerConfig: _router,
         builder: (context, child) {
           // Handle keyboard listener here
-          RawKeyboard.instance.addListener((RawKeyEvent value) => _handleKeyEvent(value));
+          RawKeyboard.instance
+              .addListener((RawKeyEvent value) => _handleKeyEvent(value));
           return child ?? const SizedBox.shrink();
         },
       ),
     );
   }
 
   void _handleKeyEvent(RawKeyEvent value) async {
-    if (!_isKeyboardListenerEnabled)  return;
+    if (!_isKeyboardListenerEnabled) return;
 
     // If user pressed Command/Control + W keys, quit the app
     if (value.isMetaPressed && value.logicalKey == LogicalKeyboardKey.keyW ||
         value.isControlPressed && value.logicalKey == LogicalKeyboardKey.keyW) {
-
-      if(_navigatorKey.currentContext == null) return;
+      if (_navigatorKey.currentContext == null) return;
 
       // show confirm dialog
-      _showQuitAppConfirmationDialog(_navigatorKey.currentContext!, (confirmCallback) {
+      _showQuitAppConfirmationDialog(_navigatorKey.currentContext!,
+          (confirmCallback) {
         if (confirmCallback) {
           SystemNavigator.pop(); // Quit the app
         }
@@ -142,7 +155,8 @@ class _MyAppState extends State<MyApp> {
     }
   }
 
-  void _showQuitAppConfirmationDialog(BuildContext context, Function(bool)? confirmCallback) {
+  void _showQuitAppConfirmationDialog(
+      BuildContext context, Function(bool)? confirmCallback) {
     // Disable the keyboard listener.
     _isKeyboardListenerEnabled = false;