[Team-01][Android] Todo 화면 및 레포지토리 구현

Android/app/src/main/java/com/example/todo_list/MainActivity.kt

@@ -7,11 +7,11 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.ViewModelProvider
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.todo_list.data.TasksRepository
 import com.example.todo_list.databinding.ActivityMainBinding
 import com.example.todo_list.history.HistoryAdapter
 import com.example.todo_list.history.HistoryViewModel
+import com.example.todo_list.tasks.data.Task
 import com.google.android.material.navigation.NavigationView
 
 class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
@@ -24,17 +24,17 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
 
         historyViewModel = ViewModelProvider(this, ViewModelFactory(TasksRepository())).get(HistoryViewModel::class.java)
 
-        val adapter = HistoryAdapter()
-        binding.recyclerviewHistory.adapter = adapter
-        binding.recyclerviewHistory.layoutManager = LinearLayoutManager(this)
+        val historyAdapter = HistoryAdapter()
+        binding.recyclerviewHistory.adapter = historyAdapter
         binding.btnMenu.setOnClickListener {
             binding.mainLayout.openDrawer(GravityCompat.END)
             historyViewModel.getHistories()
         }
+
         binding.btnClose.setOnClickListener { binding.mainLayout.closeDrawer(GravityCompat.END) }
         binding.naviView.setNavigationItemSelectedListener(this)
 
-        historyViewModel.historyList.observe(this) { adapter.submitList(it) }
+        historyViewModel.historyList.observe(this) { historyAdapter.submitList(it) }
         historyViewModel.checkLoading.observe(this) {
             if (it) {
                 binding.spinner.visibility = View.VISIBLE
@@ -44,6 +44,28 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                 binding.recyclerviewHistory.visibility = View.VISIBLE
             }
         }
+
+        val task1 = Task(
+            1,
+            "테스트하기1",
+            "콘텐츠테스트1",
+            "jung",
+            "doing",
+            "2022-04-06T15:30:00.000+09:00",
+            "2022-04-06T15:30:00.000+09:00"
+        )
+
+        val task2 = Task(
+            2,
+            "테스트하기2",
+            "콘텐츠테스트2",
+            "park",
+            "todo",
+            "2022-04-06T15:30:00.000+09:00",
+            "2022-04-06T15:30:00.000+09:00"
+        )
+
+        binding.todoTodoView.addTasks(listOf(task1, task2))
     }
 
     override fun onNavigationItemSelected(item: MenuItem): Boolean {

Android/app/src/main/java/com/example/todo_list/tasks/ItemTouchHelperCallback.kt

@@ -0,0 +1,107 @@
+package com.example.todo_list.tasks
+
+import android.graphics.Canvas
+import android.util.Log
+import android.view.View
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.example.todo_list.R
+import kotlin.math.min
+
+class ItemTouchHelperCallback(val listener: ItemTouchHelperListener) : ItemTouchHelper.Callback() {
+
+    private var clamp = 0f
+    private var currentDx = 0f
+
+    override fun getMovementFlags(
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder
+    ): Int {
+        Log.d("TAGcode", "${ItemTouchHelper.LEFT}")
+        return makeMovementFlags(0, ItemTouchHelper.LEFT)
+    }
+
+    override fun onMove(
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder,
+        target: RecyclerView.ViewHolder
+    ): Boolean {
+        return listener.onItemMove(viewHolder.adapterPosition, target.adapterPosition)
+    }
+
+    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+        Log.d("TAGonSwiped1", "$direction")
+        Log.d("TAGonSwiped2", "${viewHolder.adapterPosition}") //<< 몇번째 목록을 조작했는지
+        // direction = 방향 >> 왼쪽으로 스와이프했을때 작동
+        listener.onItemSwipe(viewHolder.adapterPosition)
+
+    }
+
+    // 터치,스와이프등 뷰에 변화가 생길겨여우
+    override fun onChildDraw(
+        c: Canvas,
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder,
+        dX: Float,
+        dY: Float,
+        actionState: Int,
+        isCurrentlyActive: Boolean
+    ) {
+        if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
+            val view = getView(viewHolder)
+            val isClamped = getTag(viewHolder)
+            val newX = clampViewPositionHorizontal(
+                dX,
+                isClamped,
+                isCurrentlyActive
+            )  // newX 만큼 이동(고정 시 이동 위치/고정 해제 시 이동 위치 결정)
+
+            // 고정시킬 시 애니메이션 추가
+            if (newX == -clamp) {
+                getView(viewHolder).animate().translationX(-clamp).setDuration(100L).start()
+                return
+            }
+
+            currentDx = newX
+            getDefaultUIUtil().onDraw(
+                c,
+                recyclerView,
+                view,
+                newX,
+                dY,
+                actionState,
+                isCurrentlyActive
+            )
+        }
+    }
+
+    fun setClamp(clamp: Float) { this.clamp = clamp }
+    private fun getView(viewHolder: RecyclerView.ViewHolder) : View = viewHolder.itemView.findViewById(R.id.todo_item)
+    private fun getTag(viewHolder: RecyclerView.ViewHolder) : Boolean =  viewHolder.itemView.tag as? Boolean ?: false
+
+    private fun clampViewPositionHorizontal(
+        dX: Float,
+        isClamped: Boolean,
+        isCurrentlyActive: Boolean
+    ) : Float {
+        // RIGHT 방향으로 swipe 막기
+        val max = 0f
+
+        // 고정할 수 있으면
+        val newX = if (isClamped) {
+            // 현재 swipe 중이면 swipe되는 영역 제한
+            if (isCurrentlyActive)
+            // 오른쪽 swipe일 때
+                if (dX < 0) dX/3 - clamp
+                // 왼쪽 swipe일 때
+                else dX - clamp
+            // swipe 중이 아니면 고정시키기
+            else -clamp
+        }
+        // 고정할 수 없으면 newX는 스와이프한 만큼
+        else dX / 2
+
+        // newX가 0보다 작은지 확인
+        return min(newX, max)
+    }
+}

