Added source for TODO list

binaryroot · binaryroot · commit c954c37859c2 · 2017-05-22T02:21:10.000+03:00
diff --git a/app/src/main/java/com/androidarchitecture/data/TaskDataSource.kt b/app/src/main/java/com/androidarchitecture/data/TaskDataSource.kt
@@ -0,0 +1,15 @@
+package com.androidarchitecture.data
+
+import android.arch.lifecycle.LiveData
+import com.androidarchitecture.entity.Task
+
+/**
+ * Created by binary on 5/22/17.
+ */
+interface TaskDataSource {
+
+    fun getAllTask(): LiveData<List<Task>>
+
+    fun saveTask(taskName:String)
+
+}
diff --git a/app/src/main/java/com/androidarchitecture/data/local/AppDatabase.kt b/app/src/main/java/com/androidarchitecture/data/local/AppDatabase.kt
@@ -2,15 +2,18 @@ package com.androidarchitecture.data.local
 
 import android.arch.persistence.room.Database
 import android.arch.persistence.room.RoomDatabase
-
-//import com.androidarchitecture.data.local.user.UserDao;
+import com.androidarchitecture.data.local.task.TaskDao
 import com.androidarchitecture.data.local.user.UserDao
+import com.androidarchitecture.entity.Task
 import com.androidarchitecture.entity.User
 
 /**
  * Created by binary on 5/19/17.
  */
-@Database(entities = arrayOf(User::class), version = 1)
+@Database(entities = arrayOf(User::class, Task::class), version = 2)
 abstract class AppDatabase : RoomDatabase() {
+
     abstract fun userDao(): UserDao
+
+    abstract fun taskDao(): TaskDao
 }
