From 1e2e42064d23f548e5cc88b16f9eb014ae2a16cb Mon Sep 17 00:00:00 2001
From: Eimen2018 <nur.amuni26@gmail.com>
Date: Tue, 21 Oct 2025 01:42:45 +0400
Subject: [PATCH] feat: update Android and iOS configurations, improve Gradle
 setup, and enhance theme management

---
 example/android/app/build.gradle              | 61 ++++++-------------
 .../android/app/src/main/AndroidManifest.xml  |  2 +-
 example/android/build.gradle                  | 56 ++++++++++++-----
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 example/android/settings.gradle               | 32 +++++++---
 .../Flutter/ephemeral/flutter_lldb_helper.py  | 32 ++++++++++
 .../ios/Flutter/ephemeral/flutter_lldbinit    |  5 ++
 example/lib/main.dart                         |  4 +-
 .../lib/ui/dark_light/dark_light_view.dart    |  2 +-
 .../multiple_themes/multiple_themes_view.dart |  2 +-
 .../multiple_themes_viewmodel.dart            |  2 +-
 pubspec.yaml                                  |  4 +-
 12 files changed, 131 insertions(+), 73 deletions(-)
 create mode 100644 example/ios/Flutter/ephemeral/flutter_lldb_helper.py
 create mode 100644 example/ios/Flutter/ephemeral/flutter_lldbinit

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 51f8692..5b57023 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -1,63 +1,40 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
+plugins {
+    id "com.android.application"
+    id "org.jetbrains.kotlin.android"
+    // Apply Flutter plugin after Android and Kotlin plugins.
+    id "dev.flutter.flutter-gradle-plugin"
 }
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion 31
+    namespace "com.example.themes_example"
+    compileSdk flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.themes_example"
-        minSdkVersion 16
-        targetSdkVersion 28
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
+        versionCode flutter.versionCode
+        versionName flutter.versionName
     }
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
+            // Signing with debug keys so `flutter run --release` keeps working.
             signingConfig signingConfigs.debug
         }
     }
 }
 
 flutter {
-    source '../..'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    source "../.."
 }
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index ecf4cb2..31afce7 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
   <application android:name="${applicationName}" android:label="themes_example" android:icon="@mipmap/ic_launcher">
-    <activity android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
+    <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
       <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 7087ad1..5d8432d 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -1,20 +1,9 @@
-buildscript {
-    ext.kotlin_version = '1.4.10'
-    repositories {
-        google()
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -26,6 +15,45 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+subprojects { subproject ->
+    if (subproject.name == "flutter_statusbarcolor_ns") {
+        subproject.plugins.withId("com.android.library") {
+            subproject.android {
+                namespace "com.sameer.flutterstatusbarcolor.flutterstatusbarcolor"
+            }
+        }
+    }
+}
+
+subprojects { subproject ->
+    subproject.plugins.withId("com.android.application") {
+        subproject.android {
+            compileOptions {
+                sourceCompatibility JavaVersion.VERSION_11
+                targetCompatibility JavaVersion.VERSION_11
+            }
+        }
+        subproject.tasks.withType(KotlinCompile).configureEach { task ->
+            task.kotlinOptions {
+                jvmTarget = JavaVersion.VERSION_11.toString()
+            }
+        }
+    }
+    subproject.plugins.withId("com.android.library") {
+        subproject.android {
+            compileOptions {
+                sourceCompatibility JavaVersion.VERSION_11
+                targetCompatibility JavaVersion.VERSION_11
+            }
+        }
+        subproject.tasks.withType(KotlinCompile).configureEach { task ->
+            task.kotlinOptions {
+                jvmTarget = JavaVersion.VERSION_11.toString()
+            }
+        }
+    }
+}
+
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 296b146..1126aa0 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
index d3b6a40..0d22924 100644
--- a/example/android/settings.gradle
+++ b/example/android/settings.gradle
@@ -2,14 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        def localPropertiesFile = file("local.properties")
+        assert localPropertiesFile.exists()
+        localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+        def flutterSdk = properties.getProperty("flutter.sdk")
+        assert flutterSdk != null : "flutter.sdk not set in local.properties"
+        return flutterSdk
+    }()
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+include ':app'
diff --git a/example/ios/Flutter/ephemeral/flutter_lldb_helper.py b/example/ios/Flutter/ephemeral/flutter_lldb_helper.py
new file mode 100644
index 0000000..a88caf9
--- /dev/null
+++ b/example/ios/Flutter/ephemeral/flutter_lldb_helper.py
@@ -0,0 +1,32 @@
+#
+# Generated file, do not edit.
+#
+
+import lldb
+
+def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict):
+    """Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages."""
+    base = frame.register["x0"].GetValueAsAddress()
+    page_len = frame.register["x1"].GetValueAsUnsigned()
+
+    # Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the
+    # first page to see if handled it correctly. This makes diagnosing
+    # misconfiguration (e.g. missing breakpoint) easier.
+    data = bytearray(page_len)
+    data[0:8] = b'IHELPED!'
+
+    error = lldb.SBError()
+    frame.GetThread().GetProcess().WriteMemory(base, data, error)
+    if not error.Success():
+        print(f'Failed to write into {base}[+{page_len}]', error)
+        return
+
+def __lldb_init_module(debugger: lldb.SBDebugger, _):
+    target = debugger.GetDummyTarget()
+    # Caveat: must use BreakpointCreateByRegEx here and not
+    # BreakpointCreateByName. For some reasons callback function does not
+    # get carried over from dummy target for the later.
+    bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$")
+    bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__))
+    bp.SetAutoContinue(True)
+    print("-- LLDB integration loaded --")
diff --git a/example/ios/Flutter/ephemeral/flutter_lldbinit b/example/ios/Flutter/ephemeral/flutter_lldbinit
new file mode 100644
index 0000000..e3ba6fb
--- /dev/null
+++ b/example/ios/Flutter/ephemeral/flutter_lldbinit
@@ -0,0 +1,5 @@
+#
+# Generated file, do not edit.
+#
+
+command script import --relative-to-command-file flutter_lldb_helper.py
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 4006898..48291bb 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -29,8 +29,8 @@ class MyApp extends StatelessWidget {
             )
             .copyWith(background: Colors.blue[300]),
       ),
