Rename uhabits-core package

2025-12-07 09:38:52 -06:00 · 2017-05-28 10:34:57 -04:00
parent c9b62669de
commit 1746920699
255 changed files with 501 additions and 468 deletions
--- a/uhabits-android/src/main/java/org/isoron/androidbase/BaseSystem.java
+++ b/uhabits-android/src/main/java/org/isoron/androidbase/BaseSystem.java
@@ -28,9 +28,10 @@ import android.view.*;

 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.utils.*;

 import java.io.*;
 import java.lang.Process;
--- a/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityComponent.java
+++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityComponent.java
@@ -21,7 +21,7 @@ package org.isoron.androidbase.activities;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.ui.*;

 import dagger.*;

--- a/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityModule.java
+++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityModule.java
@@ -22,7 +22,7 @@ package org.isoron.androidbase.activities;
 import android.content.*;

 import org.isoron.uhabits.activities.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.ui.*;

 import dagger.*;

--- a/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseExceptionHandler.java
+++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseExceptionHandler.java
@@ -23,7 +23,7 @@ import android.support.annotation.*;

 import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.models.sqlite.*;

 public class BaseExceptionHandler implements Thread.UncaughtExceptionHandler
--- a/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseRootView.java
+++ b/uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseRootView.java
@@ -27,7 +27,7 @@ import android.view.*;
 import android.widget.*;

 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.ui.*;
 import org.isoron.uhabits.utils.*;

 import static android.os.Build.VERSION.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.java
@@ -22,8 +22,9 @@ package org.isoron.uhabits;
 import android.support.annotation.*;
 import android.util.*;

-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;

 import java.text.*;
 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java
@@ -27,8 +27,8 @@ import com.activeandroid.*;
 import org.isoron.androidbase.*;
 import org.isoron.uhabits.models.sqlite.*;
 import org.isoron.uhabits.notifications.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.tasks.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsComponent.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsComponent.java
@@ -22,18 +22,21 @@ package org.isoron.uhabits;
 import android.content.*;

 import org.isoron.androidbase.*;
-import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.intents.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.io.*;
-import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.models.sqlite.*;
 import org.isoron.uhabits.notifications.*;
+import org.isoron.uhabits.core.preferences.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.sync.*;
+import org.isoron.uhabits.core.tasks.*;
+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.tasks.*;
-import org.isoron.uhabits.tasks.android.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.java
@@ -19,9 +19,11 @@

 package org.isoron.uhabits;

+import org.isoron.uhabits.core.*;
 import org.isoron.uhabits.notifications.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.ui.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;

 import dagger.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.java
@@ -23,8 +23,8 @@ import android.support.annotation.*;

 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.ui.*;

 import javax.inject.*;

--- 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
@@ -23,7 +23,7 @@ import android.os.*;

 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.screens.about.*;
