jianboy 1 year ago
parent
commit
8c2cc86129

+ 2 - 14
android/app/build.gradle

@@ -22,25 +22,17 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
-    sourceSets {
-        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).
         applicationId "com.example.demo"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -60,7 +52,3 @@ android {
 flutter {
     source '../..'
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}

+ 1 - 1
android/app/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
          FlutterApplication and put your custom class here. -->
     <uses-permission android:name="android.permission.INTERNET"/>
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        
         android:label="demo"
         android:usesCleartextTraffic="true"
         android:icon="@mipmap/ic_launcher">

+ 7 - 0
android/app/src/main/java/com/example/demo/MainActivity.java

@@ -0,0 +1,7 @@
+package com.example.demo;
+
+
+import io.flutter.embedding.android.FlutterActivity;
+
+public class MainActivity extends FlutterActivity {
+}

+ 7 - 0
android/app/src/main/java/com/example/eye_video/MainActivity.java

@@ -0,0 +1,7 @@
+package com.example.eye_video;
+
+
+import io.flutter.embedding.android.FlutterActivity;
+
+public class MainActivity extends FlutterActivity {
+}

+ 0 - 6
android/app/src/main/kotlin/com/example/demo/MainActivity.kt

@@ -1,6 +0,0 @@
-package com.example.demo
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}

+ 0 - 6
android/app/src/main/kotlin/com/example/eye_video/MainActivity.kt

@@ -1,6 +0,0 @@
-package com.example.eye_video
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}

+ 0 - 2
android/build.gradle

@@ -1,5 +1,4 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         mavenCentral()
@@ -7,7 +6,6 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 

+ 10 - 10
pubspec.yaml

@@ -32,13 +32,13 @@ flutter:
     - assets/images/
     # - assets/images/2.0x/
     # - assets/images/3.0x/
-  fonts:
-    - family: NotoSansHans-Medium
-      fonts:
-        - asset: assets/fonts/NotoSansHans-Medium.otf
-    - family: NotoSansHans-Regular
-      fonts:
-        - asset: assets/fonts/NotoSansHans-Regular.otf
-    - family: Oswald-Regular
-      fonts:
-        - asset: assets/fonts/Oswald-Regular.otf
+  # fonts:
+  #   - family: NotoSansHans-Medium
+  #     fonts:
+  #       - asset: assets/fonts/NotoSansHans-Medium.otf
+  #   - family: NotoSansHans-Regular
+  #     fonts:
+  #       - asset: assets/fonts/NotoSansHans-Regular.otf
+  #   - family: Oswald-Regular
+  #     fonts:
+  #       - asset: assets/fonts/Oswald-Regular.otf