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

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java

@@ -24,6 +24,8 @@ import android.content.*;
 import android.content.res.*;
 import android.os.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
 import androidx.test.*;
 import androidx.test.filters.*;
 import android.util.*;

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java

@@ -20,6 +20,7 @@
 package org.isoron.uhabits;
 
 import android.content.*;
+
 import androidx.test.uiautomator.*;
 
 import com.linkedin.android.testbutler.*;

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java

@@ -21,6 +21,7 @@ package org.isoron.uhabits;
 
 import android.graphics.*;
 
+import androidx.annotation.NonNull;
 import androidx.test.*;
 import android.view.*;
 import android.widget.*;

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java

@@ -19,6 +19,7 @@
 
 package org.isoron.uhabits.acceptance.steps;
 
+import androidx.annotation.StringRes;
 import androidx.test.espresso.*;
 import androidx.test.espresso.contrib.*;
 import androidx.test.uiautomator.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java

@@ -22,6 +22,8 @@ package org.isoron.uhabits.activities.about;
 import android.content.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+
 import org.isoron.androidbase.activities.*;
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.BuildConfig;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java

@@ -21,6 +21,8 @@ package org.isoron.uhabits.activities.about;
 
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.core.ui.screens.about.*;
 import org.isoron.uhabits.intents.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java

@@ -21,6 +21,7 @@ package org.isoron.uhabits.activities.common.dialogs;
 
 import android.content.*;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.*;
 
 import com.google.auto.factory.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java

@@ -23,6 +23,8 @@ import android.app.*;
 import android.content.*;
 import android.os.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.*;
 import android.util.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java

@@ -23,6 +23,9 @@ import android.content.*;
 import android.graphics.*;
 import android.util.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.views.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java

@@ -23,6 +23,8 @@ import android.content.*;
 import android.graphics.*;
 import android.util.*;
 
+import androidx.annotation.NonNull;
+
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java

@@ -25,6 +25,9 @@ import android.graphics.Paint.*;
 import android.util.*;
 import android.view.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java

@@ -25,6 +25,8 @@ import android.text.*;
 import android.util.*;
 import android.view.*;
 
+import androidx.annotation.Nullable;
+
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.utils.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java

@@ -23,6 +23,9 @@ import android.content.*;
 import android.graphics.*;
 import android.util.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java

@@ -23,6 +23,8 @@ import android.app.*;
 import android.content.*;
 import android.os.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.*;
 import android.text.format.*;
 import android.view.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java

@@ -21,6 +21,8 @@ package org.isoron.uhabits.activities.habits.edit;
 
 import android.os.*;
 
+import androidx.annotation.NonNull;
+
 import org.isoron.uhabits.core.models.*;
 
 import javax.inject.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ExampleEditText.java

@@ -23,7 +23,9 @@ import android.content.*;
 import android.text.*;
 import android.util.*;
 import android.view.*;
-import android.widget.*;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatEditText;
 
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
@@ -34,7 +36,7 @@ import static org.isoron.uhabits.utils.AttributeSetUtils.*;
  * An EditText that shows an example usage when there is no text
  * currently set. The example disappears when the widget gains focus.
  */