+import org.isoron.uhabits.core.ui.screens.about.*;

 /**
 * Activity that allows the user to see information about the app itself.
--- 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
@@ -26,7 +26,7 @@ import android.widget.*;
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.BuildConfig;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.ui.screens.about.*;
+import org.isoron.uhabits.core.ui.screens.about.*;
 import org.isoron.uhabits.utils.*;

 import butterknife.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java
@@ -24,7 +24,7 @@ import android.widget.*;

 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.intents.*;
-import org.isoron.uhabits.ui.screens.about.*;
+import org.isoron.uhabits.core.ui.screens.about.*;

 import javax.inject.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
@@ -19,7 +19,7 @@

 package org.isoron.uhabits.activities.common.dialogs;

-import org.isoron.uhabits.ui.callbacks.*;
+import org.isoron.uhabits.core.ui.callbacks.*;
 import org.isoron.uhabits.utils.*;

 /**
--- 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
@@ -27,7 +27,7 @@ import com.google.auto.factory.*;

 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.ui.callbacks.*;
+import org.isoron.uhabits.core.ui.callbacks.*;

 import butterknife.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
@@ -29,8 +29,8 @@ import android.util.*;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.utils.*;

 import static org.isoron.uhabits.utils.InterfaceUtils.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
@@ -26,8 +26,8 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.app.*;

 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;

 /**
 * Dialog that allows the user to pick one or more days of the week.
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
@@ -26,7 +26,8 @@ import android.util.*;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;

 import java.text.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
@@ -25,6 +25,7 @@ import android.support.annotation.*;
 import android.util.*;

 import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;

 import java.text.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
@@ -19,7 +19,7 @@

 package org.isoron.uhabits.activities.common.views;

-import org.isoron.uhabits.models.Habit;
+import org.isoron.uhabits.core.models.Habit;

 public interface HabitChart
 {
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
@@ -27,12 +27,13 @@ import android.util.*;
 import android.view.*;

 import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;

 import java.text.*;
 import java.util.*;

-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 import static org.isoron.uhabits.utils.InterfaceUtils.*;

 public class HistoryChart extends ScrollableChart
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
@@ -25,7 +25,8 @@ import android.support.annotation.*;
 import android.util.*;

 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;

 import java.text.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
@@ -26,7 +26,8 @@ import android.view.*;
 import android.view.ViewGroup.*;

 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;

 import java.text.*;
--- 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
@@ -33,14 +33,14 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.edit.views.*;
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.preferences.*;

 import butterknife.*;

 import static android.view.View.*;
-import static org.isoron.uhabits.activities.ThemeSwitcher.THEME_LIGHT;
+import static org.isoron.uhabits.core.ui.ThemeSwitcher.THEME_LIGHT;

 public class EditHabitDialog extends AppCompatDialogFragment
 {
@@ -77,7 +77,7 @@ public class EditHabitDialog extends AppCompatDialogFragment
    @Override
    public int getTheme()
    {
-        AppComponent component =
+        HabitsComponent component =
            ((HabitsApplication) getContext().getApplicationContext()).getComponent();

        if(component.getPreferences().getTheme() == THEME_LIGHT)
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
@@ -22,7 +22,7 @@ package org.isoron.uhabits.activities.habits.edit;
 import android.os.*;
 import android.support.annotation.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 import javax.inject.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java
@@ -28,7 +28,7 @@ import android.view.*;
 import android.widget.*;

 import org.isoron.uhabits.R;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 import butterknife.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
@@ -29,7 +29,7 @@ import android.widget.*;

 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;

 import butterknife.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java
@@ -31,7 +31,7 @@ import com.android.datetimepicker.time.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;

 import butterknife.*;
--- 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
@@ -27,8 +27,8 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.sync.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.ui.*;
+import org.isoron.uhabits.core.utils.*;

 /**
 * Activity that allows the user to see and modify the list of habits.
--- 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
@@ -25,10 +25,10 @@ import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.tasks.android.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;

 import java.io.*;

--- 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
@@ -24,9 +24,9 @@ import android.view.*;

 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.ui.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;

 import javax.inject.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.java
@@ -23,7 +23,7 @@ package org.isoron.uhabits.activities.habits.list;
 import org.isoron.androidbase.*;
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;

 import dagger.*;

--- 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
@@ -31,9 +31,9 @@ import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 import org.isoron.uhabits.utils.*;

 import javax.inject.*;
--- 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
@@ -34,13 +34,13 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.edit.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
-import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.intents.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+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.preferences.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.callbacks.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
 import org.isoron.uhabits.utils.*;

 import java.io.*;
--- 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
@@ -26,8 +26,8 @@ import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;

 import javax.inject.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java
@@ -24,7 +24,7 @@ import android.support.annotation.*;
 import com.google.auto.factory.*;

 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.preferences.*;

@AutoFactory
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardController.java
@@ -22,7 +22,7 @@ package org.isoron.uhabits.activities.habits.list.controllers;
 import android.support.annotation.*;

 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 public class HabitCardController implements HabitCardView.Controller
 {
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListController.java
@@ -24,7 +24,7 @@ import android.support.annotation.*;
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 import javax.inject.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/NumberButtonController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/NumberButtonController.java
@@ -24,7 +24,7 @@ import android.support.annotation.*;
 import com.google.auto.factory.*;

 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.preferences.*;

@AutoFactory
--- 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
@@ -26,10 +26,10 @@ import android.view.*;
 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.*;
+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.preferences.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
-import org.isoron.uhabits.utils.*;

 import java.util.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java
@@ -32,7 +32,7 @@ import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.utils.*;

 import static android.view.View.MeasureSpec.*;
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 import static org.isoron.uhabits.utils.AttributeSetUtils.*;
 import static org.isoron.uhabits.utils.InterfaceUtils.getDimension;
 import static org.isoron.uhabits.utils.InterfaceUtils.getFontAwesome;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java
@@ -27,9 +27,9 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.utils.*;

 import java.util.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.java
@@ -30,7 +30,7 @@ import android.view.*;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 import java.util.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
@@ -31,7 +31,8 @@ import android.widget.*;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;

 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java
@@ -27,6 +27,7 @@ import android.util.*;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.views.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.utils.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.java
@@ -29,7 +29,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;

 import org.isoron.uhabits.R;
-import org.isoron.uhabits.ui.screens.habits.list.HintList;
+import org.isoron.uhabits.core.ui.screens.habits.list.HintList;

 import java.util.Random;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.java
@@ -27,9 +27,9 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.utils.*;

 import java.util.*;

--- 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
@@ -26,7 +26,7 @@ import android.support.annotation.*;

 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 /**
 * Activity that allows the user to see more information about a single habit.
--- 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
@@ -23,7 +23,7 @@ import android.support.annotation.*;

 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.show.views.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;

 import javax.inject.*;

--- 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
@@ -23,8 +23,8 @@ import android.support.annotation.*;

 import org.isoron.androidbase.*;
 import org.isoron.androidbase.activities.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;

 import dagger.*;

--- 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
@@ -27,7 +27,7 @@ import android.support.v7.widget.*;
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.habits.show.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;

 import javax.inject.*;
--- 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
@@ -25,8 +25,8 @@ import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.edit.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;

 import javax.inject.*;

--- 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
@@ -24,7 +24,7 @@ import android.view.*;

 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;

 import javax.inject.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java
@@ -27,8 +27,9 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;

 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
@@ -27,8 +27,8 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.utils.*;

 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
@@ -24,8 +24,8 @@ import android.support.annotation.*;
 import android.util.*;
 import android.widget.*;

-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.models.memory.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.models.memory.*;

 public abstract class HabitCard extends LinearLayout
    implements ModelObservable.Listener
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
@@ -27,8 +27,8 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.utils.*;

 import butterknife.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
@@ -27,8 +27,9 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;

 import butterknife.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
@@ -27,9 +27,10 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.tasks.*;
 import org.isoron.uhabits.utils.*;

 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
@@ -27,8 +27,8 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.utils.*;

 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
@@ -26,7 +26,7 @@ import android.util.*;
 import android.widget.*;

 import org.isoron.uhabits.R;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;

 import butterknife.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.java
@@ -23,7 +23,7 @@ import android.os.*;

 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 public class EditSettingActivity extends BaseActivity
 {
--- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.java
@@ -25,7 +25,7 @@ import android.os.*;
 import android.support.annotation.*;

 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 import static org.isoron.uhabits.automation.FireSettingReceiver.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java
@@ -27,7 +27,7 @@ import android.widget.*;

 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;

 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.java
@@ -23,10 +23,10 @@ import android.content.*;
 import android.os.*;

 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.receivers.*;
-import org.isoron.uhabits.ui.widgets.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.ui.widgets.*;
+import org.isoron.uhabits.core.utils.*;

 import dagger.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/commands/CommandParser.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/commands/CommandParser.java
@@ -23,8 +23,8 @@ import android.support.annotation.*;

 import com.google.gson.*;

-import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
 import org.json.*;

 import javax.inject.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.java
@@ -28,7 +28,7 @@ import org.isoron.uhabits.activities.about.*;
 import org.isoron.uhabits.activities.habits.show.*;
 import org.isoron.uhabits.activities.intro.*;
 import org.isoron.uhabits.activities.settings.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 import javax.inject.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.java
@@ -23,9 +23,9 @@ import android.content.*;
 import android.net.*;
 import android.support.annotation.*;

-import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;

 import javax.inject.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.java
@@ -25,7 +25,7 @@ import android.os.*;
 import android.support.annotation.*;

 import org.isoron.androidbase.*;
-import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.*;

 import javax.inject.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.java
@@ -25,8 +25,8 @@ import android.net.*;
 import android.support.annotation.*;

 import org.isoron.androidbase.*;
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.receivers.*;

 import javax.inject.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/io/AbstractImporter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/AbstractImporter.java
@@ -21,7 +21,7 @@ package org.isoron.uhabits.io;

 import android.support.annotation.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 import java.io.*;
 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/io/GenericImporter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/GenericImporter.java
@@ -21,7 +21,7 @@ package org.isoron.uhabits.io;

 import android.support.annotation.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 import java.io.*;
 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/io/HabitBullCSVImporter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/HabitBullCSVImporter.java
@@ -24,8 +24,8 @@ import android.support.annotation.*;
 import com.activeandroid.*;
 import com.opencsv.*;

-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;

 import java.io.*;
 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java
@@ -30,7 +30,7 @@ import com.activeandroid.*;
 import org.isoron.androidbase.*;
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.DatabaseUtils;

 import java.io.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/io/RewireDBImporter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/RewireDBImporter.java
@@ -23,9 +23,9 @@ import android.database.*;
 import android.database.sqlite.*;
 import android.support.annotation.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.DatabaseUtils;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;

 import java.io.*;
 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/io/TickmateDBImporter.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/io/TickmateDBImporter.java
@@ -23,9 +23,9 @@ import android.database.*;
 import android.database.sqlite.*;
 import android.support.annotation.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.DatabaseUtils;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;

 import java.io.*;
 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLModelFactory.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLModelFactory.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.models.sqlite;

-import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;

 import dagger.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
@@ -26,9 +26,9 @@ import android.support.annotation.Nullable;
 import com.activeandroid.*;
 import com.activeandroid.query.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.models.sqlite.records.*;
-import org.isoron.uhabits.utils.*;
 import org.jetbrains.annotations.*;

 import java.util.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
@@ -25,7 +25,7 @@ import com.activeandroid.query.*;
 import com.activeandroid.util.*;

 import org.apache.commons.lang3.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.models.sqlite.records.*;

 import java.util.*;
@@ -261,7 +261,7 @@ public class SQLiteHabitList extends HabitList
        }
    }

-    protected synchronized List<Habit> toList()
+    public synchronized List<Habit> toList()
    {
        String query = buildSelectQuery();
        List<HabitRecord> recordList = sqlite.query(query, null);
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteRepetitionList.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteRepetitionList.java
@@ -19,15 +19,15 @@

 package org.isoron.uhabits.models.sqlite;

-import android.database.DatabaseUtils;
-import android.database.sqlite.SQLiteDatabase;
+import android.database.*;
+import android.database.sqlite.*;
 import android.support.annotation.*;
 import android.support.annotation.Nullable;

-import com.activeandroid.Cache;
+import com.activeandroid.*;
 import com.activeandroid.query.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.models.sqlite.records.*;
 import org.jetbrains.annotations.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
@@ -26,7 +26,7 @@ import android.support.annotation.Nullable;
 import com.activeandroid.*;
 import com.activeandroid.query.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.models.sqlite.records.*;
 import org.jetbrains.annotations.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
@@ -24,7 +24,8 @@ import android.support.annotation.Nullable;

 import com.activeandroid.query.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.models.sqlite.records.*;
 import org.isoron.uhabits.utils.*;
 import org.jetbrains.annotations.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
@@ -24,7 +24,7 @@ import android.database.*;
 import com.activeandroid.*;
 import com.activeandroid.annotation.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 /**
 * The SQLite database record corresponding to a {@link Checkmark}.
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/HabitRecord.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/HabitRecord.java
@@ -28,7 +28,7 @@ import com.activeandroid.annotation.*;
 import com.activeandroid.query.*;
 import com.activeandroid.util.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.DatabaseUtils;

 import java.lang.reflect.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/RepetitionRecord.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/RepetitionRecord.java
@@ -24,7 +24,7 @@ import android.database.*;
 import com.activeandroid.*;
 import com.activeandroid.annotation.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 /**
 * The SQLite database record corresponding to a {@link Repetition}.
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/ScoreRecord.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/ScoreRecord.java
@@ -24,7 +24,7 @@ import android.database.*;
 import com.activeandroid.*;
 import com.activeandroid.annotation.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 /**
 * The SQLite database record corresponding to a Score.
--- a/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/StreakRecord.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/records/StreakRecord.java
@@ -24,7 +24,7 @@ import android.database.*;
 import com.activeandroid.*;
 import com.activeandroid.annotation.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;

 import java.lang.reflect.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.java
@@ -28,13 +28,14 @@ import android.support.v4.app.NotificationCompat.*;

 import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.intents.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.ui.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.utils.*;

 import java.util.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.java
@@ -28,6 +28,7 @@ import android.support.annotation.*;

 import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.*;

 import javax.inject.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/AndroidPreferences.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/AndroidPreferences.java
@@ -24,8 +24,10 @@ import android.preference.*;

 import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.ui.*;

 import java.util.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java
@@ -23,8 +23,8 @@ import android.content.*;
 import android.preference.*;

 import org.isoron.androidbase.*;
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.models.*;

 import javax.inject.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/PebbleReceiver.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/PebbleReceiver.java
@@ -28,12 +28,12 @@ import com.getpebble.android.kit.PebbleKit.*;
 import com.getpebble.android.kit.util.*;

 import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.sync.*;
-import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;

 import java.util.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
@@ -21,8 +21,9 @@ package org.isoron.uhabits.receivers;

 import android.support.annotation.*;

-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.notifications.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.utils.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
@@ -23,8 +23,8 @@ import android.content.*;
 import android.util.*;

 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;

 import dagger.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java
@@ -26,7 +26,7 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.sync.*;
-import org.isoron.uhabits.ui.widgets.*;
+import org.isoron.uhabits.core.ui.widgets.*;

 import dagger.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java
@@ -25,6 +25,8 @@ import android.util.*;
 import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.preferences.*;
 import org.json.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/AndroidTaskRunner.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/AndroidTaskRunner.java
@@ -17,12 +17,12 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-package org.isoron.uhabits.tasks.android;
+package org.isoron.uhabits.tasks;

 import android.os.*;

-import org.isoron.uhabits.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.tasks.*;

 import java.util.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/ExportDBTask.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/ExportDBTask.java
@@ -17,7 +17,7 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-package org.isoron.uhabits.tasks.android;
+package org.isoron.uhabits.tasks;

 import android.content.*;
 import android.support.annotation.*;
@@ -25,7 +25,7 @@ import android.support.annotation.*;
 import com.google.auto.factory.*;

 import org.isoron.androidbase.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.utils.*;

 import java.io.*;
--- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/ImportDataTask.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/ImportDataTask.java
@@ -17,14 +17,14 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-package org.isoron.uhabits.tasks.android;
+package org.isoron.uhabits.tasks;

 import android.support.annotation.*;

 import com.google.auto.factory.*;

+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.io.*;
-import org.isoron.uhabits.tasks.*;

 import java.io.*;

--- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/package-info.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/android/package-info.java
@@ -19,6 +19,6 @@

 /**
 * Provides async tasks for useful operations such as {@link
- * org.isoron.uhabits.tasks.ExportCSVTask}.
+ * org.isoron.uhabits.core.tasks.ExportCSVTask}.
 */
-package org.isoron.uhabits.tasks.android;
+package org.isoron.uhabits.tasks;
--- a/Show More
+++ b/Show More