migrate to androidx

hotstu · Jan 9, 2019 · b7b8cda · b7b8cda
1 parent 06344c2
commit b7b8cda
Show file tree

Hide file tree

Showing 33 changed files with 120 additions and 100 deletions.
diff --git a/README.md b/README.md
@@ -11,13 +11,20 @@ implementation 'gitbub.hotstu.naiue:lib:1.0.0'
 ## changelog
 * 1.0.0
 
-    新增BindingViewHolder
-    发布到Jcenter
+    - 新增BindingViewHolder
+    - 发布到Jcenter
 
 * 0.2.1
 
     升级插件版本
 
 * 0.2.0
 
-    下拉刷新控件
+    下拉刷新控件
+
+
+## more
+
+|简书| 掘金|JCenter | dockerHub|
+| ------------- |------------- |------------- |------------- |
+| [简书](https://www.jianshu.com/u/ca2207af2001) | [掘金](https://juejin.im/user/5bee320651882516be2ebbfe) |[JCenter ](https://bintray.com/hglf/maven)      | [dockerHub](https://hub.docker.com/u/hglf)|
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,10 +24,9 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.android.support:appcompat-v7:${SUPPORT_VERSION}"
-    implementation "com.android.support:recyclerview-v7:${SUPPORT_VERSION}"
-
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
     testImplementation 'junit:junit:4.12'
     implementation project(':lib')
 }
diff --git a/app/src/main/java/github/hotstu/naiuedemo/DialogDemoActivity.kt b/app/src/main/java/github/hotstu/naiuedemo/DialogDemoActivity.kt
@@ -2,11 +2,11 @@ package github.hotstu.naiuedemo
 
 import android.content.DialogInterface
 import android.os.Bundle
-import android.support.v7.widget.Toolbar
 import android.text.InputType
 import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
+import androidx.appcompat.widget.Toolbar
 import github.hotstu.naiue.arch.MOSwipbackActivity
 import github.hotstu.naiue.dialog.MODialog
 import github.hotstu.naiue.dialog.MODialogAction

diff --git a/app/src/main/java/github/hotstu/naiuedemo/HomeActivity.kt b/app/src/main/java/github/hotstu/naiuedemo/HomeActivity.kt
@@ -2,11 +2,11 @@ package github.hotstu.naiuedemo
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
 import github.hotstu.naiue.util.MOStatusBarHelper
 import github.hotstu.naiue.widget.recycler.MOCommonViewHolder
 import github.hotstu.naiue.widget.recycler.MOTypedRecyclerAdapter

diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="github.hotstu.naiuedemo.HomeActivity">
+
     <include
         android:id="@+id/include"
         layout="@layout/mo_toolbar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/include">
 
-    </android.support.v7.widget.RecyclerView>
-</android.support.constraint.ConstraintLayout>
+    </androidx.recyclerview.widget.RecyclerView>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layout"
-    android:background="@color/mo_gray_5"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/mo_gray_5"
 
     tools:context="github.hotstu.naiuedemo.DialogDemoActivity">
 
@@ -21,8 +21,8 @@
         android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:background="@color/colorAccent"
         android:onClick="onClick"
         android:text="消息类型对话框（蓝色按钮）"
@@ -35,8 +35,8 @@
         android:id="@+id/button2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
         android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
         android:onClick="onClick"
         android:text="消息类型对话框（红色按钮）"
         app:layout_constraintEnd_toEndOf="parent"
@@ -48,8 +48,8 @@
         android:id="@+id/button3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:onClick="onClick"
         android:text="消息类型对话框 (很长文案)"
         app:layout_constraintEnd_toEndOf="parent"
@@ -60,9 +60,9 @@
         android:id="@+id/button4"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginEnd="8dp"
         android:onClick="onClick"
         android:text="菜单类型对话框"
         app:layout_constraintEnd_toEndOf="parent"
@@ -107,9 +107,9 @@
         android:id="@+id/button8"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="52dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginBottom="52dp"
         android:onClick="onClick"
         android:text="多选菜单类型对话框(item 数量很多)"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -131,11 +131,11 @@
         android:id="@+id/button10"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
         android:onClick="onClick"
         android:text="高度适应键盘升降的对话框"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button8" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_mo_fragment_demo.xml b/app/src/main/res/layout/activity_mo_fragment_demo.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="github.hotstu.naiuedemo.MoFragmentDemoActivity">
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_swip_back_demo.xml b/app/src/main/res/layout/activity_swip_back_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -17,4 +17,4 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,7 @@ subprojects {
     }
     if ("lib" == it.name) {
         group = 'gitbub.hotstu.naiue'//发布到 bintray 的groupId号
-        version = "1.0.0" // 发布到 bintray 的版本号
+        version = "1.1.0" // 发布到 bintray 的版本号
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -15,3 +15,5 @@ org.gradle.jvmargs=-Xmx1536m
 # 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
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -26,9 +26,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:appcompat-v7:${SUPPORT_VERSION}"
-    implementation "com.android.support:recyclerview-v7:${SUPPORT_VERSION}"
-    implementation("com.android.support:design:${SUPPORT_VERSION}")
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation('com.google.android.material:material:1.0.0')
 
     testImplementation 'junit:junit:4.12'
 }