Android/app/src/main/java/com/example/todo_list/tasks/ItemTouchHelperListener.kt

@@ -0,0 +1,6 @@
+package com.example.todo_list.tasks
+
+interface ItemTouchHelperListener  {
+    fun onItemMove(from_position: Int, to_position: Int): Boolean
+    fun onItemSwipe(position: Int)
+}

Android/app/src/main/java/com/example/todo_list/tasks/TaskAdapter.kt

@@ -0,0 +1,53 @@
+package com.example.todo_list.tasks
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.example.todo_list.R
+import com.example.todo_list.databinding.TodoItemBinding
+import com.example.todo_list.tasks.data.Task
+
+class TodoAdapter : ListAdapter<Task, TodoAdapter.TodoViewHolder>(diffUtil),
+    ItemTouchHelperListener {
+    inner class TodoViewHolder(private val binding: TodoItemBinding) : RecyclerView.ViewHolder(binding.root) {
+        fun bind(task: Task) {
+            binding.task = task
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        DataBindingUtil.inflate<TodoItemBinding>(
+            LayoutInflater.from(parent.context),
+            R.layout.todo_item,
+            parent,
+            false
+        ).let {
+            TodoViewHolder(it)
+        }
+
+    override fun onBindViewHolder(holder: TodoViewHolder, position: Int) {
+        val item = getItem(position)
+        holder.bind(item)
+    }
+
+    override fun onItemMove(from_position: Int, to_position: Int): Boolean {
+        return true
+    }
+
+    override fun onItemSwipe(position: Int) {
+    }
+}
+
+private val diffUtil = object : DiffUtil.ItemCallback<Task>() {
+    override fun areItemsTheSame(oldItem: Task, newItem: Task): Boolean {
+        return oldItem.id == newItem.id
+    }
+
+    override fun areContentsTheSame(oldItem: Task, newItem: Task): Boolean {
+        return oldItem == newItem
+    }
+
+}

Android/app/src/main/java/com/example/todo_list/tasks/TaskBindingAdapters.kt

@@ -0,0 +1,19 @@
+package com.example.todo_list.tasks
+
+import android.widget.TextView
+import androidx.databinding.BindingAdapter
+
+@BindingAdapter("setTitle")
+fun setTitle(view: TextView, title: String) {
+    view.text = title
+}
+
+@BindingAdapter("setContent")
+fun setContent(view: TextView, content: String) {
+    view.text = content
+}
+
+@BindingAdapter("setUser")
+fun setUser(view: TextView, user: String) {
+    view.text = user
+}

Android/app/src/main/java/com/example/todo_list/tasks/TasksView.kt

@@ -0,0 +1,65 @@
+package com.example.todo_list.tasks
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.ImageButton
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.example.todo_list.R
+import com.example.todo_list.tasks.data.Task
+
+class TasksView(context: Context, attrs: AttributeSet?) : ConstraintLayout(context, attrs) {
+
+    private lateinit var tvTitle: TextView
+    private lateinit var tvBadgeCount: TextView
+    private lateinit var btnAddTask: ImageButton
+    private lateinit var recyclerViewTodo: RecyclerView
+    private val todosAdapter = TodoAdapter()
+    init {
+        initViews()
+        initAttributes(attrs)
+    }
+
+    private fun initAttributes(attrs: AttributeSet?) {
+        context.theme.obtainStyledAttributes(
+            attrs,
+            R.styleable.TodoView,
+            0,
+            0).apply {
+                try {
+                    tvTitle.text = getString(R.styleable.TodoView_title)
+                    tvBadgeCount.text = getString(R.styleable.TodoView_badge_count)
+                } finally {
+                    recycle()
+                }
+        }
+    }
+
+    private fun initViews() {
+        val layoutInflater = context.getSystemService(
+            Context.LAYOUT_INFLATER_SERVICE
+        ) as LayoutInflater
+
+        addView(
+            layoutInflater.inflate(R.layout.tasks_view, this, false)
+        )
+
+        tvTitle = findViewById(R.id.todo_title)
+        tvBadgeCount = findViewById(R.id.todo_badge)
+        btnAddTask = findViewById(R.id.btn_task_add)
+        recyclerViewTodo = findViewById(R.id.recyclerview_todo)
+
+        recyclerViewTodo.adapter = todosAdapter
+        recyclerViewTodo.setHasFixedSize(true)
+        val touchHelper = ItemTouchHelperCallback(todosAdapter)
+        val helper = ItemTouchHelper(touchHelper)
+        helper.attachToRecyclerView(recyclerViewTodo)
+    }
+
+    fun addTasks(tasks: List<Task>) {
+        todosAdapter.submitList(tasks)
+    }
+}

Android/app/src/main/res/drawable/ic_baseline_add_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#BAB8B8"
+    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="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>

Android/app/src/main/res/drawable/todo_badge_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="@color/number_badge_bg" />
+
+</shape>