From 24d75714634563dba3f2a1cf31fd094715633946 Mon Sep 17 00:00:00 2001
From: Sangho Kim <marchbreeze03@gmail.com>
Date: Fri, 5 Jan 2024 03:05:40 +0900
Subject: [PATCH] =?UTF-8?q?[UI/#11]=20OurTodoFragment=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todolist/OurTodoCompleteFragment.kt       |  5 +--
 .../res/drawable/sel_todo_shape_tv_name.xml   | 22 ++++++++++++
 ...xml => shape_line_gray100_fill_dash_8.xml} |  0
 .../res/drawable/shape_rect_4_gray50_fill.xml |  7 ++++
 ...rect.xml => shape_rect_56_red500_fill.xml} |  0
 ...ape_rect_8_white000_fill_gray100_line.xml} |  0
 .../src/main/res/layout/fragment_our_todo.xml |  8 ++---
 .../res/layout/fragment_our_todo_complete.xml | 28 +++++++++++++++
 .../src/main/res/layout/item_our_todo.xml     | 36 +++++++++++++++++++
 9 files changed, 100 insertions(+), 6 deletions(-)
 create mode 100644 presentation/src/main/res/drawable/sel_todo_shape_tv_name.xml
 rename presentation/src/main/res/drawable/{shape_gray100_dash_line.xml => shape_line_gray100_fill_dash_8.xml} (100%)
 create mode 100644 presentation/src/main/res/drawable/shape_rect_4_gray50_fill.xml
 rename presentation/src/main/res/drawable/{shape_red500_fill_56_rect.xml => shape_rect_56_red500_fill.xml} (100%)
 rename presentation/src/main/res/drawable/{shape_white_fill_gray100_line_8_rect.xml => shape_rect_8_white000_fill_gray100_line.xml} (100%)
 create mode 100644 presentation/src/main/res/layout/fragment_our_todo_complete.xml
 create mode 100644 presentation/src/main/res/layout/item_our_todo.xml

diff --git a/presentation/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoCompleteFragment.kt b/presentation/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoCompleteFragment.kt
index 5e6a1465..508b8c74 100644
--- a/presentation/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoCompleteFragment.kt
+++ b/presentation/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoCompleteFragment.kt
@@ -1,11 +1,12 @@
 package com.going.presentation.todo.ourtodo.todolist
 
 import com.going.presentation.R
