From 6cc1ba8d9143f0bc4e7b1b15f1bf6be631c9765d Mon Sep 17 00:00:00 2001
From: darelbitsy <bitsydarel@gmail.com>
Date: Tue, 2 Jan 2024 14:58:57 +0100
Subject: [PATCH 1/6] added support for newer version of the android gradle
 plugins

---
 CHANGELOG.md                                  |  4 +++
 android/build.gradle                          | 12 +++++--
 android/src/main/AndroidManifest.xml          |  4 +--
 .../FlutterAppBadgerPlugin.java               | 31 ++++++++++++-------
 example/android/app/build.gradle              | 11 +++++--
 .../android/app/src/main/AndroidManifest.xml  |  3 +-
 .../flutterappbadgerexample/MainActivity.java | 10 +-----
 example/android/build.gradle                  |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  3 +-
 example/lib/main.dart                         | 12 +++----
 example/pubspec.yaml                          |  9 ++----
 pubspec.yaml                                  | 10 +++---
 12 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1a0382..217fbc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.5.0] - 2th January 2024
+
+* Fixed issue with gradle namespace missing and others
+
 ## [1.5.0] - 16th September 2022
 
 * PR #52 (Don't overwrite categories on iOS)
diff --git a/android/build.gradle b/android/build.gradle
index 150f685..af57bc0 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
     }
 }
 
@@ -22,18 +22,24 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 19
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
     }
