Merge pull request #213 from Hous-Release/feature/#207-fix-todo-main-…

…asset #207 [fix] todo main asset 위치 변경
Hous-Release · May 28, 2023 · e582c03 · e582c03
2 parents 10f1dab + 712124a
commit e582c03
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 45 deletions.
diff --git a/app/src/main/java/hous/release/android/presentation/todo/main/TodoFragment.kt b/app/src/main/java/hous/release/android/presentation/todo/main/TodoFragment.kt
@@ -41,7 +41,7 @@ class TodoFragment : BindingFragment<FragmentToDoBinding>(R.layout.fragment_to_d
     }
 
     private fun initClickListener() {
-        binding.llToDoViewAll.setOnClickListener {
+        binding.ivToDoViewAll.setOnClickListener {
             Intent(requireActivity(), TodoDetailActivity::class.java)
                 .apply { putExtra(CURRENT_DAY, toDoViewModel.uiState.value.dayOfWeek) }
                 .also { intent -> startActivity(intent) }
@@ -86,7 +86,8 @@ class TodoFragment : BindingFragment<FragmentToDoBinding>(R.layout.fragment_to_d
             .setArrowOrientation(ArrowOrientation.TOP)
             .setArrowPositionRules(ArrowPositionRules.ALIGN_ANCHOR)
             .setCornerRadius(10f)
-            .setBackgroundColorResource(R.color.hous_blue)
+            .setBackgroundColorResource(R.color.hous_blue_80)
+            .setArrowColorResource(R.color.hous_blue_arrow)
             .setMarginRight(18)
             .setLifecycleOwner(viewLifecycleOwner)
             .build()

diff --git a/app/src/main/res/drawable/ic_back_right.xml b/app/src/main/res/drawable/ic_back_right.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.421,12L10,18.421L8.579,17L15,10.579L16.421,12ZM10,5.579L16.421,12L15,13.421L8.579,7L10,5.579Z"
+      android:fillColor="#C8C8C8"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_to_do.xml b/app/src/main/res/layout/fragment_to_do.xml
@@ -41,36 +41,6 @@
             app:layout_constraintTop_toBottomOf="@+id/tv_to_do_date"
             tools:text="Thursday" />
 
-        <LinearLayout
-            android:id="@+id/ll_to_do_view_all"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="17dp"
-            android:background="@drawable/shape_blue_i2_fill_8_rect"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:paddingHorizontal="12dp"
-            android:paddingTop="6dp"
-            android:paddingBottom="9dp"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_to_do_dayOfWeek"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tv_to_do_date">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/to_do_small_letter"
-                android:textColor="@color/hous_blue"
-                android:theme="@style/En1" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/to_do_view_all"
-                android:textColor="@color/hous_blue"
-                android:theme="@style/H5" />
-        </LinearLayout>
-
         <androidx.compose.ui.platform.ComposeView
             android:id="@+id/cv_to_do_progress"
             android:layout_width="wrap_content"
@@ -221,16 +191,6 @@
                     app:layout_constraintTop_toTopOf="@+id/iv_to_do_our_dot"
                     tools:text="2" />
 
-                <ImageView
-                    android:id="@+id/iv_to_do_tool_tip"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="27dp"
-                    android:src="@drawable/ic_to_do_help"
-                    app:layout_constraintBottom_toBottomOf="@+id/tv_to_do_our_title"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/tv_to_do_our_title" />
-
                 <FrameLayout
                     android:id="@+id/fl_to_do_our"
                     android:layout_width="match_parent"
@@ -273,7 +233,27 @@
                     app:layout_constraintStart_toStartOf="@+id/fl_to_do_our"
                     app:layout_constraintTop_toBottomOf="@+id/fl_to_do_our" />
 
+                <ImageView
+                    android:id="@+id/iv_to_do_view_all"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:padding="4dp"
+                    android:src="@drawable/ic_back_right"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_to_do_our_title"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/tv_to_do_our_title" />
+
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>
+
+        <ImageView
+            android:id="@+id/iv_to_do_tool_tip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
+            android:src="@drawable/ic_to_do_help"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tv_to_do_date" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/item_to_do_tool_tip.xml b/app/src/main/res/layout/item_to_do_tool_tip.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@color/hous_blue"
+    android:background="@color/hous_blue_80"
     android:paddingVertical="21dp">
 
     <TextView

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -11,6 +11,8 @@
     <color name="hous_red">#FF6666</color>
     <color name="hous_yellow">#FFD66D</color>
     <color name="hous_blue">#5E9EFF</color>
+    <color name="hous_blue_arrow">#7EB1FF</color>
+    <color name="hous_blue_80">#805E9EFF</color>
     <color name="hous_blue_l1">#BCD7FF</color>
     <color name="hous_blue_l2">#F5F9FF</color>
     <color name="hous_blue_l2_80">#80f5f9ff</color>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -165,8 +165,6 @@
     <!-- To-Do -->
     <string name="to_do_total">총</string>
     <string name="to_do_count">개</string>
-    <string name="to_do_small_letter">to-do</string>
-    <string name="to_do_view_all">전체보기</string>
     <string name="to_do_homie_message_notting">아직 하나도 못했어요!</string>
     <string name="to_do_homie_message_finish">오늘 to-do 끝~!</string>
     <string name="to_do_homie_message_in_progress">잘하고 있어요!</string>