-public class ExampleEditText extends EditText
+public class ExampleEditText extends AppCompatEditText
     implements View.OnFocusChangeListener
 {
 

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java

@@ -26,6 +26,9 @@ import android.util.*;
 import android.view.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java

@@ -26,6 +26,9 @@ import android.util.*;
 import android.view.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java

@@ -25,6 +25,9 @@ import android.util.*;
 import android.view.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.datetimepicker.time.*;
 
 import org.isoron.uhabits.R;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TargetPanel.java

@@ -25,6 +25,9 @@ import android.util.*;
 import android.view.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.uhabits.R;
 
 import java.text.DecimalFormat;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java

@@ -19,6 +19,8 @@
 
 package org.isoron.uhabits.activities.habits.list.views;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.widget.*;
 import android.view.*;
 

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java

@@ -22,6 +22,7 @@ package org.isoron.uhabits.activities.habits.show;
 import android.content.*;
 import android.os.*;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.*;
 
 import org.isoron.androidbase.activities.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java

@@ -19,6 +19,8 @@
 
 package org.isoron.uhabits.activities.habits.show;
 
+import androidx.annotation.NonNull;
+
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java

@@ -21,6 +21,8 @@ package org.isoron.uhabits.activities.habits.show;
 
 import android.view.*;
 
+import androidx.annotation.NonNull;
+
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.preferences.Preferences;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java

@@ -23,6 +23,8 @@ import android.content.*;
 import android.util.*;
 import android.widget.*;
 
+import androidx.annotation.Nullable;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java

@@ -23,6 +23,8 @@ import android.content.*;
 import android.util.*;
 import android.widget.*;
 
+import androidx.annotation.Nullable;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java

@@ -23,6 +23,9 @@ import android.content.*;
 import android.util.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.models.memory.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java

@@ -23,6 +23,8 @@ import android.content.*;
 import android.util.*;
 import android.widget.*;
 
+import androidx.annotation.Nullable;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java

@@ -23,6 +23,8 @@ import android.content.*;
 import android.util.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java

@@ -23,6 +23,9 @@ import android.content.*;
 import android.util.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java

@@ -26,6 +26,12 @@ import android.os.*;
 import android.provider.*;
 import android.util.*;
 
+import androidx.annotation.Nullable;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragmentCompat;
+
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.preferences.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java

@@ -4,6 +4,7 @@ package org.isoron.uhabits.notifications;
 import android.app.*;
 import android.os.*;
 
+import androidx.annotation.Nullable;
 import androidx.core.app.*;
 import android.text.format.*;
 import android.view.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java

@@ -22,6 +22,8 @@ package org.isoron.uhabits.receivers;
 import android.content.*;
 import android.net.*;
 
+import androidx.annotation.NonNull;
+
 import org.isoron.uhabits.core.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.preferences.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java

@@ -22,6 +22,8 @@ package org.isoron.uhabits.receivers;
 import android.content.*;
 import android.util.*;
 
+import androidx.annotation.Nullable;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.utils.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/sync/Event.java

@@ -19,6 +19,9 @@
 
 package org.isoron.uhabits.sync;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.uhabits.core.database.*;
 
 @Table(name = "Events")

android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java

@@ -21,6 +21,9 @@ package org.isoron.uhabits.sync;
 
 import android.util.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.androidbase.*;
 import org.isoron.uhabits.BuildConfig;
 import org.isoron.uhabits.core.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java

@@ -21,6 +21,9 @@ package org.isoron.uhabits.tasks;
 
 import android.content.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.google.auto.factory.*;
 
 import org.isoron.androidbase.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java

@@ -19,6 +19,8 @@
 
 package org.isoron.uhabits.tasks;
 
+import androidx.annotation.NonNull;
+
 import com.google.auto.factory.*;
 
 import org.isoron.uhabits.core.io.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateFormats.java

@@ -18,6 +18,8 @@
  */
 package org.isoron.uhabits.utils;
 
+import androidx.annotation.NonNull;
+
 import org.isoron.uhabits.core.utils.*;
 
 import java.text.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java

@@ -21,6 +21,7 @@ package org.isoron.uhabits.utils;
 
 import android.content.*;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import android.util.*;
 

android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java

@@ -22,6 +22,9 @@ package org.isoron.uhabits.utils;
 import android.content.*;
 import android.database.sqlite.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt

@@ -21,7 +21,6 @@ package org.isoron.uhabits.utils
 
 import android.graphics.*
 import androidx.annotation.*
-import android.support.design.widget.*
 import androidx.appcompat.widget.Toolbar
 import android.view.*
 import android.view.ViewGroup.LayoutParams.*
@@ -75,7 +74,7 @@ fun ViewGroup.buildToolbar(): Toolbar {
 fun View.showMessage(@StringRes stringId: Int) {
     try {
         val snackbar = Snackbar.make(this, stringId, Snackbar.LENGTH_SHORT)
-        val tvId = android.support.design.R.id.snackbar_text
+        val tvId = R.id.snackbar_text
         val tv = snackbar.view.findViewById<TextView>(tvId)
         tv?.setTextColor(Color.WHITE)
         snackbar.show()

android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java

@@ -25,6 +25,8 @@ import android.graphics.*;
 import android.view.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.preferences.*;
 import org.isoron.uhabits.intents.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java

@@ -24,6 +24,9 @@ import android.content.*;
 import android.os.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.preferences.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java

@@ -6,6 +6,8 @@ import android.os.*;
 import android.util.Log;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.preferences.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java

@@ -23,6 +23,9 @@ import android.content.*;
 import android.util.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java

@@ -23,6 +23,8 @@ import android.content.*;
 import android.view.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+
 import org.isoron.uhabits.*;
 
 public class GraphWidgetView extends HabitWidgetView

android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java

@@ -27,6 +27,9 @@ import android.util.*;
 import android.view.*;
 import android.widget.*;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;