From 9ac1ae99159bf6a638400428bc987645aec5ce18 Mon Sep 17 00:00:00 2001 From: olegivo Date: Sat, 4 Jan 2020 17:00:17 +0300 Subject: [PATCH] automatic migration --- android/android-base/build.gradle | 4 ++-- .../androidbase/AndroidBugReporter.java | 1 - .../isoron/androidbase/AndroidDirFinder.java | 4 ++-- .../androidbase/BaseExceptionHandler.java | 2 -- .../androidbase/SSLContextProvider.java | 3 --- .../androidbase/activities/BaseActivity.java | 4 ++-- .../androidbase/activities/BaseMenu.java | 1 - .../androidbase/activities/BaseRootView.java | 4 ++-- .../androidbase/activities/BaseScreen.java | 15 +++++++------ .../activities/BaseSelectionMenu.java | 3 +-- .../isoron/androidbase/utils/FileUtils.java | 1 - .../androidbase/utils/InterfaceUtils.java | 4 ++-- .../androidbase/utils/StyledResources.java | 1 - android/android-pickers/build.gradle | 2 +- .../colorpicker/ColorPickerDialog.java | 4 ++-- .../datetimepicker/date/MonthView.java | 8 ++++--- .../datetimepicker/time/TimePickerDialog.java | 2 +- android/gradle.properties | 2 ++ android/uhabits-android/build.gradle | 22 +++++++++---------- .../org/isoron/uhabits/BaseAndroidTest.java | 8 ++++--- .../isoron/uhabits/BaseUserInterfaceTest.java | 5 ++--- .../java/org/isoron/uhabits/BaseViewTest.java | 6 +++-- .../isoron/uhabits/HabitsApplicationTest.java | 6 +++-- .../isoron/uhabits/acceptance/AboutTest.java | 6 +++-- .../isoron/uhabits/acceptance/HabitsTest.java | 6 +++-- .../isoron/uhabits/acceptance/LinksTest.java | 6 +++-- .../isoron/uhabits/acceptance/WidgetTest.java | 2 +- .../uhabits/acceptance/steps/CommonSteps.java | 21 +++++++++--------- .../acceptance/steps/EditHabitSteps.java | 10 ++++----- .../acceptance/steps/ListHabitsSteps.java | 20 ++++++++--------- .../uhabits/acceptance/steps/WidgetSteps.java | 2 +- .../activities/common/views/BarChartTest.java | 6 +++-- .../common/views/FrequencyChartTest.java | 6 +++-- .../common/views/HistoryChartTest.java | 6 +++-- .../activities/common/views/RingViewTest.java | 6 +++-- .../common/views/ScoreChartTest.java | 6 +++-- .../common/views/StreakChartTest.java | 6 +++-- .../list/views/CheckmarkButtonViewTest.kt | 5 +++-- .../list/views/CheckmarkPanelViewTest.kt | 5 +++-- .../habits/list/views/HabitCardViewTest.kt | 5 +++-- .../habits/list/views/HeaderViewTest.java | 6 +++-- .../habits/list/views/HintViewTest.java | 6 +++-- .../habits/list/views/NumberButtonViewTest.kt | 5 +++-- .../habits/list/views/NumberPanelViewTest.kt | 5 +++-- .../habits/show/views/FrequencyCardTest.java | 6 +++-- .../habits/show/views/HistoryCardTest.java | 6 +++-- .../habits/show/views/OverviewCardTest.java | 6 +++-- .../habits/show/views/ScoreCardTest.java | 6 +++-- .../habits/show/views/StreakCardTest.java | 6 +++-- .../habits/show/views/SubtitleCardTest.java | 6 +++-- .../uhabits/performance/PerformanceTest.java | 6 +++-- .../uhabits/regression/SavedStateTest.kt | 2 +- .../uhabits/tasks/ExportCSVTaskTest.java | 6 +++-- .../uhabits/tasks/ExportDBTaskTest.java | 6 +++-- .../uhabits/widgets/CheckmarkWidgetTest.java | 6 +++-- .../uhabits/widgets/FrequencyWidgetTest.java | 6 +++-- .../uhabits/widgets/HistoryWidgetTest.java | 6 +++-- .../uhabits/widgets/ScoreWidgetTest.java | 6 +++-- .../uhabits/widgets/StreakWidgetTest.java | 6 +++-- .../views/CheckmarkWidgetViewTest.java | 6 +++-- .../src/main/AndroidManifest.xml | 2 +- .../activities/AndroidThemeSwitcher.kt | 2 +- .../activities/about/AboutRootView.java | 1 - .../uhabits/activities/about/AboutScreen.java | 1 - .../common/dialogs/ConfirmDeleteDialog.java | 4 ++-- .../common/dialogs/HistoryEditorDialog.java | 6 ++--- .../common/dialogs/NumberPickerFactory.kt | 2 +- .../common/dialogs/WeekdayPickerDialog.java | 8 +++---- .../activities/common/views/BarChart.java | 1 - .../common/views/BundleSavedState.java | 5 +++-- .../common/views/FrequencyChart.java | 1 - .../activities/common/views/HistoryChart.java | 1 - .../activities/common/views/RingView.java | 1 - .../activities/common/views/ScoreChart.java | 1 - .../habits/edit/EditHabitDialog.java | 4 ++-- .../habits/edit/EditHabitDialogFactory.java | 1 - .../habits/edit/views/ExampleEditText.java | 1 - .../habits/edit/views/FrequencyPanel.java | 1 - .../edit/views/NameDescriptionPanel.java | 1 - .../habits/edit/views/ReminderPanel.java | 1 - .../habits/edit/views/TargetPanel.java | 1 - .../habits/list/ListHabitsRootView.kt | 2 +- .../habits/list/ListHabitsScreen.kt | 2 +- .../list/views/HabitCardListAdapter.java | 5 +++-- .../habits/list/views/HabitCardListView.kt | 6 ++--- .../habits/list/views/HabitCardViewHolder.kt | 3 ++- .../habits/show/ShowHabitRootView.java | 4 ++-- .../habits/show/ShowHabitScreen.java | 2 -- .../habits/show/ShowHabitsMenu.java | 1 - .../activities/habits/show/views/BarCard.java | 1 - .../habits/show/views/FrequencyCard.java | 1 - .../habits/show/views/HabitCard.java | 1 - .../habits/show/views/HistoryCard.java | 1 - .../habits/show/views/OverviewCard.java | 2 -- .../habits/show/views/ScoreCard.java | 1 - .../habits/show/views/StreakCard.java | 2 -- .../activities/settings/SettingsFragment.java | 2 -- .../uhabits/automation/EditSettingRootView.kt | 4 ++-- .../uhabits/intents/PendingIntentFactory.kt | 2 +- .../notifications/AndroidNotificationTray.kt | 4 ++-- .../SnoozeDelayPickerActivity.java | 6 +++-- .../uhabits/receivers/ReminderController.java | 1 - .../uhabits/receivers/ReminderReceiver.java | 3 --- .../java/org/isoron/uhabits/sync/Event.java | 2 -- .../org/isoron/uhabits/sync/SyncManager.java | 1 - .../org/isoron/uhabits/sync/SyncService.java | 2 +- .../isoron/uhabits/tasks/ExportDBTask.java | 1 - .../isoron/uhabits/tasks/ImportDataTask.java | 2 -- .../uhabits/utils/AndroidDateFormats.java | 2 -- .../uhabits/utils/AttributeSetUtils.java | 4 ++-- .../isoron/uhabits/utils/DatabaseUtils.java | 1 - .../isoron/uhabits/utils/ViewExtensions.kt | 5 +++-- .../isoron/uhabits/widgets/BaseWidget.java | 2 -- .../uhabits/widgets/BaseWidgetProvider.java | 2 -- .../uhabits/widgets/StackWidgetService.java | 1 - .../widgets/views/CheckmarkWidgetView.java | 1 - .../widgets/views/EmptyWidgetView.java | 2 +- .../widgets/views/GraphWidgetView.java | 1 - .../widgets/views/HabitWidgetView.java | 1 - .../src/main/res/layout/about.xml | 2 +- .../src/main/res/layout/automation.xml | 6 ++--- .../main/res/layout/edit_habit_frequency.xml | 2 +- .../src/main/res/layout/edit_habit_name.xml | 8 +++---- .../src/main/res/layout/edit_habit_target.xml | 8 +++---- .../src/main/res/layout/settings_activity.xml | 2 +- .../src/main/res/layout/show_habit.xml | 2 +- .../src/main/res/layout/show_habit_bar.xml | 4 ++-- .../src/main/res/layout/show_habit_score.xml | 2 +- .../src/main/res/layout/toolbar.xml | 2 +- android/uhabits-core/build.gradle | 2 +- .../core/commands/ArchiveHabitsCommand.java | 2 +- .../commands/ChangeHabitColorCommand.java | 2 +- .../isoron/uhabits/core/commands/Command.java | 2 +- .../uhabits/core/commands/CommandParser.java | 2 +- .../uhabits/core/commands/CommandRunner.java | 2 +- .../core/commands/CreateHabitCommand.java | 2 +- .../commands/CreateRepetitionCommand.java | 2 +- .../core/commands/DeleteHabitsCommand.java | 2 +- .../core/commands/EditHabitCommand.java | 2 +- .../commands/ToggleRepetitionCommand.java | 2 +- .../core/commands/UnarchiveHabitsCommand.java | 2 +- .../isoron/uhabits/core/database/Cursor.java | 2 +- .../uhabits/core/database/DatabaseOpener.java | 2 +- .../core/database/MigrationHelper.java | 2 +- .../uhabits/core/database/Repository.java | 2 +- .../uhabits/core/io/AbstractImporter.java | 2 +- .../uhabits/core/io/GenericImporter.java | 2 +- .../uhabits/core/io/HabitBullCSVImporter.java | 2 +- .../uhabits/core/io/HabitsCSVExporter.java | 2 +- .../uhabits/core/io/LoopDBImporter.java | 2 +- .../uhabits/core/io/RewireDBImporter.java | 2 +- .../uhabits/core/io/TickmateDBImporter.java | 2 +- .../uhabits/core/models/CheckmarkList.java | 2 +- .../org/isoron/uhabits/core/models/Habit.java | 2 +- .../isoron/uhabits/core/models/HabitList.java | 2 +- .../isoron/uhabits/core/models/Reminder.java | 2 +- .../uhabits/core/models/RepetitionList.java | 2 +- .../isoron/uhabits/core/models/ScoreList.java | 2 +- .../uhabits/core/models/StreakList.java | 2 +- .../models/memory/MemoryCheckmarkList.java | 2 +- .../core/models/memory/MemoryHabitList.java | 2 +- .../models/memory/MemoryRepetitionList.java | 2 +- .../core/models/memory/MemoryScoreList.java | 2 +- .../core/models/memory/MemoryStreakList.java | 2 +- .../core/models/sqlite/SQLiteHabitList.java | 2 +- .../models/sqlite/SQLiteRepetitionList.java | 4 ++-- .../uhabits/core/preferences/Preferences.java | 2 +- .../core/preferences/PropertiesStorage.java | 2 +- .../core/reminders/ReminderScheduler.java | 2 +- .../uhabits/core/tasks/ExportCSVTask.java | 2 +- .../org/isoron/uhabits/core/tasks/Task.java | 2 +- .../uhabits/core/ui/NotificationTray.java | 2 +- .../isoron/uhabits/core/ui/ThemeSwitcher.java | 2 +- .../core/ui/screens/about/AboutBehavior.java | 2 +- .../habits/list/HabitCardListCache.java | 2 +- .../core/ui/screens/habits/list/HintList.java | 2 +- .../habits/list/ListHabitsBehavior.java | 2 +- .../habits/list/ListHabitsMenuBehavior.java | 2 +- .../list/ListHabitsSelectionMenuBehavior.java | 2 +- .../habits/show/ShowHabitBehavior.java | 2 +- .../habits/show/ShowHabitMenuBehavior.java | 2 +- .../core/ui/widgets/WidgetBehavior.java | 2 +- .../uhabits/core/utils/DateFormats.java | 2 +- .../isoron/uhabits/core/utils/DateUtils.java | 2 +- .../org/isoron/uhabits/core/BaseUnitTest.java | 2 +- .../core/commands/CommandParserTest.java | 2 +- .../core/models/RepetitionListTest.java | 2 +- .../sqlite/SQLiteRepetitionListTest.java | 2 +- .../core/preferences/PreferencesTest.java | 2 +- 189 files changed, 329 insertions(+), 313 deletions(-) diff --git a/android/android-base/build.gradle b/android/android-base/build.gradle index a1e30ef89..6d7628ea6 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 e50e2b04d..b4c6484ba 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 3e40aed4d..7c0478cdb 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 3a04b8b4f..212d64b9d 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 c488bbc16..eb3716f8c 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 fae8c82ba..ee1d5a403 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 7cba01ddc..e8bf563ab 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 21c0322f7..fbaab1aa7 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 f135a6e62..ac424981a 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 87396e216..7a49076b9 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 59ca4a9b4..30a367e0c 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 e1fea418b..3c77e3e39 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 d15766f95..fe7c5be8f 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 02f9aaaaf..0627c16ca 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 1060faf5b..a4f503392 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 eff8b8186..79cda6b80 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 06c121b3c..b5e021a23 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 6745c8011..be1cc8adc 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 3db986e8c..1c4c11daf 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 714299396..ae7d13575 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 142de3e92..5a55fbebf 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 62f4841d4..643a9a311 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 ea625adc6..222d7e93f 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 7fcd2d312..6ee63aba6 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 035e0c150..8901f177b 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 fc0a729d1..e229b34e2 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 f5bcb4285..2c0f89527 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 0a7c2646b..fdfb85925 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 56440730c..90293cc24 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 fe93da24e..99d739e1f 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 c8d70f22c..3cb5a201c 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 5a5b4255c..832b6c78f 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 eaf1c2568..ff492ef41 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 e4d1ba763..d3fef3755 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 3b6907ca5..55f994e4a 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 759d2e714..216392129 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 c145b4799..fc82e1b5f 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 9c6e52533..41dc80c0a 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 bfe411cb6..024b0fa7f 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 5660b862e..19a482136 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 4c347c2a5..71f203e40 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 2bae80483..b6baabb30 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 d64830e21..1c83fdb4b 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 616c00c4e..2a660b2a0 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 571f00c41..d8ceac381 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 1313e8afc..a912f24a7 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 82b28ef76..9afe0014d 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 39aee8640..51901e896 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 07927bccb..ebe8aed46 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 eb29d1155..8c0f3763e 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 49ea79bc4..0dba9879f 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 1418c56c7..5d783ad1f 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 0546713fa..9ae51a618 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 1033233b4..c383c9338 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 d0b14553b..0aeb4762f 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 6739322ce..31a459af3 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 bbab26e67..f059d99c1 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 7af5ea3fb..550984b65 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 91d0cf696..a9d4e6f8f 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 a40ac45c9..f0354a5d5 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 acf3695c0..0c298306b 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 4a1dcadd3..24c3f0d1e 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 d5e8b0780..610c8231a 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 2799b57b4..ad9bcdf52 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 445cfb8d0..a53f1c6ad 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 1ef2d1555..9ce45125a 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 61aa65b9e..d0e959311 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 753569b79..6f5b0ee06 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 1ff047f6a..8b279463b 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 6f9e1163d..39fe209fe 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 92b4b2935..58c797a78 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 90370d5dc..c05d35619 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 8c70a42fc..ff1345852 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 8cc79e96c..cfabe5ebb 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 01b7133dd..e1e044c93 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 a91c3b14a..a06f91b64 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 1403a0b13..8e7fc2897 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 aac5d47e7..cdfa93067 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 ca7f45715..11ffa33a2 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 6d2c399e7..e8fa7df62 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 8ef88f135..7fa471969 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 25377db0c..268c1e06a 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 5ff44cacb..4cf89c363 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 6992391c1..f8636286c 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 0989fb660..259d1f14a 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 ca820109c..3f0b9d0ca 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 55966f0c3..db55cc19f 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 c74b412da..6c1f2adc6 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 b7560a5d3..d52642e85 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 540318556..5079633a1 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 ed4824958..4fce25951 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 f00754dd0..5cd1ae3de 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 74604aa62..ff285d310 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 1637ffb5e..70516bc9b 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 cdaabdc3e..cd1c7b4e8 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 4f3d6f5f6..699e21af3 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 41bb7beb2..1bd76df2e 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 ac30043bc..83de784e1 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 860e2f735..0901a0836 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 0e91220ab..2b9036993 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 f4866960d..113a883f6 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 23ad67f4b..9e5e7c3e2 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 c320601e4..bf1c54c7c 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 dba845cf6..7c5e9fb69 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 5d60009c8..847b116d8 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 b844e33d8..12adf46f2 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 fc528849e..6dd73ba72 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 52e536955..673983673 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 81e72b3b0..f97d490cb 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 67c9de531..640b99688 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 8f99eb42d..b3d1e0b35 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 a613f884d..fc0713dea 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 3ada71b50..a55d3bb92 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 fec0c2e49..c498955ae 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 74a4545f2..71f422e5f 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 b22b515a0..6fa893546 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 54b755f8e..ad66c872d 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 e11fda10f..f6d7f8eea 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 2601192fc..a11761f78 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 d07876185..f36bd68d2 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 f127a9f2d..a34e55bbc 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 d332cc822..064b0ee36 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 16d9003df..ae11d3ce5 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 9defc60d1..533814bdf 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"> - - - - . --> -