Rename uhabits-core package

uhabits-android/src/androidTest/java/org/isoron/uhabits/AndroidTestComponent.java

@@ -21,8 +21,9 @@ package org.isoron.uhabits;
 
 
 import org.isoron.androidbase.*;
+import org.isoron.uhabits.core.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.models.sqlite.*;
-import org.isoron.uhabits.tasks.*;
 
 import dagger.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java

@@ -30,9 +30,10 @@ import android.util.*;
 import junit.framework.*;
 
 import org.isoron.androidbase.*;
-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 org.junit.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java

@@ -24,7 +24,6 @@ import android.support.annotation.*;
 import android.view.*;
 import android.widget.*;
 
-import org.isoron.androidbase.activities.*;
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.*;
@@ -36,7 +35,6 @@ import static android.os.Build.VERSION.*;
 import static android.os.Build.VERSION_CODES.KITKAT;
 import static android.os.Build.VERSION_CODES.LOLLIPOP;
 import static android.view.View.MeasureSpec.*;
-import static junit.framework.Assert.*;
 
 public class BaseViewTest extends BaseAndroidTest
 {

uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java

@@ -19,8 +19,8 @@
 
 package org.isoron.uhabits;
 
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
-import org.isoron.uhabits.utils.DateUtils;
+import org.isoron.uhabits.core.utils.DateUtils;
 
 public class HabitFixtures
 {

uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java

@@ -24,7 +24,7 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.androidbase.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java

@@ -23,7 +23,8 @@ import android.support.test.filters.*;
 import android.support.test.runner.*;
 
 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 org.junit.*;
 import org.junit.runner.*;

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java

@@ -23,7 +23,7 @@ import android.support.test.filters.*;
 import android.support.test.runner.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java

@@ -23,7 +23,7 @@ import android.support.test.filters.*;
 import android.support.test.runner.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java

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

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java

@@ -23,7 +23,7 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.java

@@ -24,10 +24,10 @@ import android.view.*;
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
 import org.junit.*;
 import org.mockito.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java

@@ -27,11 +27,12 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.edit.*;
 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.preferences.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.callbacks.*;
 import org.junit.*;
 import org.junit.runner.*;
 import org.junit.runners.*;

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java

@@ -21,7 +21,7 @@ package org.isoron.uhabits.activities.habits.list.controllers;
 
 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.preferences.*;
 import org.junit.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardControllerTest.java

@@ -20,9 +20,9 @@
 package org.isoron.uhabits.activities.habits.list.controllers;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import static org.mockito.Mockito.*;

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.java

@@ -21,7 +21,7 @@ package org.isoron.uhabits.activities.habits.list.controllers;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
 import org.junit.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.java

@@ -23,7 +23,7 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.java

@@ -22,8 +22,8 @@ package org.isoron.uhabits.activities.habits.list.views;
 import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.*;
 
-import org.isoron.uhabits.models.Checkmark;
+import org.isoron.uhabits.core.models.Checkmark;
-import org.isoron.uhabits.models.Habit;
+import org.isoron.uhabits.core.models.Habit;
 import org.isoron.uhabits.BaseViewTest;
 import org.isoron.uhabits.utils.ColorUtils;
 import org.junit.Before;

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.java

@@ -23,8 +23,8 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java

@@ -23,8 +23,8 @@ import android.support.test.filters.*;
 import android.support.test.runner.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java

@@ -23,12 +23,12 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 import org.junit.*;
 import org.junit.runner.*;
 
-import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.*;
 
 @RunWith(AndroidJUnit4.class)

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java

@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java

@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java

@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java

@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java

@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java

@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/core/commands/CommandParserTest.java

@@ -17,13 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import android.support.annotation.*;
 
 import org.hamcrest.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.models.*;
 import org.json.*;
 import org.junit.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.io;
+package org.isoron.uhabits.core.io;
 
 import android.content.*;
 import android.support.test.*;
@@ -26,7 +26,7 @@ import android.test.suitebuilder.annotation.*;
 
 import org.isoron.androidbase.utils.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
@@ -34,8 +34,6 @@ import java.io.*;
 import java.util.*;
 import java.util.zip.*;
 
-import static junit.framework.Assert.*;
-
 @RunWith(AndroidJUnit4.class)
 @MediumTest
 public class HabitsCSVExporterTest extends BaseAndroidTest

uhabits-android/src/androidTest/java/org/isoron/uhabits/core/io/ImportTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.io;
+package org.isoron.uhabits.core.io;
 
 import android.content.*;
 import android.support.test.*;
@@ -26,8 +26,9 @@ import android.test.suitebuilder.annotation.*;
 
 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.*;
+import org.isoron.uhabits.core.utils.*;
+import org.isoron.uhabits.io.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/HabitListTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
@@ -30,11 +30,10 @@ import org.junit.runner.*;
 import java.io.*;
 import java.util.*;
 
-import static junit.framework.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.isoron.uhabits.models.HabitList.Order.*;
+import static org.isoron.uhabits.core.models.HabitList.Order.*;
 
 @SuppressWarnings("JavaDoc")
 @RunWith(AndroidJUnit4.class)

uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/HabitRecordTest.java

@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.sqlite;
+package org.isoron.uhabits.core.models.sqlite;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.models.sqlite.records.*;
 import org.junit.*;
 import org.junit.runner.*;

uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteCheckmarkListTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.sqlite;
+package org.isoron.uhabits.core.models.sqlite;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
@@ -25,16 +25,16 @@ import android.test.suitebuilder.annotation.*;
 import com.activeandroid.query.*;
 
 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.models.sqlite.records.*;
-import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 
 import java.util.*;
 
-import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
 
 @RunWith(AndroidJUnit4.class)
 @MediumTest

uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.sqlite;
+package org.isoron.uhabits.core.models.sqlite;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
@@ -25,7 +25,8 @@ import android.test.suitebuilder.annotation.*;
 import com.activeandroid.query.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.models.sqlite.*;
 import org.isoron.uhabits.models.sqlite.records.*;
 import org.junit.*;
 import org.junit.rules.*;
@@ -33,7 +34,6 @@ import org.junit.runner.*;
 
 import java.util.*;
 
-import static junit.framework.Assert.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsEqual.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.sqlite;
+package org.isoron.uhabits.core.models.sqlite;
 
 import android.support.annotation.*;
 import android.support.test.runner.*;
@@ -26,18 +26,18 @@ import android.test.suitebuilder.annotation.*;
 import com.activeandroid.query.*;
 
 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.models.sqlite.records.*;
-import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 
 import java.util.*;
 
-import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsNot.not;
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 
 @RunWith(AndroidJUnit4.class)
 @MediumTest

uhabits-android/src/androidTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteScoreListTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models.sqlite;
+package org.isoron.uhabits.core.models.sqlite;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
@@ -25,9 +25,9 @@ import android.test.suitebuilder.annotation.*;
 import com.activeandroid.query.*;
 
 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.models.sqlite.records.*;
-import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/core/tasks/ExportCSVTaskTest.java

@@ -17,20 +17,19 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks;
+package org.isoron.uhabits.core.tasks;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
 import java.io.*;
 import java.util.*;
 
-import static junit.framework.Assert.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.core.IsNot.not;

uhabits-android/src/androidTest/java/org/isoron/uhabits/core/tasks/ExportDBTaskTest.java

@@ -17,20 +17,18 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks;
+package org.isoron.uhabits.core.tasks;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.tasks.android.*;
+import org.isoron.uhabits.tasks.*;
 import org.junit.*;
 import org.junit.runner.*;
 
 import java.io.*;
 
-import static junit.framework.Assert.*;
-
 @RunWith(AndroidJUnit4.class)
 @MediumTest
 public class ExportDBTaskTest extends BaseAndroidTest

uhabits-android/src/androidTest/java/org/isoron/uhabits/core/utils/ReminderSchedulerTest.java

@@ -17,14 +17,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.utils;
+package org.isoron.uhabits.core.utils;
 
 import android.app.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.intents.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.utils.*;
 import org.junit.*;
 
 import java.util.*;

uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java

@@ -28,7 +28,7 @@ import com.getpebble.android.kit.*;
 import com.getpebble.android.kit.util.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.receivers.*;
 import org.json.*;
 import org.junit.*;

uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/ReminderControllerTest.java

@@ -20,8 +20,9 @@
 package org.isoron.uhabits.receivers;
 
 import org.isoron.uhabits.*;
-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.*;
 import org.junit.*;

uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/WidgetControllerTest.java

@@ -20,16 +20,16 @@
 package org.isoron.uhabits.receivers;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
+import org.isoron.uhabits.core.commands.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.notifications.*;
-import org.isoron.uhabits.ui.widgets.*;
+import org.isoron.uhabits.core.ui.widgets.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsEqual.*;
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 import static org.mockito.Mockito.*;
 
 public class WidgetControllerTest extends BaseAndroidTest

uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java

@@ -24,13 +24,13 @@ import android.test.suitebuilder.annotation.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.*;
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.core.models.Checkmark.*;
 
 @RunWith(AndroidJUnit4.class)
 @MediumTest

uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java

@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java

@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java

@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java

@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java

@@ -23,7 +23,7 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;

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.core.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.io.*;
 import java.lang.Process;

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.*;
 

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.*;
 

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

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.*;

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.core.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.text.*;
 import java.util.*;

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.*;
 

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.*;
 

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.*;
 

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.core.preferences.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.ui.*;
 
 import javax.inject.*;
 

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.

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.*;

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.*;
 

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.*;
 
 /**

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.*;
 

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.core.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.utils.*;
 
 import static org.isoron.uhabits.utils.InterfaceUtils.*;

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.core.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 /**
  * Dialog that allows the user to pick one or more days of the week.

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.*;

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.*;

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
 {

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

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.*;

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.*;

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.core.commands.*;
-import org.isoron.uhabits.models.*;
+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)

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.*;
 

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.*;
 

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.*;

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.*;

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.core.ui.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 /**
  * Activity that allows the user to see and modify the list of habits.

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.*;
 

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.core.preferences.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.ui.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 
 import javax.inject.*;
 

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.*;
 

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.core.models.*;
-import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.core.tasks.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 import org.isoron.uhabits.utils.*;
 
 import javax.inject.*;

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.*;

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.core.commands.*;
-import org.isoron.uhabits.ui.screens.habits.list.*;
+import org.isoron.uhabits.core.ui.screens.habits.list.*;
 
 import javax.inject.*;
 

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

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
 {

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.*;
 

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

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.*;
 

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;

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.*;
 

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.*;
 

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.*;

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.*;
 

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;
 

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.*;
 

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.

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.*;
 

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.core.models.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;
 
 import dagger.*;
 

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.*;

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.core.models.*;
-import org.isoron.uhabits.ui.screens.habits.show.*;
+import org.isoron.uhabits.core.ui.screens.habits.show.*;
 
 import javax.inject.*;
 

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.*;