diff --git a/presentation/src/main/java/com/going/presentation/entertrip/preferencetag/PreferenceTagViewHolder.kt b/presentation/src/main/java/com/going/presentation/entertrip/preferencetag/PreferenceTagViewHolder.kt
index db19e5e1..62922de9 100644
--- a/presentation/src/main/java/com/going/presentation/entertrip/preferencetag/PreferenceTagViewHolder.kt
+++ b/presentation/src/main/java/com/going/presentation/entertrip/preferencetag/PreferenceTagViewHolder.kt
@@ -2,7 +2,6 @@ package com.going.presentation.entertrip.preferencetag
import androidx.recyclerview.widget.RecyclerView
import com.going.domain.entity.PreferenceData
-import com.going.presentation.R
import com.going.presentation.databinding.ItemPreferenceTagBinding
class PreferenceTagViewHolder(
@@ -17,20 +16,36 @@ class PreferenceTagViewHolder(
tvPreferenceTag1.text = item.leftPrefer
tvPreferenceTag3.text = item.rightPrefer
- rgPreferenceTag.setOnCheckedChangeListener { _, checkedId ->
- val selectedButtonIdList = listOf(
- R.id.rb_preference_1,
- R.id.rb_preference_2,
- R.id.rb_preference_3,
- R.id.rb_preference_4,
- R.id.rb_preference_5
- )
+ val selectedButtonList = listOf(
+ rbPreference1,
+ rbPreference2,
+ rbPreference3,
+ rbPreference4,
+ rbPreference5
+ )
- val checkedIndex = selectedButtonIdList.indexOf(checkedId)
- if (checkedIndex != -1) {
- listener.onPreferenceSelected(item, checkedIndex)
+ val selectedViewList = listOf(
+ viewPreferenceRadio1,
+ viewPreferenceRadio2,
+ viewPreferenceRadio3,
+ viewPreferenceRadio4,
+ viewPreferenceRadio5
+ )
+
+ selectedButtonList.forEachIndexed { index, radioButton ->
+ radioButton.setOnClickListener {
+ if (radioButton.isChecked) {
+ listener.onPreferenceSelected(item, index)
+ }
+ }
+ }
+
+ selectedViewList.forEachIndexed { index, view ->
+ view.setOnClickListener {
+ selectedButtonList[index].isChecked = true
+ listener.onPreferenceSelected(item, index)
}
}
}
}
-}
+}
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/activity_profile.xml b/presentation/src/main/res/layout/activity_profile.xml
index d1c5a99d..7d74b64a 100644
--- a/presentation/src/main/res/layout/activity_profile.xml
+++ b/presentation/src/main/res/layout/activity_profile.xml
@@ -61,10 +61,8 @@
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/layout_profile_tag"
- app:layout_constraintVertical_bias="0.0">
+ app:layout_constraintTop_toBottomOf="@id/layout_profile_tag">
@@ -125,7 +121,6 @@
style="@style/TextAppearance.Doorip.Body1.Bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginHorizontal="24dp"
android:layout_marginTop="28dp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
@@ -137,7 +132,6 @@
style="@style/TextAppearance.Doorip.Detail1.Regular"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginHorizontal="24dp"
android:layout_marginTop="4dp"
android:gravity="center"
android:textColor="@color/gray_300"
@@ -145,54 +139,66 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_profile_type" />
-
+ app:layout_constraintTop_toBottomOf="@id/tv_profile_sub_type">
-
+
-
+
-
+
+
+
+
+
diff --git a/presentation/src/main/res/layout/activity_tendency_result.xml b/presentation/src/main/res/layout/activity_tendency_result.xml
index 338f1acd..0981c5c5 100644
--- a/presentation/src/main/res/layout/activity_tendency_result.xml
+++ b/presentation/src/main/res/layout/activity_tendency_result.xml
@@ -139,7 +139,7 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_10_red300_line"
android:paddingHorizontal="8dp"
- android:paddingVertical="2dp"
+ android:paddingVertical="3dp"
android:textColor="@color/red_300"
app:layout_constraintHorizontal_weight="1" />
@@ -150,7 +150,7 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_10_red300_line"
android:paddingHorizontal="8dp"
- android:paddingVertical="2dp"
+ android:paddingVertical="3dp"
android:textColor="@color/red_300"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintHorizontal_weight="1" />
@@ -162,7 +162,7 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_10_red300_line"
android:paddingHorizontal="8dp"
- android:paddingVertical="2dp"
+ android:paddingVertical="3dp"
android:textColor="@color/red_300"
app:layout_constraintHorizontal_chainStyle="packed" />
diff --git a/presentation/src/main/res/layout/activity_trip_dash_board.xml b/presentation/src/main/res/layout/activity_trip_dash_board.xml
index 1986f795..50f5704c 100644
--- a/presentation/src/main/res/layout/activity_trip_dash_board.xml
+++ b/presentation/src/main/res/layout/activity_trip_dash_board.xml
@@ -52,7 +52,7 @@
android:id="@+id/tab_dashboard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/white_000"
+ android:background="@drawable/layer_list_todo_unselected_indicator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_dashboard_toolbar"
app:tabIndicatorColor="@color/gray_500"
diff --git a/presentation/src/main/res/layout/item_dash_board_completed.xml b/presentation/src/main/res/layout/item_dash_board_completed.xml
index 8fd7b701..f2344aa8 100644
--- a/presentation/src/main/res/layout/item_dash_board_completed.xml
+++ b/presentation/src/main/res/layout/item_dash_board_completed.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingBottom="14dp">
+ android:paddingBottom="6dp">
+ android:paddingBottom="6dp">
+ app:layout_constraintTop_toTopOf="@id/tv_preference_number" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index 2aae5cd7..056aed97 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@
해당 기능은 추후 업데이트 예정이에요 :)
카카오 로그인
- 우리만의 여행을 하다
+ 우리다운 여행을 하다
개인정보처리방침