From e99f325092954a43bc4602434dafa1da7acfdfeb Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jan 2024 03:06:22 +0900 Subject: [PATCH 1/9] =?UTF-8?q?[UI/#44]=20=EB=A6=AC=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=ED=81=B4=EB=9F=AC=EB=B7=B0=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- .../preferencetag/PreferenceTagActivity.kt | 1 - .../main/res/drawable/ic_preference_union.xml | 10 ++ .../drawable/sel_radiobutton_text_color.xml | 4 - ...l_rounded_corner_preference_tag_button.xml | 8 +- .../res/layout/activity_preference_tag.xml | 2 +- .../main/res/layout/item_preference_tag.xml | 114 ++++++++---------- 7 files changed, 67 insertions(+), 74 deletions(-) create mode 100644 presentation/src/main/res/drawable/ic_preference_union.xml delete mode 100644 presentation/src/main/res/drawable/sel_radiobutton_text_color.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 758661f8..adafcd33 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -74,7 +74,7 @@ (R.layout.activity_preference_tag), diff --git a/presentation/src/main/res/drawable/ic_preference_union.xml b/presentation/src/main/res/drawable/ic_preference_union.xml new file mode 100644 index 00000000..c32426ec --- /dev/null +++ b/presentation/src/main/res/drawable/ic_preference_union.xml @@ -0,0 +1,10 @@ + + + diff --git a/presentation/src/main/res/drawable/sel_radiobutton_text_color.xml b/presentation/src/main/res/drawable/sel_radiobutton_text_color.xml deleted file mode 100644 index b2ce2093..00000000 --- a/presentation/src/main/res/drawable/sel_radiobutton_text_color.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/sel_rounded_corner_preference_tag_button.xml b/presentation/src/main/res/drawable/sel_rounded_corner_preference_tag_button.xml index df8d1d07..a18299ef 100644 --- a/presentation/src/main/res/drawable/sel_rounded_corner_preference_tag_button.xml +++ b/presentation/src/main/res/drawable/sel_rounded_corner_preference_tag_button.xml @@ -2,15 +2,15 @@ - - + + - - + + diff --git a/presentation/src/main/res/layout/activity_preference_tag.xml b/presentation/src/main/res/layout/activity_preference_tag.xml index 5c15fc4e..d1c24167 100644 --- a/presentation/src/main/res/layout/activity_preference_tag.xml +++ b/presentation/src/main/res/layout/activity_preference_tag.xml @@ -30,7 +30,7 @@ android:id="@+id/rv_preference_tag" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/gray_200" + android:background="@color/gray_100" android:paddingTop="17dp" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_constraintBottom_toTopOf="@id/btn_preference_start" diff --git a/presentation/src/main/res/layout/item_preference_tag.xml b/presentation/src/main/res/layout/item_preference_tag.xml index d19bf0c9..065e2d18 100644 --- a/presentation/src/main/res/layout/item_preference_tag.xml +++ b/presentation/src/main/res/layout/item_preference_tag.xml @@ -16,65 +16,41 @@ app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintTop_toTopOf="parent" /> - - - - + android:layout_marginTop="4dp" + android:text="계획은 얼만큼 짤까요?" + android:textColor="@color/gray_700" + app:layout_constraintEnd_toEndOf="@id/iv_preference_number" + app:layout_constraintStart_toStartOf="@id/iv_preference_number" + app:layout_constraintTop_toBottomOf="@id/iv_preference_number" /> + app:layout_constraintTop_toBottomOf="@id/tv_preference_question"> + android:textAppearance="@style/TextAppearance.Doorip.Body3.Medi" /> + android:layout_weight="1" + android:background="@drawable/sel_rounded_corner_preference_tag_button" /> + android:layout_weight="1" + android:background="@drawable/sel_rounded_corner_preference_tag_button" /> + android:layout_weight="1" + android:background="@drawable/sel_rounded_corner_preference_tag_button" /> + android:layout_weight="1" + android:background="@drawable/sel_rounded_corner_preference_tag_button" /> + + + + From bee5ed645e4dde5580576e90f1e0a64ca9dc40e8 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jan 2024 03:12:20 +0900 Subject: [PATCH 2/9] =?UTF-8?q?[UI/#44]=20=EB=A6=AC=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=ED=81=B4=EB=9F=AC=EB=B7=B0=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/item_preference_tag.xml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/res/layout/item_preference_tag.xml b/presentation/src/main/res/layout/item_preference_tag.xml index 065e2d18..539b9934 100644 --- a/presentation/src/main/res/layout/item_preference_tag.xml +++ b/presentation/src/main/res/layout/item_preference_tag.xml @@ -104,14 +104,18 @@ style="@style/TextAppearance.Doorip.Detail2.Regular" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="20dp" android:layout_marginTop="4dp" + android:layout_marginBottom="16dp" android:text="철저하게" android:textColor="@color/gray_700" - app:layout_constraintStart_toStartOf="@id/rg_preference_tag" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/rg_preference_tag" /> + + From a6be1f5b8ebd224778f235540c12addd8cc9c003 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jan 2024 05:38:16 +0900 Subject: [PATCH 3/9] =?UTF-8?q?[UI/#44]=20=EB=A6=AC=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=ED=81=B4=EB=9F=AC=EB=B7=B0=20=EC=95=84=EC=9D=B4=ED=85=9C=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/going/domain/entity/PreferenceData.kt | 5 ++- .../preferencetag/PreferenceTagViewHolder.kt | 7 ++-- .../preferencetag/PreferenceTagViewModel.kt | 29 ++++++++------ .../res/layout/activity_preference_tag.xml | 24 ++++++------ .../main/res/layout/item_preference_tag.xml | 38 ++++++++++--------- presentation/src/main/res/values/strings.xml | 3 +- 6 files changed, 60 insertions(+), 46 deletions(-) diff --git a/domain/src/main/kotlin/com/going/domain/entity/PreferenceData.kt b/domain/src/main/kotlin/com/going/domain/entity/PreferenceData.kt index 34c7df33..7a111b30 100644 --- a/domain/src/main/kotlin/com/going/domain/entity/PreferenceData.kt +++ b/domain/src/main/kotlin/com/going/domain/entity/PreferenceData.kt @@ -1,7 +1,8 @@ package com.going.domain.entity data class PreferenceData( - val number: Int, - val leftPrefer: String, + val number: String, + val question : String, val rightPrefer: String, + val leftPrefer : String, ) \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewHolder.kt b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewHolder.kt index fa10b02f..b03d3226 100644 --- a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewHolder.kt +++ b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewHolder.kt @@ -13,9 +13,10 @@ class PreferenceTagViewHolder( fun onBind(item: PreferenceData) { binding.run { - tvPreferenceNumber.text = item.number.toString() - tvPreferenceLeft.text = item.leftPrefer - tvPreferenceRight.text = item.rightPrefer + tvPreferenceNumber.text = item.number + tvPreferenceQuestion.text = item.question + tvPreferenceTag1.text = item.leftPrefer + tvPreferenceTag3.text = item.rightPrefer rgPreferenceTag.setOnCheckedChangeListener { _, checkedId -> val selectedButtonIdList = listOf( diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewModel.kt b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewModel.kt index 1e45d96a..9fa88c97 100644 --- a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewModel.kt +++ b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewModel.kt @@ -7,29 +7,34 @@ class PreferenceTagViewModel : ViewModel() { val preferenceTagList = listOf( PreferenceData( - number = 1, - leftPrefer = "휴식", - rightPrefer = "관광" + number = "01", + question = "계획은 얼만큼 짤까요?", + leftPrefer = "철저하게", + rightPrefer = "즉흥으로" ), PreferenceData( - number = 2, + number = "02", + question = "장소선택의 기준은 무엇인가요?", leftPrefer = "관광지", - rightPrefer = "로컬 플레이스" + rightPrefer = "로컬장소" ), PreferenceData( - number = 3, + number = "03", + question = "음식을 고를 때 무엇을 더 중요시 하나요?", leftPrefer = "철처한 계획", rightPrefer = "무계획" ), PreferenceData( - number = 4, - leftPrefer = "찾아온 맛집", - rightPrefer = "끌리는 곳" + number = "04", + question = "멋진 풍경이 보이면?", + leftPrefer = "사진 필수", + rightPrefer = "눈에 담기" ), PreferenceData( - number = 5, - leftPrefer = "느긋하게", - rightPrefer = "효율적으로" + number = "05", + question = "스케줄 구성은 어떻게 할까요?", + leftPrefer = "알차게", + rightPrefer = "여유롭게" ), ) diff --git a/presentation/src/main/res/layout/activity_preference_tag.xml b/presentation/src/main/res/layout/activity_preference_tag.xml index d1c24167..1caccb1b 100644 --- a/presentation/src/main/res/layout/activity_preference_tag.xml +++ b/presentation/src/main/res/layout/activity_preference_tag.xml @@ -13,30 +13,32 @@ android:background="@color/white_000" tools:context=".preferencetag.PreferenceTagActivity"> - + app:layout_constraintTop_toTopOf="parent" + app:navigationIcon="@drawable/ic_back" + app:title="@string/preference_tv_title" + app:titleTextColor="@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" /> @@ -56,8 +56,8 @@ android:id="@+id/rb_preference_1" style="@style/radio_preference_button_style" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="17dp" + android:layout_height="16dp" + android:layout_marginEnd="4dp" android:layout_weight="1" android:background="@drawable/sel_rounded_corner_preference_tag_button" android:textAppearance="@style/TextAppearance.Doorip.Body3.Medi" /> @@ -66,8 +66,8 @@ android:id="@+id/rb_preference_2" style="@style/radio_preference_button_style" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="17dp" + android:layout_height="16dp" + android:layout_marginEnd="4dp" android:layout_weight="1" android:background="@drawable/sel_rounded_corner_preference_tag_button" /> @@ -75,8 +75,8 @@ android:id="@+id/rb_preference_3" style="@style/radio_preference_button_style" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="17dp" + android:layout_height="16dp" + android:layout_marginEnd="4dp" android:layout_weight="1" android:background="@drawable/sel_rounded_corner_preference_tag_button" /> @@ -84,8 +84,8 @@ android:id="@+id/rb_preference_4" style="@style/radio_preference_button_style" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="17dp" + android:layout_height="16dp" + android:layout_marginEnd="4dp" android:layout_weight="1" android:background="@drawable/sel_rounded_corner_preference_tag_button" /> @@ -93,7 +93,7 @@ android:id="@+id/rb_preference_5" style="@style/radio_preference_button_style" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="16dp" android:layout_weight="1" android:background="@drawable/sel_rounded_corner_preference_tag_button" /> @@ -119,8 +119,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:text="상관없어" + android:layout_marginBottom="16dp" + 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_constraintTop_toBottomOf="@id/rg_preference_tag" /> @@ -132,8 +134,10 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginEnd="20dp" + android:layout_marginBottom="16dp" android:text="즉흥으로" android:textColor="@color/gray_700" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/rg_preference_tag" /> diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index e5001792..2987708f 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -70,8 +70,9 @@ 할일이 %s개 남았어요 - 이번 여행은 어땠으면 좋겠나요? + 이번 여행은! 시작하기 + 상관없어 지민님의 여행 From fdc934bb7e11803cf35b6521acb6ddbd875b4a30 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jan 2024 17:50:34 +0900 Subject: [PATCH 4/9] =?UTF-8?q?[FEAT/#44]=20ItemDecoration=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20=EB=B0=8F=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preferencetag/PreferenceTagActivity.kt | 7 ++++++ .../preferencetag/PreferenceTagDecoration.kt | 23 +++++++++++++++++++ ...ipDecoration.kt => DashBoardDecoration.kt} | 2 +- .../triplist/OngoingTripFragment.kt | 2 +- .../res/layout/activity_preference_tag.xml | 1 - 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagDecoration.kt rename presentation/src/main/java/com/going/presentation/tripdashboard/triplist/{TripDecoration.kt => DashBoardDecoration.kt} (87%) diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagActivity.kt b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagActivity.kt index ecdde9b7..e853a9a8 100644 --- a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagActivity.kt +++ b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagActivity.kt @@ -20,14 +20,21 @@ class PreferenceTagActivity : super.onCreate(savedInstanceState) initAdapter() + initItemDecoration() } + private fun initAdapter() { _adapter = PreferenceTagAdapter(this, this) binding.rvPreferenceTag.adapter = adapter adapter.submitList(viewModel.preferenceTagList) } + private fun initItemDecoration() { + val itemDeco = PreferenceTagDecoration(this) + binding.rvPreferenceTag.addItemDecoration(itemDeco) + } + override fun onPreferenceSelected(preference: PreferenceData) { // 선택된 취향 태그 처리 } diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagDecoration.kt b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagDecoration.kt new file mode 100644 index 00000000..88e77865 --- /dev/null +++ b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagDecoration.kt @@ -0,0 +1,23 @@ +package com.going.presentation.preferencetag + +import android.content.Context +import android.graphics.Rect +import android.view.View +import androidx.recyclerview.widget.RecyclerView + +class PreferenceTagDecoration (val context: Context) : RecyclerView.ItemDecoration() { + + override fun getItemOffsets( + outRect: Rect, + view: View, + parent: RecyclerView, + state: RecyclerView.State + ) { + super.getItemOffsets(outRect, view, parent, state) + val position = parent.getChildAdapterPosition(view) + + if (position == 0) outRect.top = 50 + else outRect.top = 0 + outRect.bottom = 20 + } +} \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/tripdashboard/triplist/TripDecoration.kt b/presentation/src/main/java/com/going/presentation/tripdashboard/triplist/DashBoardDecoration.kt similarity index 87% rename from presentation/src/main/java/com/going/presentation/tripdashboard/triplist/TripDecoration.kt rename to presentation/src/main/java/com/going/presentation/tripdashboard/triplist/DashBoardDecoration.kt index 6c840fd0..7679064a 100644 --- a/presentation/src/main/java/com/going/presentation/tripdashboard/triplist/TripDecoration.kt +++ b/presentation/src/main/java/com/going/presentation/tripdashboard/triplist/DashBoardDecoration.kt @@ -5,7 +5,7 @@ import android.graphics.Rect import android.view.View import androidx.recyclerview.widget.RecyclerView -class TripDecoration(val context: Context) : RecyclerView.ItemDecoration() { +class DashBoardDecoration(val context: Context) : RecyclerView.ItemDecoration() { override fun getItemOffsets( outRect: Rect, diff --git a/presentation/src/main/java/com/going/presentation/tripdashboard/triplist/OngoingTripFragment.kt b/presentation/src/main/java/com/going/presentation/tripdashboard/triplist/OngoingTripFragment.kt index 67b15f27..053bc6d5 100644 --- a/presentation/src/main/java/com/going/presentation/tripdashboard/triplist/OngoingTripFragment.kt +++ b/presentation/src/main/java/com/going/presentation/tripdashboard/triplist/OngoingTripFragment.kt @@ -37,7 +37,7 @@ class OngoingTripFragment : } private fun initItemDecoration() { - val itemDeco = TripDecoration(requireContext()) + val itemDeco = DashBoardDecoration(requireContext()) binding.rvDashboardOngoingTrip.addItemDecoration(itemDeco) } diff --git a/presentation/src/main/res/layout/activity_preference_tag.xml b/presentation/src/main/res/layout/activity_preference_tag.xml index 1caccb1b..1e577131 100644 --- a/presentation/src/main/res/layout/activity_preference_tag.xml +++ b/presentation/src/main/res/layout/activity_preference_tag.xml @@ -33,7 +33,6 @@ android:layout_width="0dp" android:layout_height="0dp" android:background="@color/gray_50" - android:paddingTop="17dp" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_constraintBottom_toTopOf="@id/btn_preference_start" app:layout_constraintEnd_toEndOf="parent" From 257d189ec7131e21a625e90060f41381295631af Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jan 2024 20:49:52 +0900 Subject: [PATCH 5/9] =?UTF-8?q?[UI/#44]=20UI=20=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 +- .../preferencetag/PreferenceTagActivity.kt | 9 +++ .../preferencetag/PreferenceTagDecoration.kt | 2 +- .../triplist/CompletedTripFragment.kt | 6 ++ .../res/drawable/ic_preference_tag_blur.xml | 21 +++++++ ...layer_list_preference_tag_gray200_line.xml | 18 ++++++ ...ape_rect_4_gray200_line_whilte000_fill.xml | 7 +++ .../res/layout/activity_preference_tag.xml | 58 ++++++++++++++----- .../res/layout/fragment_completed_trip.xml | 1 - .../res/layout/item_dash_board_completed.xml | 1 - .../main/res/layout/item_preference_tag.xml | 8 ++- presentation/src/main/res/values/strings.xml | 2 +- 12 files changed, 112 insertions(+), 23 deletions(-) create mode 100644 presentation/src/main/res/drawable/ic_preference_tag_blur.xml create mode 100644 presentation/src/main/res/drawable/layer_list_preference_tag_gray200_line.xml create mode 100644 presentation/src/main/res/drawable/shape_rect_4_gray200_line_whilte000_fill.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1829503c..fc306df4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,7 +75,7 @@ (R.layout.activity_preference_tag), @@ -21,6 +22,8 @@ class PreferenceTagActivity : initAdapter() initItemDecoration() + initBackClickListener() + } @@ -35,6 +38,12 @@ class PreferenceTagActivity : binding.rvPreferenceTag.addItemDecoration(itemDeco) } + private fun initBackClickListener(){ + binding.btnPreferenceBack.setOnSingleClickListener { + finish() + } + } + override fun onPreferenceSelected(preference: PreferenceData) { // 선택된 취향 태그 처리 } diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagDecoration.kt b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagDecoration.kt index 88e77865..3d179271 100644 --- a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagDecoration.kt +++ b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagDecoration.kt @@ -18,6 +18,6 @@ class PreferenceTagDecoration (val context: Context) : RecyclerView.ItemDecorati if (position == 0) outRect.top = 50 else outRect.top = 0 - outRect.bottom = 20 + outRect.bottom = 10 } } \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/tripdashboard/triplist/CompletedTripFragment.kt b/presentation/src/main/java/com/going/presentation/tripdashboard/triplist/CompletedTripFragment.kt index 90d0acc8..aa068dc0 100644 --- a/presentation/src/main/java/com/going/presentation/tripdashboard/triplist/CompletedTripFragment.kt +++ b/presentation/src/main/java/com/going/presentation/tripdashboard/triplist/CompletedTripFragment.kt @@ -22,6 +22,7 @@ class CompletedTripFragment : super.onViewCreated(view, savedInstanceState) setRecyclerView() + initItemDecoration() } @@ -35,6 +36,11 @@ class CompletedTripFragment : adapter.submitList(viewModel.mockCompletedList) } + private fun initItemDecoration() { + val itemDeco = DashBoardDecoration(requireContext()) + binding.rvDashboardCompletedTrip.addItemDecoration(itemDeco) + } + override fun onDestroyView() { super.onDestroyView() _adapter = null diff --git a/presentation/src/main/res/drawable/ic_preference_tag_blur.xml b/presentation/src/main/res/drawable/ic_preference_tag_blur.xml new file mode 100644 index 00000000..c05df46f --- /dev/null +++ b/presentation/src/main/res/drawable/ic_preference_tag_blur.xml @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/presentation/src/main/res/drawable/layer_list_preference_tag_gray200_line.xml b/presentation/src/main/res/drawable/layer_list_preference_tag_gray200_line.xml new file mode 100644 index 00000000..28b5964a --- /dev/null +++ b/presentation/src/main/res/drawable/layer_list_preference_tag_gray200_line.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + diff --git a/presentation/src/main/res/drawable/shape_rect_4_gray200_line_whilte000_fill.xml b/presentation/src/main/res/drawable/shape_rect_4_gray200_line_whilte000_fill.xml new file mode 100644 index 00000000..22b88e9b --- /dev/null +++ b/presentation/src/main/res/drawable/shape_rect_4_gray200_line_whilte000_fill.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/presentation/src/main/res/layout/activity_preference_tag.xml b/presentation/src/main/res/layout/activity_preference_tag.xml index 1e577131..215bbeec 100644 --- a/presentation/src/main/res/layout/activity_preference_tag.xml +++ b/presentation/src/main/res/layout/activity_preference_tag.xml @@ -13,20 +13,39 @@ android:background="@color/white_000" tools:context=".preferencetag.PreferenceTagActivity"> - + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + - + android:layout_marginBottom="8dp" + android:paddingBottom="12dp"> @@ -46,8 +48,8 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginHorizontal="16dp" - android:orientation="horizontal" android:layout_marginTop="16dp" + android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_preference_question"> diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 2987708f..4cac971e 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -71,7 +71,7 @@ 이번 여행은! - 시작하기 + 다음 상관없어 From de5bebd2962e008a466290acf714bc3f4a629ffe Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jan 2024 21:19:12 +0900 Subject: [PATCH 6/9] =?UTF-8?q?[MOD/#44]=20=EC=98=A4=ED=83=80=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 --- .../going/presentation/preferencetag/PreferenceTagViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewModel.kt b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewModel.kt index 9fa88c97..a507dc88 100644 --- a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewModel.kt +++ b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewModel.kt @@ -21,7 +21,7 @@ class PreferenceTagViewModel : ViewModel() { PreferenceData( number = "03", question = "음식을 고를 때 무엇을 더 중요시 하나요?", - leftPrefer = "철처한 계획", + leftPrefer = "철저한 계획", rightPrefer = "무계획" ), PreferenceData( From 39e4754f1ae2123c69e6f3aab915bc32b55a53c1 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jan 2024 22:12:12 +0900 Subject: [PATCH 7/9] =?UTF-8?q?[FIX/#44]=20tools=EB=A1=9C=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 --- .../src/main/res/layout/item_preference_tag.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/presentation/src/main/res/layout/item_preference_tag.xml b/presentation/src/main/res/layout/item_preference_tag.xml index 7309a4e8..a985d388 100644 --- a/presentation/src/main/res/layout/item_preference_tag.xml +++ b/presentation/src/main/res/layout/item_preference_tag.xml @@ -25,11 +25,11 @@ android:layout_marginTop="16dp" android:background="@drawable/ic_preference_union" android:gravity="center" - android:text="01" android:textColor="@color/white_000" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + tools:text="01" /> + app:layout_constraintTop_toBottomOf="@id/tv_preference_number" + tools:text="계획은 얼만큼 짤까요?" /> + app:layout_constraintTop_toBottomOf="@id/rg_preference_tag" + tools:text="철저하게" /> + app:layout_constraintTop_toBottomOf="@id/rg_preference_tag" + tools:text="즉흥으로" /> From 9eb3bc628f1b0e5dfe34f2887f7000d00136b5bb Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jan 2024 22:45:39 +0900 Subject: [PATCH 8/9] =?UTF-8?q?[FIX/#44]=20UI=20=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 +- .../triplist/OngoingViewHolder.kt | 12 +-- ...ape_rect_4_gray200_line_whilte000_fill.xml | 7 -- .../drawable/shape_rect_4_white000_fill.xml | 2 +- .../res/layout/item_dash_board_ongoing.xml | 80 ++++--------------- .../main/res/layout/item_preference_tag.xml | 2 +- presentation/src/main/res/values/strings.xml | 1 + 7 files changed, 27 insertions(+), 79 deletions(-) delete mode 100644 presentation/src/main/res/drawable/shape_rect_4_gray200_line_whilte000_fill.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fc306df4..1829503c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,7 +75,7 @@ - - - - - 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..4f1c1afb 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 @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_dash_board_ongoing.xml b/presentation/src/main/res/layout/item_dash_board_ongoing.xml index 27c6d550..7c96d0db 100644 --- a/presentation/src/main/res/layout/item_dash_board_ongoing.xml +++ b/presentation/src/main/res/layout/item_dash_board_ongoing.xml @@ -23,9 +23,9 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="16dp" + android:text="굉굉이들이랑 합숙" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:text="굉굉이들이랑 합숙" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/tv_dashboard_trip_title" /> + app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_start" /> - - - - + app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_dash" /> - - - - - + app:layout_constraintTop_toTopOf="parent" /> - - diff --git a/presentation/src/main/res/layout/item_preference_tag.xml b/presentation/src/main/res/layout/item_preference_tag.xml index a985d388..57e044c3 100644 --- a/presentation/src/main/res/layout/item_preference_tag.xml +++ b/presentation/src/main/res/layout/item_preference_tag.xml @@ -11,7 +11,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:background="@drawable/shape_rect_4_gray200_line_whilte000_fill" + android:background="@drawable/shape_rect_4_white000_fill" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 4cac971e..f6509460 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -80,6 +80,7 @@ 여행 생성하기 여행종료 - + D - %d 우리의 투두 From 974919481dbaca49b11a6c8c9fbfc21856931654 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jan 2024 23:21:21 +0900 Subject: [PATCH 9/9] =?UTF-8?q?[FIX/#44]=20String=20=EA=B0=92=20=EC=B6=94?= =?UTF-8?q?=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 ++-- .../tripdashboard/triplist/OngoingViewHolder.kt | 16 ++++++++-------- .../main/res/layout/item_dash_board_ongoing.xml | 3 +-- presentation/src/main/res/values/strings.xml | 5 +++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 559ee553..938e9030 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,7 +75,7 @@ - diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index a4002b06..69745368 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -75,12 +75,13 @@ 상관없어 - 지민님의 여행 + %s님의 여행 생성된 여행이 없어요. 여행 생성하기 여행종료 - - D - %d + D - %d + 여행중 우리의 투두