-import com.going.presentation.databinding.FragmentOurTodoBinding
+import com.going.presentation.databinding.FragmentOurTodoCompleteBinding
 import com.going.ui.base.BaseFragment
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class OurTodoCompleteFragment() : BaseFragment<FragmentOurTodoBinding>(R.layout.fragment_our_todo) {
+class OurTodoCompleteFragment() :
+    BaseFragment<FragmentOurTodoCompleteBinding>(R.layout.fragment_our_todo_complete) {
 
 }
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/sel_todo_shape_tv_name.xml b/presentation/src/main/res/drawable/sel_todo_shape_tv_name.xml
new file mode 100644
index 00000000..8d2f7454
--- /dev/null
+++ b/presentation/src/main/res/drawable/sel_todo_shape_tv_name.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="false">
+        <shape android:shape="rectangle">
+            <stroke
+                android:width="2dp"
+                android:color="@color/gray_400" />
+            <corners android:radius="2dp" />
+        </shape>
+    </item>
+
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+            <stroke
+                android:width="2dp"
+                android:color="@color/red_500" />
+            <corners android:radius="2dp" />
+        </shape>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/shape_gray100_dash_line.xml b/presentation/src/main/res/drawable/shape_line_gray100_fill_dash_8.xml
similarity index 100%
rename from presentation/src/main/res/drawable/shape_gray100_dash_line.xml
rename to presentation/src/main/res/drawable/shape_line_gray100_fill_dash_8.xml
diff --git a/presentation/src/main/res/drawable/shape_rect_4_gray50_fill.xml b/presentation/src/main/res/drawable/shape_rect_4_gray50_fill.xml
new file mode 100644
index 00000000..366d0c62
--- /dev/null
+++ b/presentation/src/main/res/drawable/shape_rect_4_gray50_fill.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="4dp" />
+    <solid
+        android:color="@color/gray_50" />
+</shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/shape_red500_fill_56_rect.xml b/presentation/src/main/res/drawable/shape_rect_56_red500_fill.xml
similarity index 100%
rename from presentation/src/main/res/drawable/shape_red500_fill_56_rect.xml
rename to presentation/src/main/res/drawable/shape_rect_56_red500_fill.xml
diff --git a/presentation/src/main/res/drawable/shape_white_fill_gray100_line_8_rect.xml b/presentation/src/main/res/drawable/shape_rect_8_white000_fill_gray100_line.xml
similarity index 100%
rename from presentation/src/main/res/drawable/shape_white_fill_gray100_line_8_rect.xml
rename to presentation/src/main/res/drawable/shape_rect_8_white000_fill_gray100_line.xml
diff --git a/presentation/src/main/res/layout/fragment_our_todo.xml b/presentation/src/main/res/layout/fragment_our_todo.xml
index 72f8c788..910912d2 100644
--- a/presentation/src/main/res/layout/fragment_our_todo.xml
+++ b/presentation/src/main/res/layout/fragment_our_todo.xml
@@ -121,7 +121,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginHorizontal="24dp"
                             android:layout_marginTop="14dp"
-                            android:background="@drawable/shape_white_fill_gray100_line_8_rect"
+                            android:background="@drawable/shape_rect_8_white000_fill_gray100_line"
                             android:paddingHorizontal="18dp"
                             android:paddingTop="22dp"
                             android:paddingBottom="29dp"
@@ -168,7 +168,7 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginHorizontal="24dp"
-                            android:background="@drawable/shape_white_fill_gray100_line_8_rect"
+                            android:background="@drawable/shape_rect_8_white000_fill_gray100_line"
                             android:paddingVertical="22dp"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
@@ -280,7 +280,7 @@
                                 android:layout_height="5dp"
                                 android:layout_marginHorizontal="10dp"
                                 android:layerType="software"
-                                android:src="@drawable/shape_gray100_dash_line" />
+                                android:src="@drawable/shape_line_gray100_fill_dash_8" />
 
                         </LinearLayout>
 
@@ -318,7 +318,7 @@
             android:elevation="2dp"
             android:layout_marginEnd="16dp"
             android:id="@+id/btn_our_todo_add_todo"
-            android:background="@drawable/shape_red500_fill_56_rect"
+            android:background="@drawable/shape_rect_56_red500_fill"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent">
 
diff --git a/presentation/src/main/res/layout/fragment_our_todo_complete.xml b/presentation/src/main/res/layout/fragment_our_todo_complete.xml
new file mode 100644
index 00000000..558c6ea8
--- /dev/null
+++ b/presentation/src/main/res/layout/fragment_our_todo_complete.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/layout_our_todo_complete"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white_000">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:id="@+id/rv_our_todo_complete"
+            android:layout_marginTop="8dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginHorizontal="23dp"
+            tools:listitem="@layout/item_our_todo"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/item_our_todo.xml b/presentation/src/main/res/layout/item_our_todo.xml
new file mode 100644
index 00000000..a4fa47d9
--- /dev/null
+++ b/presentation/src/main/res/layout/item_our_todo.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="12dp"
+    android:paddingBottom="15dp"
+    android:background="@drawable/shape_rect_4_gray50_fill">
+
+    <TextView
+        android:id="@+id/tv_our_todo_item_title"
+        style="@style/TextAppearance.Doorip.Body3.Medi"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:textColor="@color/gray_700"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="숙소 예약금 걸기" />
+
+    <TextView
+        android:id="@+id/tv_our_todo_item_date"
+        style="@style/TextAppearance.Doorip.Detail3.Regular"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:textColor="@color/gray_300"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="2023.09.23까지" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file