Skip to content

Commit 497e34f

Browse files
committed
to use androidx
1 parent 762e255 commit 497e34f

File tree

13 files changed

+161
-198
lines changed

13 files changed

+161
-198
lines changed

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ task clean(type: Delete) {
3030

3131
ext {
3232
minSdkVersion = 17
33-
targetSdkVersion = 24
34-
compileSdkVersion = 26
33+
targetSdkVersion = 29
34+
compileSdkVersion = 31
3535
// https://developer.android.com/studio/releases/build-tools
3636
buildToolsVersion = '30.0.3'
3737
FRESCO_VERSION = '1.14.2'

demo/build.gradle

+2-5
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@ android {
2222
dependencies {
2323
implementation fileTree(include: ['*.jar'], dir: 'libs')
2424
testImplementation 'junit:junit:4.12'
25-
implementation "com.android.support:appcompat-v7:$rootProject.SUPPORT_LIBRARY_VERSION"
26-
implementation "com.android.support:design:$rootProject.SUPPORT_LIBRARY_VERSION"
27-
implementation "com.android.support:support-v4:$rootProject.SUPPORT_LIBRARY_VERSION"
28-
implementation "com.android.support:recyclerview-v7:$rootProject.SUPPORT_LIBRARY_VERSION"
25+
implementation 'androidx.appcompat:appcompat:1.0.0'
26+
2927
implementation project(':multiple-images-selector')
3028

3129
// Fresco
@@ -35,5 +33,4 @@ dependencies {
3533
// For WebP support, including animated WebP
3634
implementation "com.facebook.fresco:webpsupport:$rootProject.FRESCO_VERSION"
3735
implementation "com.facebook.fresco:animated-webp:$rootProject.FRESCO_VERSION"
38-
3936
}

demo/src/main/java/com/zfdang/demo/DemoActivity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
65
import android.view.View;
76
import android.widget.Button;
87
import android.widget.TextView;
98

9+
import androidx.appcompat.app.AppCompatActivity;
10+
1011
import com.zfdang.multiple_images_selector.ImagesSelectorActivity;
1112
import com.zfdang.multiple_images_selector.SelectorSettings;
1213

gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@
1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18-
# org.gradle.parallel=true
18+
# org.gradle.parallel=true
19+
android.useAndroidX=true
20+
android.enableJetifier=true

multiple-images-selector/build.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ android {
3131
dependencies {
3232
implementation fileTree(include: ['*.jar'], dir: 'libs')
3333
testImplementation 'junit:junit:4.12'
34-
implementation "com.android.support:appcompat-v7:$rootProject.SUPPORT_LIBRARY_VERSION"
35-
implementation "com.android.support:recyclerview-v7:$rootProject.SUPPORT_LIBRARY_VERSION"
36-
implementation "com.android.support:support-v4:$rootProject.SUPPORT_LIBRARY_VERSION"
34+
implementation 'androidx.appcompat:appcompat:1.0.0'
35+
3736
implementation "io.reactivex.rxjava2:rxjava:$rootProject.RXJAVA2_VERSION"
3837
implementation "io.reactivex.rxjava2:rxandroid:$rootProject.RXANDROID2_VERSION"
3938

@@ -48,6 +47,9 @@ dependencies {
4847

4948

5049
implementation 'xyz.danoz:recyclerviewfastscroller:0.1.3'
50+
51+
// easy permission
52+
implementation 'pub.devrel:easypermissions:3.0.0'
5153
}
5254

5355
// https://github.com/blundell/release-android-library

multiple-images-selector/src/main/java/com/zfdang/multiple_images_selector/DividerItemDecoration.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
import android.graphics.Canvas;
66
import android.graphics.Rect;
77
import android.graphics.drawable.Drawable;
8-
import android.support.v7.widget.LinearLayoutManager;
9-
import android.support.v7.widget.RecyclerView;
108
import android.view.View;
119

10+
import androidx.recyclerview.widget.LinearLayoutManager;
11+
import androidx.recyclerview.widget.RecyclerView;
12+
1213
/**
1314
* Created by zfdang on 2016-3-16.
1415
*/

multiple-images-selector/src/main/java/com/zfdang/multiple_images_selector/FolderPopupWindow.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
import android.app.Activity;
44
import android.content.Context;
55
import android.graphics.Point;
6-
import android.support.v7.widget.LinearLayoutManager;
7-
import android.support.v7.widget.RecyclerView;
86
import android.util.Log;
97
import android.view.Display;
108
import android.view.LayoutInflater;
119
import android.view.View;
1210
import android.widget.PopupWindow;
1311

12+
import androidx.recyclerview.widget.LinearLayoutManager;
13+
import androidx.recyclerview.widget.RecyclerView;
14+
1415
import com.zfdang.multiple_images_selector.models.FolderListContent;
1516

1617
/**

multiple-images-selector/src/main/java/com/zfdang/multiple_images_selector/FolderRecyclerViewAdapter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.zfdang.multiple_images_selector;
22

33
import android.net.Uri;
4-
import android.support.v7.widget.RecyclerView;
54
import android.view.LayoutInflater;
65
import android.view.View;
76
import android.view.ViewGroup;
87
import android.widget.ImageView;
98
import android.widget.TextView;
109

10+
import androidx.recyclerview.widget.RecyclerView;
11+
1112
import com.facebook.drawee.view.SimpleDraweeView;
1213
import com.zfdang.multiple_images_selector.models.FolderItem;
1314
import com.zfdang.multiple_images_selector.models.FolderListContent;

multiple-images-selector/src/main/java/com/zfdang/multiple_images_selector/ImageRecyclerViewAdapter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.zfdang.multiple_images_selector;
22

33
import android.net.Uri;
4-
import android.support.v7.widget.RecyclerView;
54
import android.view.LayoutInflater;
65
import android.view.View;
76
import android.view.ViewGroup;
87
import android.widget.ImageView;
98
import android.widget.TextView;
109

10+
import androidx.recyclerview.widget.RecyclerView;
11+
1112
import com.facebook.drawee.view.SimpleDraweeView;
1213
import com.zfdang.multiple_images_selector.models.ImageItem;
1314
import com.zfdang.multiple_images_selector.models.ImageListContent;

0 commit comments

Comments
 (0)