diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/AndroidTestComponent.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/AndroidTestComponent.java index 55a756d92..093740d8e 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/AndroidTestComponent.java +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/AndroidTestComponent.java @@ -20,6 +20,7 @@ package org.isoron.uhabits; +import org.isoron.androidbase.*; import org.isoron.uhabits.models.sqlite.*; import org.isoron.uhabits.tasks.*; diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java index 38258775d..2409d9b6d 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java @@ -27,6 +27,7 @@ import android.support.annotation.*; import android.support.test.*; import android.util.*; +import org.isoron.androidbase.*; import org.isoron.uhabits.models.*; import org.isoron.uhabits.preferences.*; import org.isoron.uhabits.tasks.*; diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java index bf252ef61..edf512827 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java @@ -23,8 +23,8 @@ import android.os.*; import android.support.test.runner.*; import android.test.suitebuilder.annotation.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.models.*; -import org.isoron.uhabits.activities.*; import org.junit.*; import org.junit.runner.*; diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java index d97f03ea3..8371c593f 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java @@ -22,7 +22,7 @@ package org.isoron.uhabits; import android.support.test.runner.*; import android.test.suitebuilder.annotation.*; -import org.isoron.uhabits.activities.*; +import org.isoron.androidbase.activities.*; import org.junit.*; import org.junit.runner.*; diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/AppContext.java b/uhabits-android/src/main/java/org/isoron/androidbase/AppContext.java similarity index 96% rename from uhabits-core/src/main/java/org/isoron/uhabits/AppContext.java rename to uhabits-android/src/main/java/org/isoron/androidbase/AppContext.java index ebd0aab10..d7521e26d 100644 --- a/uhabits-core/src/main/java/org/isoron/uhabits/AppContext.java +++ b/uhabits-android/src/main/java/org/isoron/androidbase/AppContext.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits; +package org.isoron.androidbase; import java.lang.annotation.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/AppModule.java b/uhabits-android/src/main/java/org/isoron/androidbase/AppModule.java similarity index 97% rename from uhabits-android/src/main/java/org/isoron/uhabits/AppModule.java rename to uhabits-android/src/main/java/org/isoron/androidbase/AppModule.java index c5aa66c70..6e672994b 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/AppModule.java +++ b/uhabits-android/src/main/java/org/isoron/androidbase/AppModule.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits; +package org.isoron.androidbase; import android.content.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityContext.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityContext.java similarity index 95% rename from uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityContext.java rename to uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityContext.java index c75c28dae..5749c4ecc 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityContext.java +++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityContext.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities; +package org.isoron.androidbase.activities; import java.lang.annotation.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityModule.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityModule.java similarity index 96% rename from uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityModule.java rename to uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityModule.java index dcf743241..f3910c989 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityModule.java +++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityModule.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities; +package org.isoron.androidbase.activities; import android.content.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityScope.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityScope.java similarity index 95% rename from uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityScope.java rename to uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityScope.java index 3d02e80ae..82dad3ce9 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityScope.java +++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityScope.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities; +package org.isoron.androidbase.activities; import javax.inject.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseActivity.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseActivity.java similarity index 97% rename from uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseActivity.java rename to uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseActivity.java index 2167311cb..dc8f28ed6 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseActivity.java +++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseActivity.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities; +package org.isoron.androidbase.activities; import android.content.*; import android.os.*; @@ -26,6 +26,7 @@ import android.support.v7.app.*; import android.view.*; import org.isoron.uhabits.*; +import org.isoron.uhabits.activities.*; import static android.R.anim.fade_in; import static android.R.anim.fade_out; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseExceptionHandler.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseExceptionHandler.java similarity index 97% rename from uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseExceptionHandler.java rename to uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseExceptionHandler.java index 5ea4638d9..e0f4c7777 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseExceptionHandler.java +++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseExceptionHandler.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities; +package org.isoron.androidbase.activities; import android.support.annotation.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseMenu.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseMenu.java similarity index 98% rename from uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseMenu.java rename to uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseMenu.java index 0a1e8026c..0b30aec2b 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseMenu.java +++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseMenu.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities; +package org.isoron.androidbase.activities; import android.support.annotation.*; import android.view.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseRootView.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseRootView.java similarity index 97% rename from uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseRootView.java rename to uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseRootView.java index 93fbe562f..38238a6f5 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseRootView.java +++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseRootView.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities; +package org.isoron.androidbase.activities; import android.content.*; import android.support.annotation.*; @@ -27,6 +27,7 @@ import android.view.*; import android.widget.*; import org.isoron.uhabits.*; +import org.isoron.uhabits.activities.*; import org.isoron.uhabits.utils.*; import static android.os.Build.VERSION.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseScreen.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseScreen.java similarity index 99% rename from uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseScreen.java rename to uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseScreen.java index 302ec7db1..9be10c58e 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseScreen.java +++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseScreen.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities; +package org.isoron.androidbase.activities; import android.content.*; import android.graphics.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseSelectionMenu.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java similarity index 98% rename from uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseSelectionMenu.java rename to uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java index 2b3c56d25..87396e216 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseSelectionMenu.java +++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities; +package org.isoron.androidbase.activities; import android.support.annotation.*; import android.support.v7.view.ActionMode; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseSystem.java b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseSystem.java similarity index 99% rename from uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseSystem.java rename to uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseSystem.java index bacf911b3..bbb47b685 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/BaseSystem.java +++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseSystem.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.activities; +package org.isoron.androidbase.activities; import android.content.*; import android.os.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/AppComponent.java b/uhabits-android/src/main/java/org/isoron/uhabits/AppComponent.java index 3dc205dd2..4c39f48cc 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/AppComponent.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/AppComponent.java @@ -21,6 +21,7 @@ package org.isoron.uhabits; import android.content.*; +import org.isoron.androidbase.*; import org.isoron.uhabits.activities.habits.list.model.*; import org.isoron.uhabits.commands.*; import org.isoron.uhabits.intents.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java index 8e2e1e8ad..2e298ce9e 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java @@ -24,6 +24,7 @@ import android.content.*; import com.activeandroid.*; +import org.isoron.androidbase.*; import org.isoron.uhabits.models.sqlite.*; import org.isoron.uhabits.notifications.*; import org.isoron.uhabits.preferences.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityComponent.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityComponent.java index 918a70b4b..4a085df13 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityComponent.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityComponent.java @@ -19,6 +19,7 @@ package org.isoron.uhabits.activities; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; import org.isoron.uhabits.activities.common.dialogs.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/ThemeSwitcher.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/ThemeSwitcher.java index d560800ec..6a92b421d 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/ThemeSwitcher.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/ThemeSwitcher.java @@ -21,6 +21,7 @@ package org.isoron.uhabits.activities; import android.support.annotation.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; import org.isoron.uhabits.preferences.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java index b887766a5..543f032c6 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java @@ -21,7 +21,7 @@ package org.isoron.uhabits.activities.about; import android.os.*; -import org.isoron.uhabits.activities.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.intents.*; /** diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java index e4d18bbd6..4d03b5313 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java @@ -24,10 +24,10 @@ import android.support.annotation.*; import android.support.v7.widget.Toolbar; import android.widget.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.BuildConfig; import org.isoron.uhabits.*; import org.isoron.uhabits.R; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.intents.*; import org.isoron.uhabits.preferences.*; import org.isoron.uhabits.utils.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java index e13368916..f959bee62 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java @@ -21,8 +21,8 @@ package org.isoron.uhabits.activities.common.dialogs; import android.content.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.utils.*; import javax.inject.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java index cf5ef4b89..83fed5857 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java @@ -24,8 +24,8 @@ import android.support.v7.app.*; import com.google.auto.factory.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.R; -import org.isoron.uhabits.activities.*; import butterknife.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java index 93504ee7e..c2bad78f4 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java @@ -28,9 +28,9 @@ import android.view.*; import com.android.datetimepicker.time.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; import org.isoron.uhabits.R; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.activities.common.dialogs.*; import org.isoron.uhabits.activities.habits.edit.views.*; import org.isoron.uhabits.commands.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.java index ff8e50d8a..462c90645 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.java @@ -22,6 +22,7 @@ package org.isoron.uhabits.activities.habits.list; import android.content.*; import android.os.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; import org.isoron.uhabits.activities.*; import org.isoron.uhabits.activities.habits.list.model.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsComponent.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsComponent.java index 4f8161d40..fd36e8293 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsComponent.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsComponent.java @@ -19,8 +19,8 @@ package org.isoron.uhabits.activities.habits.list; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.activities.habits.list.controllers.*; import org.isoron.uhabits.activities.habits.list.model.*; import org.isoron.uhabits.utils.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java index efd734938..3e45a6411 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java @@ -21,8 +21,8 @@ package org.isoron.uhabits.activities.habits.list; import android.support.annotation.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.activities.habits.list.controllers.*; import org.isoron.uhabits.activities.habits.list.model.*; import org.isoron.uhabits.commands.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java index aa3826c4c..68b8ae69b 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java @@ -22,6 +22,7 @@ package org.isoron.uhabits.activities.habits.list; import android.support.annotation.*; import android.view.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; import org.isoron.uhabits.models.*; import org.isoron.uhabits.activities.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java index 538d8ae5a..bc120ea6d 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java @@ -25,8 +25,8 @@ import android.support.v7.widget.Toolbar; import android.view.*; import android.widget.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.R; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.activities.common.views.*; import org.isoron.uhabits.activities.habits.list.controllers.*; import org.isoron.uhabits.activities.habits.list.model.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.java index 6c0a6f9ce..c26974e95 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.java @@ -28,6 +28,7 @@ import android.text.*; import android.view.*; import android.widget.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; import org.isoron.uhabits.activities.*; import org.isoron.uhabits.activities.common.dialogs.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.java index 9543fe352..ca63f925c 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.java @@ -22,10 +22,10 @@ package org.isoron.uhabits.activities.habits.list; import android.support.annotation.*; import android.view.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; import org.isoron.uhabits.commands.*; import org.isoron.uhabits.models.*; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.activities.habits.list.controllers.*; import org.isoron.uhabits.activities.habits.list.model.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java index 949794fbf..4367bbb23 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java @@ -23,7 +23,7 @@ import android.support.annotation.*; import android.support.v7.widget.*; import android.view.*; -import org.isoron.uhabits.activities.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.activities.habits.list.*; import org.isoron.uhabits.activities.habits.list.views.*; import org.isoron.uhabits.models.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java index 7d9a90eef..611b979b5 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java @@ -24,8 +24,8 @@ import android.net.*; import android.os.*; import android.support.annotation.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.models.*; /** diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitComponent.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitComponent.java index e1974c23e..497ea8f61 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitComponent.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitComponent.java @@ -19,8 +19,8 @@ package org.isoron.uhabits.activities.habits.show; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; -import org.isoron.uhabits.activities.*; import dagger.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitController.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitController.java index c4a463199..960e5abfb 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitController.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitController.java @@ -21,7 +21,7 @@ package org.isoron.uhabits.activities.habits.show; import android.support.annotation.*; -import org.isoron.uhabits.activities.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.activities.common.dialogs.*; import org.isoron.uhabits.commands.*; import org.isoron.uhabits.models.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java index bf4cbee25..92f29ecaf 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java @@ -19,7 +19,7 @@ package org.isoron.uhabits.activities.habits.show; -import org.isoron.uhabits.activities.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.models.*; import dagger.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java index 7c2f16364..42f888014 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java @@ -24,8 +24,8 @@ import android.os.*; import android.support.annotation.*; import android.support.v7.widget.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.R; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.activities.habits.show.views.*; import org.isoron.uhabits.models.*; import org.isoron.uhabits.utils.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java index ec61d3b8f..d1f680c52 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java @@ -21,7 +21,7 @@ package org.isoron.uhabits.activities.habits.show; import android.support.annotation.*; -import org.isoron.uhabits.activities.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.activities.common.dialogs.*; import org.isoron.uhabits.activities.habits.edit.*; import org.isoron.uhabits.models.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java index 03f688a06..6d157f09e 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java @@ -22,8 +22,8 @@ package org.isoron.uhabits.activities.habits.show; import android.support.annotation.*; import android.view.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.models.*; import org.isoron.uhabits.tasks.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java index 914e7e714..15bfce36f 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java @@ -21,8 +21,8 @@ package org.isoron.uhabits.activities.settings; import android.os.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.utils.*; /** diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.java index d92e73480..3ca38f919 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.java @@ -21,8 +21,8 @@ package org.isoron.uhabits.automation; import android.os.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.models.*; public class EditSettingActivity extends BaseActivity diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java index 10fad0a0d..bcd0061b8 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java @@ -25,8 +25,8 @@ import android.support.v7.widget.*; import android.support.v7.widget.Toolbar; import android.widget.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.R; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.models.*; import org.isoron.uhabits.utils.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.java b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.java index a53547654..5757a4b83 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.java @@ -24,6 +24,7 @@ import android.content.*; import android.os.*; import android.support.annotation.*; +import org.isoron.androidbase.*; import org.isoron.uhabits.*; import javax.inject.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.java b/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.java index 12ef4c65b..cb3a8867c 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.java @@ -24,6 +24,7 @@ import android.content.*; import android.net.*; import android.support.annotation.*; +import org.isoron.androidbase.*; import org.isoron.uhabits.*; import org.isoron.uhabits.models.*; import org.isoron.uhabits.receivers.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java b/uhabits-android/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java index bfcf5886f..6ca1ffddd 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java @@ -27,6 +27,7 @@ import android.util.*; import com.activeandroid.*; +import org.isoron.androidbase.*; import org.isoron.uhabits.*; import org.isoron.uhabits.models.*; import org.isoron.uhabits.utils.DatabaseUtils; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/NotificationTray.java b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/NotificationTray.java index 838e4b4a1..bfff186b8 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/NotificationTray.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/NotificationTray.java @@ -26,6 +26,7 @@ import android.support.annotation.*; import android.support.v4.app.*; import android.support.v4.app.NotificationCompat.*; +import org.isoron.androidbase.*; import org.isoron.uhabits.*; import org.isoron.uhabits.commands.*; import org.isoron.uhabits.intents.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/Preferences.java b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/Preferences.java index 878aaa681..33d324851 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/Preferences.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/Preferences.java @@ -22,6 +22,7 @@ package org.isoron.uhabits.preferences; import android.content.*; import android.preference.*; +import org.isoron.androidbase.*; import org.isoron.uhabits.*; import org.isoron.uhabits.activities.*; import org.isoron.uhabits.models.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java index 56566f639..0fb10a8d4 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java @@ -22,6 +22,7 @@ package org.isoron.uhabits.preferences; import android.content.*; import android.preference.*; +import org.isoron.androidbase.*; import org.isoron.uhabits.*; import org.isoron.uhabits.models.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java b/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java index ebfee4be8..101786103 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java @@ -23,6 +23,7 @@ import android.content.*; import android.support.annotation.*; import android.util.*; +import org.isoron.androidbase.*; import org.isoron.uhabits.*; import org.isoron.uhabits.commands.*; import org.isoron.uhabits.preferences.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportCSVTask.java b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportCSVTask.java index 1b0abf3a3..2af56b28d 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportCSVTask.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportCSVTask.java @@ -24,7 +24,7 @@ import android.support.annotation.*; import com.google.auto.factory.*; -import org.isoron.uhabits.AppContext; +import org.isoron.androidbase.AppContext; import org.isoron.uhabits.io.*; import org.isoron.uhabits.models.*; import org.isoron.uhabits.utils.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java index 26f523194..b731071d6 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java @@ -25,8 +25,7 @@ import android.support.annotation.*; import com.google.auto.factory.AutoFactory; import com.google.auto.factory.Provided; -import org.isoron.uhabits.AppContext; -import org.isoron.uhabits.activities.ActivityContext; +import org.isoron.androidbase.AppContext; import org.isoron.uhabits.utils.*; import java.io.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.java b/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.java index 4cee13ac3..685480614 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.java @@ -25,8 +25,6 @@ import android.support.annotation.*; import android.support.v4.content.*; import android.util.*; -import org.isoron.uhabits.*; - import java.io.*; public abstract class FileUtils diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/utils/MidnightTimer.java b/uhabits-android/src/main/java/org/isoron/uhabits/utils/MidnightTimer.java index 30021ae71..340505d70 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/MidnightTimer.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/MidnightTimer.java @@ -19,7 +19,7 @@ package org.isoron.uhabits.utils; -import org.isoron.uhabits.activities.*; +import org.isoron.androidbase.activities.*; import java.util.*; import java.util.concurrent.*; diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.java index 72f3e441a..1d326a46a 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.java @@ -23,7 +23,7 @@ import android.appwidget.*; import android.content.*; import android.support.annotation.*; -import org.isoron.uhabits.*; +import org.isoron.androidbase.*; import org.isoron.uhabits.commands.*; import org.isoron.uhabits.tasks.*; diff --git a/uhabits-android/src/test/java/org/isoron/uhabits/activities/BaseActivityTest.java b/uhabits-android/src/test/java/org/isoron/uhabits/activities/BaseActivityTest.java index cf3050970..c3bef6aab 100644 --- a/uhabits-android/src/test/java/org/isoron/uhabits/activities/BaseActivityTest.java +++ b/uhabits-android/src/test/java/org/isoron/uhabits/activities/BaseActivityTest.java @@ -27,6 +27,7 @@ import android.support.v7.widget.Toolbar; import android.view.*; import android.widget.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; import org.isoron.uhabits.activities.common.dialogs.*; import org.junit.*; diff --git a/uhabits-android/src/test/java/org/isoron/uhabits/activities/BaseScreenTest.java b/uhabits-android/src/test/java/org/isoron/uhabits/activities/BaseScreenTest.java index f087aca4d..0cbcee956 100644 --- a/uhabits-android/src/test/java/org/isoron/uhabits/activities/BaseScreenTest.java +++ b/uhabits-android/src/test/java/org/isoron/uhabits/activities/BaseScreenTest.java @@ -25,6 +25,7 @@ import android.support.v7.view.ActionMode; import android.support.v7.widget.*; import android.view.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; import org.junit.*; import org.junit.runner.*; diff --git a/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsControllerTest.java b/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsControllerTest.java index 74b71a74b..e963cf808 100644 --- a/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsControllerTest.java +++ b/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsControllerTest.java @@ -19,8 +19,8 @@ package org.isoron.uhabits.activities.habits.list; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; -import org.isoron.uhabits.activities.*; import org.isoron.uhabits.activities.habits.list.model.*; import org.isoron.uhabits.commands.*; import org.isoron.uhabits.models.*; diff --git a/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.java b/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.java index c457fe0a7..c3cf921c7 100644 --- a/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.java +++ b/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.java @@ -21,6 +21,7 @@ package org.isoron.uhabits.activities.habits.list; import android.view.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; import org.isoron.uhabits.activities.*; import org.isoron.uhabits.activities.habits.list.model.*; diff --git a/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java b/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java index e292c3b56..888c8eeba 100644 --- a/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java +++ b/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java @@ -22,6 +22,7 @@ package org.isoron.uhabits.activities.habits.list; import android.content.*; +import org.isoron.androidbase.activities.*; import org.isoron.uhabits.*; import org.isoron.uhabits.activities.*; import org.isoron.uhabits.activities.common.dialogs.*;