[MERGE] #137 -> develop

leeeyubin · web-flow · commit 9c1c5cfecba4 · 2024-01-17T00:18:20.000+09:00
[FIX/#137] 유빈 담당 뷰 / 이슈 대응
diff --git a/presentation/src/main/java/com/going/presentation/dashboard/triplist/completed/CompletedViewHolder.kt b/presentation/src/main/java/com/going/presentation/dashboard/triplist/completed/CompletedViewHolder.kt
@@ -15,8 +15,11 @@ class CompletedViewHolder(
 
         binding.run {
             tvDashboardTripTitle.text = item.title
-            tvDashboardDateStart.text = item.startDate
-            tvDashboardDateEnd.text = item.endDate
+            tvDashboardDate.text = String.format(
+                itemView.context.getString(R.string.dashboard_tv_start_end_date),
+                item.startDate,
+                item.endDate
+            )
             tvDashboardDeadlineCompleted.text =
                 itemView.context.getString(R.string.dashboard_tv_completed_trip)
 
diff --git a/presentation/src/main/java/com/going/presentation/dashboard/triplist/ongoing/OngoingViewHolder.kt b/presentation/src/main/java/com/going/presentation/dashboard/triplist/ongoing/OngoingViewHolder.kt
@@ -14,8 +14,11 @@ class OngoingViewHolder(
     fun onBind(item: DashBoardTripModel) {
         binding.run {
             tvDashboardTripTitle.text = item.title
-            tvDashboardDateStart.text = item.startDate
-            tvDashboardDateEnd.text = item.endDate
+            tvDashboardDate.text = String.format(
+                itemView.context.getString(R.string.dashboard_tv_start_end_date),
+                item.startDate,
+                item.endDate
+            )
 
             if (item.day <= 0) {
                 tvDashboardDeadline.text =
diff --git a/presentation/src/main/res/layout/activity_check_friends.xml b/presentation/src/main/res/layout/activity_check_friends.xml
@@ -116,7 +116,6 @@
                         style="@style/TextAppearance.Doorip.Body3.Bold"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="108dp"
                         android:layout_marginTop="20dp"
                         android:gravity="center"
                         android:text="@string/check_friends_preference_1_title"
@@ -199,7 +198,6 @@
                         style="@style/TextAppearance.Doorip.Body3.Bold"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="108dp"
                         android:layout_marginTop="10dp"
                         android:gravity="center"
                         android:text="@string/check_friends_preference_2_title"
@@ -278,7 +276,6 @@
                         style="@style/TextAppearance.Doorip.Body3.Bold"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="108dp"
                         android:layout_marginTop="10dp"
                         android:gravity="center"
                         android:text="@string/check_friends_preference_3_title"
@@ -358,7 +355,6 @@
                         style="@style/TextAppearance.Doorip.Body3.Bold"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="108dp"
                         android:layout_marginTop="10dp"
                         android:gravity="center"
                         android:text="@string/check_friends_preference_4_title"
@@ -438,7 +434,6 @@
                         style="@style/TextAppearance.Doorip.Body3.Bold"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="108dp"
                         android:layout_marginTop="10dp"
                         android:gravity="center"
                         android:text="@string/check_friends_preference_5_title"
diff --git a/presentation/src/main/res/layout/activity_setting.xml b/presentation/src/main/res/layout/activity_setting.xml
diff --git a/presentation/src/main/res/layout/activity_trip_dash_board.xml b/presentation/src/main/res/layout/activity_trip_dash_board.xml
@@ -17,10 +17,11 @@
         <TextView
             android:id="@+id/tv_dashboard_title"
             style="@style/TextAppearance.Doorip.Head1"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
             android:layout_marginTop="44dp"
+            app:layout_constraintBottom_toTopOf="@id/tab_dashboard"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="@string/dashboard_tv_title" />
diff --git a/presentation/src/main/res/layout/fragment_completed_trip.xml b/presentation/src/main/res/layout/fragment_completed_trip.xml
@@ -38,13 +38,15 @@
             <TextView
                 android:id="@+id/tv_dashboard_empty"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:layout_marginBottom="28dp"
+                android:gravity="bottom"
                 android:text="@string/dashboard_tv_empty"
                 android:textColor="@color/gray_200"
                 app:layout_constraintBottom_toTopOf="@id/iv_dashboard_empty"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
                 android:id="@+id/iv_dashboard_empty"
diff --git a/presentation/src/main/res/layout/fragment_ongoing_trip.xml b/presentation/src/main/res/layout/fragment_ongoing_trip.xml
@@ -38,13 +38,15 @@
             <TextView
                 android:id="@+id/tv_dashboard_empty"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:layout_marginBottom="28dp"
+                android:gravity="bottom"
                 android:text="@string/dashboard_tv_empty"
                 android:textColor="@color/gray_200"
                 app:layout_constraintBottom_toTopOf="@id/iv_dashboard_empty"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
                 android:id="@+id/iv_dashboard_empty"
diff --git a/presentation/src/main/res/layout/item_dash_board_completed.xml b/presentation/src/main/res/layout/item_dash_board_completed.xml
@@ -19,11 +19,12 @@
         <TextView
             android:id="@+id/tv_dashboard_trip_title"
             style="@style/TextAppearance.Doorip.Body3.Medi"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             android:textColor="@color/gray_300"
+            app:layout_constraintEnd_toStartOf="@id/layout_dashboard_day_completed"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="굉굉이들이랑 합숙" />
@@ -33,49 +34,25 @@
             android:id="@+id/iv_dashboard_calendar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="4dp"
+            android:layout_marginStart="16dp"
             android:src="@drawable/ic_calendar"
-            app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date_start"
-            app:layout_constraintEnd_toStartOf="@id/tv_dashboard_date_start"
-            app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_start" />
+            app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/tv_dashboard_date" />
 
         <TextView
-            android:id="@+id/tv_dashboard_date_start"
+            android:id="@+id/tv_dashboard_date"
             style="@style/TextAppearance.Doorip.Detail3.Regular"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="4dp"
+            android:layout_marginStart="4dp"
             android:layout_marginBottom="16dp"
+            android:text="@string/dashboard_tv_start_end_date"
             android:textColor="@color/gray_300"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@id/tv_dashboard_trip_title"
-            app:layout_constraintTop_toBottomOf="@id/tv_dashboard_trip_title"
-            tools:text="2024 .03 .24" />
-
-        <TextView
-            android:id="@+id/tv_dashboard_date_dash"
-            style="@style/TextAppearance.Doorip.Detail3.Regular"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:textColor="@color/gray_300"
-            app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date_start"
-            app:layout_constraintStart_toEndOf="@id/tv_dashboard_date_start"
-            app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_start"
-            tools:text="@string/dashboard_tv_dash" />
-
-        <TextView
-            android:id="@+id/tv_dashboard_date_end"
-            style="@style/TextAppearance.Doorip.Detail3.Regular"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:textColor="@color/gray_300"
-            app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date_dash"
-            app:layout_constraintStart_toEndOf="@id/tv_dashboard_date_dash"
-            app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_dash"
-            tools:text="2024 .03 .31" />
+            app:layout_constraintEnd_toStartOf="@id/layout_dashboard_day_completed"
+            app:layout_constraintStart_toEndOf="@id/iv_dashboard_calendar"
+            app:layout_constraintTop_toBottomOf="@id/tv_dashboard_trip_title" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/layout_dashboard_day_completed"
diff --git a/presentation/src/main/res/layout/item_dash_board_ongoing.xml b/presentation/src/main/res/layout/item_dash_board_ongoing.xml
@@ -19,62 +19,38 @@
         <TextView
             android:id="@+id/tv_dashboard_trip_title"
             style="@style/TextAppearance.Doorip.Body3.Medi"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
+            app:layout_constraintEnd_toStartOf="@id/tv_dashboard_deadline"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="굉굉이들이랑 합숙" />
 
-
         <ImageView
             android:id="@+id/iv_dashboard_calendar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="4dp"
+            android:layout_marginStart="16dp"
             android:src="@drawable/ic_calendar"
-            app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date_start"
-            app:layout_constraintEnd_toStartOf="@id/tv_dashboard_date_start"
-            app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_start" />
+            app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/tv_dashboard_date" />
 
         <TextView
-            android:id="@+id/tv_dashboard_date_start"
+            android:id="@+id/tv_dashboard_date"
             style="@style/TextAppearance.Doorip.Detail3.Regular"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="4dp"
+            android:layout_marginStart="4dp"
             android:layout_marginBottom="16dp"
+            android:text="@string/dashboard_tv_start_end_date"
             android:textColor="@color/gray_300"
+            app:layout_constraintEnd_toStartOf="@id/tv_dashboard_deadline"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@id/tv_dashboard_trip_title"
-            app:layout_constraintTop_toBottomOf="@id/tv_dashboard_trip_title"
-            tools:text="2024 .03 .24" />
-
-        <TextView
-            android:id="@+id/tv_dashboard_date_dash"
-            style="@style/TextAppearance.Doorip.Detail3.Regular"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:text="@string/dashboard_tv_dash"
-            android:textColor="@color/gray_300"
-            app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date_start"
-            app:layout_constraintStart_toEndOf="@id/tv_dashboard_date_start"
-            app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_start" />
-
-        <TextView
-            android:id="@+id/tv_dashboard_date_end"
-            style="@style/TextAppearance.Doorip.Detail3.Regular"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:textColor="@color/gray_300"
-            app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date_dash"
-            app:layout_constraintStart_toEndOf="@id/tv_dashboard_date_dash"
-            app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_dash"
-            tools:text="2024 .03 .31" />
+            app:layout_constraintStart_toEndOf="@id/iv_dashboard_calendar"
+            app:layout_constraintTop_toBottomOf="@id/tv_dashboard_trip_title" />
 
         <TextView
             android:id="@+id/tv_dashboard_deadline"
diff --git a/presentation/src/main/res/layout/item_preference_tag.xml b/presentation/src/main/res/layout/item_preference_tag.xml
@@ -17,30 +17,53 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/tv_preference_number"
-            style="@style/TextAppearance.Doorip.Detail2.Regular"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/layout_preference_number"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:background="@drawable/ic_preference_union"
-            android:gravity="center"
-            android:textColor="@color/white_000"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="01" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:id="@+id/iv_preference_number"
+                android:layout_width="wrap_content"
+                android:adjustViewBounds="true"
+                android:layout_height="0dp"
+                android:paddingVertical="2dp"
+                android:src="@drawable/ic_preference_union"
+                app:layout_constraintTop_toTopOf="@id/tv_preference_number"
+                app:layout_constraintBottom_toBottomOf="@id/tv_preference_number"
+                app:layout_constraintStart_toStartOf="@id/tv_preference_number"
+                app:layout_constraintEnd_toEndOf="@id/tv_preference_number"/>
+
+            <TextView
+                android:id="@+id/tv_preference_number"
+                style="@style/TextAppearance.Doorip.Detail2.Regular"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textColor="@color/white_000"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="01" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
             android:id="@+id/tv_preference_question"
             style="@style/TextAppearance.Doorip.Body3.Medi"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
+            android:gravity="center"
             android:textColor="@color/gray_700"
-            app:layout_constraintEnd_toEndOf="@id/tv_preference_number"
-            app:layout_constraintStart_toStartOf="@id/tv_preference_number"
-            app:layout_constraintTop_toBottomOf="@id/tv_preference_number"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/layout_preference_number"
             tools:text="계획은 얼만큼 짤까요?" />
 
         <RadioGroup
@@ -104,13 +127,14 @@
         <TextView
             android:id="@+id/tv_preference_tag1"
             style="@style/TextAppearance.Doorip.Detail2.Regular"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="4dp"
             android:layout_marginBottom="16dp"
             android:textColor="@color/gray_700"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/tv_preference_tag2"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/rg_preference_tag"
             tools:text="철저하게" />
@@ -125,25 +149,26 @@
             android:text="@string/preference_no_matter"
             android:textColor="@color/gray_700"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/tv_preference_tag3"
+            app:layout_constraintStart_toEndOf="@id/tv_preference_tag1"
             app:layout_constraintTop_toBottomOf="@id/rg_preference_tag" />
 
         <TextView
             android:id="@+id/tv_preference_tag3"
             style="@style/TextAppearance.Doorip.Detail2.Regular"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:layout_marginEnd="20dp"
             android:layout_marginBottom="16dp"
+            android:gravity="end"
             android:textColor="@color/gray_700"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/tv_preference_tag2"
             app:layout_constraintTop_toBottomOf="@id/rg_preference_tag"
             tools:text="즉흥으로" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
@@ -116,7 +116,7 @@
     <string name="dashboard_tv_empty">새로운 여행을 시작해 보세요</string>
     <string name="dashboard_btn_create_trip">여행 추가하기</string>
     <string name="dashboard_tv_completed_trip">여행종료</string>
-    <string name="dashboard_tv_dash">-</string>
+    <string name="dashboard_tv_start_end_date">%s - %s</string>
     <string name="dashboard_tv_deadline">D - %d</string>
     <string name="dashboard_tv_traveling">여행중</string>
 
