Moving model types in prep for FB/SB model fork
Change-Id: Iffdb064295a8d32ab2f0b97410b60e6660308671
diff --git a/app/src/firebase/java/io/v/todos/persistence/PersistenceFactory.java b/app/src/firebase/java/io/v/todos/persistence/PersistenceFactory.java
index f137b99..f0da774 100644
--- a/app/src/firebase/java/io/v/todos/persistence/PersistenceFactory.java
+++ b/app/src/firebase/java/io/v/todos/persistence/PersistenceFactory.java
@@ -6,7 +6,7 @@
import android.content.Context;
-import io.v.todos.TodoList;
+import io.v.todos.model.TodoList;
import io.v.todos.persistence.firebase.FirebaseMain;
import io.v.todos.persistence.firebase.FirebaseTodoList;
diff --git a/app/src/firebase/java/io/v/todos/persistence/firebase/ChildEventListenerAdapter.java b/app/src/firebase/java/io/v/todos/persistence/firebase/ChildEventListenerAdapter.java
index 0d85b88..282eecd 100644
--- a/app/src/firebase/java/io/v/todos/persistence/firebase/ChildEventListenerAdapter.java
+++ b/app/src/firebase/java/io/v/todos/persistence/firebase/ChildEventListenerAdapter.java
@@ -8,7 +8,7 @@
import com.firebase.client.DataSnapshot;
import com.firebase.client.FirebaseError;
-import io.v.todos.KeyedData;
+import io.v.todos.model.KeyedData;
import io.v.todos.persistence.ListEventListener;
public class ChildEventListenerAdapter<T extends KeyedData> implements ChildEventListener {
diff --git a/app/src/firebase/java/io/v/todos/persistence/firebase/FirebaseMain.java b/app/src/firebase/java/io/v/todos/persistence/firebase/FirebaseMain.java
index eb7f0a6..f5f0998 100644
--- a/app/src/firebase/java/io/v/todos/persistence/firebase/FirebaseMain.java
+++ b/app/src/firebase/java/io/v/todos/persistence/firebase/FirebaseMain.java
@@ -16,8 +16,8 @@
import java.util.HashMap;
import java.util.Map;
-import io.v.todos.Task;
-import io.v.todos.TodoList;
+import io.v.todos.model.Task;
+import io.v.todos.model.TodoList;
import io.v.todos.persistence.ListEventListener;
import io.v.todos.persistence.MainPersistence;
diff --git a/app/src/firebase/java/io/v/todos/persistence/firebase/FirebaseTodoList.java b/app/src/firebase/java/io/v/todos/persistence/firebase/FirebaseTodoList.java
index ba3b3ca..ffe9419 100644
--- a/app/src/firebase/java/io/v/todos/persistence/firebase/FirebaseTodoList.java
+++ b/app/src/firebase/java/io/v/todos/persistence/firebase/FirebaseTodoList.java
@@ -12,8 +12,8 @@
import com.firebase.client.FirebaseError;
import com.firebase.client.ValueEventListener;
-import io.v.todos.Task;
-import io.v.todos.TodoList;
+import io.v.todos.model.Task;
+import io.v.todos.model.TodoList;
import io.v.todos.persistence.TodoListListener;
import io.v.todos.persistence.TodoListPersistence;
diff --git a/app/src/main/java/io/v/todos/MainActivity.java b/app/src/main/java/io/v/todos/MainActivity.java
index a9a2e49..a141ee6 100644
--- a/app/src/main/java/io/v/todos/MainActivity.java
+++ b/app/src/main/java/io/v/todos/MainActivity.java
@@ -18,6 +18,8 @@
import android.widget.EditText;
import android.widget.Toolbar;
+import io.v.todos.model.DataList;
+import io.v.todos.model.TodoList;
import io.v.todos.persistence.ListEventListener;
import io.v.todos.persistence.MainPersistence;
import io.v.todos.persistence.PersistenceFactory;
diff --git a/app/src/main/java/io/v/todos/TaskRecyclerAdapter.java b/app/src/main/java/io/v/todos/TaskRecyclerAdapter.java
index 91ff8cc..ffd1fa6 100644
--- a/app/src/main/java/io/v/todos/TaskRecyclerAdapter.java
+++ b/app/src/main/java/io/v/todos/TaskRecyclerAdapter.java
@@ -11,6 +11,8 @@
import java.util.ArrayList;
+import io.v.todos.model.Task;
+
/**
* @author alexfandrianto
*/
diff --git a/app/src/main/java/io/v/todos/TaskViewHolder.java b/app/src/main/java/io/v/todos/TaskViewHolder.java
index 05d56fc..7354ac6 100644
--- a/app/src/main/java/io/v/todos/TaskViewHolder.java
+++ b/app/src/main/java/io/v/todos/TaskViewHolder.java
@@ -8,6 +8,8 @@
import android.widget.ImageView;
import android.widget.TextView;
+import io.v.todos.model.Task;
+
/**
* @author alexfandrianto
*/
diff --git a/app/src/main/java/io/v/todos/TodoListActivity.java b/app/src/main/java/io/v/todos/TodoListActivity.java
index 8c74fb9..5372ade 100644
--- a/app/src/main/java/io/v/todos/TodoListActivity.java
+++ b/app/src/main/java/io/v/todos/TodoListActivity.java
@@ -18,6 +18,9 @@
import android.widget.EditText;
import android.widget.Toolbar;
+import io.v.todos.model.DataList;
+import io.v.todos.model.Task;
+import io.v.todos.model.TodoList;
import io.v.todos.persistence.PersistenceFactory;
import io.v.todos.persistence.TodoListListener;
import io.v.todos.persistence.TodoListPersistence;
diff --git a/app/src/main/java/io/v/todos/TodoListRecyclerAdapter.java b/app/src/main/java/io/v/todos/TodoListRecyclerAdapter.java
index 838c394..10736e1 100644
--- a/app/src/main/java/io/v/todos/TodoListRecyclerAdapter.java
+++ b/app/src/main/java/io/v/todos/TodoListRecyclerAdapter.java
@@ -11,6 +11,8 @@
import java.util.ArrayList;
+import io.v.todos.model.TodoList;
+
/**
* @author alexfandrianto
*/
diff --git a/app/src/main/java/io/v/todos/TodoListViewHolder.java b/app/src/main/java/io/v/todos/TodoListViewHolder.java
index 788fe95..83c46a3 100644
--- a/app/src/main/java/io/v/todos/TodoListViewHolder.java
+++ b/app/src/main/java/io/v/todos/TodoListViewHolder.java
@@ -7,6 +7,8 @@
import android.view.View;
import android.widget.TextView;
+import io.v.todos.model.TodoList;
+
/**
* @author alexfandrianto
*/
diff --git a/app/src/main/java/io/v/todos/DataList.java b/app/src/main/java/io/v/todos/model/DataList.java
similarity index 98%
rename from app/src/main/java/io/v/todos/DataList.java
rename to app/src/main/java/io/v/todos/model/DataList.java
index 494fe72..47fbda3 100644
--- a/app/src/main/java/io/v/todos/DataList.java
+++ b/app/src/main/java/io/v/todos/model/DataList.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package io.v.todos;
+package io.v.todos.model;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/app/src/main/java/io/v/todos/KeyedData.java b/app/src/main/java/io/v/todos/model/KeyedData.java
similarity index 94%
rename from app/src/main/java/io/v/todos/KeyedData.java
rename to app/src/main/java/io/v/todos/model/KeyedData.java
index 7abae0d..e0b2252 100644
--- a/app/src/main/java/io/v/todos/KeyedData.java
+++ b/app/src/main/java/io/v/todos/model/KeyedData.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package io.v.todos;
+package io.v.todos.model;
/**
* KeyedData represents data that has a key and is comparable.
diff --git a/app/src/main/java/io/v/todos/Task.java b/app/src/main/java/io/v/todos/model/Task.java
similarity index 98%
rename from app/src/main/java/io/v/todos/Task.java
rename to app/src/main/java/io/v/todos/model/Task.java
index 79698d9..d8af531 100644
--- a/app/src/main/java/io/v/todos/Task.java
+++ b/app/src/main/java/io/v/todos/model/Task.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package io.v.todos;
+package io.v.todos.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/app/src/main/java/io/v/todos/TodoList.java b/app/src/main/java/io/v/todos/model/TodoList.java
similarity index 98%
rename from app/src/main/java/io/v/todos/TodoList.java
rename to app/src/main/java/io/v/todos/model/TodoList.java
index cb3179c..979f504 100644
--- a/app/src/main/java/io/v/todos/TodoList.java
+++ b/app/src/main/java/io/v/todos/model/TodoList.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package io.v.todos;
+package io.v.todos.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/app/src/main/java/io/v/todos/persistence/MainPersistence.java b/app/src/main/java/io/v/todos/persistence/MainPersistence.java
index d59e4ac..08fe574 100644
--- a/app/src/main/java/io/v/todos/persistence/MainPersistence.java
+++ b/app/src/main/java/io/v/todos/persistence/MainPersistence.java
@@ -4,7 +4,7 @@
package io.v.todos.persistence;
-import io.v.todos.TodoList;
+import io.v.todos.model.TodoList;
public interface MainPersistence extends Persistence {
void addTodoList(TodoList todoList);
diff --git a/app/src/main/java/io/v/todos/persistence/TodoListListener.java b/app/src/main/java/io/v/todos/persistence/TodoListListener.java
index 7ab179d..265ef43 100644
--- a/app/src/main/java/io/v/todos/persistence/TodoListListener.java
+++ b/app/src/main/java/io/v/todos/persistence/TodoListListener.java
@@ -4,8 +4,8 @@
package io.v.todos.persistence;
-import io.v.todos.Task;
-import io.v.todos.TodoList;
+import io.v.todos.model.Task;
+import io.v.todos.model.TodoList;
public interface TodoListListener extends ListEventListener<Task> {
void onUpdate(TodoList value);
diff --git a/app/src/main/java/io/v/todos/persistence/TodoListPersistence.java b/app/src/main/java/io/v/todos/persistence/TodoListPersistence.java
index 8ec2117..1db8ec5 100644
--- a/app/src/main/java/io/v/todos/persistence/TodoListPersistence.java
+++ b/app/src/main/java/io/v/todos/persistence/TodoListPersistence.java
@@ -4,8 +4,8 @@
package io.v.todos.persistence;
-import io.v.todos.Task;
-import io.v.todos.TodoList;
+import io.v.todos.model.Task;
+import io.v.todos.model.TodoList;
public interface TodoListPersistence extends Persistence {
void updateTodoList(TodoList todoList);
diff --git a/app/src/syncbase/java/io/v/todos/persistence/PersistenceFactory.java b/app/src/syncbase/java/io/v/todos/persistence/PersistenceFactory.java
index d19bd27..3228301 100644
--- a/app/src/syncbase/java/io/v/todos/persistence/PersistenceFactory.java
+++ b/app/src/syncbase/java/io/v/todos/persistence/PersistenceFactory.java
@@ -6,7 +6,7 @@
import android.content.Context;
-import io.v.todos.TodoList;
+import io.v.todos.model.TodoList;
public final class PersistenceFactory {
private PersistenceFactory(){}
