Skip to content

Commit

Permalink
[MERGE] #145 -> develop
Browse files Browse the repository at this point in the history 
[FIX/#145] QA 이슈 대응
  • Loading branch information
@leeeyubin
leeeyubin authored Jan 16, 2024
2 parents 9526bd2 + 1e4dc31 commit 7c783df
Show file tree
Hide file tree
Showing 15 changed files with 100 additions and 88 deletions.
2 changes: 1 addition & 1 deletion presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class DashBoardActivity :
}

companion object {
const val TAB_ONGOING = "진행중인 여행"
const val TAB_ONGOING = "진행 중인 여행"
const val TAB_COMPLETED = "지나간 여행"
}
}
14 changes: 7 additions & 7 deletions ...n/java/com/going/presentation/entertrip/createtrip/preference/EnterPreferenceViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,31 +59,31 @@ class EnterPreferenceViewModel @Inject constructor(
val preferenceTagList = listOf<PreferenceData>(
PreferenceData(
number = "01",
question = "계획은 어느정도로 세울까요?",
question = "계획은 어느 정도로 세울까요?",
leftPrefer = "철저하게",
rightPrefer = "즉흥으로",
),
PreferenceData(
number = "02",
question = "어떤 곳을 가고 싶나요?",
leftPrefer = "명소 위주",
rightPrefer = "로컬 장소",
question = "장소 선택의 기준은 무엇인가요?",
leftPrefer = "관광지",
rightPrefer = "로컬장소",
),
PreferenceData(
number = "03",
question = "어떤 식당을 갈까요?",
question = "어느 식당을 갈까요?",
leftPrefer = "유명 맛집",
rightPrefer = "가까운 곳",
),
PreferenceData(
number = "04",
question = "기억하고 싶은 순간에!",
leftPrefer = "사진 필수",
leftPrefer = "사진필수",
rightPrefer = "눈에 담기",
),
PreferenceData(
number = "05",
question = "하루 일정을 어떻게 구성해요?",
question = "하루 일정을 어떻게 채우나요?",
leftPrefer = "알차게",
rightPrefer = "여유롭게",
),
Expand Down
14 changes: 7 additions & 7 deletions .../java/com/going/presentation/entertrip/invitetrip/preference/FinishPreferenceViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,31 +52,31 @@ class FinishPreferenceViewModel @Inject constructor(
val preferenceTagList = listOf<PreferenceData>(
PreferenceData(
number = "01",
question = "계획은 어느정도로 세울까요?",
question = "계획은 어느 정도로 세울까요?",
leftPrefer = "철저하게",
rightPrefer = "즉흥으로",
),
PreferenceData(
number = "02",
question = "어떤 곳을 가고 싶나요?",
leftPrefer = "명소 위주",
rightPrefer = "로컬 장소",
question = "장소 선택의 기준은 무엇인가요?",
leftPrefer = "관광지",
rightPrefer = "로컬장소",
),
PreferenceData(
number = "03",
question = "어떤 식당을 갈까요?",
question = "어느 식당을 갈까요?",
leftPrefer = "유명 맛집",
rightPrefer = "가까운 곳",
),
PreferenceData(
number = "04",
question = "기억하고 싶은 순간에!",
leftPrefer = "사진 필수",
leftPrefer = "사진필수",
rightPrefer = "눈에 담기",
),
PreferenceData(
number = "05",
question = "하루 일정을 어떻게 구성해요?",
question = "하루 일정을 어떻게 채우나요?",
leftPrefer = "알차게",
rightPrefer = "여유롭게",
),
Expand Down
22 changes: 11 additions & 11 deletions presentation/src/main/java/com/going/presentation/tendency/result/UserTendencyResultList.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ val UserTendencyResultList = listOf(
resultImage = R.drawable.img_tendency_result_srp,
profileImage = R.drawable.img_profile_6,
downloadImage = R.drawable.img_download_srp,
profileTitle = "배려심 넘치는 든든잉",
profileTitle = "배려심 넘치는, 든든잉",
profileSubTitle = "꼼꼼하고 세심하게 여행을 준비해요",
tags = listOf(
"친구와 함께",
Expand All @@ -17,19 +17,19 @@ val UserTendencyResultList = listOf(
),
profileBoxInfo = listOf(
ProfileMock.BoxInfo(
"이런점이\n좋아요",
"이런 점이\n좋아요",
"같이 여행하는 친구들을 잘 챙기고 배려해요",
"친구들이 하고 싶어 하는 것들을 일정에 잘 반영해 줘요",
"꼼꼼하고 부지런해서 여행 준비에 진심이에요",
),
ProfileMock.BoxInfo(
"이런점은\n주의해줘요",
"이런 점은\n주의해 줘요",
"완벽주의 스타일이라 계획이 틀어지면 예민해져요",
"생각하지 못한 상황을 직면하면 당황하기도 해요",
"너무 시끄러운 곳보다는 우리끼리 시간을 보낼 수 있는 곳을 더 좋아해요",
),
ProfileMock.BoxInfo(
"이런걸\n잘해요",
"이런 걸\n잘해요",
"숙소 및 입장권 미리 예약하기",
"여행지 조사하고 일정 정리하기",
"친구들 일정 조율하기",
Expand All @@ -40,7 +40,7 @@ val UserTendencyResultList = listOf(
resultImage = R.drawable.img_tendency_result_sri,
profileImage = R.drawable.img_profile_1,
downloadImage = R.drawable.img_download_sri,
profileTitle = "뭐든지 다 좋아! 와따잉",
profileTitle = "뭐든지 다 좋아, 와따잉",
profileSubTitle = "어떤 여행이든, 일정이든 즐겨요",
tags = listOf(
"실용적",
Expand Down Expand Up @@ -72,7 +72,7 @@ val UserTendencyResultList = listOf(
resultImage = R.drawable.img_tendency_result_sep,
profileImage = R.drawable.img_profile_2,
downloadImage = R.drawable.img_download_sep,
profileTitle = "계획 절대 지켜 꼼꼼잉",
profileTitle = "계획 절대 지켜, 꼼꼼잉",
profileSubTitle = "여행의 처음부터 끝까지 착실하게 계획해요",
tags = listOf(
"계획필수",
Expand Down Expand Up @@ -104,7 +104,7 @@ val UserTendencyResultList = listOf(
resultImage = R.drawable.img_tendency_result_sei,
profileImage = R.drawable.img_profile_4,
downloadImage = R.drawable.img_download_sei,
profileTitle = "하고싶은건 하는 고잉",
profileTitle = "하고싶은건 하는, 고잉",
profileSubTitle = "하고 싶은 것만 하게 해주면, 나머지는 다 괜찮아요",
tags = listOf(
"취향존중",
Expand Down Expand Up @@ -136,7 +136,7 @@ val UserTendencyResultList = listOf(
resultImage = R.drawable.img_tendency_result_arp,
profileImage = R.drawable.img_profile_8,
downloadImage = R.drawable.img_download_arp,
profileTitle = "다정한 여행 반장 모여잉",
profileTitle = "다정한 여행 반장, 모여잉",
profileSubTitle = "즐거운 여행을 위해 모두를 챙겨요",
tags = listOf(
"리더십",
Expand Down Expand Up @@ -168,7 +168,7 @@ val UserTendencyResultList = listOf(
resultImage = R.drawable.img_tendency_result_ari,
profileImage = R.drawable.img_profile_5,
downloadImage = R.drawable.img_download_ari,
profileTitle = "깨발랄 치어리더 아쟈잉",
profileTitle = "깨발랄 치어리더, 아쟈잉",
profileSubTitle = "친구들과 함께 하는 것 자체가 행복해요",
tags = listOf(
"낙천적",
Expand Down Expand Up @@ -200,7 +200,7 @@ val UserTendencyResultList = listOf(
resultImage = R.drawable.img_tendency_result_aep,
profileImage = R.drawable.img_profile_7,
downloadImage = R.drawable.img_download_aep,
profileTitle = "나만 믿어 따라와 척척잉",
profileTitle = "나만 믿어 따라와, 척척잉",
profileSubTitle = "모든 것을 계획하고 진행하는 프로총대러에요",
tags = listOf(
"내가할게",
Expand Down Expand Up @@ -232,7 +232,7 @@ val UserTendencyResultList = listOf(
resultImage = R.drawable.img_tendency_result_aei,
profileImage = R.drawable.img_profile_3,
downloadImage = R.drawable.img_download_aei,
profileTitle = "모험을 즐기는 별별잉",
profileTitle = "모험을 즐기는, 별별잉",
profileSubTitle = "여행의 진정한 재미는 새로운 도전이에요",
tags = listOf(
"도전추구",
Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/java/com/going/presentation/tendency/ttest/TendencyTestViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class TendencyTestViewModel @Inject constructor(
"도전하기보다는 원래 정했던 메뉴를 주문한다",
"구글맵에 후기를 검색한다",
"한국에는 없잖아! 바로 주문한다",
"오히려 좋아. 더 추천해달라고 한다",
"오히려 좋아, 더 추천해달라고 한다",
),
TendencyTestMock(
"친구의 지인이 동행하자고 한다면?",
Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/res/drawable/sel_rounded_corner_button.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<item android:state_enabled="false">
<shape>
<corners android:radius="4dp" />
<solid android:color="@color/gray_50" />
<solid android:color="@color/gray_100" />
</shape>
</item>

Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/res/drawable/shape_rect_6_gray200_line.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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_200" />
<stroke android:color="@color/gray_100" />
<corners android:radius="6dp" />
</shape>
2 changes: 1 addition & 1 deletion presentation/src/main/res/drawable/shape_rect_6_white000_fill_gray200_line.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
android:shape="rectangle">
<solid android:color="@color/white_000" />
<stroke android:width="1dp" />
<stroke android:color="@color/gray_200" />
<stroke android:color="@color/gray_100" />
<corners android:radius="6dp" />
</shape>
2 changes: 1 addition & 1 deletion presentation/src/main/res/layout/activity_check_friends.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="20dp"
android:layout_marginTop="24dp"
android:text="@string/check_friends_our_tag"
android:textColor="@color/gray_700"
app:layout_constraintStart_toStartOf="parent"
Expand Down
4 changes: 2 additions & 2 deletions presentation/src/main/res/layout/activity_enter_preference.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@

<data>


</data>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white_000"
android:background="@color/gray_50"
tools:context=".entertrip.createtrip.preference.EnterPreferenceActivity">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/toolbar_preference_tag"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/layer_list_preference_tag_gray100_line"
android:backgroundTint="@color/white_000"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
Expand Down
2 changes: 2 additions & 0 deletions presentation/src/main/res/layout/activity_onboarding_profile_setting.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:text="@{@string/counter(viewModel.nowNameLength, viewModel.MAX_NAME_LEN)}"
android:textColor="@color/gray_200"
app:layout_constraintEnd_toEndOf="@id/et_onboarding_profile_setting_name"
Expand Down Expand Up @@ -118,6 +119,7 @@
android:id="@+id/tv_info_counter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:text="@{@string/counter(viewModel.nowInfoLength, viewModel.MAX_INFO_LEN)}"
android:textColor="@color/gray_200"
app:layout_constraintEnd_toEndOf="@id/et_onboarding_profile_setting_info"
Expand Down
6 changes: 3 additions & 3 deletions presentation/src/main/res/layout/activity_setting.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="10dp"
android:overScrollMode="never"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@id/btn_setting_quit"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar_setting">
Expand Down Expand Up @@ -237,7 +238,6 @@

</androidx.constraintlayout.widget.ConstraintLayout>


<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/btn_setting_about_doorip"
android:layout_width="0dp"
Expand Down Expand Up @@ -348,4 +348,4 @@

</androidx.constraintlayout.widget.ConstraintLayout>

</layout>
</layout>
15 changes: 7 additions & 8 deletions presentation/src/main/res/layout/activity_tendency_result.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@
<androidx.constraintlayout.helper.widget.Flow
android:id="@+id/ll_tags"
android:layout_width="0dp"
android:layout_marginTop="12dp"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
android:orientation="horizontal"
app:flow_horizontalGap="8dp"
app:flow_wrapMode="chain"
app:constraint_referenced_ids="tv_tendency_test_result_tag1,tv_tendency_test_result_tag2,tv_tendency_test_result_tag3"
app:flow_horizontalGap="8dp"
app:flow_horizontalStyle="packed"
app:flow_wrapMode="chain"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_tendency_test_result_sub_type" />
Expand All @@ -139,7 +139,7 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_10_red300_line"
android:paddingHorizontal="8dp"
android:paddingVertical="1dp"
android:paddingVertical="2dp"
android:textColor="@color/red_300"
app:layout_constraintHorizontal_weight="1" />

Expand All @@ -150,7 +150,7 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_10_red300_line"
android:paddingHorizontal="8dp"
android:paddingVertical="1dp"
android:paddingVertical="2dp"
android:textColor="@color/red_300"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintHorizontal_weight="1" />
Expand All @@ -162,16 +162,15 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_10_red300_line"
android:paddingHorizontal="8dp"
android:paddingVertical="1dp"
android:paddingVertical="2dp"
android:textColor="@color/red_300"
app:layout_constraintHorizontal_chainStyle="packed" />


<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_box_description_first"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:layout_marginTop="23dp"
android:background="@drawable/shape_rect_6_gray200_line"
android:minHeight="142dp"
android:paddingHorizontal="14dp"
Expand Down
Loading

0 comments on commit 7c783df

Please sign in to comment.