From 04efe17d7f6fd7f0ec269590209eaeeaa7562ccd Mon Sep 17 00:00:00 2001
From: crownjoe <crownjoe@naver.com>
Date: Tue, 16 Jan 2024 03:52:27 +0900
Subject: [PATCH 1/2] =?UTF-8?q?[FEAT/#114]=20=EB=8D=B0=EC=9D=B4=ED=8A=B8?=
 =?UTF-8?q?=ED=94=BC=EC=BB=A4=20=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=20?=
 =?UTF-8?q?=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EC=9C=84=EC=B9=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../BottomSheetDateContentFragment.kt         |  9 +-
 .../drawable/shape_rect_4_gray700_fill.xml    |  7 ++
 .../drawable/shape_rect_4_white000_fill.xml   |  2 +-
 .../shape_rect_top40_white000_fill.xml        |  6 --
 .../shape_rect_top4_white000_fill.xml         | 16 ++++
 .../fragment_bottom_sheet_date_content.xml    | 85 ++++++++++++-------
 .../fragment_my_todo_create_bottom_sheet.xml  |  4 +-
 .../fragment_our_todo_create_bottom_sheet.xml |  4 +-
 9 files changed, 92 insertions(+), 43 deletions(-)
 create mode 100644 presentation/src/main/res/drawable/shape_rect_4_gray700_fill.xml
 delete mode 100644 presentation/src/main/res/drawable/shape_rect_top40_white000_fill.xml
 create mode 100644 presentation/src/main/res/drawable/shape_rect_top4_white000_fill.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c5050383..c54faabc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -98,7 +98,7 @@
 
         <activity
             android:name="com.going.presentation.entertrip.createtrip.choosedate.CreateTripActivity"
-            android:exported="false"
+            android:exported="true"
             android:screenOrientation="portrait" />
 
         <activity
diff --git a/presentation/src/main/java/com/going/presentation/entertrip/createtrip/choosedate/BottomSheetDateContentFragment.kt b/presentation/src/main/java/com/going/presentation/entertrip/createtrip/choosedate/BottomSheetDateContentFragment.kt
index d007c5d1..54beb199 100644
--- a/presentation/src/main/java/com/going/presentation/entertrip/createtrip/choosedate/BottomSheetDateContentFragment.kt
+++ b/presentation/src/main/java/com/going/presentation/entertrip/createtrip/choosedate/BottomSheetDateContentFragment.kt
@@ -1,12 +1,13 @@
 package com.going.presentation.entertrip.createtrip.choosedate
 
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.view.View
 import com.going.presentation.R
 import com.going.presentation.databinding.FragmentBottomSheetDateContentBinding
 import com.going.ui.base.BaseBottomSheet
 import com.going.ui.extension.setOnSingleClickListener
-import com.going.ui.extension.toast
 import java.util.Calendar
 
 class BottomSheetDateContentFragment(val viewModel: CreateTripViewModel, val isStart: Boolean) :
@@ -55,7 +56,11 @@ class BottomSheetDateContentFragment(val viewModel: CreateTripViewModel, val isS
                 if (startDate.before(endDate)) {
                     dismiss()
                 } else {
-                    toast(getString(R.string.create_trip_toast_error))
+                    binding.viewBlank.visibility = View.VISIBLE
+                    binding.tvErrorToast.visibility = View.VISIBLE
+                    Handler(Looper.getMainLooper()).postDelayed({
+                        binding.tvErrorToast.visibility = View.INVISIBLE
+                    }, 2000)
                 }
             } else {
                 dismiss()
diff --git a/presentation/src/main/res/drawable/shape_rect_4_gray700_fill.xml b/presentation/src/main/res/drawable/shape_rect_4_gray700_fill.xml
new file mode 100644
index 00000000..27273291
--- /dev/null
+++ b/presentation/src/main/res/drawable/shape_rect_4_gray700_fill.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke android:width="1dp"/>
+    <stroke android:color="@color/gray_700"/>
+    <solid android:color="@color/gray_700" />
+    <corners android:radius="4dp" />
+</shape>
diff --git a/presentation/src/main/res/drawable/shape_rect_4_white000_fill.xml b/presentation/src/main/res/drawable/shape_rect_4_white000_fill.xml
index a0406f33..6151e171 100644
--- a/presentation/src/main/res/drawable/shape_rect_4_white000_fill.xml
+++ b/presentation/src/main/res/drawable/shape_rect_4_white000_fill.xml
@@ -5,4 +5,4 @@
     <stroke android:color="@color/gray_100"/>
     <solid android:color="@color/white_000" />
     <corners android:radius="4dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/presentation/src/main/res/drawable/shape_rect_top40_white000_fill.xml b/presentation/src/main/res/drawable/shape_rect_top40_white000_fill.xml
deleted file mode 100644
index 2fd1d528..00000000
--- a/presentation/src/main/res/drawable/shape_rect_top40_white000_fill.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white_000"/>
-    <corners android:topLeftRadius="40dp"
-        android:topRightRadius="40dp"/>
-</shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/shape_rect_top4_white000_fill.xml b/presentation/src/main/res/drawable/shape_rect_top4_white000_fill.xml
new file mode 100644
index 00000000..36901626
--- /dev/null
+++ b/presentation/src/main/res/drawable/shape_rect_top4_white000_fill.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/transparent_60" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white_000" />
+            <corners
+                android:topLeftRadius="4dp"
+                android:topRightRadius="4dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/presentation/src/main/res/layout/fragment_bottom_sheet_date_content.xml b/presentation/src/main/res/layout/fragment_bottom_sheet_date_content.xml
index 7ec9fc47..6aafd780 100644
--- a/presentation/src/main/res/layout/fragment_bottom_sheet_date_content.xml
+++ b/presentation/src/main/res/layout/fragment_bottom_sheet_date_content.xml
@@ -4,49 +4,76 @@
 
     <data>
 
-        <import type="android.view.View" />
-
-        <import type="com.going.domain.entity.NameState" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/shape_rect_top40_white000_fill"
-        android:paddingBottom="22dp">
+        android:background="@color/transparent_60">
 
-        <DatePicker
-            android:id="@+id/dp_create_trip_date"
+        <TextView
+            android:id="@+id/tv_error_toast"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="40dp"
-            android:calendarTextColor="@color/gray_700"
-            android:calendarViewShown="false"
-            android:datePickerMode="spinner"
-            android:headerDayOfMonthTextAppearance="@style/TextAppearance.Doorip.Body2.Medi"
-            android:headerMonthTextAppearance="@style/TextAppearance.Doorip.Body2.Medi"
-            android:headerYearTextAppearance="@style/TextAppearance.Doorip.Body2.Medi"
-            android:spinnersShown="true"
+            android:background="@drawable/shape_rect_4_gray700_fill"
+            android:paddingHorizontal="12dp"
+            android:paddingVertical="10dp"
+            android:text="@string/create_trip_toast_error"
+            android:textColor="@color/white_000"
+            android:visibility="gone"
+            android:layout_marginBottom="22dp"
+            app:layout_constraintBottom_toTopOf="@id/view_blank"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintStart_toStartOf="parent" />
 
-        <TextView
-            android:id="@+id/btn_create_trip_finish"
-            style="@style/TextAppearance.Doorip.Body2.Bold"
-            android:layout_width="0dp"
+        <View
+            android:id="@+id/view_blank"
+            android:visibility="gone"
+            app:layout_constraintBottom_toTopOf="@+id/layout_date_picker"
+            android:layout_width="match_parent"
+            android:layout_height="22dp"/>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/layout_date_picker"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="40dp"
-            android:background="@drawable/sel_rounded_corner_button"
-            android:gravity="center"
-            android:paddingVertical="13dp"
-            android:text="@string/date_content_btn"
-            android:textColor="@color/white_000"
+            android:background="@drawable/shape_rect_top4_white000_fill"
+            android:paddingBottom="22dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/dp_create_trip_date" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_error_toast">
 
+            <DatePicker
+                android:id="@+id/dp_create_trip_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="40dp"
+                android:calendarTextColor="@color/gray_700"
+                android:calendarViewShown="false"
+                android:datePickerMode="spinner"
+                android:headerDayOfMonthTextAppearance="@style/TextAppearance.Doorip.Body2.Medi"
+                android:headerMonthTextAppearance="@style/TextAppearance.Doorip.Body2.Medi"
+                android:headerYearTextAppearance="@style/TextAppearance.Doorip.Body2.Medi"
+                android:spinnersShown="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/btn_create_trip_finish"
+                style="@style/TextAppearance.Doorip.Body2.Bold"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginTop="40dp"
+                android:background="@drawable/sel_rounded_corner_button"
+                android:gravity="center"
+                android:paddingVertical="13dp"
+                android:text="@string/create_trip_finish_btn"
+                android:textColor="@color/white_000"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/dp_create_trip_date" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/presentation/src/main/res/layout/fragment_my_todo_create_bottom_sheet.xml b/presentation/src/main/res/layout/fragment_my_todo_create_bottom_sheet.xml
index e807c634..5110f67c 100644
--- a/presentation/src/main/res/layout/fragment_my_todo_create_bottom_sheet.xml
+++ b/presentation/src/main/res/layout/fragment_my_todo_create_bottom_sheet.xml
@@ -9,7 +9,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/shape_rect_top40_white000_fill"
+        android:background="@drawable/shape_rect_top4_white000_fill"
         android:paddingBottom="22dp">
 
         <DatePicker
@@ -46,4 +46,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/presentation/src/main/res/layout/fragment_our_todo_create_bottom_sheet.xml b/presentation/src/main/res/layout/fragment_our_todo_create_bottom_sheet.xml
index e807c634..5110f67c 100644
--- a/presentation/src/main/res/layout/fragment_our_todo_create_bottom_sheet.xml
+++ b/presentation/src/main/res/layout/fragment_our_todo_create_bottom_sheet.xml
@@ -9,7 +9,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/shape_rect_top40_white000_fill"
+        android:background="@drawable/shape_rect_top4_white000_fill"
         android:paddingBottom="22dp">
 
         <DatePicker
@@ -46,4 +46,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>

From d802df39e553b855376931b7d460f997dacf2d45 Mon Sep 17 00:00:00 2001
From: crownjoe <crownjoe@naver.com>
Date: Tue, 16 Jan 2024 03:58:19 +0900
Subject: [PATCH 2/2] =?UTF-8?q?[FEAT/#114]=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c54faabc..c5050383 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -98,7 +98,7 @@
 
         <activity
             android:name="com.going.presentation.entertrip.createtrip.choosedate.CreateTripActivity"
-            android:exported="true"
+            android:exported="false"
             android:screenOrientation="portrait" />
 
         <activity