upgrade to Flutter 3.10 and Gradle 7+

Author: elementlo

README.md

@@ -5,7 +5,7 @@
   Shorey
   <br>
 </h1>
-Shorey是一款笔记应用, 支持Android/iOS双平台, 使用Flutter <strike>3</strike> 3开发, 体验Flutter的同时也希望做一个能成为个人知识中转站的应用, 让你更方便的把平时收集到的信息记录下来, 最后沉淀到知识库中.
+Shorey是一款笔记应用, 支持Android/iOS双平台, 使用Flutter <strike>2</strike> 3开发, 体验Flutter的同时也希望做一个能成为个人知识中转站的应用, 让你更方便的把平时收集到的信息记录下来, 最后沉淀到知识库中.
 
 后边会先开发联动Notion, 让你的Notion成为后台知识库.
 

android/app/build.gradle

@@ -32,9 +32,6 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
-    }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
@@ -64,6 +61,10 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    namespace 'com.elementlo.shorey'
+    lint {
+        disable 'InvalidPackage'
+    }
 }
 
 flutter {

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.elementlo.shorey">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.elementlo.shorey">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 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

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.elementlo.shorey">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -28,6 +28,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

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-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip

lib/base/view_state_widget.dart

@@ -145,7 +145,6 @@ class ViewStateUnAuthImage extends StatelessWidget {
         width: 130,
         height: 100,
         fit: BoxFit.fitWidth,
-        color: Theme.of(context).accentColor,
         colorBlendMode: BlendMode.srcIn,
       ),
     );

lib/config/theme_data.dart

@@ -25,17 +25,14 @@ class AppThemeData {
 			primaryColor: const Color(0xFFF7F8FA),
 			textTheme: _textTheme,
 			appBarTheme: AppBarTheme(
-				textTheme: _textTheme.apply(bodyColor: colorScheme.onPrimary),
 				color: colorScheme.background,
 				elevation: 0,
 				iconTheme: IconThemeData(color: colorScheme.primary),
-				brightness: colorScheme.brightness,
 			),
 			iconTheme: IconThemeData(color: colorScheme.onPrimary),
 			canvasColor: colorScheme.background,
 			scaffoldBackgroundColor: Color(0xFFF5F5F5),
 			highlightColor: Colors.transparent,
-			accentColor: colorScheme.primary,
 			focusColor: focusColor,
 			snackBarTheme: SnackBarThemeData(
 				behavior: SnackBarBehavior.floating,
@@ -51,7 +48,7 @@ class AppThemeData {
 	static const ColorScheme lightColorScheme = ColorScheme(
 		primary: Color(0xe26d5c),
 		primaryVariant: Color(0xFF117378),
-		secondary: Color(0xFFEFF3F3),
+		secondary: Color(0xFFe26d5c),
 		secondaryVariant: Color(0xFFFAFBFB),
 		background: Color(0xFFE6EBEB),
 		surface: Color(0xFFFAFBFB),