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 b4c6484ba..c0b30d1d9 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 @@ -23,6 +23,8 @@ import android.content.*; import android.os.*; import android.view.*; +import androidx.annotation.NonNull; + import java.io.*; import java.text.*; import java.util.*; 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 7c0478cdb..cb61cad60 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 @@ -21,6 +21,8 @@ package org.isoron.androidbase; import android.content.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.core.content.*; import android.util.*; 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 212d64b9d..6a7e4e4d1 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,6 +19,9 @@ package org.isoron.androidbase; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + 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 eb3716f8c..a522cb023 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 @@ -21,6 +21,8 @@ package org.isoron.androidbase; import android.content.*; +import androidx.annotation.NonNull; + import java.io.*; import java.security.*; import java.security.cert.Certificate; 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 ee1d5a403..2dea22e50 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 @@ -22,6 +22,7 @@ package org.isoron.androidbase.activities; import android.content.*; import android.os.*; +import androidx.annotation.Nullable; import androidx.appcompat.app.*; import android.view.*; 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 e8bf563ab..c5113a3fa 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 @@ -21,6 +21,9 @@ package org.isoron.androidbase.activities; import android.view.*; +import androidx.annotation.MenuRes; +import androidx.annotation.NonNull; + /** * Base class for all the menus in the application. *

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 fbaab1aa7..3ff339387 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 @@ -21,6 +21,8 @@ package org.isoron.androidbase.activities; import android.content.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; 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 ac424981a..331d91742 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 @@ -25,6 +25,9 @@ import android.graphics.drawable.*; import android.net.*; import android.os.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import androidx.core.content.res.*; import androidx.appcompat.app.*; import androidx.appcompat.view.ActionMode; @@ -215,7 +218,7 @@ public class BaseScreen if (snackbar == null) { snackbar = Snackbar.make(rootView, stringId, Snackbar.LENGTH_SHORT); - int tvId = android.support.design.R.id.snackbar_text; + int tvId = R.id.snackbar_text; TextView tv = (TextView) snackbar.getView().findViewById(tvId); tv.setTextColor(Color.WHITE); } 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 7a49076b9..a1b486555 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,6 +19,8 @@ package org.isoron.androidbase.activities; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; 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 30a367e0c..b04f969b8 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 @@ -22,6 +22,9 @@ package org.isoron.androidbase.utils; import android.os.*; import android.util.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import java.io.*; public abstract class FileUtils 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 3c77e3e39..e9d484cb1 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 @@ -23,6 +23,8 @@ import android.content.*; import android.content.res.*; import android.graphics.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.core.view.*; import android.util.*; import android.view.*; 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 fe7c5be8f..d00588a90 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 @@ -23,6 +23,9 @@ import android.content.*; import android.content.res.*; import android.graphics.drawable.*; +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; + import org.isoron.androidbase.*; public class StyledResources 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 ae7d13575..0734910ad 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 @@ -24,6 +24,8 @@ import android.content.*; import android.content.res.*; import android.os.*; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; import androidx.test.*; import androidx.test.filters.*; import android.util.*; 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 5a55fbebf..3e19e927e 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,6 +20,7 @@ package org.isoron.uhabits; import android.content.*; + import androidx.test.uiautomator.*; import com.linkedin.android.testbutler.*; 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 643a9a311..fcd6ff9f6 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 @@ -21,6 +21,7 @@ package org.isoron.uhabits; import android.graphics.*; +import androidx.annotation.NonNull; import androidx.test.*; import android.view.*; import android.widget.*; 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 fdfb85925..967a6b70d 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,6 +19,7 @@ package org.isoron.uhabits.acceptance.steps; +import androidx.annotation.StringRes; import androidx.test.espresso.*; import androidx.test.espresso.contrib.*; import androidx.test.uiautomator.*; 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 610c8231a..ed169720a 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 @@ -22,6 +22,8 @@ package org.isoron.uhabits.activities.about; import android.content.*; import android.widget.*; +import androidx.annotation.NonNull; + import org.isoron.androidbase.activities.*; import org.isoron.androidbase.utils.*; import org.isoron.uhabits.BuildConfig; 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 ad9bcdf52..2252d19a6 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 @@ -21,6 +21,8 @@ package org.isoron.uhabits.activities.about; import android.widget.*; +import androidx.annotation.NonNull; + import org.isoron.androidbase.activities.*; import org.isoron.uhabits.core.ui.screens.about.*; import org.isoron.uhabits.intents.*; 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 a53f1c6ad..25bbd2a6c 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 @@ -21,6 +21,7 @@ package org.isoron.uhabits.activities.common.dialogs; import android.content.*; +import androidx.annotation.NonNull; 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 9ce45125a..a3c232cc7 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 @@ -23,6 +23,8 @@ import android.app.*; import android.content.*; import android.os.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.*; import android.util.*; 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 8b279463b..667756221 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 @@ -23,6 +23,9 @@ import android.content.*; import android.graphics.*; import android.util.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; import org.isoron.uhabits.activities.habits.list.views.*; 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 58c797a78..4d365a663 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 @@ -23,6 +23,8 @@ import android.content.*; import android.graphics.*; import android.util.*; +import androidx.annotation.NonNull; + import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; 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 c05d35619..182cc9e90 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 @@ -25,6 +25,9 @@ import android.graphics.Paint.*; import android.util.*; import android.view.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; 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 ff1345852..1e2245eb1 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 @@ -25,6 +25,8 @@ import android.text.*; import android.util.*; import android.view.*; +import androidx.annotation.Nullable; + import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; import org.isoron.uhabits.utils.*; 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 cfabe5ebb..74b8ad4b3 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 @@ -23,6 +23,9 @@ import android.content.*; import android.graphics.*; import android.util.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; 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 e1e044c93..0a90f7aa4 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 @@ -23,6 +23,8 @@ import android.app.*; import android.content.*; import android.os.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; 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 a06f91b64..966126d59 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 @@ -21,6 +21,8 @@ package org.isoron.uhabits.activities.habits.edit; import android.os.*; +import androidx.annotation.NonNull; + import org.isoron.uhabits.core.models.*; import javax.inject.*; 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 8e7fc2897..276f0cfbe 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 @@ -23,7 +23,9 @@ import android.content.*; import android.text.*; import android.util.*; import android.view.*; -import android.widget.*; + +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatEditText; import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; @@ -34,7 +36,7 @@ import static org.isoron.uhabits.utils.AttributeSetUtils.*; * An EditText that shows an example usage when there is no text * currently set. The example disappears when the widget gains focus. */ -public class ExampleEditText extends EditText +public class ExampleEditText extends AppCompatEditText implements View.OnFocusChangeListener { 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 cdfa93067..4a0436601 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 @@ -26,6 +26,9 @@ import android.util.*; import android.view.*; import android.widget.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.uhabits.R; import org.isoron.uhabits.core.models.*; 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 11ffa33a2..5eb73a5e1 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 @@ -26,6 +26,9 @@ import android.util.*; import android.view.*; import android.widget.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.uhabits.R; import org.isoron.uhabits.activities.common.views.*; import org.isoron.uhabits.core.models.*; 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 e8fa7df62..e20f908c4 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 @@ -25,6 +25,9 @@ import android.util.*; import android.view.*; import android.widget.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.datetimepicker.time.*; import org.isoron.uhabits.R; 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 7fa471969..ee25dd645 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 @@ -25,6 +25,9 @@ import android.util.*; import android.view.*; import android.widget.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.uhabits.R; import java.text.DecimalFormat; 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 f8636286c..ad4f8013e 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,6 +19,8 @@ package org.isoron.uhabits.activities.habits.list.views; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.widget.*; import android.view.*; 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 db55cc19f..fc0b206fd 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 @@ -22,6 +22,7 @@ package org.isoron.uhabits.activities.habits.show; import android.content.*; import android.os.*; +import androidx.annotation.NonNull; import androidx.appcompat.widget.*; import org.isoron.androidbase.activities.*; 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 6c1f2adc6..ea432b2e6 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,6 +19,8 @@ package org.isoron.uhabits.activities.habits.show; +import androidx.annotation.NonNull; + 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 d52642e85..39c14c198 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 @@ -21,6 +21,8 @@ package org.isoron.uhabits.activities.habits.show; import android.view.*; +import androidx.annotation.NonNull; + import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; import org.isoron.uhabits.core.preferences.Preferences; 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 5079633a1..6b5dfe394 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 @@ -23,6 +23,8 @@ import android.content.*; import android.util.*; import android.widget.*; +import androidx.annotation.Nullable; + import org.isoron.uhabits.*; import org.isoron.uhabits.R; import org.isoron.uhabits.activities.common.views.*; 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 4fce25951..a87606252 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 @@ -23,6 +23,8 @@ import android.content.*; import android.util.*; import android.widget.*; +import androidx.annotation.Nullable; + import org.isoron.uhabits.*; import org.isoron.uhabits.R; import org.isoron.uhabits.activities.common.views.*; 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 5cd1ae3de..3e47830d9 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 @@ -23,6 +23,9 @@ import android.content.*; import android.util.*; import android.widget.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.memory.*; 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 ff285d310..7e1f4948b 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 @@ -23,6 +23,8 @@ import android.content.*; import android.util.*; import android.widget.*; +import androidx.annotation.Nullable; + import org.isoron.uhabits.*; import org.isoron.uhabits.R; import org.isoron.uhabits.activities.common.views.*; 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 70516bc9b..14327643c 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 @@ -23,6 +23,8 @@ import android.content.*; import android.util.*; import android.widget.*; +import androidx.annotation.NonNull; + import org.isoron.androidbase.utils.*; import org.isoron.uhabits.R; import org.isoron.uhabits.activities.common.views.*; 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 cd1c7b4e8..c6ded0903 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 @@ -23,6 +23,9 @@ import android.content.*; import android.util.*; import android.widget.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.uhabits.*; import org.isoron.uhabits.R; import org.isoron.uhabits.activities.common.views.*; 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 1bd76df2e..049f6e319 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 @@ -26,6 +26,12 @@ import android.os.*; import android.provider.*; import android.util.*; +import androidx.annotation.Nullable; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceFragmentCompat; + import org.isoron.uhabits.R; import org.isoron.uhabits.*; import org.isoron.uhabits.core.preferences.*; 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 113a883f6..0dda40de2 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 @@ -4,6 +4,7 @@ package org.isoron.uhabits.notifications; import android.app.*; import android.os.*; +import androidx.annotation.Nullable; import androidx.core.app.*; import android.text.format.*; import android.view.*; 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 9e5e7c3e2..046aee432 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 @@ -22,6 +22,8 @@ package org.isoron.uhabits.receivers; import android.content.*; import android.net.*; +import androidx.annotation.NonNull; + import org.isoron.uhabits.core.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.preferences.*; 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 bf1c54c7c..c6e29a63b 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 @@ -22,6 +22,8 @@ package org.isoron.uhabits.receivers; import android.content.*; import android.util.*; +import androidx.annotation.Nullable; + import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.utils.*; 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 7c5e9fb69..3d15d0d3e 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,6 +19,9 @@ package org.isoron.uhabits.sync; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + 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 847b116d8..88fecb6bf 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 @@ -21,6 +21,9 @@ package org.isoron.uhabits.sync; import android.util.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.androidbase.*; import org.isoron.uhabits.BuildConfig; import org.isoron.uhabits.core.*; 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 6dd73ba72..1bc67d195 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 @@ -21,6 +21,9 @@ package org.isoron.uhabits.tasks; import android.content.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.google.auto.factory.*; import org.isoron.androidbase.*; 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 673983673..6740e2ab4 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,6 +19,8 @@ package org.isoron.uhabits.tasks; +import androidx.annotation.NonNull; + 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 f97d490cb..4580997aa 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,6 +18,8 @@ */ package org.isoron.uhabits.utils; +import androidx.annotation.NonNull; + 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 640b99688..35a6553ac 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 @@ -21,6 +21,7 @@ package org.isoron.uhabits.utils; import android.content.*; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import android.util.*; 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 b3d1e0b35..050f9295f 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 @@ -22,6 +22,9 @@ package org.isoron.uhabits.utils; import android.content.*; import android.database.sqlite.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; import org.isoron.uhabits.core.*; 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 fc0713dea..f2ff5e1f6 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 @@ -21,7 +21,6 @@ package org.isoron.uhabits.utils import android.graphics.* import androidx.annotation.* -import android.support.design.widget.* import androidx.appcompat.widget.Toolbar import android.view.* import android.view.ViewGroup.LayoutParams.* @@ -75,7 +74,7 @@ fun ViewGroup.buildToolbar(): Toolbar { fun View.showMessage(@StringRes stringId: Int) { try { val snackbar = Snackbar.make(this, stringId, Snackbar.LENGTH_SHORT) - val tvId = android.support.design.R.id.snackbar_text + val tvId = R.id.snackbar_text val tv = snackbar.view.findViewById(tvId) tv?.setTextColor(Color.WHITE) snackbar.show() 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 a55d3bb92..043892101 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 @@ -25,6 +25,8 @@ import android.graphics.*; import android.view.*; import android.widget.*; +import androidx.annotation.NonNull; + import org.isoron.uhabits.*; import org.isoron.uhabits.core.preferences.*; import org.isoron.uhabits.intents.*; 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 c498955ae..98718da33 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 @@ -24,6 +24,9 @@ import android.content.*; import android.os.*; import android.widget.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.preferences.*; 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 71f422e5f..64b4be5a9 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 @@ -6,6 +6,8 @@ import android.os.*; import android.util.Log; import android.widget.*; +import androidx.annotation.NonNull; + import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.preferences.*; 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 6fa893546..f241d5a32 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 @@ -23,6 +23,9 @@ import android.content.*; import android.util.*; import android.widget.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; 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 f6d7f8eea..a2e062930 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 @@ -23,6 +23,8 @@ import android.content.*; import android.view.*; import android.widget.*; +import androidx.annotation.NonNull; + import org.isoron.uhabits.*; public class GraphWidgetView extends HabitWidgetView 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 a11761f78..f266a806f 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 @@ -27,6 +27,9 @@ import android.util.*; import android.view.*; import android.widget.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*;