From 449000ef9c24f15bb11b3ff962344541d025b643 Mon Sep 17 00:00:00 2001
From: Julian Steenbakker <juliansteenbakker@outlook.com>
Date: Tue, 5 Oct 2021 14:23:56 +0200
Subject: [PATCH 1/6] imp: upgrade gradle

---
 .../battery_plus/battery_plus/example/android/build.gradle  | 2 +-
 .../battery_plus/example/android/gradle.properties          | 1 -
 .../android/gradle/wrapper/gradle-wrapper.properties        | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/battery_plus/battery_plus/example/android/build.gradle b/packages/battery_plus/battery_plus/example/android/build.gradle
index 1c3dabf72d..5dba446517 100644
--- a/packages/battery_plus/battery_plus/example/android/build.gradle
+++ b/packages/battery_plus/battery_plus/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/packages/battery_plus/battery_plus/example/android/gradle.properties b/packages/battery_plus/battery_plus/example/android/gradle.properties
index 38c8d4544f..94adc3a3f9 100644
--- a/packages/battery_plus/battery_plus/example/android/gradle.properties
+++ b/packages/battery_plus/battery_plus/example/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/packages/battery_plus/battery_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/battery_plus/battery_plus/example/android/gradle/wrapper/gradle-wrapper.properties
index 296b146b73..48be6dfa99 100644
--- a/packages/battery_plus/battery_plus/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/battery_plus/battery_plus/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Tue Oct 05 14:03:03 CEST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+zipStoreBase=GRADLE_USER_HOME

From 7561159304e8a953528792c8f9a37d8c2879f53a Mon Sep 17 00:00:00 2001
From: Julian Steenbakker <juliansteenbakker@outlook.com>
Date: Tue, 5 Oct 2021 14:24:23 +0200
Subject: [PATCH 2/6] imp: upgrade compile sdk version

---
 .../battery_plus/example/android/app/build.gradle             | 4 ++--
 .../example/android/app/src/main/AndroidManifest.xml          | 3 ++-
 .../io/flutter/plugins/batteryexample/example/MainActivity.kt | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/battery_plus/battery_plus/example/android/app/build.gradle b/packages/battery_plus/battery_plus/example/android/app/build.gradle
index e3ad467675..b9587ca56a 100644
--- a/packages/battery_plus/battery_plus/example/android/app/build.gradle
+++ b/packages/battery_plus/battery_plus/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -40,7 +40,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.flutter.plugins.batteryexample.example"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/packages/battery_plus/battery_plus/example/android/app/src/main/AndroidManifest.xml b/packages/battery_plus/battery_plus/example/android/app/src/main/AndroidManifest.xml
index 4ba44714cb..099d5743a8 100644
--- a/packages/battery_plus/battery_plus/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/battery_plus/battery_plus/example/android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,8 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <!-- 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/packages/battery_plus/battery_plus/example/android/app/src/main/kotlin/io/flutter/plugins/batteryexample/example/MainActivity.kt b/packages/battery_plus/battery_plus/example/android/app/src/main/kotlin/io/flutter/plugins/batteryexample/example/MainActivity.kt
index e97c919f57..f1c9193025 100644
--- a/packages/battery_plus/battery_plus/example/android/app/src/main/kotlin/io/flutter/plugins/batteryexample/example/MainActivity.kt
+++ b/packages/battery_plus/battery_plus/example/android/app/src/main/kotlin/io/flutter/plugins/batteryexample/example/MainActivity.kt
@@ -2,5 +2,4 @@ package io.flutter.plugins.batteryexample.example
 
 import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity: FlutterActivity() {
-}
+class MainActivity: FlutterActivity()

From bdac70982673fec783552b645287f5680a840de7 Mon Sep 17 00:00:00 2001
From: Julian Steenbakker <juliansteenbakker@outlook.com>
Date: Tue, 5 Oct 2021 14:25:00 +0200
Subject: [PATCH 3/6] imp: upgrade compile sdk version

---
 packages/battery_plus/battery_plus/android/build.gradle      | 5 +++--
 .../battery_plus/android/src/main/AndroidManifest.xml        | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/battery_plus/battery_plus/android/build.gradle b/packages/battery_plus/battery_plus/android/build.gradle
index aa0a1ac9fd..23e1849d6d 100644
--- a/packages/battery_plus/battery_plus/android/build.gradle
+++ b/packages/battery_plus/battery_plus/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
     }
 }
 
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
@@ -31,4 +31,5 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
+
 }
diff --git a/packages/battery_plus/battery_plus/android/src/main/AndroidManifest.xml b/packages/battery_plus/battery_plus/android/src/main/AndroidManifest.xml
index 729dddeadf..da40a4e70a 100644
--- a/packages/battery_plus/battery_plus/android/src/main/AndroidManifest.xml
+++ b/packages/battery_plus/battery_plus/android/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="dev.fluttercommunity.plus.battery">
+<manifest package="dev.fluttercommunity.plus.battery">
 </manifest>

From 7c6d5109777b0f27203815fa0415efdbc7b00450 Mon Sep 17 00:00:00 2001
From: Julian Steenbakker <juliansteenbakker@outlook.com>
Date: Tue, 5 Oct 2021 14:25:27 +0200
Subject: [PATCH 4/6] imp: annotate functions with targetApi

