manual migration

android/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.java

@@ -23,6 +23,8 @@ import android.content.*;
 import android.os.*;
 import android.view.*;
 
+import androidx.annotation.NonNull;
+
 import java.io.*;
 import java.text.*;
 import java.util.*;

android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.java

@@ -21,6 +21,8 @@ package org.isoron.androidbase;
 
 import android.content.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.content.*;
 import android.util.*;
 

android/android-base/src/main/java/org/isoron/androidbase/BaseExceptionHandler.java

@@ -19,6 +19,9 @@
 
 package org.isoron.androidbase;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.androidbase.activities.*;
 
 public class BaseExceptionHandler implements Thread.UncaughtExceptionHandler

android/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.java

@@ -21,6 +21,8 @@ package org.isoron.androidbase;
 
 import android.content.*;
 
+import androidx.annotation.NonNull;
+
 import java.io.*;
 import java.security.*;
 import java.security.cert.Certificate;

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java

@@ -22,6 +22,7 @@ package org.isoron.androidbase.activities;
 import android.content.*;
 import android.os.*;
 
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.*;
 import android.view.*;
 

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseMenu.java

@@ -21,6 +21,9 @@ package org.isoron.androidbase.activities;
 
 import android.view.*;
 
+import androidx.annotation.MenuRes;
+import androidx.annotation.NonNull;
+
 /**
  * Base class for all the menus in the application.
  * <p>

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseRootView.java

@@ -21,6 +21,8 @@ package org.isoron.androidbase.activities;
 
 import android.content.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import android.view.*;
 import android.widget.*;

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseScreen.java

@@ -25,6 +25,9 @@ import android.graphics.drawable.*;
 import android.net.*;
 import android.os.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.core.content.res.*;
 import androidx.appcompat.app.*;
 import androidx.appcompat.view.ActionMode;
@@ -215,7 +218,7 @@ public class BaseScreen
         if (snackbar == null)
         {
             snackbar = Snackbar.make(rootView, stringId, Snackbar.LENGTH_SHORT);
-            int tvId = android.support.design.R.id.snackbar_text;
+            int tvId = R.id.snackbar_text;
             TextView tv = (TextView) snackbar.getView().findViewById(tvId);
             tv.setTextColor(Color.WHITE);
         }

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java

@@ -19,6 +19,8 @@
 
 package org.isoron.androidbase.activities;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.view.ActionMode;
 import android.view.*;
 

android/android-base/src/main/java/org/isoron/androidbase/utils/FileUtils.java

@@ -22,6 +22,9 @@ package org.isoron.androidbase.utils;
 import android.os.*;
 import android.util.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.io.*;
 
 public abstract class FileUtils

android/android-base/src/main/java/org/isoron/androidbase/utils/InterfaceUtils.java

@@ -23,6 +23,8 @@ import android.content.*;
 import android.content.res.*;
 import android.graphics.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.view.*;
 import android.util.*;
 import android.view.*;

android/android-base/src/main/java/org/isoron/androidbase/utils/StyledResources.java

@@ -23,6 +23,9 @@ import android.content.*;
 import android.content.res.*;
 import android.graphics.drawable.*;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+
 import org.isoron.androidbase.*;
 
 public class StyledResources