Merge pull request #4 from shim506/feature/android/navigation_drawer

[Android]  ActionLogItem 클래스 정의, ActionLogAdapter 정의,   Navigation Drawer+ toolBar에 menu버튼과 연동,  파일구조 수정

Author: shim506

android/app/build.gradle

@@ -37,6 +37,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

android/app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Todo">
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.toDo.ToDoActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

android/app/src/main/AndroidManifest.xml.rej

@@ -0,0 +1,5 @@
+package com.example.todo.common
+
+enum class ProgressType(val value:String){
+    TO_DO("해야 할일"), IN_PROGRESS("하고 있는일"), DONE("한 일")
+}

android/app/src/main/java/com/example/todo/common/Common.kt

@@ -0,0 +1,32 @@
+package com.example.todo.model
+
+import com.example.todo.common.ProgressType
+import java.time.LocalDateTime
+
+enum class ActionType(val value:String){
+    ADD("등록"),REMOVE("삭제"),MOVE("이동"),UPDATE("수정"),
+}
+
+
+data class ActionLog(val title:String, val actionType:ActionType, val time:LocalDateTime , val nowProgressType:ProgressType, val prevProgressType: ProgressType?=null   ){
+
+    override fun toString(): String {
+        return when(actionType){
+            ActionType.ADD ->{
+              "${nowProgressType.value}에 ${title}을 ${actionType.value}합니다"
+            }
+            ActionType.REMOVE->{
+                "${nowProgressType.value}에서 ${title}을 ${actionType.value}합니다"
+            }
+
+            ActionType.MOVE->{
+                "${title}을 ${prevProgressType?.value}에서 ${nowProgressType.value}로 ${actionType.value}합니다"
+            }
+            ActionType.UPDATE->{
+                "${title}을 ${actionType.value}합니다"
+            }
+
+
+        }
+    }
+}

android/app/src/main/java/com/example/todo/model/ActionLog.kt

@@ -1,6 +1,8 @@
 package com.example.todo.model
 
-data class TodoItem(var itemId: String, val title: String, val content: String)
+import com.example.todo.common.ProgressType
+
+data class TodoItem(var itemId: String, val title: String, val content: String, val type: ProgressType)
 
 
 

android/app/src/main/java/com/example/todo/model/TodoItem.kt

@@ -0,0 +1,66 @@
+package com.example.todo.ui.action
+
+import android.os.Build
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.annotation.RequiresApi
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.example.todo.R
+import com.example.todo.model.ActionLog
+import java.time.Duration
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.util.*
+
+class ActionAdapter(
+    actionDiffCallback: DiffUtil.ItemCallback<ActionLog>
+) :
+    ListAdapter<ActionLog, ActionAdapter.ViewHolder>(actionDiffCallback) {
+
+    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        private val content: TextView = itemView.findViewById(R.id.tv_action_content)
+        private val time: TextView = itemView.findViewById(R.id.tv_action_time)
+
+        @RequiresApi(Build.VERSION_CODES.O)
+        fun bind(actionItem: ActionLog) {
+            content.text = actionItem.toString()
+            time.text = getTimeDiff(actionItem.time)
+        }
+
+
+
+        @RequiresApi(Build.VERSION_CODES.O)
+        fun getTimeDiff(actionDateTime: LocalDateTime):String {
+            val nowDateTime = LocalDateTime.now(ZoneId.of("Asia/Seoul"))
+            val duration=  Duration.between(actionDateTime, nowDateTime)
+            return when {
+                duration.toDays() > 0 -> {
+                    "${duration.toDays()}일전"
+                }
+                duration.toHours()>0 -> {
+                    "${duration.toHours()}시간전"
+                }
+                else -> {
+                    "${duration.toMinutes()}분전"
+                }
+            }
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.action_log_item, parent, false)
+        return ViewHolder(view)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.bind(getItem(position))
+    }
+
+}

android/app/src/main/java/com/example/todo/ui/MainActivity.kt

@@ -1,29 +1,43 @@
-package com.example.todo.ui
+package com.example.todo.ui.toDo
 
+import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.Menu
+import android.view.MenuItem
+import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.example.todo.R
 import com.example.todo.common.TodoDiffCallback
 import com.example.todo.model.TodoItem
+import java.time.Duration
+import java.time.LocalDateTime
+import java.time.ZoneId
 
 class ToDoActivity : AppCompatActivity() {
     lateinit var rv: RecyclerView
+    lateinit var rv2:RecyclerView
+    lateinit var draw:DrawerLayout
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_todo)
         val toolbar= findViewById<Toolbar>(R.id.tb_main)
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayShowTitleEnabled(false)
-
+        draw= findViewById(R.id.draw)
 
         val adapter = TodoAdapter(TodoDiffCallback())
         rv = findViewById(R.id.rv)
+        rv2= findViewById(R.id.rv2)
         rv.adapter = adapter
         rv.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
+        rv2.adapter=adapter
+        rv2.layoutManager=  LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
 
         val list = mutableListOf<TodoItem>()
         list.add(
@@ -43,10 +57,24 @@ class ToDoActivity : AppCompatActivity() {
         )
 
         adapter.submitList(list)
+
+
     }
 
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.toolbar_action, menu)
         return true
     }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when(item.itemId){
+            R.id.action_menu-> {
+                draw.openDrawer(GravityCompat.END)
+            }
+
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
 }

android/app/src/main/java/com/example/todo/ui/action/ActionAdapter.kt

@@ -1,4 +1,4 @@
-package com.example.todo.ui
+package com.example.todo.ui.toDo
 
 import android.view.LayoutInflater
 import android.view.View