Upversion everything, fix various flutter issues/workarounds

android/app/build.gradle

@@ -32,7 +32,8 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 30
+    // compileSdkVersion 31
+    compileSdkVersion flutter.compileSdkVersion
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -45,7 +46,8 @@ android {
     defaultConfig {
         applicationId "com.kmac5dev.mindfulnotifier"
         minSdkVersion 21
-        targetSdkVersion 30
+        // targetSdkVersion 31
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

android/app/src/main/AndroidManifest.xml

@@ -1,12 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.kmac5dev.mindfulnotifier">
-    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
-         calls FlutterMain.startInitialization(this); in its onCreate method.
-         In most cases you can leave this as-is, but you if you want to provide
-         additional functionality it is fine to subclass or reimplement
-         FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="Mindful Notifier"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -24,17 +19,6 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <!--
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
-            -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +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.4-all.zip
-distributionSha256Sum=abc10bcedb58806e8654210f96031db541bcd2d6fc3161e81cb0572d6a15e821
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

lib/components/datastore.dart

@@ -1,7 +1,6 @@
 import 'dart:convert';
 import 'dart:math';
 import 'package:flutter/foundation.dart';
-import 'package:hive/hive.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -250,7 +249,8 @@ abstract class ScheduleDataStoreBase {
   static const int defaultQuietHoursEndHour = 9;
   static const int defaultQuietHoursEndMinute = 0;
   static const bool defaultNotifyQuietHours = false;
-  static const String defaultReminderMessage = constants.reminderMessageDisabled;
+  static const String defaultReminderMessage =
+      constants.reminderMessageDisabled;
   static const String defaultInfoMessage = constants.infoMessageDisabled;
   static const String defaultControlMessage = '';
   static const String defaultTheme = 'Default';

lib/components/scheduler.dart

@@ -7,6 +7,8 @@ import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:path_provider_android/path_provider_android.dart';
+import 'package:shared_preferences_android/shared_preferences_android.dart';
 
 import 'package:mindfulnotifier/components/alarmservice.dart';
 import 'package:mindfulnotifier/components/constants.dart' as constants;
@@ -78,14 +80,19 @@ class Scheduler {
   Future<void> init() async {
     logger.i("Initializing scheduler ${getCurrentIsolate()}");
 
+    // TEMPORARY: fix eof SharedPreferences and PathProvider
+    // https://github.com/flutter/flutter/issues/99155#issuecomment-1052023743:
+    // This will be replaced with 'DartPluginRegistrant.ensureInitialized()'
+    SharedPreferencesAndroid.registerWith();
+    PathProviderAndroid.registerWith();
     try {
       PackageInfo info = await PackageInfo.fromPlatform();
       Get.put(info);
     } catch (e) {
       // throws during testing
     }
 
-    ds = await ScheduleDataStore.getInstance();
+    ds ??= await ScheduleDataStore.getInstance();
     Get.delete<ScheduleDataStore>();
     Get.put(ds, permanent: true);
 
@@ -191,6 +198,7 @@ class Scheduler {
   }
 
   Future<void> sendDataStoreUpdate() async {
+    ds ??= await ScheduleDataStore.getInstance();
     sendValueToUI('syncDataStore', ds.getInMemoryInstance());
   }
 

lib/main.dart

@@ -1,5 +1,4 @@
 import 'package:device_info_plus/device_info_plus.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:mindfulnotifier/components/utils.dart';
@@ -12,7 +11,6 @@ import 'package:mindfulnotifier/components/router.dart' as router;
 import 'package:mindfulnotifier/components/alarmservice.dart';
 import 'package:mindfulnotifier/theme/themes.dart';
 
-
 void main() async {
   // needed if you intend to initialize in the `main` function
   WidgetsFlutterBinding.ensureInitialized();

lib/screens/about.dart

@@ -1,6 +1,4 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:mindfulnotifier/components/constants.dart';
@@ -87,13 +85,9 @@ This project is licensed under the terms of the [GNU General Public License v3.0
 """;
 
 Future<void> launchInBrowser(String url) async {
-  if (await canLaunch(url)) {
-    await launch(
-      url,
-      forceSafariVC: false,
-      forceWebView: false,
-      headers: <String, String>{'my_header_key': 'my_header_value'},
-    );
+  Uri uri = Uri.parse(url);
+  if (await canLaunchUrl(uri)) {
+    await launchUrl(uri, mode: LaunchMode.platformDefault);
   } else {
     throw 'Could not launch $url';
   }

lib/screens/general.dart

@@ -2,12 +2,10 @@ import 'dart:io';
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:battery_optimization/battery_optimization.dart';
+import 'package:optimization_battery/optimization_battery.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:file_picker/file_picker.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 import 'package:rflutter_alert/rflutter_alert.dart';
 import 'package:share_plus/share_plus.dart';
@@ -104,8 +102,7 @@ class GeneralWidgetController extends GetxController {
     InMemoryScheduleDataStore mds = Get.find();
 
     // update alarm service with new memory store
-    Get.find<MindfulNotifierWidgetController>()
-        .updatePermanentDataStore(mds);
+    Get.find<MindfulNotifierWidgetController>().updatePermanentDataStore(mds);
 
     scheduleDirty.value = false;
   }
@@ -273,7 +270,7 @@ class GeneralWidget extends StatelessWidget {
   }
 
   void _checkBatteryOptimization(var context) {
-    BatteryOptimization.isIgnoringBatteryOptimizations().then((onValue) {
+    OptimizationBattery.isIgnoringBatteryOptimizations().then((onValue) {
       if (onValue) {
         // Ignoring Battery Optimization
         utils.showInfoAlert(
@@ -295,7 +292,7 @@ class GeneralWidget extends StatelessWidget {
             buttons: [
               DialogButton(
                 onPressed: () {
-                  BatteryOptimization.openBatteryOptimizationSettings();
+                  OptimizationBattery.openBatteryOptimizationSettings();
                   Navigator.pop(context);
                 },
                 child: Text(

lib/screens/mindfulnotifier.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:ui';
 import 'dart:isolate';
 
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:minimize_app/minimize_app.dart';

lib/screens/reminderview.dart

@@ -1,9 +1,4 @@
-import 'dart:ui';
-
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 import 'package:mindfulnotifier/components/datastore.dart';
 import 'package:dropdown_search/dropdown_search.dart';

lib/screens/schedulesview.dart

@@ -1,10 +1,7 @@
-import 'dart:ui';
 import 'dart:async';
 
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 
 import 'package:mindfulnotifier/components/datastore.dart';

lib/screens/sound.dart

@@ -1,8 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:rflutter_alert/rflutter_alert.dart';
 import 'package:get/get.dart';
@@ -112,8 +110,7 @@ class SoundWidgetController extends GetxController {
 
   void _updateAlarmService(InMemoryScheduleDataStore mds) {
     // update alarm service with new memory store
-    Get.find<MindfulNotifierWidgetController>()
-        .updatePermanentDataStore(mds);
+    Get.find<MindfulNotifierWidgetController>().updatePermanentDataStore(mds);
   }
 }