Skip to content

Commit b0ed5b5

Browse files
TutorialsAndroidTutorialsAndroid
committed
Migrated To AndroidX
1 parent d109362 commit b0ed5b5

32 files changed

+119
-116
lines changed

‎app/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 28
4+
compileSdkVersion 29
55

66
defaultConfig {
7-
applicationId "com.github.tutorialsandroid.filepicker"
7+
applicationId "com.developer.kinda.filepicker"
88
minSdkVersion 21
9-
targetSdkVersion 28
10-
versionCode 1
11-
versionName "1.0.19"
9+
targetSdkVersion 29
10+
versionCode 2
11+
versionName "2.0.19"
1212
}
1313
buildTypes {
1414
release {
@@ -21,8 +21,8 @@ android {
2121
dependencies {
2222
implementation fileTree(include: ['*.jar'], dir: 'libs')
2323
implementation project(':filepicker')
24-
implementation 'com.android.support:appcompat-v7:28.0.0'
25-
implementation 'com.android.support:recyclerview-v7:28.0.0'
24+
implementation 'androidx.appcompat:appcompat:1.0.0'
25+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
2626
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
2727
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
2828

‎app/src/main/AndroidManifest.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.github.tutorialsandroid.filepicker">
4+
package="com.developer.kinda.filepicker">
55

66
<application
7-
android:name="com.github.tutorialsandroid.filepicker.FilePickerApplication"
7+
android:name="com.developer.kinda.filepicker.FilePickerApplication"
88
android:allowBackup="true"
99
android:icon="@mipmap/ic_launcher"
1010
android:label="@string/app_name"
@@ -13,19 +13,19 @@
1313
android:fullBackupContent="@xml/backup_descriptor"
1414
tools:ignore="GoogleAppIndexingWarning">
1515

16-
<activity android:name="com.github.tutorialsandroid.filepicker.MainActivity">
16+
<activity android:name="com.developer.kinda.filepicker.MainActivity">
1717
<intent-filter>
1818
<action android:name="android.intent.action.MAIN" />
1919
<category android:name="android.intent.category.LAUNCHER" />
2020
</intent-filter>
2121
</activity>
2222
<activity
23-
android:name="com.github.tutorialsandroid.filepicker.SettingsActivity"
23+
android:name="com.developer.kinda.filepicker.SettingsActivity"
2424
android:label="@string/title_activity_settings"
25-
android:parentActivityName="com.github.tutorialsandroid.filepicker.MainActivity">
25+
android:parentActivityName="com.developer.kinda.filepicker.MainActivity">
2626
<meta-data
2727
android:name="android.support.PARENT_ACTIVITY"
28-
android:value="com.github.tutorialsandroid.filepicker.MainActivity" />
28+
android:value="com.developer.kinda.filepicker.MainActivity" />
2929
</activity>
3030
</application>
3131

‎app/src/main/java/com/github/tutorialsandroid/filepicker/FileListAdapter.java renamed to ‎app/src/main/java/com/developer/kinda/filepicker/FileListAdapter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.github.tutorialsandroid.filepicker;
1+
package com.developer.kinda.filepicker;
22

33
import android.content.Context;
4-
import android.support.annotation.NonNull;
5-
import android.support.v7.widget.RecyclerView;
4+
import androidx.annotation.NonNull;
5+
import androidx.recyclerview.widget.RecyclerView;
66
import android.view.LayoutInflater;
77
import android.view.View;
88
import android.view.ViewGroup;

‎app/src/main/java/com/github/tutorialsandroid/filepicker/FilePickerApplication.java renamed to ‎app/src/main/java/com/developer/kinda/filepicker/FilePickerApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.tutorialsandroid.filepicker;
1+
package com.developer.kinda.filepicker;
22

33
import android.app.Application;
44
import com.squareup.leakcanary.LeakCanary;

‎app/src/main/java/com/github/tutorialsandroid/filepicker/ListItem.java renamed to ‎app/src/main/java/com/developer/kinda/filepicker/ListItem.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.tutorialsandroid.filepicker;
1+
package com.developer.kinda.filepicker;
22

33
public class ListItem {
44

‎app/src/main/java/com/github/tutorialsandroid/filepicker/MainActivity.java renamed to ‎app/src/main/java/com/developer/kinda/filepicker/MainActivity.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.github.tutorialsandroid.filepicker;
1+
package com.developer.kinda.filepicker;
22

33
import android.content.Intent;
44
import android.content.pm.PackageManager;
55
import android.os.Bundle;
6-
import android.support.annotation.NonNull;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.LinearLayoutManager;
9-
import android.support.v7.widget.RecyclerView;
6+
import androidx.annotation.NonNull;
7+
import androidx.appcompat.app.AppCompatActivity;
8+
import androidx.recyclerview.widget.LinearLayoutManager;
9+
import androidx.recyclerview.widget.RecyclerView;
1010
import android.view.Menu;
1111
import android.view.MenuInflater;
1212
import android.view.MenuItem;
@@ -15,10 +15,10 @@
1515
import android.widget.EditText;
1616
import android.widget.RadioGroup;
1717
import android.widget.Toast;
18-
import com.github.tutorialsandroid.filepicker.controller.DialogSelectionListener;
19-
import com.github.tutorialsandroid.filepicker.model.DialogConfigs;
20-
import com.github.tutorialsandroid.filepicker.model.DialogProperties;
21-
import com.github.tutorialsandroid.filepicker.view.FilePickerDialog;
18+
import com.developer.kinda.filepicker.controller.DialogSelectionListener;
19+
import com.developer.kinda.filepicker.model.DialogConfigs;
20+
import com.developer.kinda.filepicker.model.DialogProperties;
21+
import com.developer.kinda.filepicker.view.FilePickerDialog;
2222
import java.io.File;
2323
import java.util.ArrayList;
2424

‎app/src/main/java/com/github/tutorialsandroid/filepicker/SettingsActivity.java renamed to ‎app/src/main/java/com/developer/kinda/filepicker/SettingsActivity.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
package com.github.tutorialsandroid.filepicker;
1+
package com.developer.kinda.filepicker;
22

33
import android.graphics.Color;
44
import android.os.Build;
55
import android.os.Bundle;
66
import android.preference.Preference;
77
import android.preference.PreferenceActivity;
8-
import android.support.v7.widget.Toolbar;
9-
import android.util.TypedValue;
8+
import androidx.appcompat.widget.Toolbar;
109
import android.view.LayoutInflater;
1110
import android.view.View;
12-
import android.view.ViewGroup;
1311
import android.widget.LinearLayout;
14-
import android.widget.ListView;
1512
import android.widget.Toast;
1613

17-
import com.github.tutorialsandroid.filepicker.view.FilePickerPreference;
14+
import com.developer.kinda.filepicker.view.FilePickerPreference;
1815

1916
public class SettingsActivity extends PreferenceActivity implements Preference.OnPreferenceChangeListener {
2017

‎app/src/main/res/layout/activity_main.xml

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.v7.widget.LinearLayoutCompat
2+
<androidx.appcompat.widget.LinearLayoutCompat
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
@@ -11,12 +11,12 @@
1111
android:orientation="vertical"
1212
tools:listitem="@layout/file_list_item">
1313

14-
<android.support.v4.widget.NestedScrollView
14+
<androidx.core.widget.NestedScrollView
1515
android:layout_width="match_parent"
1616
android:layout_height="wrap_content"
1717
android:layout_weight="1">
1818

19-
<android.support.v7.widget.LinearLayoutCompat
19+
<androidx.appcompat.widget.LinearLayoutCompat
2020
android:layout_width="match_parent"
2121
android:layout_height="match_parent"
2222
android:paddingBottom="@dimen/activity_vertical_margin"
@@ -26,14 +26,14 @@
2626
android:orientation="vertical"
2727
tools:listitem="@layout/file_list_item">
2828

29-
<android.support.v7.widget.RecyclerView
29+
<androidx.recyclerview.widget.RecyclerView
3030
android:id="@+id/listView"
3131
android:orientation="vertical"
3232
android:layout_width="match_parent"
3333
android:layout_height="wrap_content"
3434
android:layout_marginBottom="@dimen/activity_vertical_margin" />
3535

36-
<android.support.v7.widget.AppCompatTextView
36+
<androidx.appcompat.widget.AppCompatTextView
3737
android:layout_width="match_parent"
3838
android:layout_height="wrap_content"
3939
android:textStyle="bold"
@@ -44,22 +44,22 @@
4444
android:layout_height="wrap_content"
4545
android:id="@+id/modeRadio">
4646

47-
<android.support.v7.widget.AppCompatRadioButton
47+
<androidx.appcompat.widget.AppCompatRadioButton
4848
android:layout_width="wrap_content"
4949
android:layout_height="wrap_content"
5050
android:text="@string/label_single"
5151
android:textColor="#000000"
5252
android:id="@+id/singleRadio" />
5353

54-
<android.support.v7.widget.AppCompatRadioButton
54+
<androidx.appcompat.widget.AppCompatRadioButton
5555
android:layout_width="wrap_content"
5656
android:layout_height="wrap_content"
5757
android:text="@string/label_multiple"
5858
android:textColor="#000000"
5959
android:id="@+id/multiRadio" />
6060
</RadioGroup>
6161

62-
<android.support.v7.widget.AppCompatTextView
62+
<androidx.appcompat.widget.AppCompatTextView
6363
android:layout_width="wrap_content"
6464
android:layout_height="wrap_content"
6565
android:layout_marginTop="@dimen/activity_vertical_margin"
@@ -71,92 +71,92 @@
7171
android:layout_height="wrap_content"
7272
android:id="@+id/typeRadio">
7373

74-
<android.support.v7.widget.AppCompatRadioButton
74+
<androidx.appcompat.widget.AppCompatRadioButton
7575
android:layout_width="wrap_content"
7676
android:layout_height="wrap_content"
7777
android:text="@string/label_file"
7878
android:textColor="#000000"
7979
android:id="@+id/selFile" />
8080

81-
<android.support.v7.widget.AppCompatRadioButton
81+
<androidx.appcompat.widget.AppCompatRadioButton
8282
android:id="@+id/selDir"
8383
android:layout_width="wrap_content"
8484
android:layout_height="wrap_content"
8585
android:text="@string/label_directory"
8686
android:textColor="#000000"/>
8787

88-
<android.support.v7.widget.AppCompatRadioButton
88+
<androidx.appcompat.widget.AppCompatRadioButton
8989
android:id="@+id/selfilenddir"
9090
android:layout_width="wrap_content"
9191
android:layout_height="wrap_content"
9292
android:textColor="#000000"
9393
android:text="@string/label_files_and_directories"/>
9494
</RadioGroup>
9595

96-
<android.support.v7.widget.AppCompatTextView
96+
<androidx.appcompat.widget.AppCompatTextView
9797
android:layout_width="match_parent"
9898
android:layout_height="wrap_content"
9999
android:layout_marginTop="@dimen/activity_vertical_margin"
100100
android:text="@string/label_extensions"
101101
android:textStyle="bold" />
102102

103-
<android.support.v7.widget.AppCompatEditText
103+
<androidx.appcompat.widget.AppCompatEditText
104104
android:id="@+id/extensions"
105105
android:layout_width="match_parent"
106106
android:layout_height="wrap_content"
107107
android:layout_marginTop="@dimen/activity_vertical_margin"
108108
android:hint="@string/hint_extensions" />
109109

110-
<android.support.v7.widget.AppCompatTextView
110+
<androidx.appcompat.widget.AppCompatTextView
111111
android:layout_width="wrap_content"
112112
android:layout_height="wrap_content"
113113
android:layout_marginTop="@dimen/activity_vertical_margin"
114114
android:text="@string/label_root_directory"
115115
android:textStyle="bold" />
116116

117-
<android.support.v7.widget.AppCompatEditText
117+
<androidx.appcompat.widget.AppCompatEditText
118118
android:layout_width="match_parent"
119119
android:layout_height="wrap_content"
120120
android:layout_marginTop="@dimen/activity_vertical_margin"
121121
android:hint="@string/hint_root_dir"
122122
android:id="@+id/root" />
123123

124-
<android.support.v7.widget.AppCompatTextView
124+
<androidx.appcompat.widget.AppCompatTextView
125125
android:layout_width="wrap_content"
126126
android:layout_height="wrap_content"
127127
android:layout_marginTop="@dimen/activity_vertical_margin"
128128
android:text="@string/label_offset_directory"
129129
android:textStyle="bold" />
130130

131-
<android.support.v7.widget.AppCompatEditText
131+
<androidx.appcompat.widget.AppCompatEditText
132132
android:layout_width="match_parent"
133133
android:layout_height="wrap_content"
134134
android:layout_marginTop="@dimen/activity_vertical_margin"
135135
android:hint="@string/hint_offset"
136136
android:id="@+id/offset" />
137-
</android.support.v7.widget.LinearLayoutCompat>
138-
</android.support.v4.widget.NestedScrollView>
137+
</androidx.appcompat.widget.LinearLayoutCompat>
138+
</androidx.core.widget.NestedScrollView>
139139

140-
<android.support.v7.widget.LinearLayoutCompat
140+
<androidx.appcompat.widget.LinearLayoutCompat
141141
android:orientation="horizontal"
142142
android:layout_width="match_parent"
143143
android:layout_height="wrap_content"
144144
android:layout_alignParentBottom="true"
145145
android:layout_centerHorizontal="true"
146146
android:id="@+id/linearlayout">
147147

148-
<android.support.v7.widget.AppCompatButton
148+
<androidx.appcompat.widget.AppCompatButton
149149
android:layout_width="0dp"
150150
android:layout_height="wrap_content"
151151
android:layout_weight="1"
152152
android:text="@string/label_apply"
153153
android:id="@+id/apply" />
154154

155-
<android.support.v7.widget.AppCompatButton
155+
<androidx.appcompat.widget.AppCompatButton
156156
android:layout_width="0dp"
157157
android:layout_height="wrap_content"
158158
android:layout_weight="1"
159159
android:text="@string/show_dialog"
160160
android:id="@+id/show_dialog"/>
161-
</android.support.v7.widget.LinearLayoutCompat>
162-
</android.support.v7.widget.LinearLayoutCompat>
161+
</androidx.appcompat.widget.LinearLayoutCompat>
162+
</androidx.appcompat.widget.LinearLayoutCompat>

‎app/src/main/res/layout/file_list_item.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.v7.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:orientation="vertical"
55
android:layout_width="match_parent"
66
android:layout_height="?android:listPreferredItemHeight"
77
android:gravity="center_vertical">
88

9-
<android.support.v7.widget.AppCompatTextView
9+
<androidx.appcompat.widget.AppCompatTextView
1010
android:id="@+id/name"
1111
android:layout_width="match_parent"
1212
android:layout_height="wrap_content"
@@ -15,11 +15,11 @@
1515
android:textSize="16sp"
1616
tools:text="File Name"/>
1717

18-
<android.support.v7.widget.AppCompatTextView
18+
<androidx.appcompat.widget.AppCompatTextView
1919
android:id="@+id/path"
2020
android:layout_width="match_parent"
2121
android:layout_height="wrap_content"
2222
android:textColor="#808080"
2323
android:textSize="12sp"
2424
tools:text="File Path" />
25-
</android.support.v7.widget.LinearLayoutCompat>
25+
</androidx.appcompat.widget.LinearLayoutCompat>

‎app/src/main/res/layout/toolbar.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.v7.widget.Toolbar
2+
<androidx.appcompat.widget.Toolbar
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
android:id="@+id/toolbar"

‎app/src/main/res/xml/pref_general.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto">
44

5-
<com.github.tutorialsandroid.filepicker.view.FilePickerPreference
5+
<com.developer.kinda.filepicker.view.FilePickerPreference
66
android:key="directories"
77
android:title="Pick a Directory"
88
android:summary="Just a Summary"

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.4.0'
9+
classpath 'com.android.tools.build:gradle:3.4.1'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1111

1212
// NOTE: Do not place your application dependencies here; they belong

‎filepicker/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ apply plugin: 'com.github.dcendents.android-maven'
44
group='com.github.TutorialsAndroid'
55

66
android {
7-
compileSdkVersion 28
7+
compileSdkVersion 29
88

99
defaultConfig {
1010
minSdkVersion 21
11-
targetSdkVersion 28
12-
versionCode 1
13-
versionName "1.0.19"
11+
targetSdkVersion 29
12+
versionCode 2
13+
versionName "2.0.19"
1414
}
1515
buildTypes {
1616
release {

0 commit comments

Comments
 (0)