Migrate to AndroidX (#544)

2025-12-07 09:38:52 -06:00 · 2020-01-05 18:47:01 -06:00
parent b3a40efe46 82486c7514
commit 6a91300d82
189 changed files with 468 additions and 315 deletions
--- a/android/uhabits-android/src/main/AndroidManifest.xml
+++ b/android/uhabits-android/src/main/AndroidManifest.xml
@@ -210,7 +210,7 @@
        </receiver>

        <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
            android:authorities="org.isoron.uhabits"
            android:exported="false"
            android:grantUriPermissions="true">
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
@@ -21,7 +21,7 @@ package org.isoron.uhabits.activities

 import android.content.res.Configuration.*
 import android.os.Build.VERSION.*
-import android.support.v4.content.*
+import androidx.core.content.*
 import org.isoron.androidbase.activities.*
 import org.isoron.uhabits.*
 import org.isoron.uhabits.core.preferences.*
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
@@ -20,9 +20,10 @@
 package org.isoron.uhabits.activities.about;

 import android.content.*;
-import android.support.annotation.*;
 import android.widget.*;

+import androidx.annotation.NonNull;
+
 import org.isoron.androidbase.activities.*;
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.BuildConfig;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java
@@ -19,9 +19,10 @@

 package org.isoron.uhabits.activities.about;

-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
@@ -20,8 +20,9 @@
 package org.isoron.uhabits.activities.common.dialogs;

 import android.content.*;
-import android.support.annotation.*;
-import android.support.v7.app.*;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.*;

 import com.google.auto.factory.*;

--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
@@ -22,9 +22,11 @@ package org.isoron.uhabits.activities.common.dialogs;
 import android.app.*;
 import android.content.*;
 import android.os.*;
-import android.support.annotation.*;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.*;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.*;
 import android.util.*;

 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
@@ -20,7 +20,7 @@
 package org.isoron.uhabits.activities.common.dialogs

 import android.content.*
-import android.support.v7.app.*
+import androidx.appcompat.app.*
 import android.text.*
 import android.view.*
 import android.view.inputmethod.*
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
@@ -22,10 +22,10 @@ package org.isoron.uhabits.activities.common.dialogs;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatDialogFragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;

 import org.isoron.uhabits.R;
 import org.isoron.uhabits.core.models.WeekdayList;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
@@ -21,9 +21,11 @@ package org.isoron.uhabits.activities.common.views;

 import android.content.*;
 import android.graphics.*;
-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java
@@ -20,9 +20,10 @@
 package org.isoron.uhabits.activities.common.views;

 import android.os.*;
-import android.support.v4.os.*;
+import androidx.core.os.*;
+import androidx.customview.view.AbsSavedState;

-public class BundleSavedState extends android.support.v4.view.AbsSavedState
+public class BundleSavedState extends AbsSavedState
 {
    public static final Parcelable.Creator<BundleSavedState> CREATOR =
        ParcelableCompat.newCreator(
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
@@ -21,9 +21,10 @@ package org.isoron.uhabits.activities.common.views;

 import android.content.*;
 import android.graphics.*;
-import android.support.annotation.*;
 import android.util.*;

+import androidx.annotation.NonNull;
+
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
@@ -22,10 +22,12 @@ package org.isoron.uhabits.activities.common.views;
 import android.content.*;
 import android.graphics.*;
 import android.graphics.Paint.*;
-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
@@ -21,11 +21,12 @@ package org.isoron.uhabits.activities.common.views;

 import android.content.*;
 import android.graphics.*;
-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
@@ -21,9 +21,11 @@ package org.isoron.uhabits.activities.common.views;

 import android.content.*;
 import android.graphics.*;
-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
@@ -22,8 +22,10 @@ package org.isoron.uhabits.activities.habits.edit;
 import android.app.*;
 import android.content.*;
 import android.os.*;
-import android.support.annotation.*;
-import android.support.v7.app.*;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.*;
 import android.text.format.*;
 import android.view.*;

--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
@@ -20,7 +20,8 @@
 package org.isoron.uhabits.activities.habits.edit;

 import android.os.*;
-import android.support.annotation.*;
+
+import androidx.annotation.NonNull;

 import org.isoron.uhabits.core.models.*;

--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ExampleEditText.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ExampleEditText.java
@@ -20,11 +20,12 @@
 package org.isoron.uhabits.activities.habits.edit.views;

 import android.content.*;
-import android.support.annotation.*;
 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.*;
@@ -35,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
 {

--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java
@@ -22,11 +22,13 @@ package org.isoron.uhabits.activities.habits.edit.views;
 import android.annotation.*;
 import android.content.*;
 import android.content.res.*;
-import android.support.annotation.*;
 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.*;

--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
@@ -22,11 +22,13 @@ package org.isoron.uhabits.activities.habits.edit.views;
 import android.content.*;
 import android.content.res.*;
 import android.os.*;
-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java
@@ -21,11 +21,13 @@ package org.isoron.uhabits.activities.habits.edit.views;

 import android.content.*;
 import android.os.*;
-import android.support.annotation.*;
 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;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TargetPanel.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TargetPanel.java
@@ -21,11 +21,13 @@ package org.isoron.uhabits.activities.habits.edit.views;

 import android.content.*;
 import android.content.res.*;
-import android.support.annotation.*;
 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;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
@@ -22,7 +22,7 @@ package org.isoron.uhabits.activities.habits.list
 import android.content.*
 import android.os.Build.VERSION.*
 import android.os.Build.VERSION_CODES.*
-import android.support.v7.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
 import android.view.ViewGroup.LayoutParams.*
 import android.widget.*
 import org.isoron.androidbase.activities.*
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
@@ -21,7 +21,7 @@ package org.isoron.uhabits.activities.habits.list

 import android.app.*
 import android.content.*
-import android.support.annotation.*
+import androidx.annotation.*
 import dagger.*
 import org.isoron.androidbase.activities.*
 import org.isoron.androidbase.utils.*
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java
@@ -19,10 +19,13 @@

 package org.isoron.uhabits.activities.habits.list.views;

-import android.support.annotation.*;
-import android.support.v7.widget.*;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.*;
 import android.view.*;

+import androidx.recyclerview.widget.RecyclerView;
+
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.activities.habits.list.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
@@ -21,9 +21,9 @@ package org.isoron.uhabits.activities.habits.list.views

 import android.content.*
 import android.os.*
-import android.support.v7.widget.*
-import android.support.v7.widget.helper.*
-import android.support.v7.widget.helper.ItemTouchHelper.*
+import androidx.appcompat.widget.*
+import androidx.recyclerview.widget.*
+import androidx.recyclerview.widget.ItemTouchHelper.*
 import android.view.*
 import com.google.auto.factory.*
 import dagger.*
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt
@@ -19,7 +19,8 @@

 package org.isoron.uhabits.activities.habits.list.views

-import android.support.v7.widget.*
+import androidx.appcompat.widget.*
 import android.view.*
+import androidx.recyclerview.widget.RecyclerView

 class HabitCardViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
@@ -21,8 +21,9 @@ package org.isoron.uhabits.activities.habits.show;

 import android.content.*;
 import android.os.*;
-import android.support.annotation.*;
-import android.support.v7.widget.*;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.*;

 import org.isoron.androidbase.activities.*;
 import org.isoron.androidbase.utils.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
@@ -19,7 +19,7 @@

 package org.isoron.uhabits.activities.habits.show;

-import android.support.annotation.*;
+import androidx.annotation.NonNull;

 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
@@ -19,9 +19,10 @@

 package org.isoron.uhabits.activities.habits.show;

-import android.support.annotation.*;
 import android.view.*;

+import androidx.annotation.NonNull;
+
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.preferences.Preferences;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java
@@ -20,10 +20,11 @@
 package org.isoron.uhabits.activities.habits.show.views;

 import android.content.*;
-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
@@ -20,10 +20,11 @@
 package org.isoron.uhabits.activities.habits.show.views;

 import android.content.*;
-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
@@ -20,10 +20,12 @@
 package org.isoron.uhabits.activities.habits.show.views;

 import android.content.*;
-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
@@ -20,10 +20,11 @@
 package org.isoron.uhabits.activities.habits.show.views;

 import android.content.*;
-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
@@ -20,12 +20,12 @@
 package org.isoron.uhabits.activities.habits.show.views;

 import android.content.*;
-import android.support.annotation.*;
 import android.util.*;
 import android.widget.*;

+import androidx.annotation.NonNull;
+
 import org.isoron.androidbase.utils.*;
-import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
@@ -20,10 +20,12 @@
 package org.isoron.uhabits.activities.habits.show.views;

 import android.content.*;
-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
@@ -20,11 +20,9 @@
 package org.isoron.uhabits.activities.habits.show.views;

 import android.content.*;
-import android.support.annotation.*;
 import android.util.*;
 import android.widget.*;

-import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
@@ -24,10 +24,14 @@ import android.content.*;
 import android.net.*;
 import android.os.*;
 import android.provider.*;
-import android.support.annotation.*;
-import android.support.v7.preference.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
@@ -21,8 +21,8 @@ package org.isoron.uhabits.automation

 import android.R.layout.*
 import android.content.*
-import android.support.v7.widget.*
-import android.support.v7.widget.Toolbar
+import androidx.appcompat.widget.*
+import androidx.appcompat.widget.Toolbar
 import android.widget.*
 import butterknife.*
 import org.isoron.androidbase.activities.*
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt
@@ -64,7 +64,7 @@ class PendingIntentFactory
                    FLAG_UPDATE_CURRENT)

    fun showHabit(habit: Habit): PendingIntent =
-            android.support.v4.app.TaskStackBuilder
+            androidx.core.app.TaskStackBuilder
                    .create(context)
                    .addNextIntentWithParentStack(
                            intentFactory.startShowHabitActivity(
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
@@ -25,8 +25,8 @@ import android.graphics.*
 import android.graphics.BitmapFactory.*
 import android.os.*
 import android.os.Build.VERSION.*
-import android.support.v4.app.*
-import android.support.v4.app.NotificationCompat.*
+import androidx.core.app.*
+import androidx.core.app.NotificationCompat.*
 import android.util.*
 import org.isoron.androidbase.*
 import org.isoron.uhabits.R
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java
@@ -3,12 +3,15 @@ package org.isoron.uhabits.notifications;

 import android.app.*;
 import android.os.*;
-import android.support.annotation.*;
-import android.support.v4.app.*;
+
+import androidx.annotation.Nullable;
+import androidx.core.app.*;
 import android.text.format.*;
 import android.view.*;
 import android.widget.*;

+import androidx.fragment.app.FragmentActivity;
+
 import com.android.datetimepicker.time.TimePickerDialog;

 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
@@ -21,7 +21,8 @@ package org.isoron.uhabits.receivers;

 import android.content.*;
 import android.net.*;
-import android.support.annotation.*;
+
+import androidx.annotation.NonNull;

 import org.isoron.uhabits.core.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
@@ -20,15 +20,14 @@
 package org.isoron.uhabits.receivers;

 import android.content.*;
-import android.support.annotation.*;
 import android.util.*;

+import androidx.annotation.Nullable;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.utils.*;

-import java.util.*;
-
 import static android.content.ContentUris.*;

 /**
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/Event.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/Event.java
@@ -19,7 +19,8 @@

 package org.isoron.uhabits.sync;

-import android.support.annotation.*;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import org.isoron.uhabits.core.database.*;

--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java
@@ -19,9 +19,11 @@

 package org.isoron.uhabits.sync;

-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncService.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncService.java
@@ -23,7 +23,7 @@ import android.app.*;
 import android.content.*;
 import android.net.*;
 import android.os.*;
-import android.support.v4.app.*;
+import androidx.core.app.*;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.preferences.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
@@ -20,7 +20,9 @@
 package org.isoron.uhabits.tasks;

 import android.content.*;
-import android.support.annotation.*;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.google.auto.factory.*;

--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
@@ -19,7 +19,7 @@

 package org.isoron.uhabits.tasks;

-import android.support.annotation.*;
+import androidx.annotation.NonNull;

 import com.google.auto.factory.*;

--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateFormats.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateFormats.java
@@ -18,7 +18,7 @@
 */
 package org.isoron.uhabits.utils;

-import android.support.annotation.*;
+import androidx.annotation.NonNull;

 import org.isoron.uhabits.core.utils.*;

--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java
@@ -20,8 +20,9 @@
 package org.isoron.uhabits.utils;

 import android.content.*;
-import android.support.annotation.*;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.*;

 import org.jetbrains.annotations.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
@@ -21,7 +21,9 @@ package org.isoron.uhabits.utils;

 import android.content.*;
 import android.database.sqlite.*;
-import android.support.annotation.*;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt
@@ -20,13 +20,13 @@
 package org.isoron.uhabits.utils

 import android.graphics.*
-import android.support.annotation.*
-import android.support.design.widget.*
-import android.support.v7.widget.Toolbar
+import androidx.annotation.*
+import androidx.appcompat.widget.Toolbar
 import android.view.*
 import android.view.ViewGroup.LayoutParams.*
 import android.widget.*
 import android.widget.RelativeLayout.*
+import com.google.android.material.snackbar.Snackbar
 import org.isoron.androidbase.utils.*
 import org.isoron.uhabits.*

@@ -74,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()
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
@@ -22,11 +22,11 @@ package org.isoron.uhabits.widgets;
 import android.app.*;
 import android.content.*;
 import android.graphics.*;
-import android.support.annotation.*;
-import android.util.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
@@ -22,10 +22,11 @@ package org.isoron.uhabits.widgets;
 import android.appwidget.*;
 import android.content.*;
 import android.os.*;
-import android.support.annotation.*;
-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.preferences.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java
@@ -3,10 +3,11 @@ package org.isoron.uhabits.widgets;
 import android.appwidget.*;
 import android.content.*;
 import android.os.*;
-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
@@ -20,10 +20,12 @@
 package org.isoron.uhabits.widgets.views;

 import android.content.*;
-import android.support.annotation.*;
 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.*;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java
@@ -20,7 +20,7 @@
 package org.isoron.uhabits.widgets.views;

 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.widget.TextView;

 import org.isoron.uhabits.R;
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java
@@ -20,10 +20,11 @@
 package org.isoron.uhabits.widgets.views;

 import android.content.*;
-import android.support.annotation.*;
 import android.view.*;
 import android.widget.*;

+import androidx.annotation.NonNull;
+
 import org.isoron.uhabits.*;

 public class GraphWidgetView extends HabitWidgetView
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java
@@ -23,11 +23,13 @@ import android.content.*;
 import android.graphics.*;
 import android.graphics.drawable.*;
 import android.graphics.drawable.shapes.*;
-import android.support.annotation.*;
 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.*;

--- a/android/uhabits-android/src/main/res/layout/about.xml
+++ b/android/uhabits-android/src/main/res/layout/about.xml
@@ -25,7 +25,7 @@
            android:background="?windowBackgroundColor"
            android:fillViewport="true">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
        app:popupTheme="?toolbarPopupTheme"
        style="@style/Toolbar"/>
--- a/android/uhabits-android/src/main/res/layout/automation.xml
+++ b/android/uhabits-android/src/main/res/layout/automation.xml
@@ -24,7 +24,7 @@
              android:layout_height="match_parent"
              android:orientation="vertical">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
        style="@style/Toolbar"
        android:title="@string/app_name"
@@ -41,7 +41,7 @@
                style="@style/dialogFormLabel"
                android:text="@string/action"/>

-            <android.support.v7.widget.AppCompatSpinner
+            <androidx.appcompat.widget.AppCompatSpinner
                android:id="@+id/actionSpinner"
                android:layout_width="wrap_content"
                android:layout_height="25dp"
@@ -57,7 +57,7 @@
                style="@style/dialogFormLabel"
                android:text="@string/habit"/>

-            <android.support.v7.widget.AppCompatSpinner
+            <androidx.appcompat.widget.AppCompatSpinner
                android:id="@+id/habitSpinner"
                android:layout_width="wrap_content"
                android:layout_height="25dp"
--- a/android/uhabits-android/src/main/res/layout/edit_habit_frequency.xml
+++ b/android/uhabits-android/src/main/res/layout/edit_habit_frequency.xml
@@ -29,7 +29,7 @@
        style="@style/dialogFormLabel"
        android:text="@string/repeat"/>

-    <android.support.v7.widget.AppCompatSpinner
+    <androidx.appcompat.widget.AppCompatSpinner
        android:id="@+id/spinner"
        android:layout_width="wrap_content"
        android:layout_height="25dp"
--- a/android/uhabits-android/src/main/res/layout/edit_habit_name.xml
+++ b/android/uhabits-android/src/main/res/layout/edit_habit_name.xml
@@ -28,7 +28,7 @@
    <LinearLayout
        style="@style/dialogFormRow">

-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
            android:id="@+id/tilName"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
@@ -43,7 +43,7 @@

                <requestFocus/>
            </EditText>
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>

        <ImageButton
            android:id="@+id/buttonPickColor"
@@ -54,7 +54,7 @@

    </LinearLayout>

-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

@@ -65,6 +65,6 @@
            android:layout_height="wrap_content"
            android:hint="@string/question"
            app:example="@string/example_question_numerical"/>
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>

 </LinearLayout>
--- a/android/uhabits-android/src/main/res/layout/edit_habit_target.xml
+++ b/android/uhabits-android/src/main/res/layout/edit_habit_target.xml
@@ -29,7 +29,7 @@
        style="@style/dialogFormLabel"
        android:text="@string/target"/>

-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_weight="2">
@@ -43,9 +43,9 @@
            android:inputType="numberDecimal"
            android:text="@string/default_count"
            />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>

-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_weight="2">
@@ -58,5 +58,5 @@
            android:hint="@string/unit"
            android:inputType="text"
            app:example="@string/example_units"/>
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 </LinearLayout>
--- a/android/uhabits-android/src/main/res/layout/settings_activity.xml
+++ b/android/uhabits-android/src/main/res/layout/settings_activity.xml
@@ -26,7 +26,7 @@
             tools:context=".activities.settings.SettingsActivity"
             tools:ignore="MergeRootFrame">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
        app:popupTheme="?toolbarPopupTheme"
        style="@style/Toolbar"/>
--- a/android/uhabits-android/src/main/res/layout/show_habit.xml
+++ b/android/uhabits-android/src/main/res/layout/show_habit.xml
@@ -25,7 +25,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
        style="@style/Toolbar"
        app:popupTheme="?toolbarPopupTheme"
--- a/android/uhabits-android/src/main/res/layout/show_habit_bar.xml
+++ b/android/uhabits-android/src/main/res/layout/show_habit_bar.xml
@@ -23,7 +23,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

-        <android.support.v7.widget.AppCompatSpinner
+        <androidx.appcompat.widget.AppCompatSpinner
            android:id="@+id/numericalSpinner"
            android:layout_width="wrap_content"
            android:layout_height="22dp"
@@ -33,7 +33,7 @@
            android:entries="@array/strengthIntervalNames"
            android:theme="@style/SmallSpinner" />

-        <android.support.v7.widget.AppCompatSpinner
+        <androidx.appcompat.widget.AppCompatSpinner
            android:id="@+id/boolSpinner"
            android:layout_width="wrap_content"
            android:layout_height="22dp"
--- a/android/uhabits-android/src/main/res/layout/show_habit_score.xml
+++ b/android/uhabits-android/src/main/res/layout/show_habit_score.xml
@@ -23,7 +23,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

-        <android.support.v7.widget.AppCompatSpinner
+        <androidx.appcompat.widget.AppCompatSpinner
            android:id="@+id/spinner"
            android:layout_width="wrap_content"
            android:layout_height="22dp"
--- a/android/uhabits-android/src/main/res/layout/toolbar.xml
+++ b/android/uhabits-android/src/main/res/layout/toolbar.xml
@@ -18,7 +18,7 @@
  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
  -->

-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
    android:id="@+id/toolbar"
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"