diff --git a/lib/src/main/java/github/hotstu/naiue/arch/MOActivity.java b/lib/src/main/java/github/hotstu/naiue/arch/MOActivity.java
@@ -1,9 +1,9 @@
 package github.hotstu.naiue.arch;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import github.hotstu.naiue.util.MOStatusBarHelper;
 
 /**

diff --git a/lib/src/main/java/github/hotstu/naiue/arch/MOFragment.java b/lib/src/main/java/github/hotstu/naiue/arch/MOFragment.java
@@ -1,11 +1,6 @@
 package github.hotstu.naiue.arch;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.view.ViewCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -18,6 +13,11 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import github.hotstu.naiue.R;
 import github.hotstu.naiue.util.MOViewHelper;
 import github.hotstu.naiue.widget.swipback.MOSwipeBackLayout;

diff --git a/lib/src/main/java/github/hotstu/naiue/arch/MOFragmentActivity.java b/lib/src/main/java/github/hotstu/naiue/arch/MOFragmentActivity.java
@@ -2,11 +2,11 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
 import android.util.Log;
 import android.widget.FrameLayout;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
 import github.hotstu.naiue.R;
 import github.hotstu.naiue.widget.MOInsetFrameLayout;
 

diff --git a/lib/src/main/java/github/hotstu/naiue/arch/MOSwipbackActivity.java b/lib/src/main/java/github/hotstu/naiue/arch/MOSwipbackActivity.java
@@ -1,17 +1,16 @@
 package github.hotstu.naiue.arch;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
 import github.hotstu.naiue.widget.swipback.MOSwipeBackLayout;
 import github.hotstu.naiue.widget.swipback.Utils;
 
 import static github.hotstu.naiue.widget.swipback.MOSwipeBackLayout.EDGE_LEFT;
 
 
 public abstract class MOSwipbackActivity extends MOActivity {
-    private static final String TAG = "MOSwipbackActivity";
     private MOSwipeBackLayout.SwipeListener listener = new MOSwipeBackLayout.SwipeListener() {
         @Override
         public void onScrollStateChange(int state, float scrollPercent) {

diff --git a/lib/src/main/java/github/hotstu/naiue/dialog/MODialog.java b/lib/src/main/java/github/hotstu/naiue/dialog/MODialog.java
@@ -7,8 +7,6 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.v7.widget.AppCompatTextView;
 import android.text.InputType;
 import android.text.method.TransformationMethod;
 import android.util.TypedValue;
@@ -29,6 +27,8 @@
 
 import java.util.ArrayList;
 
+import androidx.annotation.LayoutRes;
+import androidx.appcompat.widget.AppCompatTextView;
 import github.hotstu.naiue.R;
 import github.hotstu.naiue.util.MODisplayHelper;
 import github.hotstu.naiue.util.MOResHelper;

diff --git a/lib/src/main/java/github/hotstu/naiue/dialog/MODialogAction.java b/lib/src/main/java/github/hotstu/naiue/dialog/MODialogAction.java
@@ -6,8 +6,6 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.IntDef;
-import android.support.v4.content.ContextCompat;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
@@ -19,6 +17,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import androidx.annotation.IntDef;
+import androidx.core.content.ContextCompat;
 import github.hotstu.naiue.R;
 import github.hotstu.naiue.util.MOResHelper;
 import github.hotstu.naiue.util.MOViewHelper;

diff --git a/lib/src/main/java/github/hotstu/naiue/dialog/MODialogBuilder.java b/lib/src/main/java/github/hotstu/naiue/dialog/MODialogBuilder.java
@@ -2,8 +2,6 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.annotation.StyleRes;
 import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
@@ -15,6 +13,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
 import github.hotstu.naiue.R;
 import github.hotstu.naiue.util.MODisplayHelper;
 import github.hotstu.naiue.util.MOResHelper;

diff --git a/lib/src/main/java/github/hotstu/naiue/util/MODeviceHelper.java b/lib/src/main/java/github/hotstu/naiue/util/MODeviceHelper.java
@@ -7,7 +7,6 @@
 import android.os.Binder;
 import android.os.Build;
 import android.os.Environment;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
 import java.io.File;
@@ -18,6 +17,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import androidx.annotation.Nullable;
+
 /**
  * @author cginechen
  * @date 2016-08-11

diff --git a/lib/src/main/java/github/hotstu/naiue/util/MORelayInsetsToChild.java b/lib/src/main/java/github/hotstu/naiue/util/MORelayInsetsToChild.java
@@ -1,13 +1,13 @@
 package github.hotstu.naiue.util;
 
 import android.graphics.Rect;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.view.OnApplyWindowInsetsListener;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.WindowInsetsCompat;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.OnApplyWindowInsetsListener;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import github.hotstu.naiue.widget.InsetsAwareView;
 
 /**