Merge branch 'release/0.10.0'

# Conflicts:
#	FishBun/src/main/java/com/sangcomz/fishbun/FishBunFileProvider.java
#	README.md
#	settings.gradle

FishBun/build.gradle

@@ -38,10 +38,10 @@ apply plugin: 'co.riiid.gradle'
 apply from: '../gradle/release.gradle'
 
 dependencies {
-    compileOnly "com.android.support:appcompat-v7:$rootProject.support_version"
-    compile "com.android.support.constraint:constraint-layout:$rootProject.constraint_version"
-    compile "com.android.support:design:$rootProject.support_version"
-    compile "com.android.support:recyclerview-v7:$rootProject.support_version"
+    compileOnly "androidx.appcompat:appcompat:$rootProject.androidx_version"
+    compile "androidx.constraintlayout:constraintlayout:$rootProject.constraint_version"
+    compile "com.google.android.material:material:$rootProject.material_version"
+    compile "androidx.recyclerview:recyclerview:$rootProject.androidx_version"
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.8.9'

FishBun/src/main/java/com/sangcomz/fishbun/BaseActivity.java

@@ -2,7 +2,7 @@
 
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Window;
 
 import com.sangcomz.fishbun.define.Define;

FishBun/src/main/java/com/sangcomz/fishbun/BaseFragment.java

@@ -1,8 +1,8 @@
 package com.sangcomz.fishbun;
 
 import android.os.Bundle;
-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;

FishBun/src/main/java/com/sangcomz/fishbun/FishBun.java

@@ -1,7 +1,7 @@
 package com.sangcomz.fishbun;
 
 import android.app.Activity;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import com.sangcomz.fishbun.adapter.image.ImageAdapter;
 

FishBun/src/main/java/com/sangcomz/fishbun/FishBunCreator.java

@@ -5,7 +5,7 @@
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import com.sangcomz.fishbun.bean.Album;
 import com.sangcomz.fishbun.define.Define;

FishBun/src/main/java/com/sangcomz/fishbun/FishBunFileProvider.java

@@ -1,6 +1,6 @@
 package com.sangcomz.fishbun;
 
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 public class FishBunFileProvider extends FileProvider {
 

FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/AlbumListAdapter.java

@@ -4,8 +4,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/DetailViewPagerAdapter.java

@@ -1,10 +1,10 @@
 package com.sangcomz.fishbun.adapter.view;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.constraint.ConstraintLayout;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/PickerGridAdapter.java

@@ -4,10 +4,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

FishBun/src/main/java/com/sangcomz/fishbun/permission/PermissionCheck.java

@@ -6,8 +6,8 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.widget.Toast;
 
 import com.sangcomz.fishbun.R;

FishBun/src/main/java/com/sangcomz/fishbun/ui/album/AlbumActivity.java

@@ -6,11 +6,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/DetailActivity.java

@@ -4,9 +4,9 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.content.ContextCompat;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 import android.view.Window;
 import android.widget.ImageButton;

FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerActivity.java

@@ -5,11 +5,11 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerController.java

@@ -8,7 +8,7 @@
 import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.sangcomz.fishbun.permission.PermissionCheck;
 import com.sangcomz.fishbun.util.CameraUtil;

FishBun/src/main/java/com/sangcomz/fishbun/util/CameraUtil.java

@@ -5,7 +5,7 @@
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 import com.sangcomz.fishbun.define.Define;
 

FishBun/src/main/java/com/sangcomz/fishbun/util/CustomPagerSnapHelper.java

@@ -1,7 +1,7 @@
 package com.sangcomz.fishbun.util;
 
-import android.support.v7.widget.PagerSnapHelper;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.PagerSnapHelper;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Created by sangcomz on 11/06/2017.

FishBun/src/main/java/com/sangcomz/fishbun/util/RadioWithTextButton.java

@@ -6,7 +6,7 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;

FishBun/src/main/java/com/sangcomz/fishbun/util/SquareFrameLayout.java

@@ -6,7 +6,7 @@
 /**
  * Created by sangc on 2015-12-26.
  */
-public class SquareFrameLayout extends android.support.v7.widget.ContentFrameLayout {
+public class SquareFrameLayout extends androidx.appcompat.widget.ContentFrameLayout {
     public SquareFrameLayout(Context context) {
         super(context);
     }

FishBun/src/main/java/com/sangcomz/fishbun/util/SquareImageView.java

@@ -6,7 +6,7 @@
 /**
  * Created by sangc on 2015-12-26.
  */
-public class SquareImageView extends android.support.v7.widget.AppCompatImageView {
+public class SquareImageView extends androidx.appcompat.widget.AppCompatImageView {
     public SquareImageView(Context context) {
         super(context);
     }

FishBun/src/main/java/com/sangcomz/fishbun/util/TouchImageView.java

@@ -36,7 +36,7 @@
 import android.widget.OverScroller;
 import android.widget.Scroller;
 
-public class TouchImageView extends android.support.v7.widget.AppCompatImageView {
+public class TouchImageView extends androidx.appcompat.widget.AppCompatImageView {
 
     private static final String DEBUG = "DEBUG";
 

FishBun/src/main/res/layout/activity_detail_actiivy.xml

@@ -1,13 +1,13 @@
 <?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"
     android:background="@android:color/black">
 
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/vp_detail_pager"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -19,7 +19,7 @@
         app:layout_constraintVertical_bias="1.0" />
 
 
-    <android.support.v7.widget.AppCompatImageButton
+    <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/btn_detail_back"
         android:layout_width="30dp"
         android:layout_height="30dp"
@@ -41,4 +41,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

FishBun/src/main/res/layout/activity_photo_album.xml

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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=".ui.album.AlbumActivity">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_album_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_album_bar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="#3F51B5"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <RelativeLayout
         android:id="@+id/rel_album_empty"
@@ -65,4 +65,4 @@
     </RelativeLayout>
 
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

FishBun/src/main/res/layout/activity_photo_picker.xml

@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_picker_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_picker_bar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="#3F51B5"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

FishBun/src/main/res/layout/detail_item.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"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -17,4 +17,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.5" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

FishBunDemo/build.gradle

@@ -57,13 +57,13 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':FishBun')
 
-    implementation "com.android.support:appcompat-v7:$rootProject.support_version"
-    implementation "com.android.support:recyclerview-v7:$rootProject.support_version"
+    implementation "androidx.appcompat:appcompat:$rootProject.androidx_version"
+    implementation "androidx.recyclerview:recyclerview:$rootProject.androidx_version"
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
 
-    implementation "com.android.support:support-v4:$rootProject.support_version"
+    implementation "androidx.legacy:legacy-support-v4:$rootProject.androidx_version"
     implementation "com.squareup.picasso:picasso:$rootProject.picasso_version"
     implementation "com.github.bumptech.glide:glide:$rootProject.glide_version"
 }

FishBunDemo/src/main/java/com/sangcomz/fishbundemo/ImageAdapter.java

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

FishBunDemo/src/main/java/com/sangcomz/fishbundemo/MainActivity.java

@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 

FishBunDemo/src/main/java/com/sangcomz/fishbundemo/SubFragment.java

@@ -5,9 +5,9 @@
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;