Update android

sirily11 · Aug 27, 2021 · 0bf10ee · 0bf10ee
1 parent ea34907
commit 0bf10ee
Show file tree

Hide file tree

Showing 33 changed files with 15 additions and 1,425 deletions.
diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies
diff --git a/android/app/build.gradle b/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 29
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -39,7 +39,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "sirilee.storage.storage_management_system_mobile"
-        minSdkVersion 16
+        minSdkVersion 26
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

diff --git a/android/build.gradle b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/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-6.1.1-all.zip
diff --git a/android/settings_aar.gradle b/android/settings_aar.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/lib/States/ItemProvider.dart b/lib/States/ItemProvider.dart
@@ -148,7 +148,7 @@ class ItemProvider with ChangeNotifier {
             context: context,
             backgroundColor: Colors.transparent,
             expand: true,
-            builder: (context, controller) => SearchListPage(
+            builder: (context) => SearchListPage(
               items: items,
             ),
           );
@@ -157,7 +157,7 @@ class ItemProvider with ChangeNotifier {
             context: context,
             backgroundColor: Colors.transparent,
             expand: true,
-            builder: (context, controller) => SearchListPage(
+            builder: (context) => SearchListPage(
               items: items,
             ),
           );

diff --git a/lib/pages/Home/Detail/SubDetail/PositionDetail.dart b/lib/pages/Home/Detail/SubDetail/PositionDetail.dart
@@ -131,7 +131,7 @@ class _PositionDetailState extends State<PositionDetail> {
       url = await showCupertinoModalBottomSheet<String>(
         context: context,
         expand: true,
-        builder: (context, c) => UploadDialog(
+        builder: (context) => UploadDialog(
           image: file,
           imageDestination: ImageDestination.detailPosition,
         ),
@@ -205,7 +205,7 @@ class _PrintingWidgetState extends State<PrintingWidget> {
         ),
       ),
       actions: <Widget>[
-        FlatButton(
+        TextButton(
           onPressed: () async {
             Navigator.pop(context);
           },

diff --git a/lib/pages/Home/Homepage.dart b/lib/pages/Home/Homepage.dart
@@ -101,12 +101,12 @@ class HomePageState extends State<Homepage> {
               try {
                 await CupertinoScaffold.showCupertinoModalBottomSheet(
                   context: context,
-                  builder: (c, s) => CategorySelector(),
+                  builder: (c) => CategorySelector(),
                 );
               } catch (err) {
                 showCupertinoModalBottomSheet(
                   context: context,
-                  builder: (c, s) => CategorySelector(),
+                  builder: (c) => CategorySelector(),
                 );
               }
             },

diff --git a/lib/pages/ItemImage/NewImageScreen.dart b/lib/pages/ItemImage/NewImageScreen.dart
@@ -29,7 +29,7 @@ class _ImageScreenState extends State<ImageScreen> {
       await showCupertinoModalBottomSheet(
         context: context,
         expand: true,
-        builder: (context, _) => UploadDialog(
+        builder: (context) => UploadDialog(
           id: widget.id,
           image: image,
           labels: labels,

diff --git a/plugins/menubar/.flutter-plugins-dependencies b/plugins/menubar/.flutter-plugins-dependencies
diff --git a/plugins/menubar/.gitignore b/plugins/menubar/.gitignore
diff --git a/plugins/menubar/LICENSE b/plugins/menubar/LICENSE
diff --git a/plugins/menubar/analysis_options.yaml b/plugins/menubar/analysis_options.yaml
diff --git a/plugins/menubar/ios/.gitignore b/plugins/menubar/ios/.gitignore
diff --git a/plugins/menubar/ios/Classes/MenubarPlugin.h b/plugins/menubar/ios/Classes/MenubarPlugin.h
diff --git a/plugins/menubar/ios/Classes/MenubarPlugin.m b/plugins/menubar/ios/Classes/MenubarPlugin.m
diff --git a/plugins/menubar/ios/menubar.podspec b/plugins/menubar/ios/menubar.podspec
diff --git a/plugins/menubar/lib/menubar.dart b/plugins/menubar/lib/menubar.dart