From 596af6afe6dea8d0ec1c97b08248f9fd41167480 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Wed, 23 Dec 2020 13:43:42 -0600 Subject: [PATCH] Remove android-base; move Dagger classes to uhabits.inject --- android/android-base/.gitignore | 1 - android/android-base/build.gradle | 33 ------------- android/android-base/proguard-rules.pro | 25 ---------- .../android-base/src/main/AndroidManifest.xml | 2 - .../isoron/androidbase/SSLContextProvider.kt | 48 ------------------- .../android-base/src/main/res/values/base.xml | 6 --- android/settings.gradle | 2 +- android/uhabits-android/build.gradle | 1 - .../org/isoron/uhabits/BaseAndroidTest.java | 3 +- .../isoron/uhabits/BaseUserInterfaceTest.java | 4 +- .../java/org/isoron/uhabits/BaseViewTest.java | 3 +- .../uhabits/HabitsActivityTestComponent.kt | 3 +- .../isoron/uhabits/HabitsApplicationTest.java | 2 - .../HabitsApplicationTestComponent.java | 2 +- .../isoron/uhabits/database/AutoBackupTest.kt | 1 - .../org/isoron/uhabits}/AndroidBugReporter.kt | 16 +++---- .../org/isoron/uhabits}/AndroidDirFinder.kt | 7 +-- .../isoron/uhabits}/BaseExceptionHandler.kt | 4 +- .../org/isoron/uhabits/HabitsApplication.kt | 2 +- .../activities/AndroidThemeSwitcher.kt | 2 +- .../uhabits/activities/HabitsActivity.kt | 2 +- .../uhabits/activities/HabitsDirFinder.kt | 2 +- .../dialogs/ColorPickerDialogFactory.java | 3 +- .../common/dialogs/ConfirmDeleteDialog.java | 4 +- .../common/dialogs/ConfirmSyncKeyDialog.java | 4 +- .../common/dialogs/HistoryEditorDialog.java | 2 +- .../common/dialogs/NumberPickerFactory.kt | 4 +- .../activities/common/views/BarChart.java | 3 +- .../common/views/FrequencyChart.java | 1 - .../activities/common/views/HistoryChart.java | 3 +- .../activities/common/views/RingView.java | 3 +- .../activities/common/views/ScoreChart.java | 3 +- .../activities/common/views/StreakChart.java | 4 +- .../activities/common/views/TargetChart.java | 4 +- .../habits/edit/EditHabitActivity.kt | 1 - .../habits/list/ListHabitsActivity.kt | 2 +- .../activities/habits/list/ListHabitsMenu.kt | 2 +- .../habits/list/ListHabitsModule.kt | 3 +- .../habits/list/ListHabitsRootView.kt | 2 +- .../habits/list/ListHabitsScreen.kt | 3 +- .../habits/list/ListHabitsSelectionMenu.kt | 2 +- .../habits/list/views/CheckmarkButtonView.kt | 2 +- .../habits/list/views/CheckmarkPanelView.kt | 2 +- .../list/views/HabitCardListAdapter.java | 2 +- .../list/views/HabitCardListController.kt | 2 +- .../habits/list/views/HabitCardListView.kt | 2 +- .../habits/list/views/HabitCardView.kt | 2 +- .../habits/list/views/NumberButtonView.kt | 5 +- .../habits/list/views/NumberPanelView.kt | 2 +- .../habits/show/ShowHabitActivity.kt | 1 - .../habits/show/views/OverviewCard.kt | 1 - .../habits/show/views/SubtitleCard.kt | 1 - .../uhabits/activities/sync/SyncActivity.kt | 2 +- .../uhabits/automation/FireSettingReceiver.kt | 1 + .../org/isoron/uhabits/database/AutoBackup.kt | 2 +- .../isoron/uhabits/inject}/ActivityContext.kt | 4 +- .../inject}/ActivityContextModule.java | 2 +- .../isoron/uhabits/inject}/ActivityScope.kt | 4 +- .../org/isoron/uhabits/inject}/AppContext.kt | 4 +- .../uhabits/inject}/AppContextModule.java | 4 +- .../{activities => inject}/HabitModule.kt | 2 +- .../HabitsActivityComponent.kt | 6 +-- .../HabitsActivityModule.kt | 6 +-- .../HabitsApplicationComponent.java | 5 +- .../uhabits/{ => inject}/HabitsModule.kt | 4 +- .../isoron/uhabits/intents/IntentScheduler.kt | 2 +- .../uhabits/intents/PendingIntentFactory.kt | 3 +- .../notifications/AndroidNotificationTray.kt | 2 +- .../uhabits/notifications/RingtoneManager.kt | 2 +- .../SnoozeDelayPickerActivity.java | 3 +- .../preferences/SharedPreferencesStorage.kt | 2 +- .../uhabits/receivers/ReminderReceiver.java | 1 + .../uhabits/receivers/WidgetReceiver.java | 1 + .../isoron/uhabits/tasks/ExportDBTask.java | 3 +- .../org/isoron/uhabits}/utils/ColorUtils.kt | 4 +- .../isoron/uhabits/utils/DatabaseUtils.java | 2 - .../org/isoron/uhabits}/utils/FileUtils.kt | 4 +- .../isoron/uhabits}/utils/InterfaceUtils.kt | 4 +- .../org/isoron/uhabits/utils/PaletteUtils.kt | 1 - .../isoron/uhabits}/utils/StyledResources.kt | 6 +-- .../isoron/uhabits/utils/ViewExtensions.kt | 3 +- .../uhabits/widgets/BaseWidgetProvider.java | 2 +- .../uhabits/widgets/StackWidgetService.java | 2 +- .../isoron/uhabits/widgets/WidgetUpdater.kt | 3 +- .../widgets/views/CheckmarkWidgetView.java | 4 +- .../widgets/views/HabitWidgetView.java | 4 +- .../src/main/res/layout/about.xml | 5 -- .../src/main/res/layout/settings_activity.xml | 4 -- .../src/main/res/layout/show_habit.xml | 5 -- .../src/main/res/values/attrs.xml | 1 + .../src/main/res/values/material_colors.xml | 0 91 files changed, 107 insertions(+), 258 deletions(-) delete mode 100644 android/android-base/.gitignore delete mode 100644 android/android-base/build.gradle delete mode 100644 android/android-base/proguard-rules.pro delete mode 100644 android/android-base/src/main/AndroidManifest.xml delete mode 100644 android/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.kt delete mode 100644 android/android-base/src/main/res/values/base.xml rename android/{android-base/src/main/java/org/isoron/androidbase => uhabits-android/src/main/java/org/isoron/uhabits}/AndroidBugReporter.kt (93%) rename android/{android-base/src/main/java/org/isoron/androidbase => uhabits-android/src/main/java/org/isoron/uhabits}/AndroidDirFinder.kt (86%) rename android/{android-base/src/main/java/org/isoron/androidbase => uhabits-android/src/main/java/org/isoron/uhabits}/BaseExceptionHandler.kt (93%) rename android/{android-base/src/main/java/org/isoron/androidbase => uhabits-android/src/main/java/org/isoron/uhabits/inject}/ActivityContext.kt (85%) rename android/{android-base/src/main/java/org/isoron/androidbase => uhabits-android/src/main/java/org/isoron/uhabits/inject}/ActivityContextModule.java (96%) rename android/{android-base/src/main/java/org/isoron/androidbase => uhabits-android/src/main/java/org/isoron/uhabits/inject}/ActivityScope.kt (86%) rename android/{android-base/src/main/java/org/isoron/androidbase => uhabits-android/src/main/java/org/isoron/uhabits/inject}/AppContext.kt (86%) rename android/{android-base/src/main/java/org/isoron/androidbase => uhabits-android/src/main/java/org/isoron/uhabits/inject}/AppContextModule.java (90%) rename android/uhabits-android/src/main/java/org/isoron/uhabits/{activities => inject}/HabitModule.kt (96%) rename android/uhabits-android/src/main/java/org/isoron/uhabits/{activities => inject}/HabitsActivityComponent.kt (91%) rename android/uhabits-android/src/main/java/org/isoron/uhabits/{activities => inject}/HabitsActivityModule.kt (88%) rename android/uhabits-android/src/main/java/org/isoron/uhabits/{ => inject}/HabitsApplicationComponent.java (95%) rename android/uhabits-android/src/main/java/org/isoron/uhabits/{ => inject}/HabitsModule.kt (98%) rename android/{android-base/src/main/java/org/isoron/androidbase => uhabits-android/src/main/java/org/isoron/uhabits}/utils/ColorUtils.kt (95%) rename android/{android-base/src/main/java/org/isoron/androidbase => uhabits-android/src/main/java/org/isoron/uhabits}/utils/FileUtils.kt (95%) rename android/{android-base/src/main/java/org/isoron/androidbase => uhabits-android/src/main/java/org/isoron/uhabits}/utils/InterfaceUtils.kt (96%) rename android/{android-base/src/main/java/org/isoron/androidbase => uhabits-android/src/main/java/org/isoron/uhabits}/utils/StyledResources.kt (95%) rename android/{android-base => uhabits-android}/src/main/res/values/material_colors.xml (100%) diff --git a/android/android-base/.gitignore b/android/android-base/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/android/android-base/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/android/android-base/build.gradle b/android/android-base/build.gradle deleted file mode 100644 index ba3cc6c54..000000000 --- a/android/android-base/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion COMPILE_SDK_VERSION as Integer - - defaultConfig { - minSdkVersion MIN_SDK_VERSION as Integer - targetSdkVersion TARGET_SDK_VERSION as Integer - buildConfigField 'int', 'VERSION_CODE', "$VERSION_CODE" - buildConfigField 'String', 'VERSION_NAME', "\"$VERSION_NAME\"" - } - - compileOptions { - targetCompatibility JavaVersion.VERSION_1_8 - sourceCompatibility JavaVersion.VERSION_1_8 - } - - lintOptions { - checkReleaseBuilds false - abortOnError false - } -} - -dependencies { - implementation "com.google.dagger:dagger:$DAGGER_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" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION" -} diff --git a/android/android-base/proguard-rules.pro b/android/android-base/proguard-rules.pro deleted file mode 100644 index 2d5885450..000000000 --- a/android/android-base/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /gemini-b/opt/android-sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/android/android-base/src/main/AndroidManifest.xml b/android/android-base/src/main/AndroidManifest.xml deleted file mode 100644 index dff4e0297..000000000 --- a/android/android-base/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/android/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.kt b/android/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.kt deleted file mode 100644 index 797d6c93d..000000000 --- a/android/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.kt +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2017 Álinson Santos Xavier - * - * This file is part of Loop Habit Tracker. - * - * Loop Habit Tracker is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * Loop Habit Tracker is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ -package org.isoron.androidbase - -import android.content.Context -import java.security.KeyStore -import java.security.cert.CertificateFactory -import javax.inject.Inject -import javax.net.ssl.SSLContext -import javax.net.ssl.TrustManagerFactory - -class SSLContextProvider @Inject constructor(@param:AppContext private val context: Context) { - fun getCACertSSLContext(): SSLContext { - try { - val cf = CertificateFactory.getInstance("X.509") - val ca = cf.generateCertificate(context.assets.open("cacert.pem")) - val ks = KeyStore.getInstance(KeyStore.getDefaultType()).apply { - load(null, null) - setCertificateEntry("ca", ca) - } - val alg = TrustManagerFactory.getDefaultAlgorithm() - val tmf = TrustManagerFactory.getInstance(alg).apply { - init(ks) - } - return SSLContext.getInstance("TLS").apply { - init(null, tmf.trustManagers, null) - } - } catch (e: Exception) { - throw RuntimeException(e) - } - } -} \ No newline at end of file diff --git a/android/android-base/src/main/res/values/base.xml b/android/android-base/src/main/res/values/base.xml deleted file mode 100644 index c22a13fad..000000000 --- a/android/android-base/src/main/res/values/base.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/android/settings.gradle b/android/settings.gradle index bbd1aad49..3c3f626c5 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1 +1 @@ -include ':uhabits-android', ':uhabits-core', ':android-base', ':android-pickers' +include ':uhabits-android', ':uhabits-core', ':android-pickers' diff --git a/android/uhabits-android/build.gradle b/android/uhabits-android/build.gradle index 0df060e82..3e686773a 100644 --- a/android/uhabits-android/build.gradle +++ b/android/uhabits-android/build.gradle @@ -79,7 +79,6 @@ android { dependencies { implementation project(":uhabits-core") - implementation project(":android-base") implementation project(":android-pickers") implementation 'androidx.appcompat:appcompat:1.0.0' 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 06385ad9b..662a12fc5 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 @@ -32,12 +32,11 @@ import androidx.test.uiautomator.*; import junit.framework.*; -import org.isoron.androidbase.*; -import org.isoron.androidbase.utils.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.preferences.*; import org.isoron.uhabits.core.tasks.*; import org.isoron.uhabits.core.utils.*; +import org.isoron.uhabits.inject.*; import org.isoron.uhabits.utils.*; import org.junit.*; 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 edf9ce6d8..82a54d11a 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 @@ -29,11 +29,9 @@ import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.preferences.*; import org.isoron.uhabits.core.ui.screens.habits.list.*; import org.isoron.uhabits.core.utils.*; +import org.isoron.uhabits.inject.*; import org.junit.*; -import java.time.*; -import java.util.*; - import static androidx.test.core.app.ApplicationProvider.*; import static androidx.test.platform.app.InstrumentationRegistry.*; import static androidx.test.uiautomator.UiDevice.*; 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 9156df2c7..e56ae3561 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 @@ -26,8 +26,7 @@ import android.widget.*; import androidx.annotation.*; import androidx.test.platform.app.*; -import org.isoron.androidbase.*; -import org.isoron.androidbase.utils.*; +import org.isoron.uhabits.utils.*; import org.isoron.uhabits.widgets.*; import java.io.*; diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt index bb60854ba..3d262e0b3 100644 --- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt +++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt @@ -20,11 +20,10 @@ package org.isoron.uhabits import dagger.* -import org.isoron.androidbase.* -import org.isoron.uhabits.activities.* import org.isoron.uhabits.activities.habits.list.* import org.isoron.uhabits.activities.habits.list.views.* import org.isoron.uhabits.core.ui.screens.habits.list.* +import org.isoron.uhabits.inject.* import org.mockito.Mockito.* @Module 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 222d7e93f..6fcc98544 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 @@ -20,11 +20,9 @@ package org.isoron.uhabits; import androidx.test.filters.*; -import androidx.test.runner.*; import androidx.test.ext.junit.runners.AndroidJUnit4; -import org.isoron.androidbase.*; import org.junit.*; import org.junit.runner.*; diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java index 313e64bab..0559bf53f 100644 --- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java +++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java @@ -19,9 +19,9 @@ package org.isoron.uhabits; -import org.isoron.androidbase.*; import org.isoron.uhabits.core.*; import org.isoron.uhabits.core.tasks.*; +import org.isoron.uhabits.inject.*; import org.isoron.uhabits.intents.*; import dagger.*; diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AutoBackupTest.kt b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AutoBackupTest.kt index cbc25be08..2d818b030 100644 --- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AutoBackupTest.kt +++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AutoBackupTest.kt @@ -19,7 +19,6 @@ package org.isoron.uhabits.database -import org.isoron.androidbase.* import org.isoron.uhabits.* import org.isoron.uhabits.core.utils.* import org.junit.* diff --git a/android/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidBugReporter.kt similarity index 93% rename from android/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidBugReporter.kt index 00efcbc7e..aace157a1 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidBugReporter.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -16,16 +16,16 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package org.isoron.androidbase +package org.isoron.uhabits -import android.content.Context -import android.os.Build -import android.os.Environment -import android.view.WindowManager +import android.content.* +import android.os.* +import android.view.* +import org.isoron.uhabits.inject.* import java.io.* -import java.text.SimpleDateFormat +import java.text.* import java.util.* -import javax.inject.Inject +import javax.inject.* open class AndroidBugReporter @Inject constructor(@AppContext private val context: Context) { diff --git a/android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidDirFinder.kt similarity index 86% rename from android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidDirFinder.kt index ec1d6d783..0ec7ec2b9 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidDirFinder.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -16,11 +16,12 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package org.isoron.androidbase +package org.isoron.uhabits import android.content.Context import androidx.core.content.ContextCompat -import org.isoron.androidbase.utils.FileUtils +import org.isoron.uhabits.inject.* +import org.isoron.uhabits.utils.FileUtils import java.io.File import javax.inject.Inject diff --git a/android/android-base/src/main/java/org/isoron/androidbase/BaseExceptionHandler.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/BaseExceptionHandler.kt similarity index 93% rename from android/android-base/src/main/java/org/isoron/androidbase/BaseExceptionHandler.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/BaseExceptionHandler.kt index cf66b9220..151b97301 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/BaseExceptionHandler.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/BaseExceptionHandler.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package org.isoron.androidbase +package org.isoron.uhabits import android.app.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt index f2ca04790..36783ed24 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt @@ -21,11 +21,11 @@ package org.isoron.uhabits import android.app.* import android.content.* -import org.isoron.androidbase.* import org.isoron.uhabits.core.database.* import org.isoron.uhabits.core.reminders.* import org.isoron.uhabits.core.ui.* import org.isoron.uhabits.core.utils.* +import org.isoron.uhabits.inject.* import org.isoron.uhabits.utils.* import org.isoron.uhabits.widgets.* import java.io.* 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 55187acf8..7469fde0e 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 @@ -24,10 +24,10 @@ import android.content.* import android.content.res.Configuration.* import android.os.Build.VERSION.* import androidx.core.content.* -import org.isoron.androidbase.* import org.isoron.uhabits.R import org.isoron.uhabits.core.preferences.* import org.isoron.uhabits.core.ui.* +import org.isoron.uhabits.inject.* @ActivityScope class AndroidThemeSwitcher diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivity.kt index 5efb38ba0..98687d08b 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivity.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivity.kt @@ -22,9 +22,9 @@ package org.isoron.uhabits.activities import android.content.* import android.os.* import androidx.appcompat.app.* -import org.isoron.androidbase.* import org.isoron.uhabits.* import org.isoron.uhabits.core.models.* +import org.isoron.uhabits.inject.* abstract class HabitsActivity : AppCompatActivity() { lateinit var component: HabitsActivityComponent diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt index 54bf67390..84c10cb13 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt @@ -18,7 +18,7 @@ */ package org.isoron.uhabits.activities -import org.isoron.androidbase.* +import org.isoron.uhabits.* import org.isoron.uhabits.core.ui.screens.habits.list.* import org.isoron.uhabits.core.ui.screens.habits.show.* import java.io.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java index 360937e20..377308403 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java @@ -21,10 +21,9 @@ package org.isoron.uhabits.activities.common.dialogs; import android.content.*; -import org.isoron.androidbase.*; -import org.isoron.androidbase.utils.*; import org.isoron.uhabits.R; import org.isoron.uhabits.core.models.*; +import org.isoron.uhabits.inject.*; import org.isoron.uhabits.utils.*; import javax.inject.*; 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 e130c9a25..7b6d93159 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 @@ -27,9 +27,9 @@ import androidx.appcompat.app.*; import com.google.auto.factory.*; -import org.isoron.androidbase.*; -import org.isoron.uhabits.core.ui.callbacks.*; import org.isoron.uhabits.R; +import org.isoron.uhabits.core.ui.callbacks.*; +import org.isoron.uhabits.inject.*; /** * Dialog that asks the user confirmation before executing a delete operation. diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java index 5a6017ec6..f755046e0 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java @@ -27,9 +27,9 @@ import androidx.appcompat.app.*; import com.google.auto.factory.*; -import org.isoron.androidbase.*; -import org.isoron.uhabits.core.ui.callbacks.*; import org.isoron.uhabits.R; +import org.isoron.uhabits.core.ui.callbacks.*; +import org.isoron.uhabits.inject.*; @AutoFactory(allowSubclasses = true) public class ConfirmSyncKeyDialog extends AlertDialog 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 3db266651..f9a0f2d4e 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 @@ -38,7 +38,7 @@ import org.isoron.uhabits.core.ui.callbacks.*; import org.isoron.uhabits.utils.*; import org.jetbrains.annotations.*; -import static org.isoron.androidbase.utils.InterfaceUtils.*; +import static org.isoron.uhabits.utils.InterfaceUtils.*; public class HistoryEditorDialog extends AppCompatDialogFragment implements DialogInterface.OnClickListener, ModelObservable.Listener 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 04fa5b119..aba101a0c 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 @@ -26,10 +26,10 @@ import android.view.* import android.view.WindowManager.LayoutParams.* import android.view.inputmethod.* import android.widget.* -import org.isoron.androidbase.* -import org.isoron.androidbase.utils.* import org.isoron.uhabits.R import org.isoron.uhabits.core.ui.screens.habits.list.* +import org.isoron.uhabits.inject.* +import org.isoron.uhabits.utils.* import javax.inject.* class NumberPickerFactory 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 3dfe67c61..4b58ac581 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 @@ -26,7 +26,6 @@ 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.*; import org.isoron.uhabits.core.models.*; @@ -36,7 +35,7 @@ import org.isoron.uhabits.utils.*; import java.text.*; import java.util.*; -import static org.isoron.androidbase.utils.InterfaceUtils.*; +import static org.isoron.uhabits.utils.InterfaceUtils.*; public class BarChart extends ScrollableChart { 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 684e31f7d..bfa91cd06 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 @@ -25,7 +25,6 @@ import android.util.*; import androidx.annotation.NonNull; -import org.isoron.androidbase.utils.*; 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/activities/common/views/HistoryChart.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java index 7d2ef2e9c..d27bdc280 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 @@ -29,7 +29,6 @@ import android.view.*; import androidx.annotation.*; import androidx.annotation.Nullable; -import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.ui.callbacks.*; @@ -40,7 +39,7 @@ import org.jetbrains.annotations.*; import java.text.*; import java.util.*; -import static org.isoron.androidbase.utils.InterfaceUtils.*; +import static org.isoron.uhabits.utils.InterfaceUtils.*; import static org.isoron.uhabits.core.models.Checkmark.*; public class HistoryChart extends ScrollableChart 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 1e2245eb1..8b3710e3d 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 @@ -27,12 +27,11 @@ import android.view.*; import androidx.annotation.Nullable; -import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; import org.isoron.uhabits.utils.*; import static org.isoron.uhabits.utils.AttributeSetUtils.*; -import static org.isoron.androidbase.utils.InterfaceUtils.*; +import static org.isoron.uhabits.utils.InterfaceUtils.*; public class RingView extends 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 310307ee9..ccf33ac4d 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 @@ -26,7 +26,6 @@ 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.*; import org.isoron.uhabits.core.utils.*; @@ -35,7 +34,7 @@ import org.isoron.uhabits.utils.*; import java.text.*; import java.util.*; -import static org.isoron.androidbase.utils.InterfaceUtils.*; +import static org.isoron.uhabits.utils.InterfaceUtils.*; public class ScoreChart extends ScrollableChart { diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java index 70f6c05d7..0f25e5d52 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java @@ -25,16 +25,16 @@ import android.util.*; import android.view.*; import android.view.ViewGroup.*; -import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.utils.*; +import org.isoron.uhabits.utils.*; import java.text.*; import java.util.*; import static android.view.View.MeasureSpec.*; -import static org.isoron.androidbase.utils.InterfaceUtils.*; +import static org.isoron.uhabits.utils.InterfaceUtils.*; public class StreakChart extends View { diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.java index 30ec17bd9..76bb27814 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.java @@ -24,14 +24,14 @@ import android.graphics.*; import android.util.*; import android.view.*; -import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; import org.isoron.uhabits.activities.habits.list.views.*; +import org.isoron.uhabits.utils.*; import java.util.*; import static android.view.View.MeasureSpec.*; -import static org.isoron.androidbase.utils.InterfaceUtils.*; +import static org.isoron.uhabits.utils.InterfaceUtils.*; public class TargetChart extends View { diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt index 58672ada8..bb8dce596 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt @@ -29,7 +29,6 @@ import androidx.appcompat.app.* import androidx.fragment.app.* import com.android.datetimepicker.time.* import kotlinx.android.synthetic.main.activity_edit_habit.* -import org.isoron.androidbase.utils.* import org.isoron.uhabits.* import org.isoron.uhabits.activities.* import org.isoron.uhabits.activities.common.dialogs.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt index 1e4444ddb..14b3d6b92 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt @@ -23,7 +23,7 @@ import android.content.* import android.os.* import android.view.* import kotlinx.coroutines.* -import org.isoron.androidbase.* +import org.isoron.uhabits.* import org.isoron.uhabits.activities.* import org.isoron.uhabits.activities.habits.list.views.* import org.isoron.uhabits.core.preferences.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt index 932b007ae..20ba1d15a 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt @@ -22,11 +22,11 @@ package org.isoron.uhabits.activities.habits.list import android.content.* import android.view.* import androidx.appcompat.app.* -import org.isoron.androidbase.* import org.isoron.uhabits.R import org.isoron.uhabits.core.preferences.* import org.isoron.uhabits.core.ui.* import org.isoron.uhabits.core.ui.screens.habits.list.* +import org.isoron.uhabits.inject.* import javax.inject.* @ActivityScope diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt index 55ffc22cf..8977d0398 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt @@ -21,10 +21,11 @@ package org.isoron.uhabits.activities.habits.list import android.content.* import dagger.* -import org.isoron.androidbase.* +import org.isoron.uhabits.* import org.isoron.uhabits.activities.* import org.isoron.uhabits.activities.habits.list.views.* import org.isoron.uhabits.core.ui.screens.habits.list.* +import org.isoron.uhabits.inject.* import javax.inject.* class BugReporterProxy 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 01efd1d3d..7d8a354e3 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,6 @@ package org.isoron.uhabits.activities.habits.list import android.content.* import android.view.ViewGroup.LayoutParams.* import android.widget.* -import org.isoron.androidbase.* import org.isoron.uhabits.R import org.isoron.uhabits.activities.common.views.* import org.isoron.uhabits.activities.habits.list.views.* @@ -31,6 +30,7 @@ import org.isoron.uhabits.core.preferences.* import org.isoron.uhabits.core.tasks.* import org.isoron.uhabits.core.ui.screens.habits.list.* import org.isoron.uhabits.core.utils.* +import org.isoron.uhabits.inject.* import org.isoron.uhabits.utils.* import java.lang.Math.* import javax.inject.* 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 eddafe1d5..0ff0857e3 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 @@ -25,8 +25,6 @@ import android.util.* import androidx.annotation.* import androidx.appcompat.app.* import dagger.* -import org.isoron.androidbase.* -import org.isoron.androidbase.utils.* import org.isoron.uhabits.R import org.isoron.uhabits.activities.common.dialogs.* import org.isoron.uhabits.activities.habits.edit.* @@ -38,6 +36,7 @@ import org.isoron.uhabits.core.ui.* import org.isoron.uhabits.core.ui.callbacks.* import org.isoron.uhabits.core.ui.screens.habits.list.* import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior.Message.* +import org.isoron.uhabits.inject.* import org.isoron.uhabits.intents.* import org.isoron.uhabits.tasks.* import org.isoron.uhabits.utils.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt index 546113e51..42193fd08 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt @@ -24,7 +24,6 @@ import android.view.* import androidx.appcompat.app.* import androidx.appcompat.view.ActionMode import dagger.* -import org.isoron.androidbase.* import org.isoron.uhabits.R import org.isoron.uhabits.activities.habits.list.views.* import org.isoron.uhabits.core.commands.* @@ -32,6 +31,7 @@ import org.isoron.uhabits.core.preferences.* import org.isoron.uhabits.core.ui.* import org.isoron.uhabits.core.ui.screens.habits.list.* import org.isoron.uhabits.core.utils.* +import org.isoron.uhabits.inject.* import javax.inject.* @ActivityScope diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt index 4c8cf5c7a..cb4f5d3f4 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt @@ -25,11 +25,11 @@ import android.text.* import android.view.* import android.view.View.MeasureSpec.* import com.google.auto.factory.* -import org.isoron.androidbase.* import org.isoron.uhabits.R import org.isoron.uhabits.core.models.* import org.isoron.uhabits.core.models.Checkmark.* import org.isoron.uhabits.core.preferences.* +import org.isoron.uhabits.inject.* import org.isoron.uhabits.utils.* @AutoFactory diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt index 0a8d8e2b4..0b9f6d0f1 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt @@ -21,11 +21,11 @@ package org.isoron.uhabits.activities.habits.list.views import android.content.* import com.google.auto.factory.* -import org.isoron.androidbase.* import org.isoron.uhabits.core.models.* import org.isoron.uhabits.core.models.Checkmark.* import org.isoron.uhabits.core.preferences.* import org.isoron.uhabits.core.utils.* +import org.isoron.uhabits.inject.* @AutoFactory class CheckmarkPanelView( 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 de74a4ffe..35acdfa70 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 @@ -26,12 +26,12 @@ import android.view.*; import androidx.recyclerview.widget.RecyclerView; -import org.isoron.androidbase.*; import org.isoron.uhabits.activities.habits.list.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.preferences.*; import org.isoron.uhabits.core.ui.screens.habits.list.*; import org.isoron.uhabits.core.utils.*; +import org.isoron.uhabits.inject.*; import java.util.*; diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt index 8690d1d19..898bfc48c 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt @@ -20,10 +20,10 @@ package org.isoron.uhabits.activities.habits.list.views import dagger.* -import org.isoron.androidbase.* import org.isoron.uhabits.activities.habits.list.* import org.isoron.uhabits.core.models.* import org.isoron.uhabits.core.ui.screens.habits.list.* +import org.isoron.uhabits.inject.* import javax.inject.* /** 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 62e5be7af..a4cb243cc 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 @@ -26,10 +26,10 @@ import androidx.recyclerview.widget.ItemTouchHelper.* import android.view.* import com.google.auto.factory.* import dagger.* -import org.isoron.androidbase.* import org.isoron.uhabits.R import org.isoron.uhabits.activities.common.views.* import org.isoron.uhabits.core.models.* +import org.isoron.uhabits.inject.* @AutoFactory class HabitCardListView( diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt index b90c25534..c1851c9b1 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt @@ -28,12 +28,12 @@ import android.view.* import android.view.ViewGroup.LayoutParams.* import android.widget.* import com.google.auto.factory.* -import org.isoron.androidbase.* import org.isoron.uhabits.R import org.isoron.uhabits.activities.common.views.* import org.isoron.uhabits.core.models.* import org.isoron.uhabits.core.ui.screens.habits.list.* import org.isoron.uhabits.core.utils.* +import org.isoron.uhabits.inject.* import org.isoron.uhabits.utils.* @AutoFactory diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt index 44975b6b6..4b30545d8 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt @@ -25,11 +25,10 @@ import android.text.* import android.view.* import android.view.View.* import com.google.auto.factory.* -import org.isoron.androidbase.* -import org.isoron.androidbase.utils.* -import org.isoron.androidbase.utils.InterfaceUtils.getDimension +import org.isoron.uhabits.utils.InterfaceUtils.getDimension import org.isoron.uhabits.R import org.isoron.uhabits.core.preferences.* +import org.isoron.uhabits.inject.* import org.isoron.uhabits.utils.* import java.text.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt index 5e4095d8f..f9dc47a67 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt @@ -21,10 +21,10 @@ package org.isoron.uhabits.activities.habits.list.views import android.content.* import com.google.auto.factory.* -import org.isoron.androidbase.* import org.isoron.uhabits.core.models.* import org.isoron.uhabits.core.preferences.* import org.isoron.uhabits.core.utils.* +import org.isoron.uhabits.inject.* @AutoFactory class NumberPanelView( diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt index 394108299..b0de0f21c 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt @@ -23,7 +23,6 @@ import android.os.* import android.view.* import androidx.appcompat.app.* import kotlinx.coroutines.* -import org.isoron.androidbase.* import org.isoron.uhabits.* import org.isoron.uhabits.activities.* import org.isoron.uhabits.activities.common.dialogs.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.kt index 0090a5395..c158e1170 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.kt @@ -23,7 +23,6 @@ import android.util.* import android.view.* import android.widget.* import kotlinx.coroutines.* -import org.isoron.androidbase.utils.* 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/activities/habits/show/views/SubtitleCard.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.kt index 8a30aa527..47802ca04 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.kt @@ -24,7 +24,6 @@ import android.content.res.* import android.util.* import android.view.* import android.widget.* -import org.isoron.androidbase.utils.* import org.isoron.uhabits.* import org.isoron.uhabits.activities.habits.list.views.* import org.isoron.uhabits.core.models.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt index 86b6682c8..9b5fd2fc6 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt @@ -29,7 +29,7 @@ import androidx.appcompat.app.* import com.google.zxing.* import com.google.zxing.qrcode.* import kotlinx.coroutines.* -import org.isoron.androidbase.utils.InterfaceUtils.getFontAwesome +import org.isoron.uhabits.utils.InterfaceUtils.getFontAwesome import org.isoron.uhabits.* import org.isoron.uhabits.activities.* import org.isoron.uhabits.core.models.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt index 6aff0ead6..b4f332f4e 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt @@ -25,6 +25,7 @@ import org.isoron.uhabits.* import org.isoron.uhabits.core.models.* import org.isoron.uhabits.core.ui.widgets.* import org.isoron.uhabits.core.utils.* +import org.isoron.uhabits.inject.* import org.isoron.uhabits.receivers.* const val ACTION_CHECK = 0 diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/database/AutoBackup.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/database/AutoBackup.kt index 0c9be3969..4ea8cfce3 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/database/AutoBackup.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/database/AutoBackup.kt @@ -21,7 +21,7 @@ package org.isoron.uhabits.database import android.content.* import android.util.* -import org.isoron.androidbase.* +import org.isoron.uhabits.* import org.isoron.uhabits.core.utils.* import org.isoron.uhabits.utils.* import java.io.* diff --git a/android/android-base/src/main/java/org/isoron/androidbase/ActivityContext.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContext.kt similarity index 85% rename from android/android-base/src/main/java/org/isoron/androidbase/ActivityContext.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContext.kt index 22a285cd1..64d19f958 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/ActivityContext.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContext.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package org.isoron.androidbase +package org.isoron.uhabits.inject import javax.inject.* diff --git a/android/android-base/src/main/java/org/isoron/androidbase/ActivityContextModule.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.java similarity index 96% rename from android/android-base/src/main/java/org/isoron/androidbase/ActivityContextModule.java rename to android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.java index 88d7da3af..01ec64376 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/ActivityContextModule.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.androidbase; +package org.isoron.uhabits.inject; import android.content.*; diff --git a/android/android-base/src/main/java/org/isoron/androidbase/ActivityScope.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityScope.kt similarity index 86% rename from android/android-base/src/main/java/org/isoron/androidbase/ActivityScope.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityScope.kt index df4386329..ab47d9d1e 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/ActivityScope.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityScope.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package org.isoron.androidbase +package org.isoron.uhabits.inject import javax.inject.* diff --git a/android/android-base/src/main/java/org/isoron/androidbase/AppContext.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContext.kt similarity index 86% rename from android/android-base/src/main/java/org/isoron/androidbase/AppContext.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContext.kt index 55e22e9b3..a97b0dba9 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/AppContext.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContext.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package org.isoron.androidbase +package org.isoron.uhabits.inject import javax.inject.Qualifier diff --git a/android/android-base/src/main/java/org/isoron/androidbase/AppContextModule.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.java similarity index 90% rename from android/android-base/src/main/java/org/isoron/androidbase/AppContextModule.java rename to android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.java index c166a89d8..298c04c1d 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/AppContextModule.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.androidbase; +package org.isoron.uhabits.inject; import android.content.*; diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitModule.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitModule.kt similarity index 96% rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitModule.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitModule.kt index c4d76d03c..fea9c4c36 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitModule.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitModule.kt @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities +package org.isoron.uhabits.inject import dagger.* import org.isoron.uhabits.core.models.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityComponent.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityComponent.kt similarity index 91% rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityComponent.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityComponent.kt index 8fc66c304..d7f7454c8 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityComponent.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityComponent.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -17,11 +17,9 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities +package org.isoron.uhabits.inject import dagger.* -import org.isoron.androidbase.* -import org.isoron.uhabits.* import org.isoron.uhabits.activities.common.dialogs.* import org.isoron.uhabits.activities.habits.list.* import org.isoron.uhabits.activities.habits.list.views.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityModule.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityModule.kt similarity index 88% rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityModule.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityModule.kt index 3cccd2109..464603c4e 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityModule.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityModule.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -17,11 +17,11 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities +package org.isoron.uhabits.inject import android.content.* import dagger.* -import org.isoron.androidbase.* +import org.isoron.uhabits.activities.* import org.isoron.uhabits.core.preferences.* import org.isoron.uhabits.core.ui.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsApplicationComponent.java similarity index 95% rename from android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java rename to android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsApplicationComponent.java index 52d499d1c..496c169d6 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsApplicationComponent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -17,11 +17,10 @@ * with this program. If not, see . */ -package org.isoron.uhabits; +package org.isoron.uhabits.inject; import android.content.*; -import org.isoron.androidbase.*; import org.isoron.uhabits.core.*; import org.isoron.uhabits.core.commands.*; import org.isoron.uhabits.core.io.*; diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsModule.kt similarity index 98% rename from android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsModule.kt index 9a274f17b..98ce94389 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsModule.kt @@ -17,11 +17,10 @@ * with this program. If not, see . */ -package org.isoron.uhabits +package org.isoron.uhabits.inject import android.content.* import dagger.* -import org.isoron.androidbase.* import org.isoron.uhabits.core.* import org.isoron.uhabits.core.commands.* import org.isoron.uhabits.core.database.* @@ -34,6 +33,7 @@ import org.isoron.uhabits.core.sync.* import org.isoron.uhabits.core.tasks.* import org.isoron.uhabits.core.ui.* import org.isoron.uhabits.database.* +import org.isoron.uhabits.inject.* import org.isoron.uhabits.intents.* import org.isoron.uhabits.io.* import org.isoron.uhabits.notifications.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt index f1d404a65..2aa2eb75e 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt @@ -26,11 +26,11 @@ import android.content.Context.* import android.os.Build.VERSION.* import android.os.Build.VERSION_CODES.* import android.util.* -import org.isoron.androidbase.* import org.isoron.uhabits.core.* import org.isoron.uhabits.core.models.* import org.isoron.uhabits.core.reminders.ReminderScheduler.* import org.isoron.uhabits.core.utils.* +import org.isoron.uhabits.inject.* import java.util.* import javax.inject.* 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 2e36dd231..21f5563ac 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 @@ -23,11 +23,10 @@ import android.app.* import android.app.PendingIntent.* import android.content.* import android.net.* -import org.isoron.androidbase.* import org.isoron.uhabits.core.* import org.isoron.uhabits.core.models.* +import org.isoron.uhabits.inject.* import org.isoron.uhabits.receivers.* -import org.isoron.uhabits.widgets.* import javax.inject.* @AppScope 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 42e584b8f..8bd602294 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 @@ -28,12 +28,12 @@ import android.os.Build.VERSION.* import android.util.* import androidx.core.app.* import androidx.core.app.NotificationCompat.* -import org.isoron.androidbase.* import org.isoron.uhabits.R import org.isoron.uhabits.core.* import org.isoron.uhabits.core.models.* import org.isoron.uhabits.core.preferences.* import org.isoron.uhabits.core.ui.* +import org.isoron.uhabits.inject.* import org.isoron.uhabits.intents.* import javax.inject.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt index f29382eac..30dca11f6 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt @@ -24,9 +24,9 @@ import android.media.RingtoneManager.* import android.net.* import android.preference.* import android.provider.* -import org.isoron.androidbase.* import org.isoron.uhabits.R import org.isoron.uhabits.core.* +import org.isoron.uhabits.inject.* import javax.inject.* @AppScope 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 a66cc34a5..db2226840 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 @@ -6,7 +6,7 @@ import android.graphics.*; import android.os.*; import androidx.annotation.Nullable; -import androidx.core.app.*; + import android.text.format.*; import android.view.*; import android.widget.*; @@ -17,6 +17,7 @@ import com.android.datetimepicker.time.TimePickerDialog; import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; +import org.isoron.uhabits.inject.*; import org.isoron.uhabits.receivers.*; import org.isoron.uhabits.utils.*; diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt index b92f10385..2a942d044 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt @@ -21,10 +21,10 @@ package org.isoron.uhabits.preferences import android.content.* import android.preference.* -import org.isoron.androidbase.* import org.isoron.uhabits.R import org.isoron.uhabits.core.* import org.isoron.uhabits.core.preferences.* +import org.isoron.uhabits.inject.* import javax.inject.* @AppScope 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 2d387c74f..3e18c6191 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 @@ -27,6 +27,7 @@ import androidx.annotation.Nullable; import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.utils.*; +import org.isoron.uhabits.inject.*; import static android.content.ContentUris.*; diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java index ee5ed743d..25e21bfb7 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java @@ -25,6 +25,7 @@ import android.util.*; import org.isoron.uhabits.*; import org.isoron.uhabits.core.preferences.*; import org.isoron.uhabits.core.ui.widgets.*; +import org.isoron.uhabits.inject.*; import org.isoron.uhabits.intents.*; import org.isoron.uhabits.widgets.*; import org.isoron.uhabits.widgets.activities.*; 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 1bc67d195..fc00a62a2 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 @@ -26,8 +26,9 @@ import androidx.annotation.Nullable; import com.google.auto.factory.*; -import org.isoron.androidbase.*; +import org.isoron.uhabits.*; import org.isoron.uhabits.core.tasks.*; +import org.isoron.uhabits.inject.*; import org.isoron.uhabits.utils.*; import java.io.*; diff --git a/android/android-base/src/main/java/org/isoron/androidbase/utils/ColorUtils.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ColorUtils.kt similarity index 95% rename from android/android-base/src/main/java/org/isoron/androidbase/utils/ColorUtils.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ColorUtils.kt index 5f3d3e9e8..0510adf6d 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/utils/ColorUtils.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ColorUtils.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package org.isoron.androidbase.utils +package org.isoron.uhabits.utils import android.graphics.Color import kotlin.math.max 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 a22c25209..831680902 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 @@ -26,9 +26,7 @@ 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.*; import org.isoron.uhabits.core.Config; import org.isoron.uhabits.core.utils.*; diff --git a/android/android-base/src/main/java/org/isoron/androidbase/utils/FileUtils.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.kt similarity index 95% rename from android/android-base/src/main/java/org/isoron/androidbase/utils/FileUtils.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.kt index 7e6b68f88..2b1d1922b 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/utils/FileUtils.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package org.isoron.androidbase.utils +package org.isoron.uhabits.utils import android.os.Environment import android.util.Log diff --git a/android/android-base/src/main/java/org/isoron/androidbase/utils/InterfaceUtils.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.kt similarity index 96% rename from android/android-base/src/main/java/org/isoron/androidbase/utils/InterfaceUtils.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.kt index 6ce0abae8..477598105 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/utils/InterfaceUtils.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package org.isoron.androidbase.utils +package org.isoron.uhabits.utils import android.content.* import android.graphics.* diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt index fa542eabf..f563275ee 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt @@ -3,7 +3,6 @@ package org.isoron.uhabits.utils import android.content.Context import android.graphics.Color import android.util.Log -import org.isoron.androidbase.utils.StyledResources import org.isoron.uhabits.core.models.* object PaletteUtils { diff --git a/android/android-base/src/main/java/org/isoron/androidbase/utils/StyledResources.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/StyledResources.kt similarity index 95% rename from android/android-base/src/main/java/org/isoron/androidbase/utils/StyledResources.kt rename to android/uhabits-android/src/main/java/org/isoron/uhabits/utils/StyledResources.kt index 3ef22d052..961bc9749 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/utils/StyledResources.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/StyledResources.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package org.isoron.androidbase.utils +package org.isoron.uhabits.utils import android.content.Context import android.content.res.TypedArray import android.graphics.drawable.Drawable import androidx.annotation.AttrRes -import org.isoron.androidbase.R +import org.isoron.uhabits.R class StyledResources(private val context: Context) { 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 1c955609c..08898c091 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 @@ -33,7 +33,6 @@ import androidx.appcompat.app.* import androidx.appcompat.widget.Toolbar import androidx.core.content.* import com.google.android.material.snackbar.* -import org.isoron.androidbase.utils.* import org.isoron.uhabits.* import org.isoron.uhabits.core.models.* import java.io.* @@ -148,7 +147,7 @@ fun View.setupToolbar( val res = StyledResources(context) toolbar.title = title val toolbarColor = if (!res.getBoolean(R.attr.useHabitColorAsPrimary)) { - StyledResources(context).getColor(org.isoron.androidbase.R.attr.colorPrimary) + StyledResources(context).getColor(R.attr.colorPrimary) } else { color.toThemedAndroidColor(context) } 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 69e8437da..46a5821fc 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 @@ -34,7 +34,7 @@ import org.isoron.uhabits.core.preferences.*; import java.util.*; import static android.appwidget.AppWidgetManager.*; -import static org.isoron.androidbase.utils.InterfaceUtils.dpToPixels; +import static org.isoron.uhabits.utils.InterfaceUtils.dpToPixels; public abstract class BaseWidgetProvider extends AppWidgetProvider { 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 64b4be5a9..b03c441d3 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 @@ -16,7 +16,7 @@ import org.isoron.uhabits.core.utils.*; import java.util.*; import static android.appwidget.AppWidgetManager.*; -import static org.isoron.androidbase.utils.InterfaceUtils.dpToPixels; +import static org.isoron.uhabits.utils.InterfaceUtils.dpToPixels; import static org.isoron.uhabits.widgets.StackWidgetService.*; public class StackWidgetService extends RemoteViewsService diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt index 693d023ec..64573ad26 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt @@ -21,14 +21,13 @@ package org.isoron.uhabits.widgets import android.appwidget.* import android.content.* -import org.isoron.androidbase.* import org.isoron.uhabits.core.commands.* import org.isoron.uhabits.core.preferences.* import org.isoron.uhabits.core.tasks.* import org.isoron.uhabits.core.utils.* +import org.isoron.uhabits.inject.* import org.isoron.uhabits.intents.* import javax.inject.* -import kotlin.math.* /** * A WidgetUpdater listens to the commands being executed by the application and 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 0ff221c42..188557577 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 @@ -26,15 +26,15 @@ import android.widget.*; 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.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.activities.common.views.*; import org.isoron.uhabits.core.preferences.*; +import org.isoron.uhabits.inject.*; import org.isoron.uhabits.utils.*; -import static org.isoron.androidbase.utils.InterfaceUtils.getDimension; +import static org.isoron.uhabits.utils.InterfaceUtils.getDimension; public class CheckmarkWidgetView extends HabitWidgetView { protected int activeColor; 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 c6cd05d57..8c51cb21e 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 @@ -29,12 +29,12 @@ import android.widget.*; import androidx.annotation.*; -import org.isoron.androidbase.utils.*; import org.isoron.uhabits.*; +import org.isoron.uhabits.utils.*; import java.util.*; -import static org.isoron.androidbase.utils.InterfaceUtils.*; +import static org.isoron.uhabits.utils.InterfaceUtils.*; public abstract class HabitWidgetView extends FrameLayout { diff --git a/android/uhabits-android/src/main/res/layout/about.xml b/android/uhabits-android/src/main/res/layout/about.xml index f36bd68d2..143cb40d7 100644 --- a/android/uhabits-android/src/main/res/layout/about.xml +++ b/android/uhabits-android/src/main/res/layout/about.xml @@ -425,9 +425,4 @@ - - 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 ae11d3ce5..f83e3e64f 100644 --- a/android/uhabits-android/src/main/res/layout/settings_activity.xml +++ b/android/uhabits-android/src/main/res/layout/settings_activity.xml @@ -39,8 +39,4 @@ android:layout_gravity="center" android:layout_below="@id/toolbar"/> - - 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 b94dd2999..401921532 100644 --- a/android/uhabits-android/src/main/res/layout/show_habit.xml +++ b/android/uhabits-android/src/main/res/layout/show_habit.xml @@ -89,9 +89,4 @@ - - diff --git a/android/uhabits-android/src/main/res/values/attrs.xml b/android/uhabits-android/src/main/res/values/attrs.xml index 4fb100075..70c4e711d 100644 --- a/android/uhabits-android/src/main/res/values/attrs.xml +++ b/android/uhabits-android/src/main/res/values/attrs.xml @@ -47,6 +47,7 @@ + diff --git a/android/android-base/src/main/res/values/material_colors.xml b/android/uhabits-android/src/main/res/values/material_colors.xml similarity index 100% rename from android/android-base/src/main/res/values/material_colors.xml rename to android/uhabits-android/src/main/res/values/material_colors.xml