Migrate to AndroidX (#544)

2025-12-06 09:08: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/build.gradle
+++ b/android/uhabits-android/build.gradle
@@ -31,7 +31,7 @@ android {
        targetSdkVersion TARGET_SDK_VERSION as Integer

        applicationId "org.isoron.uhabits"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

    buildTypes {
@@ -76,10 +76,10 @@ dependencies {
    implementation project(":android-base")
    implementation project(":android-pickers")

-    implementation "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
-    implementation "com.android.support:design:$SUPPORT_LIBRARY_VERSION"
-    implementation "com.android.support:preference-v14:$SUPPORT_LIBRARY_VERSION"
-    implementation "com.android.support:support-v4:$SUPPORT_LIBRARY_VERSION"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
    implementation "com.github.paolorotolo:appintro:3.4.0"
    implementation "com.google.dagger:dagger:$DAGGER_VERSION"
    implementation "com.jakewharton:butterknife:8.6.1-SNAPSHOT"
@@ -91,19 +91,19 @@ dependencies {
    compileOnly "javax.annotation:jsr250-api:1.0"
    compileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
    kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
-    kapt "com.jakewharton:butterknife-compiler:9.0.0"
+    kapt "com.jakewharton:butterknife-compiler:10.2.1"
    annotationProcessor "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"

-    androidTestImplementation "com.android.support.test.espresso:espresso-contrib:2.2.2"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:2.2.2"
-    androidTestImplementation "com.android.support.test.uiautomator:uiautomator-v18:2.1.1"
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
    androidTestImplementation "com.google.dagger:dagger:$DAGGER_VERSION"
    androidTestImplementation "com.linkedin.testbutler:test-butler-library:1.3.1"
    androidTestCompileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
    androidTestAnnotationProcessor "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
-    androidTestImplementation "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION"
-    androidTestImplementation "com.android.support.test:rules:0.5"
-    androidTestImplementation "com.android.support.test:runner:0.5"
+    androidTestImplementation 'androidx.annotation:annotation:1.0.0'
+    androidTestImplementation 'androidx.test:rules:1.1.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
    androidTestImplementation "com.google.guava:guava:24.1-android"
    androidTestImplementation project(":uhabits-core")
    kaptAndroidTest "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
@@ -23,11 +23,15 @@ import android.appwidget.*;
 import android.content.*;
 import android.content.res.*;
 import android.os.*;
-import android.support.annotation.*;
-import android.support.test.*;
-import android.support.test.filters.*;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.test.*;
+import androidx.test.filters.*;
 import android.util.*;

+import androidx.test.platform.app.InstrumentationRegistry;
+
 import junit.framework.*;

 import org.isoron.androidbase.*;
@@ -80,8 +84,8 @@ public class BaseAndroidTest extends TestCase
    {
        if (Looper.myLooper() == null) Looper.prepare();

-        targetContext = InstrumentationRegistry.getTargetContext();
-        testContext = InstrumentationRegistry.getContext();
+        targetContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        testContext = InstrumentationRegistry.getInstrumentation().getContext();

        DateUtils.setFixedLocalTime(FIXED_LOCAL_TIME);
        setResolution(2.0f);
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
@@ -20,7 +20,8 @@
 package org.isoron.uhabits;

 import android.content.*;
-import android.support.test.uiautomator.*;
+
+import androidx.test.uiautomator.*;

 import com.linkedin.android.testbutler.*;

@@ -30,8 +31,10 @@ import org.isoron.uhabits.core.ui.screens.habits.list.*;
 import org.isoron.uhabits.core.utils.*;
 import org.junit.*;

-import static android.support.test.InstrumentationRegistry.*;
-import static android.support.test.uiautomator.UiDevice.*;
+import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getTargetContext;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.uiautomator.UiDevice.*;

 public class BaseUserInterfaceTest
 {
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
@@ -20,11 +20,14 @@
 package org.isoron.uhabits;

 import android.graphics.*;
-import android.support.annotation.*;
-import android.support.test.*;
+
+import androidx.annotation.NonNull;
+import androidx.test.*;
 import android.view.*;
 import android.widget.*;

+import androidx.test.platform.app.InstrumentationRegistry;
+
 import org.isoron.androidbase.*;
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.widgets.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.androidbase.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits.acceptance;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits.acceptance;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits.acceptance;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java
@@ -19,7 +19,7 @@

 package org.isoron.uhabits.acceptance;

-import android.support.test.filters.*;
+import androidx.test.filters.*;

 import org.isoron.uhabits.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
@@ -19,22 +19,24 @@

 package org.isoron.uhabits.acceptance.steps;

-import android.support.annotation.*;
-import android.support.test.espresso.*;
-import android.support.test.espresso.contrib.*;
-import android.support.test.uiautomator.*;
-import android.support.v7.widget.*;
+import androidx.annotation.StringRes;
+import androidx.test.espresso.*;
+import androidx.test.espresso.contrib.*;
+import androidx.test.uiautomator.*;
+import androidx.appcompat.widget.*;
+
+import androidx.recyclerview.widget.RecyclerView;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.habits.list.*;

 import static android.os.Build.VERSION.*;
-import static android.support.test.espresso.Espresso.*;
-import static android.support.test.espresso.action.ViewActions.*;
-import static android.support.test.espresso.assertion.PositionAssertions.*;
-import static android.support.test.espresso.assertion.ViewAssertions.*;
-import static android.support.test.espresso.matcher.ViewMatchers.*;
+import static androidx.test.espresso.Espresso.*;
+import static androidx.test.espresso.action.ViewActions.*;
+import static androidx.test.espresso.assertion.PositionAssertions.*;
+import static androidx.test.espresso.assertion.ViewAssertions.*;
+import static androidx.test.espresso.matcher.ViewMatchers.*;
 import static junit.framework.Assert.*;
 import static org.hamcrest.CoreMatchers.*;

--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
@@ -19,14 +19,14 @@

 package org.isoron.uhabits.acceptance.steps;

-import android.support.test.uiautomator.*;
+import androidx.test.uiautomator.*;

 import org.isoron.uhabits.*;

-import static android.support.test.espresso.Espresso.*;
-import static android.support.test.espresso.action.ViewActions.*;
-import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
-import static android.support.test.espresso.matcher.ViewMatchers.*;
+import static androidx.test.espresso.Espresso.*;
+import static androidx.test.espresso.action.ViewActions.*;
+import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static androidx.test.espresso.matcher.ViewMatchers.*;
 import static org.isoron.uhabits.BaseUserInterfaceTest.*;

 public class EditHabitSteps
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
@@ -19,7 +19,7 @@

 package org.isoron.uhabits.acceptance.steps;

-import android.support.test.espresso.*;
+import androidx.test.espresso.*;
 import android.view.*;

 import org.hamcrest.*;
@@ -28,15 +28,15 @@ import org.isoron.uhabits.activities.habits.list.views.*;

 import java.util.*;

-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
-import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
-import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
-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.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
+import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
+import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+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 org.hamcrest.CoreMatchers.*;
 import static org.isoron.uhabits.BaseUserInterfaceTest.device;
 import static org.isoron.uhabits.acceptance.steps.CommonSteps.clickText;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
@@ -19,7 +19,7 @@

 package org.isoron.uhabits.acceptance.steps;

-import android.support.test.uiautomator.*;
+import androidx.test.uiautomator.*;

 import static android.os.Build.VERSION.SDK_INT;
 import static junit.framework.Assert.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits.activities.common.views;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits.activities.common.views;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits.activities.common.views;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
@@ -20,8 +20,10 @@
 package org.isoron.uhabits.activities.common.views;

 import android.graphics.*;
-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.utils.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits.activities.common.views;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits.activities.common.views;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.kt
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.kt
@@ -19,8 +19,9 @@

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

-import android.support.test.filters.*
-import android.support.test.runner.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.*
+import androidx.test.runner.*
 import org.isoron.uhabits.*
 import org.isoron.uhabits.core.models.*
 import org.isoron.uhabits.utils.*
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.kt
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.kt
@@ -19,8 +19,9 @@

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

-import android.support.test.filters.*
-import android.support.test.runner.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.*
+import androidx.test.runner.*
 import org.hamcrest.CoreMatchers.*
 import org.hamcrest.MatcherAssert.*
 import org.isoron.uhabits.*
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt
@@ -19,8 +19,9 @@

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

-import android.support.test.filters.*
-import android.support.test.runner.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.*
+import androidx.test.runner.*
 import org.isoron.uhabits.*
 import org.isoron.uhabits.core.models.*
 import org.junit.*
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java
@@ -19,8 +19,10 @@

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

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.preferences.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
@@ -19,8 +19,10 @@

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

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.ui.screens.habits.list.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
@@ -19,8 +19,9 @@

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

-import android.support.test.filters.*
-import android.support.test.runner.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.*
+import androidx.test.runner.*
 import org.hamcrest.CoreMatchers.*
 import org.hamcrest.MatcherAssert.*
 import org.isoron.uhabits.*
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
@@ -19,8 +19,9 @@

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

-import android.support.test.filters.*
-import android.support.test.runner.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.*
+import androidx.test.runner.*
 import org.hamcrest.CoreMatchers.*
 import org.hamcrest.MatcherAssert.*
 import org.isoron.uhabits.*
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
@@ -19,10 +19,12 @@

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

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
 import android.view.*;

+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
@@ -19,10 +19,12 @@

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

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
 import android.view.*;

+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
@@ -19,10 +19,12 @@

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

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
 import android.view.*;

+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
@@ -19,10 +19,12 @@

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

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
 import android.view.*;

+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
@@ -19,10 +19,12 @@

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

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
 import android.view.*;

+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
@@ -19,10 +19,12 @@

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

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
 import android.view.*;

+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits.performance;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt
@@ -19,7 +19,7 @@

 package org.isoron.uhabits.regression

-import android.support.test.filters.*
+import androidx.test.filters.*

 import org.isoron.uhabits.*
 import org.junit.*
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits.tasks;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits.tasks;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
@@ -19,10 +19,12 @@

 package org.isoron.uhabits.widgets;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
 import android.widget.*;

+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
@@ -19,10 +19,12 @@

 package org.isoron.uhabits.widgets;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
 import android.widget.*;

+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
@@ -19,10 +19,12 @@

 package org.isoron.uhabits.widgets;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
 import android.widget.*;

+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
@@ -19,10 +19,12 @@

 package org.isoron.uhabits.widgets;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
 import android.widget.*;

+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
@@ -19,10 +19,12 @@

 package org.isoron.uhabits.widgets;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
 import android.widget.*;

+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
@@ -19,8 +19,10 @@

 package org.isoron.uhabits.widgets.views;

-import android.support.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.filters.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
--- 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/Show More
+++ b/Show More