Migration to AndroidX

ironeagle-ir · Mar 25, 2019 · 1545658 · 1545658
1 parent 275e02f
commit 1545658
Show file tree

Hide file tree

Showing 105 changed files with 340 additions and 341 deletions.
diff --git a/authorizer/build.gradle b/authorizer/build.gradle
@@ -18,7 +18,7 @@ android {
  targetSdkVersion 28
  versionCode 300
  versionName '0.3.0'
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
  //Reference them in .xml files.
  resValue "string", "application_id", "${applicationId}"
@@ -49,21 +49,22 @@ repositories {
 dependencies {
  implementation fileTree(include: ['*.jar'], dir: 'libs')
  implementation project(':lib')
- androidTestImplementation 'com.android.support:support-annotations:28.0.0'
- androidTestImplementation 'com.android.support.test:runner:1.0.1'
- androidTestImplementation 'com.android.support.test:rules:1.0.1'
+ androidTestImplementation 'androidx.annotation:annotation:1.0.2'
+ androidTestImplementation 'androidx.test:runner:1.1.1'
+ androidTestImplementation 'androidx.test:rules:1.1.1'
  androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
- androidTestImplementation('com.android.support.test.espresso:espresso-contrib:2.2.2') {
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+ androidTestImplementation('androidx.test.espresso:espresso-contrib:3.1.0') {
  exclude module: 'support-v4'
  exclude module: 'appcompat-v7'
  exclude module: 'design'
  exclude module: 'recyclerview-v7'
  }
- androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.1'
- implementation 'com.android.support:recyclerview-v7:28.0.0'
- implementation 'com.android.support:appcompat-v7:28.0.0'
- implementation 'com.github.bmelnychuk:atv:1.2.+'
+ androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.1'
+ implementation 'androidx.recyclerview:recyclerview:1.0.0'
+ implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation 'com.github.bmelnychuk:atv:1.2.9'
  implementation 'com.mikepenz:iconics-core:2.8.1@aar'
  implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.2@aar'
  implementation 'com.mikepenz:devicon-typeface:2.0.0.2@aar'

diff --git a/authorizer/src/androidTest/java/net/tjado/passwdsafe/test/FileListActivityTest.java b/authorizer/src/androidTest/java/net/tjado/passwdsafe/test/FileListActivityTest.java
@@ -8,10 +8,10 @@
 package net.tjado.passwdsafe.test;
 
 import android.os.Environment;
-import android.support.test.espresso.DataInteraction;
-import android.support.test.espresso.intent.rule.IntentsTestRule;
-import android.support.test.espresso.matcher.BoundedMatcher;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.espresso.DataInteraction;
+import androidx.test.espresso.intent.rule.IntentsTestRule;
+import androidx.test.espresso.matcher.BoundedMatcher;
+import androidx.test.runner.AndroidJUnit4;
 import android.view.Gravity;
 
 import net.tjado.passwdsafe.BuildConfig;
@@ -31,20 +31,20 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static android.support.test.espresso.Espresso.onData;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.contrib.DrawerActions.open;
-import static android.support.test.espresso.contrib.DrawerMatchers.isClosed;
-import static android.support.test.espresso.contrib.NavigationViewActions.navigateTo;
-import static android.support.test.espresso.intent.Checks.checkNotNull;
-import static android.support.test.espresso.intent.Intents.intended;
-import static android.support.test.espresso.intent.matcher.IntentMatchers.hasAction;
-import static android.support.test.espresso.intent.matcher.IntentMatchers.hasData;
-import static android.support.test.espresso.intent.matcher.IntentMatchers.toPackage;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onData;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.contrib.DrawerActions.open;
+import static androidx.test.espresso.contrib.DrawerMatchers.isClosed;
+import static androidx.test.espresso.contrib.NavigationViewActions.navigateTo;
+import static androidx.test.espresso.intent.Checks.checkNotNull;
+import static androidx.test.espresso.intent.Intents.intended;
+import static androidx.test.espresso.intent.matcher.IntentMatchers.hasAction;
+import static androidx.test.espresso.intent.matcher.IntentMatchers.hasData;
+import static androidx.test.espresso.intent.matcher.IntentMatchers.toPackage;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static net.tjado.passwdsafe.test.util.TestUtils.withAdaptedData;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.anything;

diff --git a/authorizer/src/androidTest/java/net/tjado/passwdsafe/test/PasswdSafeNewFileFragmentTest.java b/authorizer/src/androidTest/java/net/tjado/passwdsafe/test/PasswdSafeNewFileFragmentTest.java
@@ -9,10 +9,10 @@
 
 import android.content.Intent;
 import android.net.Uri;
-import android.support.test.espresso.ViewInteraction;
-import android.support.test.espresso.matcher.ViewMatchers;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.espresso.ViewInteraction;
+import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
 import android.view.Gravity;
 
 import net.tjado.passwdsafe.PasswdSafe;
@@ -27,26 +27,26 @@
 
 import java.io.File;
 
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
-import static android.support.test.espresso.Espresso.pressBack;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
-import static android.support.test.espresso.action.ViewActions.replaceText;
-import static android.support.test.espresso.action.ViewActions.scrollTo;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.contrib.DrawerActions.close;
-import static android.support.test.espresso.contrib.DrawerActions.open;
-import static android.support.test.espresso.contrib.DrawerMatchers.isClosed;
-import static android.support.test.espresso.contrib.DrawerMatchers.isOpen;
-import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withParent;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
+import static androidx.test.espresso.Espresso.pressBack;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static androidx.test.espresso.action.ViewActions.replaceText;
+import static androidx.test.espresso.action.ViewActions.scrollTo;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.contrib.DrawerActions.close;
+import static androidx.test.espresso.contrib.DrawerActions.open;
+import static androidx.test.espresso.contrib.DrawerMatchers.isClosed;
+import static androidx.test.espresso.contrib.DrawerMatchers.isOpen;
+import static androidx.test.espresso.matcher.ViewMatchers.hasFocus;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
+import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withParent;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static net.tjado.passwdsafe.test.util.TestUtils.withTextInputError;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.isEmptyString;

diff --git a/authorizer/src/androidTest/java/net/tjado/passwdsafe/test/util/SparseArrayTest.java b/authorizer/src/androidTest/java/net/tjado/passwdsafe/test/util/SparseArrayTest.java
@@ -7,7 +7,7 @@
  */
 package net.tjado.passwdsafe.test.util;
 
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/authorizer/src/androidTest/java/net/tjado/passwdsafe/test/util/TestUtils.java b/authorizer/src/androidTest/java/net/tjado/passwdsafe/test/util/TestUtils.java
@@ -7,8 +7,8 @@
  */
 package net.tjado.passwdsafe.test.util;
 
-import android.support.design.widget.TextInputLayout;
-import android.support.test.espresso.matcher.BoundedMatcher;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.test.espresso.matcher.BoundedMatcher;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Adapter;
@@ -18,7 +18,7 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
-import static android.support.test.espresso.intent.Checks.checkNotNull;
+import static androidx.test.espresso.intent.Checks.checkNotNull;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 

diff --git a/authorizer/src/main/java/net/tjado/authorizer/OutputBluetoothKeyboard.java b/authorizer/src/main/java/net/tjado/authorizer/OutputBluetoothKeyboard.java
@@ -18,7 +18,7 @@
 import android.content.Context;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/AboutFragment.java b/authorizer/src/main/java/net/tjado/passwdsafe/AboutFragment.java
@@ -9,8 +9,8 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/AbstractNavDrawerFragment.java b/authorizer/src/main/java/net/tjado/passwdsafe/AbstractNavDrawerFragment.java
@@ -11,13 +11,13 @@
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.support.design.widget.NavigationView;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.navigation.NavigationView;
+import androidx.fragment.app.Fragment;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/AbstractPasswdSafeFileDataFragment.java b/authorizer/src/main/java/net/tjado/passwdsafe/AbstractPasswdSafeFileDataFragment.java
@@ -8,7 +8,7 @@
 package net.tjado.passwdsafe;
 
 import android.content.Context;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.Menu;
 import android.view.MenuInflater;
 

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/AbstractPasswdSafeLocationFragment.java b/authorizer/src/main/java/net/tjado/passwdsafe/AbstractPasswdSafeLocationFragment.java
@@ -8,8 +8,8 @@
 package net.tjado.passwdsafe;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.tjado.passwdsafe.file.PasswdFileData;
 import net.tjado.passwdsafe.file.PasswdFileDataUser;

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/AbstractPasswdSafeOpenNewFileFragment.java b/authorizer/src/main/java/net/tjado/passwdsafe/AbstractPasswdSafeOpenNewFileFragment.java
@@ -9,7 +9,7 @@
 
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 import android.widget.ProgressBar;
 

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/AbstractPasswdSafeRecordFragment.java b/authorizer/src/main/java/net/tjado/passwdsafe/AbstractPasswdSafeRecordFragment.java
@@ -7,7 +7,7 @@
  */
 package net.tjado.passwdsafe;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.widget.TextView;
 

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/FileListActivity.java b/authorizer/src/main/java/net/tjado/passwdsafe/FileListActivity.java
@@ -13,13 +13,13 @@
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/FileListFragment.java b/authorizer/src/main/java/net/tjado/passwdsafe/FileListFragment.java
@@ -23,11 +23,11 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.AsyncTaskLoader;
-import android.support.v4.content.Loader;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.AsyncTaskLoader;
+import androidx.loader.content.Loader;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.Menu;

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/FileListNavDrawerFragment.java b/authorizer/src/main/java/net/tjado/passwdsafe/FileListNavDrawerFragment.java
@@ -8,7 +8,7 @@
 package net.tjado.passwdsafe;
 
 import android.os.Bundle;
-import android.support.v4.widget.DrawerLayout;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/LauncherFileShortcuts.java b/authorizer/src/main/java/net/tjado/passwdsafe/LauncherFileShortcuts.java
@@ -11,10 +11,10 @@
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
 
 import net.tjado.passwdsafe.lib.ApiCompat;
 import net.tjado.passwdsafe.lib.PasswdSafeUtil;

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/LauncherRecordShortcuts.java b/authorizer/src/main/java/net/tjado/passwdsafe/LauncherRecordShortcuts.java
@@ -11,11 +11,11 @@
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
 
 import net.tjado.passwdsafe.file.PasswdFileData;

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/NotificationMgr.java b/authorizer/src/main/java/net/tjado/passwdsafe/NotificationMgr.java
@@ -31,8 +31,8 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.BaseColumns;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
 import android.util.Log;
 
 import net.tjado.passwdsafe.file.PasswdExpiration;

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/PasswdSafe.java b/authorizer/src/main/java/net/tjado/passwdsafe/PasswdSafe.java
@@ -14,21 +14,21 @@
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.ActionBar;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.core.view.MenuItemCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.ActionBar;
 import android.os.Bundle;
-import android.support.v7.widget.SearchView;
+import androidx.appcompat.widget.SearchView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.support.v4.widget.DrawerLayout;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;

diff --git a/authorizer/src/main/java/net/tjado/passwdsafe/PasswdSafeChangePasswordFragment.java b/authorizer/src/main/java/net/tjado/passwdsafe/PasswdSafeChangePasswordFragment.java
@@ -10,8 +10,8 @@
 import android.content.Context;
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.TextInputLayout;
+import androidx.annotation.NonNull;
+import com.google.android.material.textfield.TextInputLayout;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.view.LayoutInflater;