diff --git a/app/src/main/java/com/androidarchitecture/data/local/task/TaskDao.kt b/app/src/main/java/com/androidarchitecture/data/local/task/TaskDao.kt
@@ -0,0 +1,21 @@
+package com.androidarchitecture.data.local.task
+
+import android.arch.lifecycle.LiveData
+import android.arch.persistence.room.Dao
+import android.arch.persistence.room.Insert
+import android.arch.persistence.room.Query
+import com.androidarchitecture.entity.Task
+
+/**
+ * Created by binary on 5/22/17.
+ */
+@Dao
+interface TaskDao : TaskLocalAPI {
+
+    @Query("SELECT * FROM task")
+    override fun getAllTask(): LiveData<List<Task>>
+
+    @Insert
+    override fun saveTask(task: Task)
+
+}
diff --git a/app/src/main/java/com/androidarchitecture/data/local/task/TaskLocalAPI.kt b/app/src/main/java/com/androidarchitecture/data/local/task/TaskLocalAPI.kt
@@ -0,0 +1,15 @@
+package com.androidarchitecture.data.local.task
+
+import android.arch.lifecycle.LiveData
+import com.androidarchitecture.entity.Task
+
+/**
+ * Created by binary on 5/22/17.
+ */
+interface TaskLocalAPI {
+
+    fun getAllTask(): LiveData<List<Task>>
+
+    fun saveTask(task: Task)
+
+}
diff --git a/app/src/main/java/com/androidarchitecture/data/repository/TaskRepository.kt b/app/src/main/java/com/androidarchitecture/data/repository/TaskRepository.kt
@@ -0,0 +1,25 @@
+package com.androidarchitecture.data.repository
+
+import android.arch.lifecycle.LiveData
+import com.androidarchitecture.core.executor.ThreadExecutor
+import com.androidarchitecture.data.TaskDataSource
+import com.androidarchitecture.entity.Task
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by binary on 5/22/17.
+ */
+@Singleton
+class TaskRepository @Inject constructor(taskRepositoryFactory: TaskRepositoryFactory , val threadExecutor: ThreadExecutor) : TaskDataSource {
+
+    private val taskLocalAPI = taskRepositoryFactory.createTaskLocalAPI()
+
+    override fun getAllTask(): LiveData<List<Task>> {
+        return taskLocalAPI.getAllTask()
+    }
+
+    override fun saveTask(taskName: String) {
+        threadExecutor.execute { taskLocalAPI.saveTask(Task(taskName)) }
+    }
+}
diff --git a/app/src/main/java/com/androidarchitecture/data/repository/TaskRepositoryFactory.kt b/app/src/main/java/com/androidarchitecture/data/repository/TaskRepositoryFactory.kt
@@ -0,0 +1,17 @@
+package com.androidarchitecture.data.repository
+
+import com.androidarchitecture.data.local.AppDatabase
+import com.androidarchitecture.data.local.task.TaskLocalAPI
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by binary on 5/22/17.
+ */
+@Singleton
+class TaskRepositoryFactory @Inject constructor(private var appDatabase: AppDatabase) {
+
+    fun createTaskLocalAPI(): TaskLocalAPI {
+        return appDatabase.taskDao()
+    }
+}
diff --git a/app/src/main/java/com/androidarchitecture/data/repository/UserRepository.kt b/app/src/main/java/com/androidarchitecture/data/repository/UserRepository.kt
@@ -16,19 +16,19 @@ import javax.inject.Singleton
 @Singleton
 class UserRepository @Inject constructor(userRepositoryFactory: UserRepositoryFactory, var threadExecutor: ThreadExecutor) : UserDataSource {
 
-    private val userNetApi = userRepositoryFactory.createUserNetApi()
-    private val userLocalApi = userRepositoryFactory.createUserLocalAPI()
+    private val userNetAPI = userRepositoryFactory.createUserNetAPI()
+    private val userLocalAPI = userRepositoryFactory.createUserLocalAPI()
 
     //region UserDataSource
     override fun loadUserInfoById(userId: Int): LiveData<User> {
        val result = MutableLiveData<User>()
         threadExecutor.execute {
-            val userLocal = userLocalApi.findById(userId)
+            val userLocal = userLocalAPI.findById(userId)
 
             if(userLocal != null) {
                 result.postValue(userLocal)
             } else {
-                userNetApi.loadUserById(userId).observeForever {
+                userNetAPI.loadUserById(userId).observeForever {
                     result.postValue(it)
                 }
             }
@@ -38,7 +38,7 @@ class UserRepository @Inject constructor(userRepositoryFactory: UserRepositoryFa
     }
 
     override fun saveUser(user: User) {
-        threadExecutor.execute { userLocalApi.saveUser(user) }
+        threadExecutor.execute { userLocalAPI.saveUser(user) }
     }
     //endregion
 }
diff --git a/app/src/main/java/com/androidarchitecture/data/repository/UserRepositoryFactory.kt b/app/src/main/java/com/androidarchitecture/data/repository/UserRepositoryFactory.kt
@@ -14,7 +14,7 @@ import javax.inject.Singleton
 @Singleton
 class UserRepositoryFactory @Inject constructor(var context:Context, private var appDatabase: AppDatabase) {
 
-    fun createUserNetApi() : UserNetAPI {
+    fun createUserNetAPI() : UserNetAPI {
         return RetrofitUserAPI(context)
     }
 
diff --git a/app/src/main/java/com/androidarchitecture/di/component/AppComponent.kt b/app/src/main/java/com/androidarchitecture/di/component/AppComponent.kt
@@ -7,7 +7,9 @@ import com.androidarchitecture.di.module.DataModule
 import dagger.Component
 import javax.inject.Singleton
 import com.androidarchitecture.core.executor.ThreadExecutor
+import com.androidarchitecture.data.TaskDataSource
 import com.androidarchitecture.view.activity.LoginActivity
+import com.androidarchitecture.view.fragment.MainFragment
 
 
 /**
@@ -23,5 +25,9 @@ interface AppComponent {
 
     fun userDataSource(): UserDataSource
 
+    fun taskDataSource(): TaskDataSource
+
     fun inject(loginActivity: LoginActivity)
+
+    fun inject(mainFragment: MainFragment)
 }
diff --git a/app/src/main/java/com/androidarchitecture/di/module/DataModule.kt b/app/src/main/java/com/androidarchitecture/di/module/DataModule.kt
@@ -1,6 +1,8 @@
 package com.androidarchitecture.di.module
 
+import com.androidarchitecture.data.TaskDataSource
 import com.androidarchitecture.data.UserDataSource
+import com.androidarchitecture.data.repository.TaskRepository
 import com.androidarchitecture.data.repository.UserRepository
 import dagger.Module
 import dagger.Provides
@@ -16,4 +18,8 @@ class DataModule {
     @Singleton
     fun providerUserDataSource(userRepository: UserRepository) : UserDataSource = userRepository
 
+    @Provides
+    @Singleton
+    fun providerTaskDataSource(taskRepository: TaskRepository) : TaskDataSource = taskRepository
+
 }
diff --git a/app/src/main/java/com/androidarchitecture/entity/Task.kt b/app/src/main/java/com/androidarchitecture/entity/Task.kt
@@ -0,0 +1,23 @@
+package com.androidarchitecture.entity
+
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.PrimaryKey
+import com.google.gson.annotations.SerializedName
+
+/**
+ * Created by binary on 5/22/17.
+ */
+@Entity
+class Task() {
+
+    @PrimaryKey(autoGenerate = true)
+    @SerializedName("user_id")
+    var uid: Int = 0
+
+    @SerializedName("task")
+    var task: String? = null
+
+    constructor(task: String) : this() {
+        this.task = task
+    }
+}
diff --git a/app/src/main/java/com/androidarchitecture/view/activity/MainActivity.kt b/app/src/main/java/com/androidarchitecture/view/activity/MainActivity.kt
@@ -1,8 +1,6 @@
 package com.androidarchitecture.view.activity
 
 import android.os.Bundle
-import android.support.design.widget.FloatingActionButton
-import android.support.design.widget.Snackbar
 import com.androidarchitecture.R
 import com.androidarchitecture.core.BaseActivity
 import com.androidarchitecture.view.fragment.MainFragment
diff --git a/app/src/main/java/com/androidarchitecture/view/adapter/TaskAdapter.kt b/app/src/main/java/com/androidarchitecture/view/adapter/TaskAdapter.kt
@@ -0,0 +1,33 @@
+package com.androidarchitecture.view.adapter
+
+
+import android.support.v7.widget.RecyclerView
+import android.support.v7.widget.RecyclerView.Adapter
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import com.androidarchitecture.R
+import com.androidarchitecture.entity.Task
+
+/**
+ * Created by binary on 5/22/17.
+ */
+class TaskAdapter(val taskList: List<Task>): Adapter<TaskAdapter.Holder>() {
+
+    //region Adapter
+    override fun onBindViewHolder(holder: Holder?, position: Int) {
+        holder?.taskView?.text = taskList[position].task
+    }
+
+    override fun getItemCount(): Int = taskList.size
+
+    override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): Holder {
+        return Holder(LayoutInflater.from(parent?.context).inflate(R.layout.layout_task, parent, false))
+    }
+    //endregion
+
+    inner class Holder(view: View): RecyclerView.ViewHolder(view) {
+        val taskView: TextView = view.findViewById(R.id.task) as TextView
+    }
+}
diff --git a/app/src/main/java/com/androidarchitecture/view/fragment/MainFragment.kt b/app/src/main/java/com/androidarchitecture/view/fragment/MainFragment.kt
@@ -1,15 +1,29 @@
 package com.androidarchitecture.view.fragment
 
+import android.arch.lifecycle.Observer
 import android.support.v4.app.Fragment
 import android.os.Bundle
 import com.androidarchitecture.R
 import com.androidarchitecture.core.BaseFragment
+import android.arch.lifecycle.ViewModelProviders
+import android.support.v7.app.AlertDialog
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
+import android.widget.EditText
+import com.androidarchitecture.entity.Task
+import com.androidarchitecture.view.adapter.TaskAdapter
+import com.androidarchitecture.view.model.TaskViewModel
+
 
 /**
  * Created by binary on 5/20/17.
  */
 class MainFragment : BaseFragment() {
 
+    private lateinit var taskViewModel: TaskViewModel
+    private lateinit var taskAdapter: TaskAdapter
+    private var taskList  = mutableListOf<Task>()
+
     companion object {
         fun newInstance(): Fragment = MainFragment()
     }
@@ -18,8 +32,36 @@ class MainFragment : BaseFragment() {
     override fun getContentViewID(): Int = R.layout.fragment_main
 
     override fun initView(savedInstanceState: Bundle?) {
-
+        view?.findViewById(R.id.fab)?.setOnClickListener { showAddDialog() }
+        initRecycleView()
+        taskViewModel = ViewModelProviders.of(this@MainFragment).get(TaskViewModel::class.java)
+        taskViewModel.taskDataSource = getAppComponent()?.taskDataSource()!!
+        taskViewModel.getTasks()?.observe(this@MainFragment, Observer {
+            taskList.clear()
+            it?.let {
+                taskList.addAll(it)
+                taskAdapter.notifyDataSetChanged()
+            }
+        })
     }
     //endregion
 
+    //region Utility API
+    private fun initRecycleView() {
+        val taskRecycleView = view?.findViewById(R.id.task_list) as RecyclerView
+        taskRecycleView.layoutManager = LinearLayoutManager(context)
+        taskAdapter = TaskAdapter(taskList)
+        taskRecycleView.adapter = taskAdapter
+    }
+
+    private fun showAddDialog() {
+        val builder = AlertDialog.Builder(this@MainFragment.context)
+        builder.setTitle(getString(R.string.add_to_todo_list))
+        val input = EditText(this@MainFragment.context)
+        builder.setView(input)
+        builder.setPositiveButton("OK", { d, _ -> taskViewModel.addTask(input.text.toString()); d.cancel() })
+        builder.setNegativeButton("Cancel", { d, _ -> d.cancel() })
+        builder.show()
+    }
+    //endregion
 }
diff --git a/app/src/main/java/com/androidarchitecture/view/model/TaskViewModel.kt b/app/src/main/java/com/androidarchitecture/view/model/TaskViewModel.kt
@@ -0,0 +1,38 @@
+package com.androidarchitecture.view.model
+
+import android.arch.lifecycle.LiveData
+import android.arch.lifecycle.MutableLiveData
+import android.arch.lifecycle.ViewModel
+import com.androidarchitecture.data.TaskDataSource
+import com.androidarchitecture.entity.Task
+
+/**
+ * Created by binary on 5/22/17.
+ */
+class TaskViewModel : ViewModel() {
+
+    lateinit var taskDataSource: TaskDataSource
+    private var tasks: MutableLiveData<List<Task>>? = null
+
+    //region UserViewModel
+    fun getTasks(): LiveData<List<Task>>? {
+        if (tasks == null) {
+            tasks = MutableLiveData()
+            loadTasks()
+        }
+        return tasks
+    }
+
+    fun addTask(task: String) {
+        taskDataSource.saveTask(task)
+    }
+    //endregion
+
+    //region UtilityAPI
+    private fun loadTasks() {
+        taskDataSource.getAllTask().observeForever {
+            tasks?.postValue(it)
+        }
+    }
+    //endregion
+}
diff --git a/app/src/main/java/com/androidarchitecture/view/model/UserViewModel.kt b/app/src/main/java/com/androidarchitecture/view/model/UserViewModel.kt
diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
diff --git a/app/src/main/res/layout/layout_task.xml b/app/src/main/res/layout/layout_task.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -16,19 +16,19 @@ import javax.inject.Singleton`
`16`	`16`	`@Singleton`
`17`	`17`	`class UserRepository @Inject constructor(userRepositoryFactory: UserRepositoryFactory, var threadExecutor: ThreadExecutor) : UserDataSource {`
`18`	`18`
`19`		`- private val userNetApi = userRepositoryFactory.createUserNetApi()`
`20`		`- private val userLocalApi = userRepositoryFactory.createUserLocalAPI()`
	`19`	`+ private val userNetAPI = userRepositoryFactory.createUserNetAPI()`
	`20`	`+ private val userLocalAPI = userRepositoryFactory.createUserLocalAPI()`
`21`	`21`
`22`	`22`	`//region UserDataSource`
`23`	`23`	`override fun loadUserInfoById(userId: Int): LiveData<User> {`
`24`	`24`	`val result = MutableLiveData<User>()`
`25`	`25`	`threadExecutor.execute {`
`26`		`- val userLocal = userLocalApi.findById(userId)`
	`26`	`+ val userLocal = userLocalAPI.findById(userId)`
`27`	`27`
`28`	`28`	`if(userLocal != null) {`
`29`	`29`	`result.postValue(userLocal)`
`30`	`30`	`} else {`
`31`		`- userNetApi.loadUserById(userId).observeForever {`
	`31`	`+ userNetAPI.loadUserById(userId).observeForever {`
`32`	`32`	`result.postValue(it)`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -38,7 +38,7 @@ class UserRepository @Inject constructor(userRepositoryFactory: UserRepositoryFa`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`override fun saveUser(user: User) {`
`41`		`- threadExecutor.execute { userLocalApi.saveUser(user) }`
	`41`	`+ threadExecutor.execute { userLocalAPI.saveUser(user) }`
`42`	`42`	`}`
`43`	`43`	`//endregion`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import javax.inject.Singleton`
`14`	`14`	`@Singleton`
`15`	`15`	`class UserRepositoryFactory @Inject constructor(var context:Context, private var appDatabase: AppDatabase) {`
`16`	`16`
`17`		`- fun createUserNetApi() : UserNetAPI {`
	`17`	`+ fun createUserNetAPI() : UserNetAPI {`
`18`	`18`	`return RetrofitUserAPI(context)`
`19`	`19`	`}`
`20`	`20`