정렬 기능 추가

app/src/main/java/com/gdsc/todo/model/db/ToDoDatabase.kt

@@ -12,7 +12,7 @@ import com.gdsc.todo.model.dao.ToDoDao
 // 반드시 RoomDatabase를 상속받은 추상클래스를 만들어야 한다.
 // 추상 클래스로 만든 인스턴스는 주로 싱글톤으로 만든다.
 // 같은 시간에 여러 개의 인스턴스에서 데이터베이스에 접근하는 것을 막기 위함이다.
-@Database(entities = [MyToDoList::class], version = 6)
+@Database(entities = [MyToDoList::class], version = 9)
 abstract class ToDoDatabase: RoomDatabase() {
     abstract fun getToDoDao(): ToDoDao
 

app/src/main/java/com/gdsc/todo/model/entity/MyToDoList.kt

@@ -10,5 +10,6 @@ import androidx.room.PrimaryKey
 data class MyToDoList(
     @PrimaryKey(autoGenerate = true) val id: Long = 0,
     @ColumnInfo(name="title") val title: String,
-    @ColumnInfo(name="content") val content: String
+    @ColumnInfo(name="content") val content: String,
+    @ColumnInfo(name="date") val date: String
 )

app/src/main/java/com/gdsc/todo/ui/ToDo/ToDoActivity.kt

@@ -3,27 +3,41 @@ package com.gdsc.todo.ui.ToDo
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.util.Log
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.widget.Toast
+import android.widget.Toolbar
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
+import com.gdsc.todo.R
 import com.gdsc.todo.ui.ToDoViewModel
 import com.gdsc.todo.databinding.ActivityToDoBinding
 import com.gdsc.todo.model.db.ToDoDatabase
 import com.gdsc.todo.model.entity.MyToDoList
 import com.gdsc.todo.ui.AddToDo.AddToDoActivity
 
 const val TAG2 = "ToDoActivity"
+const val ISSORTED = "isSorted"
 
 class ToDoActivity : AppCompatActivity() {
     private lateinit var recyclerView: RecyclerView
     private lateinit var toDoAdapter: ToDoAdapter
     private lateinit var viewModel: ToDoViewModel
+    private lateinit var toolbar: androidx.appcompat.widget.Toolbar
+    private var titleIsSorted: Boolean = false
+    private var dateIsSorted: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val binding = ActivityToDoBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
         recyclerView = binding.todoRecyclerView
+        toolbar = binding.todoToolbar
+        setSupportActionBar(toolbar)
+
         viewModel = ViewModelProvider(this , ViewModelProvider.AndroidViewModelFactory(getApplication())).get(
             ToDoViewModel::class.java)
         setRecyclerView()
@@ -34,7 +48,10 @@ class ToDoActivity : AppCompatActivity() {
     }
 
     fun setRecyclerView() {
-        toDoAdapter = ToDoAdapter(viewModel.myToDoSet, viewModel)
+        when(titleIsSorted || dateIsSorted){
+            true -> toDoAdapter = ToDoAdapter(viewModel.sortMyToDoSet, viewModel)
+            false -> toDoAdapter = ToDoAdapter(viewModel.myToDoSet, viewModel)
+        }
         toDoAdapter.notifyDataSetChanged()
         recyclerView.apply {
             adapter = toDoAdapter
@@ -48,8 +65,8 @@ class ToDoActivity : AppCompatActivity() {
 
     override fun onRestart() {
         super.onRestart()
-        viewModel.getAll()
         setRecyclerView()
+
     }
 
     override fun onDestroy() {
@@ -66,4 +83,49 @@ class ToDoActivity : AppCompatActivity() {
     private fun checkEvent(toDo: MyToDoList){
         viewModel.deleteToDo(toDo)
     }
+
+    // toolbar에 menu.xml 추가
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.menu, menu)
+        return true
+    }
+
+    // toolbar에 추가된 항목 클릭 시 이벤트 처리
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when(item.itemId){
+            R.id.sort_title -> {
+                when(titleIsSorted) {
+                    true -> {
+                        Log.d(ISSORTED, titleIsSorted.toString())
+                        titleIsSorted = false
+                        setRecyclerView()
+                    }
+                    false -> {
+                        Log.d(ISSORTED, titleIsSorted.toString())
+                        viewModel.sortTitle()
+                        titleIsSorted = true
+                        dateIsSorted = false
+                        setRecyclerView()
+                    }
+                }
+                return true
+            }
+            R.id.sort_date -> {
+                when(dateIsSorted){
+                    true -> {
+                        dateIsSorted = false
+                        setRecyclerView()
+                    }
+                    false -> {
+                        viewModel.sortDate()
+                        dateIsSorted = true
+                        titleIsSorted = false
+                        setRecyclerView()
+                    }
+                }
+                return true
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
 }

app/src/main/java/com/gdsc/todo/ui/ToDoViewModel.kt

@@ -10,11 +10,15 @@ import com.gdsc.todo.model.entity.MyToDoList
 class ToDoViewModel(application: Application) : AndroidViewModel(application) {
 
     private var _myToDoSet = ArrayList<MyToDoList>()
+    private var _sortMyToDoSet = ArrayList<MyToDoList>()
 
     val myToDoSet: List<MyToDoList>
         get() = _myToDoSet
+    val sortMyToDoSet: List<MyToDoList>
+        get() = _sortMyToDoSet
     var title = ""
     var content = ""
+    var date = ""
 
     private val repository: ToDoRepository by lazy{
         ToDoRepository(application)
@@ -23,6 +27,8 @@ class ToDoViewModel(application: Application) : AndroidViewModel(application) {
     init {
         Log.d(TAG, "init")
         getAll()
+        // _sortMyToDoSet = _myToDoSet 얕은 복사(기존 객체에 영향 O)
+        _sortMyToDoSet.addAll(_myToDoSet) // 깊은 복사(기존 객체에 영향 X)
     }
 
     fun getAll(){
@@ -34,7 +40,7 @@ class ToDoViewModel(application: Application) : AndroidViewModel(application) {
 
     fun addButtonClick(){
         Thread{
-            val newToDo = MyToDoList(title = title.toString(), content = content.toString())
+            val newToDo = MyToDoList(title = title, content = content, date = "~" + date)
             repository.insert(newToDo)
         }.start()
         Thread.sleep(TIME) // 있어야 제목이 저장됨(왜?)
@@ -48,8 +54,16 @@ class ToDoViewModel(application: Application) : AndroidViewModel(application) {
 
     fun checkEmpty() = title!=""  && content!=""
 
+    fun sortTitle(){
+        _sortMyToDoSet.sortBy{it.title}
+    }
+
+    fun sortDate(){
+        _sortMyToDoSet.sortBy{it.date}
+    }
+
     companion object{
         const val TAG = "ToDoViewModel"
-        const val TIME: Long = 1000
+        const val TIME: Long = 500
     }
 }

app/src/main/res/drawable/sort.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>

app/src/main/res/drawable/sort_date.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M9,11L7,11v2h2v-2zM13,11h-2v2h2v-2zM17,11h-2v2h2v-2zM19,4h-1L18,2h-2v2L8,4L8,2L6,2v2L5,4c-1.11,0 -1.99,0.9 -1.99,2L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM19,20L5,20L5,9h14v11z"/>
+</vector>

app/src/main/res/drawable/sort_title.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21,11h-1.5v-0.5h-2v3h2V13H21v1c0,0.55 -0.45,1 -1,1h-3c-0.55,0 -1,-0.45 -1,-1v-4c0,-0.55 0.45,-1 1,-1h3c0.55,0 1,0.45 1,1V11zM8,10v5H6.5v-1.5h-2V15H3v-5c0,-0.55 0.45,-1 1,-1h3C7.55,9 8,9.45 8,10zM6.5,10.5h-2V12h2V10.5zM13.5,12c0.55,0 1,0.45 1,1v1c0,0.55 -0.45,1 -1,1h-4V9h4c0.55,0 1,0.45 1,1v1C14.5,11.55 14.05,12 13.5,12zM11,10.5v0.75h2V10.5H11zM13,12.75h-2v0.75h2V12.75z"/>
+</vector>

app/src/main/res/layout/activity_add_to_do.xml

@@ -43,10 +43,23 @@
             android:text="@={addToDoViewModel.title}"/>
 
         <EditText
-            android:id="@+id/addTodo_content"
+            android:id="@+id/addTodo_date"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/addTodo_title"
+            android:layout_marginStart="13dp"
+            android:layout_marginTop="13dp"
+            android:layout_marginEnd="13dp"
+            android:layout_marginBottom="13dp"
+            android:background="@android:color/transparent"
+            android:hint="Deadline(mmdd)"
+            android:text="@={addToDoViewModel.date}" />
+
+        <EditText
+            android:id="@+id/addTodo_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/addTodo_date"
             android:layout_marginLeft="13dp"
             android:layout_marginRight="13dp"
             android:background="@android:color/transparent"

app/src/main/res/layout/item_todo.xml

@@ -47,6 +47,16 @@
                     android:textSize="13dp"
                     android:text="@{item.content}"/>
 
+                <TextView
+                    android:id="@+id/date"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:text="@{item.date}"
+                    android:textColor="#C67C5252"
+                    android:textStyle="bold"
+                    android:textSize="13dp" />
+
             </LinearLayout>
 
         </LinearLayout>

app/src/main/res/menu/menu.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/sort_title"
+        android:icon="@drawable/sort"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/sort_date"
+        android:icon="@drawable/sort_date"
+        app:showAsAction="always" />
+
+</menu>