zhangmengjie 5 лет назад
Родитель
Сommit
0d86ddd711

+ 1 - 1
android/app/build.gradle

@@ -163,7 +163,7 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     // 如果你需要支持GIF动图
     implementation 'com.facebook.fresco:animated-gif:1.10.0'
-    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+    implementation "androidx.appcompat:appcompat:${rootProject.ext.supportLibVersion}"
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
 }

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

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.edufound.mobile">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -23,10 +24,12 @@
     <application
         android:name="com.edufound.MainApplication"
         android:allowBackup="false"
+        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:replace="android:appComponentFactory">
 
         <meta-data
             android:name="android.max_aspect"

Разница между файлами не показана из-за своего большого размера
+ 129 - 125
android/app/src/main/assets/index.android.bundle


+ 1 - 1
android/app/src/main/java/com/edufound/mobile/util/AndroidUtil.java

@@ -1,7 +1,7 @@
 package com.edufound.mobile.util;
 
 import android.content.Intent;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.Toast;
 
 import com.edufound.mobile.activity.WebActivity;

+ 1 - 1
android/app/src/main/java/com/edufound/mobile/util/PermissionConstants.java

@@ -8,7 +8,7 @@ package com.edufound.mobile.util;
         import android.Manifest;
         import android.Manifest.permission;
         import android.annotation.SuppressLint;
-        import android.support.annotation.StringDef;
+        import androidx.annotation.StringDef;
 
         import java.lang.annotation.Retention;
         import java.lang.annotation.RetentionPolicy;

+ 4 - 4
android/app/src/main/java/com/edufound/mobile/util/PermissionUtils.java

@@ -10,10 +10,10 @@ package com.edufound.mobile.util;
         import android.net.Uri;
         import android.os.Build;
         import android.os.Bundle;
-        import android.support.annotation.NonNull;
-        import android.support.annotation.Nullable;
-        import android.support.annotation.RequiresApi;
-        import android.support.v4.content.ContextCompat;
+        import androidx.annotation.NonNull;
+        import androidx.annotation.Nullable;
+        import androidx.annotation.RequiresApi;
+        import androidx.core.content.ContextCompat;
 
         import java.util.ArrayList;
         import java.util.Arrays;

+ 1 - 1
android/app/src/main/java/com/edufound/mobile/util/Utils.java

@@ -8,7 +8,7 @@ import android.content.Context;
 import android.graphics.Point;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.WindowManager;
 
 import java.lang.ref.WeakReference;

+ 1 - 1
android/app/src/main/java/com/edufound/mobile/view/modal/PopModal.java

@@ -7,7 +7,7 @@ import android.content.DialogInterface;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.Log;

+ 1 - 1
android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         minSdkVersion = 16
         compileSdkVersion = 28
         targetSdkVersion = 28
-        supportLibVersion = "28.0.0"
+        supportLibVersion = '1.0.0-beta01'
     }
     repositories {
         google()

+ 2 - 1
android/gradle.properties

@@ -20,4 +20,5 @@ MYAPP_RELEASE_STORE_FILE=edufound.keystore
 MYAPP_RELEASE_KEY_ALIAS=edufound_key
 MYAPP_RELEASE_STORE_PASSWORD=edufound123
 MYAPP_RELEASE_KEY_PASSWORD=edufound321
-
+android.useAndroidX=true
+android.enableJetifier=true