From 505c40553c4803b1a6912cd4a12dc3523dad796a Mon Sep 17 00:00:00 2001 From: Frank Zhang Date: Thu, 7 May 2020 14:02:05 +0800 Subject: [PATCH] androidx support and version upto 1.0.4 --- .idea/caches/build_file_checksums.ser | Bin 0 -> 584 bytes .idea/codeStyles/Project.xml | 113 ++++++++++++++++++ .idea/gradle.xml | 20 ++++ .idea/inspectionProfiles/Project_Default.xml | 10 ++ .idea/misc.xml | 9 ++ .idea/modules.xml | 10 ++ .idea/runConfigurations.xml | 12 ++ .idea/vcs.xml | 6 + app/build.gradle | 25 ++-- .../demo/broadcast/BroadcastManager.java | 2 +- .../demo/ui/activity/ExceptionActivity.java | 2 +- .../demo/ui/activity/LoginActivity.java | 2 +- .../demo/ui/activity/MainActivity.java | 2 +- .../demo/ui/adapter/ChildFragmentAdapter.java | 2 +- .../demo/ui/adapter/FragmentAdapter.java | 2 +- .../demo/ui/fragment/ContactsFragment.java | 6 +- .../demo/ui/fragment/MainFragment.java | 4 +- .../demo/ui/widget/BottomNavigatorView.java | 2 +- build.gradle | 4 +- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 18 +-- .../fragmentnavigator/FragmentNavigator.java | 8 +- .../FragmentNavigatorAdapter.java | 2 +- 24 files changed, 226 insertions(+), 41 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..eae1b2fb47a1871563c15c03c234b02f8f81e29e GIT binary patch literal 584 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}2z_zyOYkOxc*3?Q2s1iqTp%Is)pXGlzb6jortmRiD~ zrXO0IT2!o`R+N~Rtq;|$j|iHA)S{Bi)Z)@YhB^i|kP%m8dv5kKY+`xYz&Yd152v~k z2A(8Pkijg5E1a=?ChLjp8Bc4{C1-e + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..ec2010d --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..641b544 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..dfd2c79 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..6b02b07 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index b7da2eb..c18f361 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 29 + buildToolsVersion "28.0.3" defaultConfig { applicationId "com.aspsine.fragmentnavigator.demo" - minSdkVersion 11 - targetSdkVersion 24 - versionCode 3 - versionName "3.0" + minSdkVersion 14 + targetSdkVersion 29 + versionCode 4 + versionName "4.0" } buildTypes { release { @@ -23,10 +23,11 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile project(':library') -// compile 'com.github.Aspsine:FragmentNavigator:1.0.2' - compile 'com.android.support:appcompat-v7:24.2.0' - compile 'com.android.support:design:24.2.0' - testCompile 'junit:junit:4.12' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation project(':library') + //implementation 'com.github.Aspsine:FragmentNavigator:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.1.0' + testImplementation 'junit:junit:4.12' + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' } diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/broadcast/BroadcastManager.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/broadcast/BroadcastManager.java index 66e5583..40d2a6a 100644 --- a/app/src/main/java/com/aspsine/fragmentnavigator/demo/broadcast/BroadcastManager.java +++ b/app/src/main/java/com/aspsine/fragmentnavigator/demo/broadcast/BroadcastManager.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.support.v4.content.LocalBroadcastManager; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.aspsine.fragmentnavigator.demo.Action; diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/ExceptionActivity.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/ExceptionActivity.java index 3797d64..d38290d 100644 --- a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/ExceptionActivity.java +++ b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/ExceptionActivity.java @@ -1,7 +1,7 @@ package com.aspsine.fragmentnavigator.demo.ui.activity; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.Button; diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/LoginActivity.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/LoginActivity.java index 977c808..19944ec 100644 --- a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/LoginActivity.java +++ b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/LoginActivity.java @@ -1,7 +1,7 @@ package com.aspsine.fragmentnavigator.demo.ui.activity; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.text.TextUtils; import android.view.View; import android.widget.Button; diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/MainActivity.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/MainActivity.java index 3240a2f..648d208 100644 --- a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/MainActivity.java +++ b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/MainActivity.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/adapter/ChildFragmentAdapter.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/adapter/ChildFragmentAdapter.java index 8cd0a0c..38a481b 100644 --- a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/adapter/ChildFragmentAdapter.java +++ b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/adapter/ChildFragmentAdapter.java @@ -1,6 +1,6 @@ package com.aspsine.fragmentnavigator.demo.ui.adapter; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.aspsine.fragmentnavigator.FragmentNavigatorAdapter; import com.aspsine.fragmentnavigator.demo.ui.fragment.MainFragment; diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/adapter/FragmentAdapter.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/adapter/FragmentAdapter.java index 0bb3635..1b5c75d 100644 --- a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/adapter/FragmentAdapter.java +++ b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/adapter/FragmentAdapter.java @@ -1,6 +1,6 @@ package com.aspsine.fragmentnavigator.demo.ui.adapter; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.aspsine.fragmentnavigator.FragmentNavigatorAdapter; import com.aspsine.fragmentnavigator.demo.ui.fragment.ContactsFragment; diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/fragment/ContactsFragment.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/fragment/ContactsFragment.java index 47a49ed..f786b06 100644 --- a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/fragment/ContactsFragment.java +++ b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/fragment/ContactsFragment.java @@ -2,9 +2,9 @@ import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.util.Log; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/fragment/MainFragment.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/fragment/MainFragment.java index 58c780b..407a11c 100644 --- a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/fragment/MainFragment.java +++ b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/fragment/MainFragment.java @@ -4,8 +4,8 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/widget/BottomNavigatorView.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/widget/BottomNavigatorView.java index 3189e23..e14df58 100644 --- a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/widget/BottomNavigatorView.java +++ b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/widget/BottomNavigatorView.java @@ -3,7 +3,7 @@ import android.content.Context; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.v7.widget.LinearLayoutCompat; +import androidx.appcompat.widget.LinearLayoutCompat; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/build.gradle b/build.gradle index 77ce66e..b27b75b 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:3.6.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle.properties b/gradle.properties index 1d3591c..915f0e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8ef0dfe..c5a81de 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/library/build.gradle b/library/build.gradle index ce9adc3..bdd03b1 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 29 + buildToolsVersion "28.0.3" defaultConfig { - minSdkVersion 10 - targetSdkVersion 24 - versionCode 3 - versionName "1.0.2" + minSdkVersion 14 + targetSdkVersion 29 + versionCode 4 + versionName "1.0.4" } buildTypes { release { @@ -19,7 +19,7 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile 'com.android.support:support-fragment:24.2.0' + implementation fileTree(include: ['*.jar'], dir: 'libs') + testImplementation 'junit:junit:4.12' + implementation 'androidx.fragment:fragment:1.2.4' } diff --git a/library/src/main/java/com/aspsine/fragmentnavigator/FragmentNavigator.java b/library/src/main/java/com/aspsine/fragmentnavigator/FragmentNavigator.java index a5969c3..a30bbc6 100644 --- a/library/src/main/java/com/aspsine/fragmentnavigator/FragmentNavigator.java +++ b/library/src/main/java/com/aspsine/fragmentnavigator/FragmentNavigator.java @@ -1,10 +1,10 @@ package com.aspsine.fragmentnavigator; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import androidx.annotation.IdRes; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; /** * Created by aspsine on 16/3/30. diff --git a/library/src/main/java/com/aspsine/fragmentnavigator/FragmentNavigatorAdapter.java b/library/src/main/java/com/aspsine/fragmentnavigator/FragmentNavigatorAdapter.java index a7ab229..a281c48 100644 --- a/library/src/main/java/com/aspsine/fragmentnavigator/FragmentNavigatorAdapter.java +++ b/library/src/main/java/com/aspsine/fragmentnavigator/FragmentNavigatorAdapter.java @@ -1,6 +1,6 @@ package com.aspsine.fragmentnavigator; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; /** * Created by aspsine on 16/3/30.