Rename uhabits-core package

uhabits-core/src/test/java/org/isoron/uhabits/BaseUnitTest.java

@@ -19,11 +19,11 @@
 
 package org.isoron.uhabits;
 
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.models.memory.*;
-import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.models.memory.*;
+import org.isoron.uhabits.core.tasks.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 import org.mockito.junit.*;

uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.java

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

uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.java

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

uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.java

@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 
 import static junit.framework.Assert.*;

uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.java

@@ -17,17 +17,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 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 org.junit.*;
 
 import static junit.framework.Assert.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.isoron.uhabits.models.Checkmark.CHECKED_EXPLICITLY;
+import static org.isoron.uhabits.core.models.Checkmark.CHECKED_EXPLICITLY;
 
 public class CreateRepetitionCommandTest extends BaseUnitTest
 {

uhabits-core/src/test/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.java

@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.rules.*;
 

uhabits-core/src/test/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.java

@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 
 import static org.hamcrest.MatcherAssert.*;

uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommandTest.java

@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.commands;
+package org.isoron.uhabits.core.commands;
 
 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 org.junit.*;
 
 import static junit.framework.Assert.*;

uhabits-core/src/test/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.java

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

uhabits-core/src/test/java/org/isoron/uhabits/core/models/CheckmarkListTest.java

@@ -17,17 +17,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import java.io.*;
 
 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.*;
 
 public class CheckmarkListTest extends BaseUnitTest
 {

uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitFixtures.java

@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 
 public class HabitFixtures
 {

uhabits-core/src/test/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 org.hamcrest.*;
 import org.isoron.uhabits.*;
@@ -27,7 +27,7 @@ import java.io.*;
 import java.util.*;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.isoron.uhabits.models.HabitList.Order.*;
+import static org.isoron.uhabits.core.models.HabitList.Order.*;
 import static org.junit.Assert.*;
 
 @SuppressWarnings("JavaDoc")

uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitTest.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 org.isoron.uhabits.*;
 import org.junit.*;

uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java

@@ -17,12 +17,12 @@
  * 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.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import java.util.*;

uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java

@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 
 import java.io.*;

uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java

@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.models;
+package org.isoron.uhabits.core.models;
 
 import org.isoron.uhabits.*;
 import org.junit.*;
 
 import static org.hamcrest.number.IsCloseTo.*;
-import static org.isoron.uhabits.models.Score.*;
+import static org.isoron.uhabits.core.models.Score.*;
 import static org.junit.Assert.*;
 
 public class ScoreTest extends BaseUnitTest

uhabits-core/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java

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

uhabits-core/src/test/java/org/isoron/uhabits/core/models/WeekdayListTest.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 org.isoron.uhabits.*;
 import org.junit.*;

uhabits-core/src/test/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.tasks;
+package org.isoron.uhabits.core.tasks;
 
 import org.isoron.uhabits.*;
 import org.junit.*;

uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.java

@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import junit.framework.Assert;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.commands.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.Test;
 
 import java.util.*;

uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.java

@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 import org.mockito.*;
 

uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.java

@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.utils.*;
 import org.junit.*;
 import org.mockito.*;
 
@@ -32,7 +32,7 @@ import static java.nio.file.Files.*;
 import static junit.framework.TestCase.assertTrue;
 import static org.apache.commons.io.FileUtils.*;
 import static org.hamcrest.CoreMatchers.*;
-import static org.isoron.uhabits.ui.screens.habits.list.ListHabitsBehavior.Message.*;
+import static org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior.Message.*;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.any;

uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java

@@ -17,19 +17,19 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.ui.*;
 import org.junit.*;
 import org.mockito.*;
 
 import static junit.framework.TestCase.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
-import static org.isoron.uhabits.models.HabitList.Order.*;
+import static org.isoron.uhabits.core.models.HabitList.Order.*;
 import static org.mockito.Mockito.*;
 
 public class ListHabitsMenuBehaviorTest extends BaseUnitTest

uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java

@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.list;
+package org.isoron.uhabits.core.ui.screens.habits.list;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.callbacks.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.callbacks.*;
 import org.junit.*;
 import org.mockito.*;
 

uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehaviorTest.java

@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.screens.habits.show;
+package org.isoron.uhabits.core.ui.screens.habits.show;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 
 import java.io.*;

uhabits-core/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.utils;
+package org.isoron.uhabits.core.utils;
 
 import org.isoron.uhabits.*;
 import org.junit.*;