+
     if (project.android.hasProperty('namespace')) {
         namespace 'fr.g123k.flutterappbadge.flutterappbadger'
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 6a3dcb8..94cbbcf 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,3 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="fr.g123k.flutterappbadge.flutterappbadger">
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/android/src/main/java/fr/g123k/flutterappbadger/FlutterAppBadgerPlugin.java b/android/src/main/java/fr/g123k/flutterappbadger/FlutterAppBadgerPlugin.java
index 18d1e47..659a169 100644
--- a/android/src/main/java/fr/g123k/flutterappbadger/FlutterAppBadgerPlugin.java
+++ b/android/src/main/java/fr/g123k/flutterappbadger/FlutterAppBadgerPlugin.java
@@ -2,6 +2,8 @@
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -30,23 +32,28 @@ public void onAttachedToEngine(FlutterPluginBinding flutterPluginBinding) {
   }
 
   @Override
-  public void onDetachedFromEngine(FlutterPluginBinding flutterPluginBinding) {
+  public void onDetachedFromEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
     channel.setMethodCallHandler(null);
     applicationContext = null;
   }
 
   @Override
-  public void onMethodCall(MethodCall call, Result result) {
-    if (call.method.equals("updateBadgeCount")) {
-      ShortcutBadger.applyCount(applicationContext, Integer.valueOf(call.argument("count").toString()));
-      result.success(null);
-    } else if (call.method.equals("removeBadge")) {
-      ShortcutBadger.removeCount(applicationContext);
-      result.success(null);
-    } else if (call.method.equals("isAppBadgeSupported")) {
-      result.success(ShortcutBadger.isBadgeCounterSupported(applicationContext));
-    } else {
-      result.notImplemented();
+  public void onMethodCall(MethodCall call, @NonNull Result result) {
+    switch (call.method) {
+      case "updateBadgeCount":
+        ShortcutBadger.applyCount(applicationContext, Integer.valueOf(call.argument("count").toString()));
+        result.success(null);
+        break;
+      case "removeBadge":
+        ShortcutBadger.removeCount(applicationContext);
+        result.success(null);
+        break;
+      case "isAppBadgeSupported":
+        result.success(ShortcutBadger.isBadgeCounterSupported(applicationContext));
+        break;
+      default:
+        result.notImplemented();
+        break;
     }
   }
 }
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 1f18553..3c5c4e0 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -15,7 +15,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdk = 33
 
     lintOptions {
         disable 'InvalidPackage'
@@ -24,8 +24,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "fr.g123k.flutterappbadger.flutterappbadgerexample"
-        minSdkVersion 16
-        targetSdkVersion 29
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -38,6 +38,11 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 flutter {
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 4ed4f4d..7a5ab2c 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -22,7 +22,8 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <!-- This keeps the window background of the activity showing
                  until Flutter renders its first frame. It can be removed if
                  there is no splash screen (such as the default splash screen
diff --git a/example/android/app/src/main/java/fr/g123k/flutterappbadge/flutterappbadgerexample/MainActivity.java b/example/android/app/src/main/java/fr/g123k/flutterappbadge/flutterappbadgerexample/MainActivity.java
index 8e5050c..03b9a86 100644
--- a/example/android/app/src/main/java/fr/g123k/flutterappbadge/flutterappbadgerexample/MainActivity.java
+++ b/example/android/app/src/main/java/fr/g123k/flutterappbadge/flutterappbadgerexample/MainActivity.java
@@ -1,14 +1,6 @@
 package fr.g123k.flutterappbadge.flutterappbadgerexample;
 
-import android.os.Bundle;
-
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.embedding.android.FlutterActivity;
 
 public class MainActivity extends FlutterActivity {
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    GeneratedPluginRegistrant.registerWith(this);
-  }
 }
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 9e4e79b..889a995 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
     }
 }
 
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 622ab64..c99adad 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Tue Jan 02 14:47:09 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 95facd4..4f2121b 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -54,17 +54,13 @@ class _MyAppState extends State<MyApp> {
             crossAxisAlignment: CrossAxisAlignment.center,
             children: <Widget>[
               new Text('Badge supported: $_appBadgeSupported\n'),
-              new RaisedButton(
+              new ElevatedButton(
                 child: new Text('Add badge'),
-                onPressed: () {
-                  _addBadge();
-                },
+                onPressed: () => _addBadge(),
               ),
-              new RaisedButton(
+              new ElevatedButton(
                   child: new Text('Remove badge'),
-                  onPressed: () {
-                    _removeBadge();
-                  }),
+                  onPressed: () => _removeBadge()),
             ],
           ),
         ),
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index e8c47f2..a3a4603 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -1,17 +1,14 @@
 name: flutter_app_badger_example
 description: Demonstrates how to use the flutter_app_badger plugin.
 
-environment:                                                      
-  sdk: '>=2.12.0 <3.0.0'
+environment:
+  sdk: '>=2.19.6 <4.0.0'
+  flutter: ">=3.7.12"
 
 dependencies:
   flutter:
     sdk: flutter
 
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^0.1.0
-
 dev_dependencies:
   flutter_test:
     sdk: flutter
diff --git a/pubspec.yaml b/pubspec.yaml
index 9151e4d..c27a5d2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,8 +1,12 @@
 name: flutter_app_badger
 description: Plugin to update the app badge on the launcher (both for Android, iOS and macOS)
-version: 1.5.0
+version: 1.5.1
 homepage: https://github.com/g123k/flutter_app_badger
 
+environment:
+  sdk: '>=2.19.6 <4.0.0'
+  flutter: ">=3.7.12"
+
 dependencies:
   flutter:
     sdk: flutter
@@ -18,7 +22,3 @@ flutter:
       macos:
         pluginClass: FlutterAppBadgerPlugin
 
-
-environment:
-  sdk: '>=2.12.0 <3.0.0'
-  flutter: ">=1.10.0"

From a1918eb0cd5151c01e359626111e80fe0d14ff25 Mon Sep 17 00:00:00 2001
From: darelbitsy <bitsydarel@gmail.com>
Date: Tue, 2 Jan 2024 15:08:36 +0100
Subject: [PATCH 2/6] Updated release notes

---
 CHANGELOG.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 217fbc0..971b53a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
-## [1.5.0] - 2th January 2024
+## [1.5.1] - 2nd January 2024
 
-* Fixed issue with gradle namespace missing and others
+* Fixed an issue with missing Gradle namespace and other related issues.
+* Resolved an issue with the Java target SDK.
+* Adjusted Dart SDK constraint to exclusively support Dart null-safety and Flutter null-safety versions.
+* Corrected the usage of old Flutter embedding in the example app.
+* Updated the wrapper to support the new Gradle version.
 
 ## [1.5.0] - 16th September 2022
 

From ea4989dab93ffe25a2c65d8e3dc318725a7953f1 Mon Sep 17 00:00:00 2001
From: EvGeniyLell <evgeniylell@gmail.com>
Date: Tue, 5 Mar 2024 17:45:58 +0200
Subject: [PATCH 3/6] remove unneeded `UNUserNotificationCenter
 requestAuthorizationWithOptions`

---
 ios/Classes/FlutterAppBadgerPlugin.m | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/ios/Classes/FlutterAppBadgerPlugin.m b/ios/Classes/FlutterAppBadgerPlugin.m
index 60bdf51..d937d8c 100644
--- a/ios/Classes/FlutterAppBadgerPlugin.m
+++ b/ios/Classes/FlutterAppBadgerPlugin.m
@@ -10,19 +10,7 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
   [registrar addMethodCallDelegate:instance channel:channel];
 }
 
-- (void)enableNotifications {
-    if (@available(iOS 10, *)) {
-        UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-        [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error){}];
-    } else {
-        UIUserNotificationSettings* notificationSettings = [UIUserNotificationSettings settingsForTypes:UIUserNotificationTypeAlert | UIUserNotificationTypeBadge | UIUserNotificationTypeSound categories:[[UIApplication sharedApplication] currentUserNotificationSettings].categories];
-        [[UIApplication sharedApplication] registerUserNotificationSettings:notificationSettings];
-    }
-}
-
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
-    [self enableNotifications];
-        
     if ([@"updateBadgeCount" isEqualToString:call.method]) {
         NSDictionary *args = call.arguments;
         NSNumber *count = [args objectForKey:@"count"];

From 300fd54a2b584910f76e88acb4b1bb9b3475818b Mon Sep 17 00:00:00 2001
From: EvGeniyLell <evgeniylell@gmail.com>
Date: Tue, 5 Mar 2024 17:51:05 +0200
Subject: [PATCH 4/6] remove unneeded `UNUserNotificationCenter
 requestAuthorizationWithOptions`

---
 pubspec.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index c27a5d2..15db685 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,11 +1,11 @@
 name: flutter_app_badger
 description: Plugin to update the app badge on the launcher (both for Android, iOS and macOS)
-version: 1.5.1
+version: 1.5.1+2
 homepage: https://github.com/g123k/flutter_app_badger
 
 environment:
-  sdk: '>=2.19.6 <4.0.0'
-  flutter: ">=3.7.12"
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.19.1 <4.0.0"
 
 dependencies:
   flutter:

From ddc145dd1073ed1cd4a6eb7f18ff3f442c5ee57f Mon Sep 17 00:00:00 2001
From: EvGeniyLell <evgeniylell@gmail.com>
Date: Tue, 5 Mar 2024 17:52:03 +0200
Subject: [PATCH 5/6] remove unneeded `UNUserNotificationCenter
 requestAuthorizationWithOptions`

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 15db685..7d8bb91 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_app_badger
 description: Plugin to update the app badge on the launcher (both for Android, iOS and macOS)
-version: 1.5.1+2
+version: 1.5.2
 homepage: https://github.com/g123k/flutter_app_badger
 
 environment:

From a8f82f80175cf28c0ec7addaaff380989ddead4b Mon Sep 17 00:00:00 2001
From: EvGeniyLell <evgeniylell@gmail.com>
Date: Fri, 15 Mar 2024 13:21:59 +0200
Subject: [PATCH 6/6] remove unneeded `UNUserNotificationCenter
 requestAuthorizationWithOptions`

---
 CHANGELOG.md | 4 ++++
 pubspec.yaml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 971b53a..d3143a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.5.2] - 15th Mart 2024
+
+* Removed unnecessary requestAuthorizationWithOptions for iOS, this plugin doesn't need it to show badges. This should be used only for remote push notification.
+
 ## [1.5.1] - 2nd January 2024
 
 * Fixed an issue with missing Gradle namespace and other related issues.
diff --git a/pubspec.yaml b/pubspec.yaml
index 7d8bb91..d234598 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,8 +4,8 @@ version: 1.5.2
 homepage: https://github.com/g123k/flutter_app_badger
 
 environment:
-  sdk: ">=3.3.0 <4.0.0"
-  flutter: ">=3.19.1 <4.0.0"
+  sdk: '>=2.19.6 <4.0.0'
+  flutter: '>=3.7.12'
 
 dependencies:
   flutter: