Skip to content

Commit c63e57a

Browse files
author
Gear61
committed
Migrate to AndroidX
1 parent 76960cd commit c63e57a

26 files changed

+137
-135
lines changed

‎SQLPractice.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</configuration>
99
</facet>
1010
</component>
11-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
1212
<exclude-output />
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

‎app/app.iml

+62-52
Large diffs are not rendered by default.

‎app/build.gradle

+11-8
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "randomappsinc.com.sqlpracticeplus"
88
minSdkVersion 14
99
targetSdkVersion 28
10-
versionCode 187
11-
versionName "1.8.7"
10+
versionCode 188
11+
versionName "1.8.8"
1212
}
1313
buildTypes {
1414
release {
@@ -23,16 +23,19 @@ android {
2323
disable 'GoogleAppIndexingWarning'
2424
baseline file("lint-baseline.xml")
2525
}
26+
compileOptions {
27+
sourceCompatibility JavaVersion.VERSION_1_8
28+
targetCompatibility JavaVersion.VERSION_1_8
29+
}
2630
}
2731

2832
dependencies {
2933
implementation fileTree(dir: 'libs', include: ['*.jar'])
30-
implementation 'com.android.support:appcompat-v7:28.0.0'
31-
implementation 'com.android.support:design:28.0.0'
32-
implementation 'com.android.support:support-v13:28.0.0'
33-
implementation 'com.android.support:cardview-v7:28.0.0'
34-
implementation 'com.jakewharton:butterknife:8.8.1'
35-
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
34+
implementation 'androidx.appcompat:appcompat:1.0.2'
35+
implementation 'com.google.android.material:material:1.0.0'
36+
implementation 'androidx.cardview:cardview:1.0.0'
37+
implementation 'com.jakewharton:butterknife:10.1.0'
38+
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
3639
implementation 'com.joanzapata.iconify:android-iconify-fontawesome:2.2.2'
3740
implementation 'com.joanzapata.iconify:android-iconify-ionicons:2.2.2'
3841
implementation 'com.afollestad.material-dialogs:core:0.9.6.0'

‎app/src/androidTest/java/randomappsinc/com/sqlpractice/ApplicationTest.java

-13
This file was deleted.

‎app/src/main/java/randomappsinc/com/sqlpractice/activities/AnswerCheckerActivity.java

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

33
import android.graphics.Typeface;
44
import android.os.Bundle;
5-
import android.support.annotation.NonNull;
65
import android.view.View;
76
import android.view.ViewGroup;
87
import android.widget.LinearLayout;
98
import android.widget.TableLayout;
109
import android.widget.TextView;
1110

11+
import androidx.annotation.NonNull;
12+
1213
import com.afollestad.materialdialogs.DialogAction;
1314
import com.afollestad.materialdialogs.MaterialDialog;
1415

‎app/src/main/java/randomappsinc/com/sqlpractice/activities/MainActivity.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
import android.content.Intent;
44
import android.net.Uri;
55
import android.os.Bundle;
6-
import android.support.annotation.NonNull;
7-
import android.support.v7.widget.RecyclerView;
86
import android.view.Menu;
97
import android.view.MenuItem;
108

9+
import androidx.annotation.NonNull;
10+
import androidx.recyclerview.widget.RecyclerView;
11+
1112
import com.afollestad.materialdialogs.DialogAction;
1213
import com.afollestad.materialdialogs.MaterialDialog;
1314
import com.joanzapata.iconify.fonts.IoniconsIcons;

‎app/src/main/java/randomappsinc/com/sqlpractice/activities/QuestionActivity.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.v4.view.ViewPager;
65
import android.view.Menu;
76
import android.view.MenuItem;
87
import android.view.View;
98

9+
import androidx.viewpager.widget.ViewPager;
10+
1011
import com.afollestad.materialdialogs.MaterialDialog;
1112
import com.joanzapata.iconify.fonts.IoniconsIcons;
1213

‎app/src/main/java/randomappsinc/com/sqlpractice/activities/SplashActivity.java

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

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
5+
6+
import androidx.appcompat.app.AppCompatActivity;
67

78
public class SplashActivity extends AppCompatActivity {
89

‎app/src/main/java/randomappsinc/com/sqlpractice/activities/StandardActivity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package randomappsinc.com.sqlpractice.activities;
22

33
import android.content.Intent;
4-
import android.support.v7.app.AppCompatActivity;
54
import android.view.MenuItem;
65

6+
import androidx.appcompat.app.AppCompatActivity;
7+
78
import randomappsinc.com.sqlpractice.R;
89

910
public class StandardActivity extends AppCompatActivity {

‎app/src/main/java/randomappsinc/com/sqlpractice/adapters/QueryACAdapter.java

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

33
import android.annotation.SuppressLint;
44
import android.content.Context;
5-
import android.support.annotation.NonNull;
65
import android.text.Editable;
76
import android.text.TextWatcher;
87
import android.view.LayoutInflater;
@@ -14,6 +13,8 @@
1413
import android.widget.Filter;
1514
import android.widget.TextView;
1615

16+
import androidx.annotation.NonNull;
17+
1718
import java.util.ArrayList;
1819
import java.util.Arrays;
1920
import java.util.HashSet;

‎app/src/main/java/randomappsinc/com/sqlpractice/adapters/QuestionsAdapter.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package randomappsinc.com.sqlpractice.adapters;
22

33
import android.content.Context;
4-
import android.support.annotation.NonNull;
5-
import android.support.v7.widget.RecyclerView;
64
import android.view.LayoutInflater;
75
import android.view.View;
86
import android.view.ViewGroup;
97
import android.widget.TextView;
108

9+
import androidx.annotation.NonNull;
10+
import androidx.recyclerview.widget.RecyclerView;
11+
1112
import butterknife.BindColor;
1213
import butterknife.BindView;
1314
import butterknife.ButterKnife;

‎app/src/main/java/randomappsinc/com/sqlpractice/adapters/QuestionsPagerAdapter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package randomappsinc.com.sqlpractice.adapters;
22

3-
import android.support.v4.app.Fragment;
4-
import android.support.v4.app.FragmentManager;
5-
import android.support.v4.app.FragmentStatePagerAdapter;
3+
import androidx.fragment.app.Fragment;
4+
import androidx.fragment.app.FragmentManager;
5+
import androidx.fragment.app.FragmentStatePagerAdapter;
66

77
import randomappsinc.com.sqlpractice.database.QuestionServer;
88
import randomappsinc.com.sqlpractice.fragments.QuestionFragment;

‎app/src/main/java/randomappsinc/com/sqlpractice/fragments/QuestionFragment.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.annotation.NonNull;
6-
import android.support.v4.app.Fragment;
75
import android.view.LayoutInflater;
86
import android.view.View;
97
import android.view.ViewGroup;
108
import android.widget.AutoCompleteTextView;
119
import android.widget.TextView;
1210

11+
import androidx.annotation.NonNull;
12+
import androidx.fragment.app.Fragment;
13+
1314
import com.afollestad.materialdialogs.DialogAction;
1415
import com.afollestad.materialdialogs.MaterialDialog;
1516

‎app/src/main/java/randomappsinc/com/sqlpractice/utils/ToastUtils.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package randomappsinc.com.sqlpractice.utils;
22

33
import android.content.Context;
4-
import android.support.annotation.StringRes;
54
import android.widget.Toast;
65

6+
import androidx.annotation.StringRes;
7+
78
public class ToastUtils {
89

910
public static void showLongToast(Context context, @StringRes int resId) {

‎app/src/main/java/randomappsinc/com/sqlpractice/utils/Utils.java

+19-14
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@
44
import android.content.ClipData;
55
import android.content.ClipboardManager;
66
import android.content.Context;
7-
import android.support.design.widget.Snackbar;
7+
import android.graphics.Color;
8+
import android.text.SpannableStringBuilder;
9+
import android.text.Spanned;
10+
import android.text.style.ForegroundColorSpan;
811
import android.view.Menu;
912
import android.view.View;
1013
import android.view.inputmethod.InputMethodManager;
11-
import android.widget.TextView;
1214

15+
import com.google.android.material.snackbar.Snackbar;
1316
import com.joanzapata.iconify.Icon;
1417
import com.joanzapata.iconify.IconDrawable;
1518

@@ -24,28 +27,30 @@ public class Utils {
2427

2528
public static void showSnackbar(View parent, String content) {
2629
Context context = parent.getContext();
27-
Snackbar snackbar = Snackbar.make(parent, content, Snackbar.LENGTH_LONG);
30+
SpannableStringBuilder spannableString = new SpannableStringBuilder(content);
31+
spannableString.setSpan(
32+
new ForegroundColorSpan(Color.WHITE),
33+
0,
34+
content.length(),
35+
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
36+
Snackbar snackbar = Snackbar.make(parent, spannableString, Snackbar.LENGTH_LONG);
2837
View view = snackbar.getView();
2938
view.setBackgroundColor(context.getResources().getColor(R.color.app_turquoise));
30-
TextView textView = view.findViewById(android.support.design.R.id.snackbar_text);
31-
textView.setTextColor(context.getResources().getColor(R.color.white));
3239
snackbar.show();
3340
}
3441

3542
public static void showLongSnackbar(View parent, String content) {
3643
Context context = parent.getContext();
44+
SpannableStringBuilder spannableString = new SpannableStringBuilder(content);
45+
spannableString.setSpan(
46+
new ForegroundColorSpan(Color.WHITE),
47+
0,
48+
content.length(),
49+
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
3750
final Snackbar snackbar = Snackbar.make(parent, content, Snackbar.LENGTH_INDEFINITE);
3851
View view = snackbar.getView();
3952
view.setBackgroundColor(context.getResources().getColor(R.color.app_turquoise));
40-
TextView textView = view.findViewById(android.support.design.R.id.snackbar_text);
41-
textView.setTextColor(context.getResources().getColor(R.color.white));
42-
textView.setMaxLines(8);
43-
snackbar.setAction(R.string.dismiss, new View.OnClickListener() {
44-
@Override
45-
public void onClick(View v) {
46-
snackbar.dismiss();
47-
}
48-
});
53+
snackbar.setAction(R.string.dismiss, v -> snackbar.dismiss());
4954
snackbar.setActionTextColor(context.getResources().getColor(R.color.white));
5055
snackbar.show();
5156
}

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<android.support.v7.widget.RecyclerView
1+
<androidx.recyclerview.widget.RecyclerView
22
xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:id="@+id/question_list"
@@ -7,4 +7,5 @@
77
android:paddingTop="4dp"
88
android:paddingBottom="4dp"
99
android:clipToPadding="false"
10-
app:layoutManager="android.support.v7.widget.LinearLayoutManager"/>
10+
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
11+
/>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<android.support.design.widget.CoordinatorLayout
1+
<androidx.coordinatorlayout.widget.CoordinatorLayout
22
xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:id="@+id/parent"
@@ -69,4 +69,4 @@
6969
style="@style/rounded_button"/>
7070
</LinearLayout>
7171
</ScrollView>
72-
</android.support.design.widget.CoordinatorLayout>
72+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

‎app/src/main/res/layout/question_container.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.v4.view.ViewPager
2+
<androidx.viewpager.widget.ViewPager
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
android:id="@+id/question_pager"
55
android:background="@color/white"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<android.support.design.widget.CoordinatorLayout
1+
<androidx.coordinatorlayout.widget.CoordinatorLayout
22
xmlns:android="http://schemas.android.com/apk/res/android"
33
android:id="@+id/parent"
44
android:background="@color/white"
@@ -48,4 +48,4 @@
4848
style="@style/rounded_button"/>
4949
</LinearLayout>
5050
</ScrollView>
51-
</android.support.design.widget.CoordinatorLayout>
51+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:layout_height="wrap_content"
99
tools:ignore="SpUsage, RtlHardcoded">
1010

11-
<android.support.v7.widget.CardView
11+
<androidx.cardview.widget.CardView
1212
android:layout_width="match_parent"
1313
android:layout_height="wrap_content"
1414
android:layout_marginLeft="8dp"
@@ -60,5 +60,5 @@
6060
android:textColor="@color/dark_gray"/>
6161
</LinearLayout>
6262
</RelativeLayout>
63-
</android.support.v7.widget.CardView>
63+
</androidx.cardview.widget.CardView>
6464
</FrameLayout>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.design.widget.CoordinatorLayout
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
android:id="@+id/parent"
55
android:layout_width="match_parent"
@@ -36,4 +36,4 @@
3636
style="@style/rounded_button"/>
3737
</LinearLayout>
3838
</ScrollView>
39-
</android.support.design.widget.CoordinatorLayout>
39+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.design.widget.CoordinatorLayout
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
android:id="@+id/parent"
55
android:background="@color/white"
@@ -10,4 +10,4 @@
1010
android:id="@+id/settings_options"
1111
android:layout_width="match_parent"
1212
android:layout_height="match_parent"/>
13-
</android.support.design.widget.CoordinatorLayout>
13+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

‎app/src/test/java/randomappsinc/com/sqlpractice/ExampleUnitTest.java

-15
This file was deleted.

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.4.1'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files

‎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.enableJetifier=true
20+
android.useAndroidX=true

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Sep 29 11:26:05 PDT 2018
1+
#Sun May 26 22:45:17 PDT 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

0 commit comments

Comments
 (0)