-      statusBarColorBuilder: (theme) => theme.colorScheme.secondary,
-      navigationBarColorBuilder: (theme) => theme.colorScheme.secondary,
+      statusBarColorBuilder: (theme) => theme?.colorScheme.secondary,
+      navigationBarColorBuilder: (theme) => theme?.colorScheme.secondary,
       // themes: getThemes(),
       builder: (context, regularTheme, darkTheme, themeMode) => MaterialApp(
         title: 'Flutter Demo',
diff --git a/example/lib/ui/dark_light/dark_light_view.dart b/example/lib/ui/dark_light/dark_light_view.dart
index ffc435f..f580af3 100644
--- a/example/lib/ui/dark_light/dark_light_view.dart
+++ b/example/lib/ui/dark_light/dark_light_view.dart
@@ -5,7 +5,7 @@ import 'package:stacked_themes/stacked_themes.dart';
 import 'dark_light_viewmodel.dart';
 
 class DarkLightView extends StatelessWidget {
-  const DarkLightView({Key key}) : super(key: key);
+  const DarkLightView({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/example/lib/ui/multiple_themes/multiple_themes_view.dart b/example/lib/ui/multiple_themes/multiple_themes_view.dart
index e66eff2..2305c2b 100644
--- a/example/lib/ui/multiple_themes/multiple_themes_view.dart
+++ b/example/lib/ui/multiple_themes/multiple_themes_view.dart
@@ -4,7 +4,7 @@ import 'package:stacked/stacked.dart';
 import 'multiple_themes_viewmodel.dart';
 
 class MultipleThemesView extends StatelessWidget {
-  const MultipleThemesView({Key key}) : super(key: key);
+  const MultipleThemesView({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/example/lib/ui/multiple_themes/multiple_themes_viewmodel.dart b/example/lib/ui/multiple_themes/multiple_themes_viewmodel.dart
index f933bf5..b679b1a 100644
--- a/example/lib/ui/multiple_themes/multiple_themes_viewmodel.dart
+++ b/example/lib/ui/multiple_themes/multiple_themes_viewmodel.dart
@@ -6,7 +6,7 @@ class ThemeModel {
   final int index;
   final String title;
 
-  ThemeModel({this.index, this.title});
+  ThemeModel({required this.index, required this.title});
 }
 
 class MultipleThemesViewModel extends BaseViewModel {
diff --git a/pubspec.yaml b/pubspec.yaml
index b458aa1..02b4006 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,8 +16,8 @@ dependencies:
   provider: ^6.0.0
   rxdart: ^0.27.1
   shared_preferences: ^2.0.6
-  get_it: ^7.1.3
-  flutter_statusbarcolor_ns: ^0.5.0
+  get_it: ^8.2.0
+  flutter_statusbarcolor_ns: ^0.6.0
 
   #universal_io
   universal_io: ^2.0.4