automatic migration

android/android-base/build.gradle

@@ -23,8 +23,8 @@ android {
 
 dependencies {
     implementation "com.google.dagger:dagger:$DAGGER_VERSION"
-    implementation "com.android.support:design:$SUPPORT_LIBRARY_VERSION"
+    implementation 'com.google.android.material:material:1.0.0'
-    implementation "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "org.apache.commons:commons-lang3:3.5"
 
     annotationProcessor "com.google.dagger:dagger-compiler:$DAGGER_VERSION"

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

@@ -21,7 +21,6 @@ package org.isoron.androidbase;
 
 import android.content.*;
 import android.os.*;
-import android.support.annotation.*;
 import android.view.*;
 
 import java.io.*;

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

@@ -20,8 +20,8 @@
 package org.isoron.androidbase;
 
 import android.content.*;
-import android.support.annotation.*;
+
-import android.support.v4.content.*;
+import androidx.core.content.*;
 import android.util.*;
 
 import org.isoron.androidbase.utils.*;

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

@@ -19,8 +19,6 @@
 
 package org.isoron.androidbase;
 
-import android.support.annotation.*;
-
 import org.isoron.androidbase.activities.*;
 
 public class BaseExceptionHandler implements Thread.UncaughtExceptionHandler

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

@@ -20,9 +20,6 @@
 package org.isoron.androidbase;
 
 import android.content.*;
-import android.support.annotation.*;
-
-import org.isoron.androidbase.*;
 
 import java.io.*;
 import java.security.*;

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

@@ -21,8 +21,8 @@ package org.isoron.androidbase.activities;
 
 import android.content.*;
 import android.os.*;
-import android.support.annotation.*;
+
-import android.support.v7.app.*;
+import androidx.appcompat.app.*;
 import android.view.*;
 
 import org.isoron.androidbase.*;

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

@@ -19,7 +19,6 @@
 
 package org.isoron.androidbase.activities;
 
-import android.support.annotation.*;
 import android.view.*;
 
 /**

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

@@ -20,8 +20,8 @@
 package org.isoron.androidbase.activities;
 
 import android.content.*;
-import android.support.annotation.*;
+
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.*;
 import android.widget.*;
 

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

@@ -24,15 +24,16 @@ import android.graphics.*;
 import android.graphics.drawable.*;
 import android.net.*;
 import android.os.*;
-import android.support.annotation.*;
+
-import android.support.design.widget.*;
+import androidx.core.content.res.*;
-import android.support.v4.content.res.*;
+import androidx.appcompat.app.*;
-import android.support.v7.app.*;
+import androidx.appcompat.view.ActionMode;
-import android.support.v7.view.ActionMode;
+import androidx.appcompat.widget.Toolbar;
-import android.support.v7.widget.Toolbar;
 import android.view.*;
 import android.widget.*;
 
+import com.google.android.material.snackbar.Snackbar;
+
 import org.isoron.androidbase.*;
 import org.isoron.androidbase.utils.*;
 
@@ -40,7 +41,7 @@ import java.io.*;
 
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.Build.VERSION_CODES.LOLLIPOP;
-import static android.support.v4.content.FileProvider.getUriForFile;
+import static androidx.core.content.FileProvider.getUriForFile;
 
 /**
  * Base class for all screens in the application.

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

@@ -19,8 +19,7 @@
 
 package org.isoron.androidbase.activities;
 
-import android.support.annotation.*;
+import androidx.appcompat.view.ActionMode;
-import android.support.v7.view.ActionMode;
 import android.view.*;
 
 /**

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

@@ -20,7 +20,6 @@
 package org.isoron.androidbase.utils;
 
 import android.os.*;
-import android.support.annotation.*;
 import android.util.*;
 
 import java.io.*;

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

@@ -22,8 +22,8 @@ package org.isoron.androidbase.utils;
 import android.content.*;
 import android.content.res.*;
 import android.graphics.*;
-import android.support.annotation.*;
+
-import android.support.v4.view.*;
+import androidx.core.view.*;
 import android.util.*;
 import android.view.*;
 import android.widget.*;

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

@@ -22,7 +22,6 @@ package org.isoron.androidbase.utils;
 import android.content.*;
 import android.content.res.*;
 import android.graphics.drawable.*;
-import android.support.annotation.*;
 
 import org.isoron.androidbase.*;
 

android/android-pickers/build.gradle

@@ -20,5 +20,5 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 }

android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java

@@ -18,8 +18,8 @@ package com.android.colorpicker;
 
 import android.app.*;
 import android.os.*;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.app.*;
+import androidx.appcompat.app.*;
 import android.view.*;
 import android.widget.*;
 

android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java

@@ -21,13 +21,15 @@ import android.content.res.*;
 import android.graphics.*;
 import android.graphics.Paint.*;
 import android.os.*;
-import android.support.v4.view.*;
+import androidx.core.view.*;
-import android.support.v4.view.accessibility.*;
+import androidx.core.view.accessibility.*;
-import android.support.v4.widget.*;
+import androidx.core.widget.*;
 import android.text.format.*;
 import android.view.*;
 import android.view.accessibility.*;
 
+import androidx.customview.widget.ExploreByTouchHelper;
+
 import com.android.*;
 import com.android.datetimepicker.*;
 import com.android.datetimepicker.date.MonthAdapter.*;

android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java

@@ -23,7 +23,7 @@ import android.app.*;
 import android.content.*;
 import android.content.res.*;
 import android.os.*;
-import android.support.v7.app.*;
+import androidx.appcompat.app.*;
 import android.util.*;
 import android.view.*;
 import android.view.View.*;

android/gradle.properties

@@ -14,3 +14,5 @@ BUILD_TOOLS_VERSION = 3.5.3
 org.gradle.parallel=false
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms2048m -Xmx2048m -XX:MaxPermSize=2048m
+android.useAndroidX=true
+android.enableJetifier=true

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 'androidx.appcompat:appcompat:1.0.0'
-    implementation "com.android.support:design:$SUPPORT_LIBRARY_VERSION"
+    implementation 'com.google.android.material:material:1.0.0'
-    implementation "com.android.support:preference-v14:$SUPPORT_LIBRARY_VERSION"
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
-    implementation "com.android.support:support-v4:$SUPPORT_LIBRARY_VERSION"
+    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"
@@ -94,16 +94,16 @@ dependencies {
     kapt "com.jakewharton:butterknife-compiler:9.0.0"
     annotationProcessor "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
 
-    androidTestImplementation "com.android.support.test.espresso:espresso-contrib:2.2.2"
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0'
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:2.2.2"
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
-    androidTestImplementation "com.android.support.test.uiautomator:uiautomator-v18:2.1.1"
+    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 'androidx.annotation:annotation:1.0.0'
-    androidTestImplementation "com.android.support.test:rules:0.5"
+    androidTestImplementation 'androidx.test:rules:1.1.1'
-    androidTestImplementation "com.android.support.test:runner:0.5"
+    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"

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

@@ -23,11 +23,13 @@ import android.appwidget.*;
 import android.content.*;
 import android.content.res.*;
 import android.os.*;
-import android.support.annotation.*;
+
-import android.support.test.*;
+import androidx.test.*;
-import android.support.test.filters.*;
+import androidx.test.filters.*;
 import android.util.*;
 
+import androidx.test.platform.app.InstrumentationRegistry;
+
 import junit.framework.*;
 
 import org.isoron.androidbase.*;

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

@@ -20,7 +20,7 @@
 package org.isoron.uhabits;
 
 import android.content.*;
-import android.support.test.uiautomator.*;
+import androidx.test.uiautomator.*;
 
 import com.linkedin.android.testbutler.*;
 
@@ -30,8 +30,7 @@ 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 androidx.test.uiautomator.UiDevice.*;
-import static android.support.test.uiautomator.UiDevice.*;
 
 public class BaseUserInterfaceTest
 {

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

@@ -20,11 +20,13 @@
 package org.isoron.uhabits;
 
 import android.graphics.*;
-import android.support.annotation.*;
+
-import android.support.test.*;
+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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.androidbase.*;
 import org.junit.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.junit.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.junit.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.junit.*;

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.*;

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

@@ -19,22 +19,23 @@
 
 package org.isoron.uhabits.acceptance.steps;
 
-import android.support.annotation.*;
+import androidx.test.espresso.*;
-import android.support.test.espresso.*;
+import androidx.test.espresso.contrib.*;
-import android.support.test.espresso.contrib.*;
+import androidx.test.uiautomator.*;
-import android.support.test.uiautomator.*;
+import androidx.appcompat.widget.*;
-import android.support.v7.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 androidx.test.espresso.Espresso.*;
-import static android.support.test.espresso.action.ViewActions.*;
+import static androidx.test.espresso.action.ViewActions.*;
-import static android.support.test.espresso.assertion.PositionAssertions.*;
+import static androidx.test.espresso.assertion.PositionAssertions.*;
-import static android.support.test.espresso.assertion.ViewAssertions.*;
+import static androidx.test.espresso.assertion.ViewAssertions.*;
-import static android.support.test.espresso.matcher.ViewMatchers.*;
+import static androidx.test.espresso.matcher.ViewMatchers.*;
 import static junit.framework.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
 

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 androidx.test.espresso.Espresso.*;
-import static android.support.test.espresso.action.ViewActions.*;
+import static androidx.test.espresso.action.ViewActions.*;
-import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
-import static android.support.test.espresso.matcher.ViewMatchers.*;
+import static androidx.test.espresso.matcher.ViewMatchers.*;
 import static org.isoron.uhabits.BaseUserInterfaceTest.*;
 
 public class EditHabitSteps

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 androidx.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
+import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
-import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
+import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
-import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
+import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withParent;
+import static androidx.test.espresso.matcher.ViewMatchers.withParent;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+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;

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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.utils.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;

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 androidx.test.ext.junit.runners.AndroidJUnit4
-import android.support.test.runner.*
+import androidx.test.filters.*
+import androidx.test.runner.*
 import org.isoron.uhabits.*
 import org.isoron.uhabits.core.models.*
 import org.isoron.uhabits.utils.*

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 androidx.test.ext.junit.runners.AndroidJUnit4
-import android.support.test.runner.*
+import androidx.test.filters.*
+import androidx.test.runner.*
 import org.hamcrest.CoreMatchers.*
 import org.hamcrest.MatcherAssert.*
 import org.isoron.uhabits.*

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 androidx.test.ext.junit.runners.AndroidJUnit4
-import android.support.test.runner.*
+import androidx.test.filters.*
+import androidx.test.runner.*
 import org.isoron.uhabits.*
 import org.isoron.uhabits.core.models.*
 import org.junit.*

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.preferences.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.ui.screens.habits.list.*;

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 androidx.test.ext.junit.runners.AndroidJUnit4
-import android.support.test.runner.*
+import androidx.test.filters.*
+import androidx.test.runner.*
 import org.hamcrest.CoreMatchers.*
 import org.hamcrest.MatcherAssert.*
 import org.isoron.uhabits.*

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 androidx.test.ext.junit.runners.AndroidJUnit4
-import android.support.test.runner.*
+import androidx.test.filters.*
+import androidx.test.runner.*
 import org.hamcrest.CoreMatchers.*
 import org.hamcrest.MatcherAssert.*
 import org.isoron.uhabits.*

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;

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.*

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.junit.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.junit.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+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.*;

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 androidx.test.filters.*;
-import android.support.test.runner.*;
+import androidx.test.runner.*;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;

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">

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.*

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

@@ -20,7 +20,6 @@
 package org.isoron.uhabits.activities.about;
 
 import android.content.*;
-import android.support.annotation.*;
 import android.widget.*;
 
 import org.isoron.androidbase.activities.*;

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

@@ -19,7 +19,6 @@
 
 package org.isoron.uhabits.activities.about;
 
-import android.support.annotation.*;
 import android.widget.*;
 
 import org.isoron.androidbase.activities.*;

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

@@ -20,8 +20,8 @@
 package org.isoron.uhabits.activities.common.dialogs;
 
 import android.content.*;
-import android.support.annotation.*;
+
-import android.support.v7.app.*;
+import androidx.appcompat.app.*;
 
 import com.google.auto.factory.*;
 

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

@@ -22,9 +22,9 @@ 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 androidx.appcompat.app.AlertDialog;
-import android.support.v7.app.*;
+import androidx.appcompat.app.*;
 import android.util.*;
 
 import org.isoron.uhabits.*;

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.*

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 androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.app.AppCompatDialogFragment;
+import androidx.appcompat.app.AppCompatDialogFragment;
 
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.core.models.WeekdayList;

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

@@ -21,7 +21,6 @@ package org.isoron.uhabits.activities.common.views;
 
 import android.content.*;
 import android.graphics.*;
-import android.support.annotation.*;
 import android.util.*;
 
 import org.isoron.androidbase.utils.*;

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(

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

@@ -21,7 +21,6 @@ package org.isoron.uhabits.activities.common.views;
 
 import android.content.*;
 import android.graphics.*;
-import android.support.annotation.*;
 import android.util.*;
 
 import org.isoron.androidbase.utils.*;

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

@@ -22,7 +22,6 @@ 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.*;
 

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

@@ -21,7 +21,6 @@ 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.*;

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

@@ -21,7 +21,6 @@ package org.isoron.uhabits.activities.common.views;
 
 import android.content.*;
 import android.graphics.*;
-import android.support.annotation.*;
 import android.util.*;
 
 import org.isoron.androidbase.utils.*;

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

@@ -22,8 +22,8 @@ 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.appcompat.app.*;
 import android.text.format.*;
 import android.view.*;
 

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

@@ -20,7 +20,6 @@
 package org.isoron.uhabits.activities.habits.edit;
 
 import android.os.*;
-import android.support.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

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

@@ -20,7 +20,6 @@
 package org.isoron.uhabits.activities.habits.edit.views;
 
 import android.content.*;
-import android.support.annotation.*;
 import android.text.*;
 import android.util.*;
 import android.view.*;

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

@@ -22,7 +22,6 @@ 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.*;

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

@@ -22,7 +22,6 @@ 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.*;

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

@@ -21,7 +21,6 @@ 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.*;

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

@@ -21,7 +21,6 @@ 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.*;

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.*

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.*

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

@@ -19,10 +19,11 @@
 
 package org.isoron.uhabits.activities.habits.list.views;
 
-import android.support.annotation.*;
+import androidx.appcompat.widget.*;
-import android.support.v7.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.*;

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 androidx.appcompat.widget.*
-import android.support.v7.widget.helper.*
+import androidx.recyclerview.widget.*
-import android.support.v7.widget.helper.ItemTouchHelper.*
+import androidx.recyclerview.widget.ItemTouchHelper.*
 import android.view.*
 import com.google.auto.factory.*
 import dagger.*

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)

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

@@ -21,8 +21,8 @@ package org.isoron.uhabits.activities.habits.show;
 
 import android.content.*;
 import android.os.*;
-import android.support.annotation.*;
+
-import android.support.v7.widget.*;
+import androidx.appcompat.widget.*;
 
 import org.isoron.androidbase.activities.*;
 import org.isoron.androidbase.utils.*;

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

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

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

@@ -19,7 +19,6 @@
 
 package org.isoron.uhabits.activities.habits.show;
 
-import android.support.annotation.*;
 import android.view.*;
 
 import org.isoron.androidbase.activities.*;

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

@@ -20,7 +20,6 @@
 package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
-import android.support.annotation.*;
 import android.util.*;
 import android.widget.*;
 

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

@@ -20,7 +20,6 @@
 package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
-import android.support.annotation.*;
 import android.util.*;
 import android.widget.*;
 

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

@@ -20,7 +20,6 @@
 package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
-import android.support.annotation.*;
 import android.util.*;
 import android.widget.*;
 

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

@@ -20,7 +20,6 @@
 package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
-import android.support.annotation.*;
 import android.util.*;
 import android.widget.*;
 

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

@@ -20,12 +20,10 @@
 package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
-import android.support.annotation.*;
 import android.util.*;
 import android.widget.*;
 
 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.*;

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

@@ -20,7 +20,6 @@
 package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
-import android.support.annotation.*;
 import android.util.*;
 import android.widget.*;
 

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.*;

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

@@ -24,8 +24,6 @@ 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 org.isoron.uhabits.R;

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 androidx.appcompat.widget.*
-import android.support.v7.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
 import android.widget.*
 import butterknife.*
 import org.isoron.androidbase.activities.*

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(

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 androidx.core.app.*
-import android.support.v4.app.NotificationCompat.*
+import androidx.core.app.NotificationCompat.*
 import android.util.*
 import org.isoron.androidbase.*
 import org.isoron.uhabits.R