Skip to content

Commit b84eb1e

Browse files
author
Rubén Viguera Marañón
committed
Fix for issue Cleveroad#43
Refactor to Android X
1 parent 3c77871 commit b84eb1e

40 files changed

+122
-119
lines changed

‎build.gradle

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

33
buildscript {
44
ext.gradle_tools_version = '3.2.0'
5-
ext.support_version = '28.0.0'
5+
ext.support_version = '1.1.0'
66
ext.glide_version = '4.7.1'
77

88
repositories {

‎gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@ POM_LICENCE_URL=http://opensource.org/licenses/MIT
3030
POM_LICENCE_DIST=repo
3131

3232
POM_DEVELOPER_ID=cleveroad
33-
POM_DEVELOPER_NAME=Cleveroad
33+
POM_DEVELOPER_NAME=Cleveroad
34+
android.useAndroidX=true
35+
android.enableJetifier=true

‎library/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
targetSdkVersion 28
99
versionCode 8
1010
versionName "1.2.0"
11-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
11+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212

1313
}
1414
buildTypes {
@@ -21,6 +21,6 @@ android {
2121

2222
dependencies {
2323
implementation fileTree(include: ['*.jar'], dir: 'libs')
24-
implementation "com.android.support:appcompat-v7:$support_version"
24+
implementation "androidx.appcompat:appcompat:$support_version"
2525
}
2626
//apply from: 'gradle-mvn-push.gradle'

‎library/src/main/java/com/cleveroad/adaptivetablelayout/AdaptiveTableAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.cleveroad.adaptivetablelayout;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55
import android.view.ViewGroup;
66

77
/**

‎library/src/main/java/com/cleveroad/adaptivetablelayout/AdaptiveTableLayout.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import android.os.Bundle;
1111
import android.os.Parcel;
1212
import android.os.Parcelable;
13-
import android.support.annotation.NonNull;
14-
import android.support.annotation.Nullable;
15-
import android.support.annotation.RequiresApi;
16-
import android.support.v4.util.SparseArrayCompat;
17-
import android.support.v4.view.ViewCompat;
13+
import androidx.annotation.NonNull;
14+
import androidx.annotation.Nullable;
15+
import androidx.annotation.RequiresApi;
16+
import androidx.collection.SparseArrayCompat;
17+
import androidx.core.view.ViewCompat;
1818
import android.util.AttributeSet;
1919
import android.view.MotionEvent;
2020
import android.view.View;

‎library/src/main/java/com/cleveroad/adaptivetablelayout/DataAdaptiveTableLayoutAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.cleveroad.adaptivetablelayout;
22

33
import android.os.Bundle;
4-
import android.support.annotation.NonNull;
4+
import androidx.annotation.NonNull;
55

66
interface DataAdaptiveTableLayoutAdapter<VH extends ViewHolder> extends AdaptiveTableAdapter<VH> {
77
/**

‎library/src/main/java/com/cleveroad/adaptivetablelayout/LayoutDirection.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.cleveroad.adaptivetablelayout;
22

3-
import android.support.annotation.IntDef;
3+
import androidx.annotation.IntDef;
44

55
import java.lang.annotation.Retention;
66
import java.lang.annotation.RetentionPolicy;

‎library/src/main/java/com/cleveroad/adaptivetablelayout/LinkedAdaptiveTableAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.cleveroad.adaptivetablelayout;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55

66
import java.util.ArrayList;
77
import java.util.List;

‎library/src/main/java/com/cleveroad/adaptivetablelayout/LinkedAdaptiveTableAdapterImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import android.annotation.SuppressLint;
44
import android.os.Bundle;
5-
import android.support.annotation.NonNull;
6-
import android.support.annotation.Nullable;
5+
import androidx.annotation.NonNull;
6+
import androidx.annotation.Nullable;
77
import android.view.ViewGroup;
88

99
import java.util.HashMap;

‎library/src/main/java/com/cleveroad/adaptivetablelayout/Recycler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.cleveroad.adaptivetablelayout;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55
import android.util.SparseArray;
66

77
import java.util.ArrayDeque;

‎library/src/main/java/com/cleveroad/adaptivetablelayout/ScrollHelper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.cleveroad.adaptivetablelayout;
22

33
import android.content.Context;
4-
import android.support.annotation.Nullable;
5-
import android.support.v4.view.GestureDetectorCompat;
4+
import androidx.annotation.Nullable;
5+
import androidx.core.view.GestureDetectorCompat;
66
import android.view.GestureDetector;
77
import android.view.MotionEvent;
88

‎library/src/main/java/com/cleveroad/adaptivetablelayout/ScrollType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.cleveroad.adaptivetablelayout;
22

3-
import android.support.annotation.IntDef;
3+
import androidx.annotation.IntDef;
44

55
import java.lang.annotation.Retention;
66
import java.lang.annotation.RetentionPolicy;

‎library/src/main/java/com/cleveroad/adaptivetablelayout/ShadowHelper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.cleveroad.adaptivetablelayout;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55
import android.view.View;
66
import android.view.ViewGroup;
77

‎library/src/main/java/com/cleveroad/adaptivetablelayout/SparseMatrix.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.cleveroad.adaptivetablelayout;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
5-
import android.support.v4.util.SparseArrayCompat;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
5+
import androidx.collection.SparseArrayCompat;
66

77
import java.util.Collection;
88
import java.util.LinkedList;

‎library/src/main/java/com/cleveroad/adaptivetablelayout/ViewHolder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.cleveroad.adaptivetablelayout;
22

3-
import android.support.annotation.NonNull;
3+
import androidx.annotation.NonNull;
44
import android.view.View;
55

66
/**

‎library/src/main/java/com/cleveroad/adaptivetablelayout/ViewHolderImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.cleveroad.adaptivetablelayout;
22

3-
import android.support.annotation.NonNull;
3+
import androidx.annotation.NonNull;
44
import android.view.View;
55

66
/**

‎library/src/main/java/com/cleveroad/adaptivetablelayout/ViewHolderType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.cleveroad.adaptivetablelayout;
22

3-
import android.support.annotation.IntDef;
3+
import androidx.annotation.IntDef;
44

55
import java.lang.annotation.Retention;
66
import java.lang.annotation.RetentionPolicy;

‎sample/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
targetSdkVersion 28
99
versionCode 8
1010
versionName "1.2.0"
11-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
11+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212
}
1313
buildTypes {
1414
release {
@@ -20,10 +20,10 @@ android {
2020

2121
dependencies {
2222
implementation fileTree(include: ['*.jar'], dir: 'libs')
23-
implementation "com.android.support:appcompat-v7:$support_version"
24-
implementation "com.android.support:cardview-v7:$support_version"
25-
implementation "com.android.support:support-v4:$support_version"
26-
implementation "com.android.support:design:$support_version"
23+
implementation "androidx.appcompat:appcompat:$support_version"
24+
implementation 'androidx.cardview:cardview:1.0.0'
25+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
26+
implementation 'com.google.android.material:material:1.0.0'
2727
// compile 'com.facebook.android:facebook-android-sdk:4.24.0'
2828

2929
//Glide

‎sample/src/main/java/com/cleveroad/sample/adapter/SampleLinkedTableAdapter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import android.content.res.Resources;
55
import android.graphics.drawable.Drawable;
66
import android.graphics.drawable.GradientDrawable;
7-
import android.support.annotation.NonNull;
8-
import android.support.annotation.Nullable;
9-
import android.support.v4.graphics.ColorUtils;
7+
import androidx.annotation.NonNull;
8+
import androidx.annotation.Nullable;
9+
import androidx.core.graphics.ColorUtils;
1010
import android.text.TextUtils;
1111
import android.view.LayoutInflater;
1212
import android.view.View;

‎sample/src/main/java/com/cleveroad/sample/datasource/CsvFileDataSourceImpl.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import android.content.Context;
55
import android.net.Uri;
66
import android.os.Bundle;
7-
import android.support.annotation.NonNull;
8-
import android.support.v4.app.LoaderManager;
9-
import android.support.v4.content.Loader;
7+
import androidx.annotation.NonNull;
8+
import androidx.loader.app.LoaderManager;
9+
import androidx.loader.content.Loader;
1010
import android.text.TextUtils;
1111
import android.util.Log;
1212
import android.util.SparseArray;

‎sample/src/main/java/com/cleveroad/sample/datasource/UpdateCsvFileLoader.java

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

33
import android.content.Context;
44
import android.os.Environment;
5-
import android.support.v4.content.AsyncTaskLoader;
5+
import androidx.loader.content.AsyncTaskLoader;
66
import android.util.Log;
77

88
import com.cleveroad.sample.utils.ClosableUtil;

‎sample/src/main/java/com/cleveroad/sample/provider/DocumentsProvider.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import android.os.StrictMode;
1111
import android.provider.DocumentsContract;
1212
import android.provider.MediaStore;
13-
import android.support.annotation.NonNull;
14-
import android.support.annotation.Nullable;
13+
import androidx.annotation.NonNull;
14+
import androidx.annotation.Nullable;
1515

1616
import com.cleveroad.sample.SampleApplication;
1717

‎sample/src/main/java/com/cleveroad/sample/ui/CsvPickerFragment.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import android.os.Build;
1010
import android.os.Bundle;
1111
import android.os.Environment;
12-
import android.support.annotation.NonNull;
13-
import android.support.annotation.Nullable;
14-
import android.support.v4.app.Fragment;
12+
import androidx.annotation.NonNull;
13+
import androidx.annotation.Nullable;
14+
import androidx.fragment.app.Fragment;
1515
import android.text.SpannableString;
1616
import android.text.Spanned;
1717
import android.text.TextPaint;

‎sample/src/main/java/com/cleveroad/sample/ui/SampleActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.cleveroad.sample.ui;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.widget.Toast;
66

77
import com.cleveroad.sample.R;

‎sample/src/main/java/com/cleveroad/sample/ui/TableLayoutFragment.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
import android.net.Uri;
77
import android.os.Build;
88
import android.os.Bundle;
9-
import android.support.annotation.NonNull;
10-
import android.support.annotation.Nullable;
11-
import android.support.design.widget.Snackbar;
12-
import android.support.v4.app.Fragment;
13-
import android.support.v7.widget.Toolbar;
149
import android.util.Log;
1510
import android.view.LayoutInflater;
1611
import android.view.MenuItem;
@@ -19,6 +14,11 @@
1914
import android.widget.ProgressBar;
2015
import android.widget.TextView;
2116

17+
import androidx.annotation.NonNull;
18+
import androidx.annotation.Nullable;
19+
import androidx.appcompat.widget.Toolbar;
20+
import androidx.fragment.app.Fragment;
21+
2222
import com.cleveroad.adaptivetablelayout.AdaptiveTableLayout;
2323
import com.cleveroad.adaptivetablelayout.LinkedAdaptiveTableAdapter;
2424
import com.cleveroad.adaptivetablelayout.OnItemClickListener;
@@ -33,6 +33,7 @@
3333
import com.cleveroad.sample.ui.dialogs.EditItemDialog;
3434
import com.cleveroad.sample.ui.dialogs.SettingsDialog;
3535
import com.cleveroad.sample.utils.PermissionHelper;
36+
import com.google.android.material.snackbar.Snackbar;
3637

3738
import java.util.Objects;
3839

@@ -140,7 +141,7 @@ public boolean onMenuItemClick(MenuItem item) {
140141
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
141142
super.onViewCreated(view, savedInstanceState);
142143
mSnackbar = Snackbar.make(view, R.string.changes_saved, Snackbar.LENGTH_INDEFINITE);
143-
TextView tv = mSnackbar.getView().findViewById(android.support.design.R.id.snackbar_text);
144+
TextView tv = mSnackbar.getView().findViewById(R.id.snackbar_text);
144145
tv.setMaxLines(3);
145146
mSnackbar.setAction("Close", new View.OnClickListener() {
146147
@Override

‎sample/src/main/java/com/cleveroad/sample/ui/dialogs/AddColumnDialog.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import android.content.Intent;
55
import android.graphics.drawable.ColorDrawable;
66
import android.os.Bundle;
7-
import android.support.annotation.NonNull;
8-
import android.support.annotation.Nullable;
9-
import android.support.v4.app.DialogFragment;
10-
import android.support.v4.app.Fragment;
7+
import androidx.annotation.NonNull;
8+
import androidx.annotation.Nullable;
9+
import androidx.fragment.app.DialogFragment;
10+
import androidx.fragment.app.Fragment;
1111
import android.view.LayoutInflater;
1212
import android.view.View;
1313
import android.view.ViewGroup;

‎sample/src/main/java/com/cleveroad/sample/ui/dialogs/AddRowDialog.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import android.content.Intent;
55
import android.graphics.drawable.ColorDrawable;
66
import android.os.Bundle;
7-
import android.support.annotation.Nullable;
8-
import android.support.v4.app.DialogFragment;
9-
import android.support.v4.app.Fragment;
7+
import androidx.annotation.Nullable;
8+
import androidx.fragment.app.DialogFragment;
9+
import androidx.fragment.app.Fragment;
1010
import android.view.LayoutInflater;
1111
import android.view.View;
1212
import android.view.ViewGroup;

‎sample/src/main/java/com/cleveroad/sample/ui/dialogs/DeleteDialog.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import android.content.Intent;
55
import android.graphics.drawable.ColorDrawable;
66
import android.os.Bundle;
7-
import android.support.annotation.Nullable;
8-
import android.support.v4.app.DialogFragment;
9-
import android.support.v4.app.Fragment;
7+
import androidx.annotation.Nullable;
8+
import androidx.fragment.app.DialogFragment;
9+
import androidx.fragment.app.Fragment;
1010
import android.view.LayoutInflater;
1111
import android.view.View;
1212
import android.view.ViewGroup;

‎sample/src/main/java/com/cleveroad/sample/ui/dialogs/EditItemDialog.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
import android.graphics.drawable.ColorDrawable;
66
import android.os.Build;
77
import android.os.Bundle;
8-
import android.support.annotation.NonNull;
9-
import android.support.annotation.Nullable;
10-
import android.support.design.widget.TextInputEditText;
11-
import android.support.design.widget.TextInputLayout;
12-
import android.support.v4.app.DialogFragment;
13-
import android.support.v4.app.Fragment;
8+
import androidx.annotation.NonNull;
9+
import androidx.annotation.Nullable;
10+
import com.google.android.material.textfield.TextInputEditText;
11+
import com.google.android.material.textfield.TextInputLayout;
12+
import androidx.fragment.app.DialogFragment;
13+
import androidx.fragment.app.Fragment;
1414
import android.util.DisplayMetrics;
1515
import android.view.LayoutInflater;
1616
import android.view.View;

‎sample/src/main/java/com/cleveroad/sample/ui/dialogs/SettingsDialog.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
import android.graphics.drawable.ColorDrawable;
66
import android.os.Build;
77
import android.os.Bundle;
8-
import android.support.annotation.NonNull;
9-
import android.support.annotation.Nullable;
10-
import android.support.v4.app.DialogFragment;
11-
import android.support.v4.app.Fragment;
12-
import android.support.v7.widget.SwitchCompat;
8+
import androidx.annotation.NonNull;
9+
import androidx.annotation.Nullable;
10+
import androidx.fragment.app.DialogFragment;
11+
import androidx.fragment.app.Fragment;
12+
import androidx.appcompat.widget.SwitchCompat;
1313
import android.util.DisplayMetrics;
1414
import android.view.LayoutInflater;
1515
import android.view.View;

0 commit comments

Comments
 (0)