Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 483e8d9

Browse files
msfjarviszidhuss
msfjarvis
authored and
zidhuss
committed
Migrate to AndroidX (#430)
* Update gradle and external dependencies - Switch away from deprecated compile directive - Remove explicit buildToolsVersion, is defined by the gradle plugin now - Fix build in SelectFolderActivity Signed-off-by: Harsh Shandilya <harsh@prjkt.io> * Upgrade gradle plugin and wrapper to latest alpha Signed-off-by: Harsh Shandilya <harsh@prjkt.io> * Don't use alpha gradle plugin Signed-off-by: Harsh Shandilya <harsh@prjkt.io> * Migrate to AndroidX https://developer.android.com/jetpack/androidx/ Signed-off-by: Harsh Shandilya <harsh@prjkt.io> * Upgrade AndroidX dependencies to stable release Signed-off-by: Harsh Shandilya <harsh@prjkt.io> * Enable Jetifier Signed-off-by: Harsh Shandilya <harsh@prjkt.io> * SelectFolderFragment: Fix build Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
1 parent b8c5dd8 commit 483e8d9

35 files changed

+145
-122
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ ant.properties
1414
#Gradle
1515
.gradle
1616
build
17-
gradle.properties
1817
.DS_Store
1918

2019
#Maven

‎app/build.gradle

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ apply plugin: 'kotlin-android-extensions'
44
apply plugin: 'eclipse'
55

66
android {
7-
compileSdkVersion 27
7+
compileSdkVersion 28
88
defaultConfig {
99
applicationId "com.zeapo.pwdstore"
1010
minSdkVersion 16
11-
targetSdkVersion 27
11+
targetSdkVersion 28
1212
versionCode 95
1313
versionName "1.2.0.75"
1414

15-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
15+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
}
1717
compileOptions {
1818
sourceCompatibility JavaVersion.VERSION_1_7
@@ -55,11 +55,11 @@ android {
5555
}
5656

5757
dependencies {
58-
implementation 'com.android.support:appcompat-v7:27.1.1'
59-
implementation 'com.android.support:recyclerview-v7:27.1.1'
60-
implementation 'com.android.support:cardview-v7:27.1.1'
61-
implementation 'com.android.support:design:27.1.1'
62-
implementation 'com.android.support:support-annotations:27.1.1'
58+
implementation 'androidx.appcompat:appcompat:1.0.0'
59+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
60+
implementation 'androidx.cardview:cardview:1.0.0'
61+
implementation 'com.google.android.material:material:1.0.0'
62+
implementation 'androidx.annotation:annotation:1.0.0'
6363
implementation 'org.sufficientlysecure:openpgp-api:11.0'
6464
implementation 'com.nononsenseapps:filepicker:2.4.2'
6565
implementation('org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r') {
@@ -70,15 +70,15 @@ dependencies {
7070
implementation 'commons-codec:commons-codec:1.11'
7171
implementation 'com.jayway.android.robotium:robotium-solo:5.3.1'
7272
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
73-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
73+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
7474

7575
// Testing-only dependencies
7676
androidTestImplementation 'junit:junit:4.12'
7777
androidTestImplementation 'org.mockito:mockito-core:2.18.0'
78-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
79-
androidTestImplementation 'com.android.support.test:rules:1.0.2'
80-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
81-
androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
78+
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
79+
androidTestImplementation 'androidx.test:rules:1.1.0-alpha4'
80+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
81+
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0-alpha4'
8282

8383

8484
}

‎app/src/androidTest/java/com/zeapo/pwdstore/DecryptTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import android.content.ClipboardManager
55
import android.content.Context
66
import android.content.Intent
77
import android.os.SystemClock
8-
import android.support.test.InstrumentationRegistry
9-
import android.support.test.filters.LargeTest
10-
import android.support.test.rule.ActivityTestRule
11-
import android.support.test.runner.AndroidJUnit4
8+
import androidx.test.InstrumentationRegistry
9+
import androidx.test.filters.LargeTest
10+
import androidx.test.rule.ActivityTestRule
11+
import androidx.test.runner.AndroidJUnit4
1212
import android.util.Log
1313
import com.zeapo.pwdstore.crypto.PgpActivity
1414
import kotlinx.android.synthetic.main.decrypt_layout.*

‎app/src/androidTest/java/com/zeapo/pwdstore/EncryptTest.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package com.zeapo.pwdstore
33
import android.annotation.SuppressLint
44
import android.content.Context
55
import android.content.Intent
6-
import android.support.test.InstrumentationRegistry
7-
import android.support.test.espresso.Espresso.onView
8-
import android.support.test.espresso.action.ViewActions.*
9-
import android.support.test.espresso.assertion.ViewAssertions
10-
import android.support.test.espresso.matcher.ViewMatchers.withId
11-
import android.support.test.espresso.matcher.ViewMatchers.withText
12-
import android.support.test.filters.LargeTest
13-
import android.support.test.rule.ActivityTestRule
14-
import android.support.test.runner.AndroidJUnit4
6+
import androidx.test.InstrumentationRegistry
7+
import androidx.test.espresso.Espresso.onView
8+
import androidx.test.espresso.action.ViewActions.*
9+
import androidx.test.espresso.assertion.ViewAssertions
10+
import androidx.test.espresso.matcher.ViewMatchers.withId
11+
import androidx.test.espresso.matcher.ViewMatchers.withText
12+
import androidx.test.filters.LargeTest
13+
import androidx.test.rule.ActivityTestRule
14+
import androidx.test.runner.AndroidJUnit4
1515
import com.zeapo.pwdstore.crypto.PgpActivity
1616
import org.apache.commons.io.FileUtils
1717
import org.apache.commons.io.IOUtils

‎app/src/main/java/com/zeapo/pwdstore/DividerItemDecoration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.content.res.TypedArray;
55
import android.graphics.Canvas;
66
import android.graphics.drawable.Drawable;
7-
import android.support.v4.content.ContextCompat;
8-
import android.support.v7.widget.RecyclerView;
7+
import androidx.core.content.ContextCompat;
8+
import androidx.recyclerview.widget.RecyclerView;
99
import android.view.View;
1010

1111
class DividerItemDecoration extends RecyclerView.ItemDecoration {

‎app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import android.content.SharedPreferences;
55
import android.os.Bundle;
66
import android.preference.PreferenceManager;
7-
import android.support.design.widget.FloatingActionButton;
8-
import android.support.v4.app.Fragment;
9-
import android.support.v7.app.AppCompatActivity;
10-
import android.support.v7.widget.LinearLayoutManager;
11-
import android.support.v7.widget.RecyclerView;
7+
import com.google.android.material.floatingactionbutton.FloatingActionButton;
8+
import androidx.fragment.app.Fragment;
9+
import androidx.appcompat.app.AppCompatActivity;
10+
import androidx.recyclerview.widget.LinearLayoutManager;
11+
import androidx.recyclerview.widget.RecyclerView;
1212
import android.util.Log;
1313
import android.view.LayoutInflater;
1414
import android.view.View;

‎app/src/main/java/com/zeapo/pwdstore/PasswordStore.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
import android.os.Build;
1515
import android.os.Bundle;
1616
import android.preference.PreferenceManager;
17-
import android.support.annotation.NonNull;
18-
import android.support.design.widget.Snackbar;
19-
import android.support.v4.app.ActivityCompat;
20-
import android.support.v4.app.FragmentManager;
21-
import android.support.v4.app.FragmentTransaction;
22-
import android.support.v4.content.ContextCompat;
23-
import android.support.v4.view.MenuItemCompat;
24-
import android.support.v7.app.AlertDialog;
25-
import android.support.v7.app.AppCompatActivity;
26-
import android.support.v7.widget.SearchView;
17+
import androidx.annotation.NonNull;
18+
import com.google.android.material.snackbar.Snackbar;
19+
import androidx.core.app.ActivityCompat;
20+
import androidx.fragment.app.FragmentManager;
21+
import androidx.fragment.app.FragmentTransaction;
22+
import androidx.core.content.ContextCompat;
23+
import androidx.core.view.MenuItemCompat;
24+
import androidx.appcompat.app.AlertDialog;
25+
import androidx.appcompat.app.AppCompatActivity;
26+
import androidx.appcompat.widget.SearchView;
2727
import android.text.TextUtils;
2828
import android.util.Log;
2929
import android.view.KeyEvent;
@@ -143,7 +143,7 @@ public void onClick(View view) {
143143
});
144144
snack.show();
145145
View view = snack.getView();
146-
TextView tv = (TextView) view.findViewById(android.support.design.R.id.snackbar_text);
146+
TextView tv = (TextView) view.findViewById(com.google.android.material.R.id.snackbar_text);
147147
tv.setTextColor(Color.WHITE);
148148
tv.setMaxLines(10);
149149
} else {

‎app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package com.zeapo.pwdstore
22

33
import android.app.Activity
44
import android.os.Bundle
5-
import android.support.v4.app.FragmentManager
6-
import android.support.v7.app.AppCompatActivity
5+
import androidx.appcompat.app.AppCompatActivity
76
import android.view.Menu
87
import android.view.MenuItem
8+
import androidx.fragment.app.FragmentManager
99
import com.zeapo.pwdstore.utils.PasswordRepository
1010

1111
// TODO more work needed, this is just an extraction from PgpHandler

‎app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import android.content.SharedPreferences;
55
import android.os.Bundle;
66
import android.preference.PreferenceManager;
7-
import android.support.design.widget.FloatingActionButton;
8-
import android.support.v4.app.Fragment;
9-
import android.support.v7.app.AppCompatActivity;
10-
import android.support.v7.widget.LinearLayoutManager;
11-
import android.support.v7.widget.RecyclerView;
7+
import com.google.android.material.floatingactionbutton.FloatingActionButton;
8+
import androidx.fragment.app.Fragment;
9+
import androidx.appcompat.app.AppCompatActivity;
10+
import androidx.recyclerview.widget.LinearLayoutManager;
11+
import androidx.recyclerview.widget.RecyclerView;
1212
import android.view.LayoutInflater;
1313
import android.view.View;
1414
import android.view.ViewGroup;
@@ -62,16 +62,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
6262
View view = inflater.inflate(R.layout.password_recycler_view, container, false);
6363

6464
// use a linear layout manager
65-
recyclerView = (RecyclerView) view.findViewById(R.id.pass_recycler);
65+
recyclerView = view.findViewById(R.id.pass_recycler);
6666
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
6767

6868
// use divider
6969
recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), R.drawable.divider));
7070

7171
// Set the adapter
7272
recyclerView.setAdapter(recyclerAdapter);
73-
FloatingActionButton fab = (FloatingActionButton) view.findViewById(R.id.fab);
74-
if (fab != null) fab.setVisibility(View.GONE);
73+
FloatingActionButton fab = view.findViewById(R.id.fab);
74+
if (fab != null) fab.hide();
7575

7676
registerForContextMenu(recyclerView);
7777
return view;

‎app/src/main/java/com/zeapo/pwdstore/SshKeyGen.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import android.os.AsyncTask;
1515
import android.os.Bundle;
1616
import android.preference.PreferenceManager;
17-
import android.support.v7.app.AlertDialog;
18-
import android.support.v7.app.AppCompatActivity;
17+
import androidx.appcompat.app.AlertDialog;
18+
import androidx.appcompat.app.AppCompatActivity;
1919
import android.text.InputType;
2020
import android.view.LayoutInflater;
2121
import android.view.View;

‎app/src/main/java/com/zeapo/pwdstore/ToCloneOrNot.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.zeapo.pwdstore;
22

33
import android.os.Bundle;
4-
import android.support.v4.app.Fragment;
4+
import androidx.fragment.app.Fragment;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎app/src/main/java/com/zeapo/pwdstore/UserPreference.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import android.preference.Preference
1515
import android.preference.PreferenceFragment
1616
import android.preference.PreferenceManager
1717
import android.provider.Settings
18-
import android.support.design.widget.Snackbar
19-
import android.support.v4.app.ActivityCompat
20-
import android.support.v4.content.ContextCompat
21-
import android.support.v7.app.AlertDialog
22-
import android.support.v7.app.AppCompatActivity
18+
import com.google.android.material.snackbar.Snackbar
19+
import androidx.core.app.ActivityCompat
20+
import androidx.core.content.ContextCompat
21+
import androidx.appcompat.app.AlertDialog
22+
import androidx.appcompat.app.AppCompatActivity
2323
import android.util.Log
2424
import android.view.MenuItem
2525
import android.view.accessibility.AccessibilityManager
@@ -283,13 +283,13 @@ class UserPreference : AppCompatActivity() {
283283
private fun runWithPermissions(requestedPermission: String, requestCode: Int, reason: String, body: () -> Unit) {
284284
if (ContextCompat.checkSelfPermission(this, requestedPermission) != PackageManager.PERMISSION_GRANTED) {
285285
if (ActivityCompat.shouldShowRequestPermissionRationale(this, requestedPermission)) {
286-
val snack = Snackbar.make(prefsFragment.view!!, reason, Snackbar.LENGTH_INDEFINITE)
286+
val snack = Snackbar.make(prefsFragment.view, reason, Snackbar.LENGTH_INDEFINITE)
287287
.setAction(R.string.dialog_ok) {
288288
ActivityCompat.requestPermissions(this, arrayOf(requestedPermission), requestCode)
289289
}
290290
snack.show()
291291
val view = snack.view
292-
val tv = view.findViewById<TextView>(android.support.design.R.id.snackbar_text)
292+
val tv = view.findViewById<TextView>(com.google.android.material.R.id.snackbar_text)
293293
tv.setTextColor(Color.WHITE)
294294
tv.maxLines = 10
295295
} else {

‎app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.content.IntentSender;
77
import android.content.SharedPreferences;
88
import android.os.Bundle;
9-
import android.support.v7.app.AppCompatActivity;
9+
import androidx.appcompat.app.AppCompatActivity;
1010
import android.util.Log;
1111

1212
import com.zeapo.pwdstore.PasswordStore;

‎app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import android.content.SharedPreferences;
1111
import android.content.pm.PackageManager;
1212
import android.os.Bundle;
13-
import android.support.annotation.NonNull;
14-
import android.support.v4.content.ContextCompat;
15-
import android.support.v7.app.AlertDialog;
13+
import androidx.annotation.NonNull;
14+
import androidx.core.content.ContextCompat;
15+
import androidx.appcompat.app.AlertDialog;
1616
import android.view.LayoutInflater;
1717
import android.view.View;
1818
import android.view.ViewGroup;

‎app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
import android.content.pm.ResolveInfo;
99
import android.os.AsyncTask;
1010
import android.os.Bundle;
11-
import android.support.design.widget.FloatingActionButton;
12-
import android.support.v4.app.NavUtils;
13-
import android.support.v4.app.TaskStackBuilder;
14-
import android.support.v4.view.MenuItemCompat;
15-
import android.support.v7.app.AppCompatActivity;
16-
import android.support.v7.widget.DividerItemDecoration;
17-
import android.support.v7.widget.LinearLayoutManager;
18-
import android.support.v7.widget.RecyclerView;
19-
import android.support.v7.widget.SearchView;
11+
import com.google.android.material.floatingactionbutton.FloatingActionButton;
12+
import androidx.core.app.NavUtils;
13+
import androidx.core.app.TaskStackBuilder;
14+
import androidx.core.view.MenuItemCompat;
15+
import androidx.appcompat.app.AppCompatActivity;
16+
import androidx.recyclerview.widget.DividerItemDecoration;
17+
import androidx.recyclerview.widget.LinearLayoutManager;
18+
import androidx.recyclerview.widget.RecyclerView;
19+
import androidx.appcompat.widget.SearchView;
2020
import android.view.Menu;
2121
import android.view.MenuItem;
2222
import android.view.View;

‎app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import android.content.SharedPreferences;
55
import android.content.pm.PackageManager;
66
import android.graphics.drawable.Drawable;
7-
import android.support.v7.util.SortedList;
8-
import android.support.v7.widget.RecyclerView;
9-
import android.support.v7.widget.util.SortedListAdapterCallback;
7+
import androidx.recyclerview.widget.SortedList;
8+
import androidx.recyclerview.widget.RecyclerView;
9+
import androidx.recyclerview.widget.SortedListAdapterCallback;
1010
import android.view.LayoutInflater;
1111
import android.view.View;
1212
import android.view.ViewGroup;

‎app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import android.os.Bundle;
1717
import android.preference.PreferenceManager;
1818
import android.provider.Settings;
19-
import android.support.v7.app.AlertDialog;
19+
import androidx.appcompat.app.AlertDialog;
2020
import android.util.Log;
2121
import android.view.WindowManager;
2222
import android.view.accessibility.AccessibilityEvent;

0 commit comments

Comments
 (0)