降级到support

hss01248 · Oct 13, 2020 · 39303ce · 39303ce
1 parent f65105f
commit 39303ce
Show file tree

Hide file tree

Showing 19 changed files with 48 additions and 181 deletions.
diff --git a/activityresult/build.gradle b/activityresult/build.gradle
@@ -11,7 +11,6 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }
 
@@ -27,9 +26,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+implementation 'com.android.support:appcompat-v7:28.0.0'
+
     api project (':transfrag')
 }
diff --git a/activityresult/src/androidTest/java/com/hss01248/activityresult/ExampleInstrumentedTest.java b/activityresult/src/androidTest/java/com/hss01248/activityresult/ExampleInstrumentedTest.java
diff --git a/activityresult/src/main/java/com/hss01248/activityresult/ActivityResultListener.java b/activityresult/src/main/java/com/hss01248/activityresult/ActivityResultListener.java
@@ -2,9 +2,10 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
+
 
 /**
  * time:2020/4/30

diff --git a/activityresult/src/main/java/com/hss01248/activityresult/GoOutOfAppForResultFragment.java b/activityresult/src/main/java/com/hss01248/activityresult/GoOutOfAppForResultFragment.java
@@ -1,10 +1,10 @@
 package com.hss01248.activityresult;
 
 import android.content.Intent;
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentActivity;
 
 import com.hss01248.transfrag.BaseTransFragment;
 

diff --git a/activityresult/src/main/java/com/hss01248/activityresult/InAppResultFragment.java b/activityresult/src/main/java/com/hss01248/activityresult/InAppResultFragment.java
@@ -1,10 +1,11 @@
 package com.hss01248.activityresult;
 
 import android.content.Intent;
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentActivity;
+
 
 import com.hss01248.transfrag.BaseTransFragment;
 

diff --git a/activityresult/src/main/java/com/hss01248/activityresult/StartActivityUtil.java b/activityresult/src/main/java/com/hss01248/activityresult/StartActivityUtil.java
@@ -6,11 +6,13 @@
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentActivity;
+
 
 
 
@@ -45,7 +47,7 @@ private static boolean isAppDebugable(Application application) {
     }
 
     @SuppressLint("CheckResult")
-    public static void goOutAppForResult(@NonNull Activity activity, @NonNull  Intent intent,
+    public static void goOutAppForResult(@NonNull AppCompatActivity activity, @NonNull  Intent intent,
                                          @NonNull final ActivityResultListener listener){
         init(activity.getApplication());
         new GoOutOfAppForResultFragment((FragmentActivity) activity,intent).goOutApp(listener);
@@ -59,11 +61,11 @@ public static void goOutAppForResult(@NonNull Activity activity, @NonNull  Inten
      * @param listener
      */
     @SuppressLint("CheckResult")
-    public static <T extends Activity> void startActivity(@NonNull final Activity activity,
-                                     @Nullable Class<T> targetClazz,
-                                     @Nullable Intent intent,
-                                     boolean needResult,
-                                     @NonNull final TheActivityListener<T> listener) {
+    public static <T extends AppCompatActivity> void startActivity(@NonNull final AppCompatActivity activity,
+                                                                   @Nullable Class<T> targetClazz,
+                                                                   @Nullable Intent intent,
+                                                                   boolean needResult,
+                                                                   @NonNull final TheActivityListener<T> listener) {
         init(activity.getApplication());
         if(targetClazz == null && intent == null){
             listener.onActivityNotFound(new Throwable("targetClazz and intent can not be  null at same time"));
@@ -93,8 +95,8 @@ public static <T extends Activity> void startActivity(@NonNull final Activity ac
         }
     }
 
-    private static <T extends Activity> void registerCallback(final Application application, final Class<T> targetClazz,
-                                         final TheActivityListener<T> listener) {
+    private static <T extends AppCompatActivity> void registerCallback(final Application application, final Class<T> targetClazz,
+                                                                       final TheActivityListener<T> listener) {
 
         application.registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
             boolean hasonActivityCreated;

diff --git a/activityresult/src/main/java/com/hss01248/activityresult/TheActivityListener.java b/activityresult/src/main/java/com/hss01248/activityresult/TheActivityListener.java
@@ -3,16 +3,17 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 /**
  * time:2020/4/30
  * author:hss
  * desription:
  */
-public  class TheActivityListener<T extends Activity> implements ActivityResultListener {
+public  class TheActivityListener<T extends AppCompatActivity> implements ActivityResultListener {
 
 
 

diff --git a/activityresult/src/test/java/com/hss01248/activityresult/ExampleUnitTest.java b/activityresult/src/test/java/com/hss01248/activityresult/ExampleUnitTest.java
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
     }
     buildTypes {
         release {
@@ -21,10 +21,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+
     implementation project (':activityresult')
 }
diff --git a/app/src/androidTest/java/com/hss01248/transfragmentdemo/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/hss01248/transfragmentdemo/ExampleInstrumentedTest.java
diff --git a/app/src/main/java/com/hss01248/transfragmentdemo/ActivityDemo2.java b/app/src/main/java/com/hss01248/transfragmentdemo/ActivityDemo2.java
@@ -2,11 +2,12 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
+
 
 /**
  * time:2020/4/30

diff --git a/app/src/main/java/com/hss01248/transfragmentdemo/MainActivity.java b/app/src/main/java/com/hss01248/transfragmentdemo/MainActivity.java
@@ -1,15 +1,16 @@
 package com.hss01248.transfragmentdemo;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.NotificationManagerCompat;
+
 
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.NotificationManagerCompat;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
 

diff --git a/app/src/main/java/com/hss01248/transfragmentdemo/OrderFragment.java b/app/src/main/java/com/hss01248/transfragmentdemo/OrderFragment.java
@@ -1,6 +1,8 @@
 package com.hss01248.transfragmentdemo;
 
-import androidx.fragment.app.FragmentActivity;
+
+
+import android.support.v4.app.FragmentActivity;
 
 import com.hss01248.transfrag.BaseTransFragment;
 

diff --git a/app/src/test/java/com/hss01248/transfragmentdemo/ExampleUnitTest.java b/app/src/test/java/com/hss01248/transfragmentdemo/ExampleUnitTest.java
diff --git a/gradle.properties b/gradle.properties
@@ -14,7 +14,5 @@ org.gradle.jvmargs=-Xmx1536m
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+
 
diff --git a/transfrag/build.gradle b/transfrag/build.gradle
@@ -11,7 +11,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
         consumerProguardFiles 'consumer-rules.pro'
     }
 
@@ -27,10 +27,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+     implementation 'com.android.support:appcompat-v7:28.0.0'
     //implementation 'com.github.VictorAlbertos:RxActivityResult:0.5.0-2.x'
     //implementation 'io.reactivex.rxjava2:rxjava:2.2.3'
 }
diff --git a/transfrag/src/androidTest/java/com/hss01248/transfrag/ExampleInstrumentedTest.java b/transfrag/src/androidTest/java/com/hss01248/transfrag/ExampleInstrumentedTest.java
diff --git a/transfrag/src/main/java/com/hss01248/transfrag/BaseTransFragment.java b/transfrag/src/main/java/com/hss01248/transfrag/BaseTransFragment.java
@@ -4,13 +4,14 @@
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
 import android.util.Log;
 
 
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
+
 
 import java.util.UUID;
 

diff --git a/transfrag/src/test/java/com/hss01248/transfrag/ExampleUnitTest.java b/transfrag/src/test/java/com/hss01248/transfrag/ExampleUnitTest.java