diff --git a/android/android-base/build.gradle b/android/android-base/build.gradle index a1e30ef8..6d7628ea 100644 --- a/android/android-base/build.gradle +++ b/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.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION" + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0' implementation "org.apache.commons:commons-lang3:3.5" annotationProcessor "com.google.dagger:dagger-compiler:$DAGGER_VERSION" diff --git a/android/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.java b/android/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.java index e50e2b04..b4c6484b 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.java +++ b/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.*; diff --git a/android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.java b/android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.java index 3e40aed4..7c0478cd 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.java +++ b/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.*; diff --git a/android/android-base/src/main/java/org/isoron/androidbase/BaseExceptionHandler.java b/android/android-base/src/main/java/org/isoron/androidbase/BaseExceptionHandler.java index 3a04b8b4..212d64b9 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/BaseExceptionHandler.java +++ b/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 diff --git a/android/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.java b/android/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.java index c488bbc1..eb3716f8 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.java +++ b/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.*; diff --git a/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java index fae8c82b..ee1d5a40 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java +++ b/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.*; diff --git a/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseMenu.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseMenu.java index 7cba01dd..e8bf563a 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseMenu.java +++ b/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.*; /** diff --git a/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseRootView.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseRootView.java index 21c0322f..fbaab1aa 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseRootView.java +++ b/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.*; diff --git a/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseScreen.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseScreen.java index f135a6e6..ac424981 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseScreen.java +++ b/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 android.support.v4.content.res.*; -import android.support.v7.app.*; -import android.support.v7.view.ActionMode; -import android.support.v7.widget.Toolbar; + +import androidx.core.content.res.*; +import androidx.appcompat.app.*; +import androidx.appcompat.view.ActionMode; +import androidx.appcompat.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. diff --git a/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java index 87396e21..7a49076b 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java +++ b/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 android.support.v7.view.ActionMode; +import androidx.appcompat.view.ActionMode; import android.view.*; /** diff --git a/android/android-base/src/main/java/org/isoron/androidbase/utils/FileUtils.java b/android/android-base/src/main/java/org/isoron/androidbase/utils/FileUtils.java index 59ca4a9b..30a367e0 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/utils/FileUtils.java +++ b/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.*; diff --git a/android/android-base/src/main/java/org/isoron/androidbase/utils/InterfaceUtils.java b/android/android-base/src/main/java/org/isoron/androidbase/utils/InterfaceUtils.java index e1fea418..3c77e3e3 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/utils/InterfaceUtils.java +++ b/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.*; diff --git a/android/android-base/src/main/java/org/isoron/androidbase/utils/StyledResources.java b/android/android-base/src/main/java/org/isoron/androidbase/utils/StyledResources.java index d15766f9..fe7c5be8 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/utils/StyledResources.java +++ b/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.*; diff --git a/android/android-pickers/build.gradle b/android/android-pickers/build.gradle index 02f9aaaa..0627c16c 100644 --- a/android/android-pickers/build.gradle +++ b/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' } diff --git a/android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java b/android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java index 1060faf5..a4f50339 100644 --- a/android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java +++ b/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 android.support.v7.app.*; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.*; import android.view.*; import android.widget.*; diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java b/android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java index eff8b818..79cda6b8 100644 --- a/android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java +++ b/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 android.support.v4.view.accessibility.*; -import android.support.v4.widget.*; +import androidx.core.view.*; +import androidx.core.view.accessibility.*; +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.*; diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java b/android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java index 06c121b3..b5e021a2 100644 --- a/android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java +++ b/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.*; diff --git a/android/gradle.properties b/android/gradle.properties index 6745c801..be1cc8ad 100644 --- a/android/gradle.properties +++ b/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 diff --git a/android/uhabits-android/build.gradle b/android/uhabits-android/build.gradle index 3db986e8..1c4c11da 100644 --- 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" @@ -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 "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" diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java index 71429939..ae7d1357 100644 --- 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,13 @@ 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.test.*; +import androidx.test.filters.*; import android.util.*; +import androidx.test.platform.app.InstrumentationRegistry; + import junit.framework.*; import org.isoron.androidbase.*; diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java index 142de3e9..5a55fbeb 100644 --- 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,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 android.support.test.uiautomator.UiDevice.*; +import static androidx.test.uiautomator.UiDevice.*; public class BaseUserInterfaceTest { diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java index 62f4841d..643a9a31 100644 --- 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,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.*; diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java index ea625adc..222d7e93 100644 --- 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.*; diff --git 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 index 7fcd2d31..6ee63aba 100644 --- 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.*; diff --git 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 index 035e0c15..8901f177 100644 --- 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.*; diff --git 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 index fc0a729d..e229b34e 100644 --- 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.*; diff --git 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 index f5bcb428..2c0f8952 100644 --- 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.*; diff --git 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 index 0a7c2646..fdfb8592 100644 --- 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,23 @@ 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.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.*; diff --git 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 index 56440730..90293cc2 100644 --- 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 diff --git 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 index fe93da24..99d739e1 100644 --- 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; diff --git 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 index c8d70f22..3cb5a201 100644 --- 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.*; diff --git 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 index 5a5b4255..832b6c78 100644 --- 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.*; diff --git 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 index eaf1c256..ff492ef4 100644 --- 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.*; diff --git 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 index e4d1ba76..d3fef375 100644 --- 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.*; diff --git 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 index 3b6907ca..55f994e4 100644 --- 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.*; diff --git 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 index 759d2e71..21639212 100644 --- 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.*; diff --git 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 index c145b479..fc82e1b5 100644 --- 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.*; diff --git 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 index 9c6e5253..41dc80c0 100644 --- 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.* diff --git 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 index bfe411cb..024b0fa7 100644 --- 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.* diff --git 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 index 5660b862..19a48213 100644 --- 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.* diff --git 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 index 4c347c2a..71f203e4 100644 --- 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.*; diff --git 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 index 2bae8048..b6baabb3 100644 --- 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.*; diff --git 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 index d64830e2..1c83fdb4 100644 --- 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.* diff --git 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 index 616c00c4..2a660b2a 100644 --- 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.* diff --git 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 index 571f00c4..d8ceac38 100644 --- 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.*; diff --git 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 index 1313e8af..a912f24a 100644 --- 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.*; diff --git 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 index 82b28ef7..9afe0014 100644 --- 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.*; diff --git 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 index 39aee864..51901e89 100644 --- 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.*; diff --git 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 index 07927bcc..ebe8aed4 100644 --- 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.*; diff --git 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 index eb29d115..8c0f3763 100644 --- 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.*; diff --git 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 index 49ea79bc..0dba9879 100644 --- 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.*; diff --git 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 index 1418c56c..5d783ad1 100644 --- 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.* diff --git 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 index 0546713f..9ae51a61 100644 --- 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.*; diff --git 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 index 1033233b..c383c933 100644 --- 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.*; diff --git 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 index d0b14553..0aeb4762 100644 --- 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.*; diff --git 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 index 6739322c..31a459af 100644 --- 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.*; diff --git 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 index bbab26e6..f059d99c 100644 --- 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.*; diff --git 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 index 7af5ea3f..550984b6 100644 --- 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.*; diff --git 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 index 91d0cf69..a9d4e6f8 100644 --- 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.*; diff --git 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 index a40ac45c..f0354a5d 100644 --- 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.*; diff --git a/android/uhabits-android/src/main/AndroidManifest.xml b/android/uhabits-android/src/main/AndroidManifest.xml index acf3695c..0c298306 100644 --- a/android/uhabits-android/src/main/AndroidManifest.xml +++ b/android/uhabits-android/src/main/AndroidManifest.xml @@ -210,7 +210,7 @@ diff --git 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 index 4a1dcadd..24c3f0d1 100644 --- 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.* diff --git 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 index d5e8b078..610c8231 100644 --- 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,7 +20,6 @@ package org.isoron.uhabits.activities.about; import android.content.*; -import android.support.annotation.*; import android.widget.*; import org.isoron.androidbase.activities.*; diff --git 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 index 2799b57b..ad9bcdf5 100644 --- 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,7 +19,6 @@ package org.isoron.uhabits.activities.about; -import android.support.annotation.*; import android.widget.*; import org.isoron.androidbase.activities.*; diff --git 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 index 445cfb8d..a53f1c6a 100644 --- 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,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.*; diff --git 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 index 1ef2d155..9ce45125 100644 --- 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,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 android.support.v7.app.*; + +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.*; import android.util.*; import org.isoron.uhabits.*; diff --git 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 index 61aa65b9..d0e95931 100644 --- 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.* diff --git 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 index 753569b7..6f5b0ee0 100644 --- 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; diff --git 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 index 1ff047f6..8b279463 100644 --- 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,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.*; diff --git 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 index 6f9e1163..39fe209f 100644 --- 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 CREATOR = ParcelableCompat.newCreator( diff --git 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 index 92b4b293..58c797a7 100644 --- 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,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.*; diff --git 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 index 90370d5d..c05d3561 100644 --- 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,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.*; diff --git 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 index 8c70a42f..ff134585 100644 --- 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,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.*; diff --git 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 index 8cc79e96..cfabe5eb 100644 --- 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,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.*; diff --git 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 index 01b7133d..e1e044c9 100644 --- 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,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.*; diff --git 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 index a91c3b14..a06f91b6 100644 --- 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,6 @@ package org.isoron.uhabits.activities.habits.edit; import android.os.*; -import android.support.annotation.*; import org.isoron.uhabits.core.models.*; diff --git 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 index 1403a0b1..8e7fc289 100644 --- 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,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.*; diff --git 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 index aac5d47e..cdfa9306 100644 --- 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,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.*; diff --git 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 index ca7f4571..11ffa33a 100644 --- 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,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.*; diff --git 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 index 6d2c399e..e8fa7df6 100644 --- 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,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.*; diff --git 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 index 8ef88f13..7fa47196 100644 --- 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,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.*; diff --git 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 index 25377db0..268c1e06 100644 --- 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.* diff --git 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 index 5ff44cac..4cf89c36 100644 --- 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.* diff --git 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 index 6992391c..f8636286 100644 --- 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,11 @@ package org.isoron.uhabits.activities.habits.list.views; -import android.support.annotation.*; -import android.support.v7.widget.*; +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.*; diff --git 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 index 0989fb66..259d1f14 100644 --- 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.* diff --git 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 index ca820109..3f0b9d0c 100644 --- 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) diff --git 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 index 55966f0c..db55cc19 100644 --- 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,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.*; diff --git 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 index c74b412d..6c1f2adc 100644 --- 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,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.*; diff --git 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 index b7560a5d..d52642e8 100644 --- 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,7 +19,6 @@ package org.isoron.uhabits.activities.habits.show; -import android.support.annotation.*; import android.view.*; import org.isoron.androidbase.activities.*; diff --git 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 index 54031855..5079633a 100644 --- 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,7 +20,6 @@ package org.isoron.uhabits.activities.habits.show.views; import android.content.*; -import android.support.annotation.*; import android.util.*; import android.widget.*; diff --git 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 index ed482495..4fce2595 100644 --- 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,7 +20,6 @@ package org.isoron.uhabits.activities.habits.show.views; import android.content.*; -import android.support.annotation.*; import android.util.*; import android.widget.*; diff --git 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 index f00754dd..5cd1ae3d 100644 --- 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,7 +20,6 @@ package org.isoron.uhabits.activities.habits.show.views; import android.content.*; -import android.support.annotation.*; import android.util.*; import android.widget.*; diff --git 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 index 74604aa6..ff285d31 100644 --- 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,7 +20,6 @@ package org.isoron.uhabits.activities.habits.show.views; import android.content.*; -import android.support.annotation.*; import android.util.*; import android.widget.*; diff --git 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 index 1637ffb5..70516bc9 100644 --- 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,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.*; diff --git 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 index cdaabdc3..cd1c7b4e 100644 --- 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,7 +20,6 @@ package org.isoron.uhabits.activities.habits.show.views; import android.content.*; -import android.support.annotation.*; import android.util.*; import android.widget.*; diff --git 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 index 4f3d6f5f..699e21af 100644 --- 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.*; diff --git 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 index 41bb7beb..1bd76df2 100644 --- 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,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; diff --git 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 index ac30043b..83de784e 100644 --- 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.* diff --git 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 index 860e2f73..0901a083 100644 --- 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( diff --git 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 index 0e91220a..2b903699 100644 --- 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 diff --git 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 index f4866960..113a883f 100644 --- 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,14 @@ package org.isoron.uhabits.notifications; import android.app.*; import android.os.*; -import android.support.annotation.*; -import android.support.v4.app.*; + +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.*; diff --git 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 index 23ad67f4..9e5e7c3e 100644 --- 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,6 @@ package org.isoron.uhabits.receivers; import android.content.*; import android.net.*; -import android.support.annotation.*; import org.isoron.uhabits.core.*; import org.isoron.uhabits.core.models.*; diff --git 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 index c320601e..bf1c54c7 100644 --- 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,12 @@ package org.isoron.uhabits.receivers; import android.content.*; -import android.support.annotation.*; import android.util.*; import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.utils.*; -import java.util.*; - import static android.content.ContentUris.*; /** diff --git 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 index dba845cf..7c5e9fb6 100644 --- 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,8 +19,6 @@ package org.isoron.uhabits.sync; -import android.support.annotation.*; - import org.isoron.uhabits.core.database.*; @Table(name = "Events") diff --git 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 index 5d60009c..847b116d 100644 --- 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,7 +19,6 @@ package org.isoron.uhabits.sync; -import android.support.annotation.*; import android.util.*; import org.isoron.androidbase.*; diff --git 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 index b844e33d..12adf46f 100644 --- 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.*; diff --git 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 index fc528849..6dd73ba7 100644 --- 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,6 @@ package org.isoron.uhabits.tasks; import android.content.*; -import android.support.annotation.*; import com.google.auto.factory.*; diff --git 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 index 52e53695..67398367 100644 --- 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,8 +19,6 @@ package org.isoron.uhabits.tasks; -import android.support.annotation.*; - import com.google.auto.factory.*; import org.isoron.uhabits.core.io.*; diff --git 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 index 81e72b3b..f97d490c 100644 --- 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,8 +18,6 @@ */ package org.isoron.uhabits.utils; -import android.support.annotation.*; - import org.isoron.uhabits.core.utils.*; import java.text.*; diff --git 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 index 67c9de53..640b9968 100644 --- 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,8 @@ package org.isoron.uhabits.utils; import android.content.*; -import android.support.annotation.*; -import android.support.annotation.Nullable; + +import androidx.annotation.Nullable; import android.util.*; import org.jetbrains.annotations.*; diff --git 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 index 8f99eb42..b3d1e0b3 100644 --- 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,6 @@ package org.isoron.uhabits.utils; import android.content.*; import android.database.sqlite.*; -import android.support.annotation.*; import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; diff --git 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 index a613f884..fc0713de 100644 --- 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,14 @@ package org.isoron.uhabits.utils import android.graphics.* -import android.support.annotation.* +import androidx.annotation.* import android.support.design.widget.* -import android.support.v7.widget.Toolbar +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.* diff --git 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 index 3ada71b5..a55d3bb9 100644 --- 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,8 +22,6 @@ 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.*; diff --git 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 index fec0c2e4..c498955a 100644 --- 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,8 +22,6 @@ 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 org.isoron.uhabits.*; diff --git 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 index 74a4545f..71f422e5 100644 --- 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,7 +3,6 @@ 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.*; diff --git 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 index b22b515a..6fa89354 100644 --- 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,7 +20,6 @@ package org.isoron.uhabits.widgets.views; import android.content.*; -import android.support.annotation.*; import android.util.*; import android.widget.*; diff --git 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 index 54b755f8..ad66c872 100644 --- 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; diff --git 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 index e11fda10..f6d7f8ee 100644 --- 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,7 +20,6 @@ package org.isoron.uhabits.widgets.views; import android.content.*; -import android.support.annotation.*; import android.view.*; import android.widget.*; diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java index 2601192f..a11761f7 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java @@ -23,7 +23,6 @@ import android.content.*; import android.graphics.*; import android.graphics.drawable.*; import android.graphics.drawable.shapes.*; -import android.support.annotation.*; import android.util.*; import android.view.*; import android.widget.*; diff --git a/android/uhabits-android/src/main/res/layout/about.xml b/android/uhabits-android/src/main/res/layout/about.xml index d0787618..f36bd68d 100644 --- a/android/uhabits-android/src/main/res/layout/about.xml +++ b/android/uhabits-android/src/main/res/layout/about.xml @@ -25,7 +25,7 @@ android:background="?windowBackgroundColor" android:fillViewport="true"> - diff --git a/android/uhabits-android/src/main/res/layout/automation.xml b/android/uhabits-android/src/main/res/layout/automation.xml index f127a9f2..a34e55bb 100644 --- a/android/uhabits-android/src/main/res/layout/automation.xml +++ b/android/uhabits-android/src/main/res/layout/automation.xml @@ -24,7 +24,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - - + - @@ -65,6 +65,6 @@ android:layout_height="wrap_content" android:hint="@string/question" app:example="@string/example_question_numerical"/> - + \ No newline at end of file diff --git a/android/uhabits-android/src/main/res/layout/edit_habit_target.xml b/android/uhabits-android/src/main/res/layout/edit_habit_target.xml index d332cc82..064b0ee3 100644 --- a/android/uhabits-android/src/main/res/layout/edit_habit_target.xml +++ b/android/uhabits-android/src/main/res/layout/edit_habit_target.xml @@ -29,7 +29,7 @@ style="@style/dialogFormLabel" android:text="@string/target"/> - @@ -43,9 +43,9 @@ android:inputType="numberDecimal" android:text="@string/default_count" /> - + - @@ -58,5 +58,5 @@ android:hint="@string/unit" android:inputType="text" app:example="@string/example_units"/> - + \ No newline at end of file diff --git a/android/uhabits-android/src/main/res/layout/settings_activity.xml b/android/uhabits-android/src/main/res/layout/settings_activity.xml index 16d9003d..ae11d3ce 100644 --- a/android/uhabits-android/src/main/res/layout/settings_activity.xml +++ b/android/uhabits-android/src/main/res/layout/settings_activity.xml @@ -26,7 +26,7 @@ tools:context=".activities.settings.SettingsActivity" tools:ignore="MergeRootFrame"> - diff --git a/android/uhabits-android/src/main/res/layout/show_habit.xml b/android/uhabits-android/src/main/res/layout/show_habit.xml index 9defc60d..533814bd 100644 --- a/android/uhabits-android/src/main/res/layout/show_habit.xml +++ b/android/uhabits-android/src/main/res/layout/show_habit.xml @@ -25,7 +25,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - . --> -