---
 .../plus/battery/BatteryPlusPlugin.java       | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/battery_plus/battery_plus/android/src/main/java/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java b/packages/battery_plus/battery_plus/android/src/main/java/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java
index d6eba33370..aa2348c7bd 100644
--- a/packages/battery_plus/battery_plus/android/src/main/java/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java
+++ b/packages/battery_plus/battery_plus/android/src/main/java/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java
@@ -4,6 +4,7 @@
 
 package dev.fluttercommunity.plus.battery;
 
+import android.annotation.TargetApi;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.ContextWrapper;
@@ -15,6 +16,10 @@
 import android.os.Build.VERSION_CODES;
 import android.os.PowerManager;
 import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.EventChannel;
@@ -52,7 +57,7 @@ private void onAttachedToEngine(Context applicationContext, BinaryMessenger mess
   }
 
   @Override
-  public void onDetachedFromEngine(FlutterPluginBinding binding) {
+  public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
     applicationContext = null;
     methodChannel.setMethodCallHandler(null);
     methodChannel = null;
@@ -61,7 +66,7 @@ public void onDetachedFromEngine(FlutterPluginBinding binding) {
   }
 
   @Override
-  public void onMethodCall(MethodCall call, Result result) {
+  public void onMethodCall(MethodCall call, @NonNull Result result) {
     if (call.method.equals("getBatteryLevel")) {
       int batteryLevel = getBatteryLevel();
 
@@ -83,13 +88,19 @@ public void onMethodCall(MethodCall call, Result result) {
     }
   }
 
+  @TargetApi(VERSION_CODES.O)
   @Override
   public void onListen(Object arguments, EventSink events) {
     chargingStateChangeReceiver = createChargingStateChangeReceiver(events);
     applicationContext.registerReceiver(
         chargingStateChangeReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
 
-    int status = getBatteryProperty(BatteryManager.BATTERY_PROPERTY_STATUS);
+    int status;
+    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+      status = getBatteryProperty(BatteryManager.BATTERY_PROPERTY_STATUS);
+    } else {
+      status = BatteryManager.BATTERY_STATUS_UNKNOWN;
+    }
     publishBatteryStatus(events, status);
   }
 
@@ -100,7 +111,7 @@ public void onCancel(Object arguments) {
   }
 
   private int getBatteryLevel() {
-    int batteryLevel = -1;
+    int batteryLevel;
     if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
       batteryLevel = getBatteryProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY);
     } else {
@@ -163,9 +174,10 @@ private Boolean getPowerSaveModeForXiaomi() {
     return null;
   }
 
+  @RequiresApi(api = VERSION_CODES.LOLLIPOP)
   private int getBatteryProperty(int property) {
     BatteryManager batteryManager =
-        (BatteryManager) applicationContext.getSystemService(applicationContext.BATTERY_SERVICE);
+        (BatteryManager) applicationContext.getSystemService(Context.BATTERY_SERVICE);
     return batteryManager.getIntProperty(property);
   }
 

From 1fd8d8e94ce2135925d8aa9c719de0286b086577 Mon Sep 17 00:00:00 2001
From: Julian Steenbakker <juliansteenbakker@outlook.com>
Date: Tue, 5 Oct 2021 14:28:53 +0200
Subject: [PATCH 5/6] style: melos format

---
 .../dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/battery_plus/battery_plus/android/src/main/java/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java b/packages/battery_plus/battery_plus/android/src/main/java/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java
index aa2348c7bd..46980059c1 100644
--- a/packages/battery_plus/battery_plus/android/src/main/java/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java
+++ b/packages/battery_plus/battery_plus/android/src/main/java/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.java
@@ -16,10 +16,8 @@
 import android.os.Build.VERSION_CODES;
 import android.os.PowerManager;
 import android.provider.Settings;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
-
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.EventChannel;

From 4d11c78e7c47e6ada6fb7f763bdd254d6f39f22c Mon Sep 17 00:00:00 2001
From: Julian Steenbakker <juliansteenbakker@outlook.com>
Date: Tue, 5 Oct 2021 14:32:12 +0200
Subject: [PATCH 6/6] bump version to 2.0.1

---
 packages/battery_plus/battery_plus/CHANGELOG.md | 5 +++++
 packages/battery_plus/battery_plus/pubspec.yaml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/battery_plus/battery_plus/CHANGELOG.md b/packages/battery_plus/battery_plus/CHANGELOG.md
index 1be5a9f96e..c7d51cd669 100644
--- a/packages/battery_plus/battery_plus/CHANGELOG.md
+++ b/packages/battery_plus/battery_plus/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.0.1
+
+- Upgrade Android compile SDK version
+- Several code improvements
+
 ## 2.0.0
 
 - Remove deprecated method `registerWith` (of Android v1 embedding)
diff --git a/packages/battery_plus/battery_plus/pubspec.yaml b/packages/battery_plus/battery_plus/pubspec.yaml
index 3af3d0d3c1..c6e0d498a9 100644
--- a/packages/battery_plus/battery_plus/pubspec.yaml
+++ b/packages/battery_plus/battery_plus/pubspec.yaml
@@ -1,6 +1,6 @@
 name: battery_plus
 description: Flutter plugin for accessing information about the battery state(full, charging, discharging).
-version: 2.0.0
+version: 2.0.1
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/