Skip to content

Commit

Permalink
[FIX/#144] QA 관련 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@crownjoe
crownjoe committed Jan 16, 2024
1 parent fc4ab4b commit c691c58
Show file tree
Hide file tree
Showing 9 changed files with 118 additions and 106 deletions.
2 changes: 1 addition & 1 deletion ...on/src/main/java/com/going/presentation/entertrip/createtrip/finish/FinishTripActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class FinishTripActivity :
}

private fun initCopyCodetvClickListener() {
binding.tvFinishTripTermsText.setOnSingleClickListener {
binding.tvInviteCode.setOnSingleClickListener {
val clipboardManager =
this.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
val clipData = ClipData.newPlainText("INVITE_CODE_LABEL", inviteCode)
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/going/presentation/entertrip/invitetrip/finish/InviteFinishActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class InviteFinishActivity :

companion object {
const val DATE_FORMAT = "%s - %s"
const val D_DAY_FORMAT = "D - %d"
const val D_DAY_FORMAT = "D-%d"
const val TRIP_FORMAT = "여행중"
}
}
Expand Down
4 changes: 3 additions & 1 deletion ...src/main/java/com/going/presentation/entertrip/invitetrip/invitecode/EnterTripActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,10 @@ class EnterTripActivity : BaseActivity<ActivityEnterTripBinding>(R.layout.activi
}

is UiState.Failure -> {
if (state.msg == getString(R.string.profile_tv_no_trip)) {
if (state.msg == getString(R.string.enter_trip_invite_code_error)) {
toast(getString(R.string.enter_trip_invite_code_error))
} else if (state.msg == getString(R.string.enter_trip_my_code_error)) {
toast(getString(R.string.enter_trip_my_code_error))
} else {
toast(getString(R.string.server_error))
}
Expand Down
7 changes: 5 additions & 2 deletions ...rc/main/java/com/going/presentation/entertrip/invitetrip/invitecode/EnterTripViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ class EnterTripViewModel @Inject constructor(
val errorCode = jsonObject.getString("code")
val errorMessage = jsonObject.getString("message")

if (errorCode == ERROR_CODE) {
if (errorCode == NO_TRIP_CODE_ERROR) {
_tripState.value = UiState.Failure(errorMessage)
} else if (errorCode == MY_INVITE_CODE_ERROR) {
_tripState.value = UiState.Failure(errorMessage)
} else {
_tripState.value = UiState.Failure(throwable.message.orEmpty())
Expand All @@ -77,6 +79,7 @@ class EnterTripViewModel @Inject constructor(
private const val ENG_NUM_PATTERN = "^[a-z0-9]*$"
val ENG_NUM_REGEX: Pattern = Pattern.compile(ENG_NUM_PATTERN)
const val MAX_INVITE_LEN = 6
const val ERROR_CODE = "e4043"
const val NO_TRIP_CODE_ERROR = "e4043"
const val MY_INVITE_CODE_ERROR = "e4092"
}
}
6 changes: 3 additions & 3 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 @@ -11,7 +11,7 @@ val UserTendencyResultList = listOf(
profileTitle = "배려심 넘치는 든든잉",
profileSubTitle = "꼼꼼하고 세심하게 여행을 준비해요",
tags = listOf(
"친구와 함께",
"친구와함께",
"꼼꼼함",
"세심함",
),
Expand Down Expand Up @@ -173,7 +173,7 @@ val UserTendencyResultList = listOf(
tags = listOf(
"낙천적",
"낭만추구",
"남는건 사",
"남는건사진",
),
profileBoxInfo = listOf(
ProfileMock.BoxInfo(
Expand Down Expand Up @@ -201,7 +201,7 @@ val UserTendencyResultList = listOf(
profileImage = R.drawable.img_profile_7,
downloadImage = R.drawable.img_download_aep,
profileTitle = "나만 믿어 따라와 척척잉",
profileSubTitle = "모든 것을 계획하고 진행하는 프로총대러에요",
profileSubTitle = "모든 것을 계획하고 진행하는 프로총대러예요",
tags = listOf(
"내가할게",
"야무지게",
Expand Down
6 changes: 6 additions & 0 deletions presentation/src/main/res/drawable/shape_rect_6_gray100_line.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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_100" />
<corners android:radius="6dp" />
</shape>
94 changes: 52 additions & 42 deletions presentation/src/main/res/layout/activity_finish_trip.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
android:background="@drawable/shape_rect_2_red100_fill"
android:paddingHorizontal="8dp"
android:paddingVertical="2dp"
android:text="D - 16"
android:text="D-16"
android:textAppearance="@style/TextAppearance.Doorip.Detail2.Bold"
android:textColor="@color/red_500"
app:layout_constraintEnd_toEndOf="parent"
Expand Down Expand Up @@ -110,59 +110,69 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:background="@drawable/shape_rect_8_white000_fill_gray100_line"
android:paddingVertical="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_finish_trip_info_top">

<TextView
android:id="@+id/tv_invite_code"
style="@style/TextAppearance.Doorip.Head4"

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_copy_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:text="a1b2c3"
app:layout_constraintBottom_toTopOf="@id/iv_finish_trip_copy"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="@id/layout_finish_trip_info_bottom">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_finish_trip_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:src="@drawable/ic_finish_trip_copy"
app:layout_constraintBottom_toBottomOf="@id/tv_finish_trip_terms_text"
app:layout_constraintEnd_toStartOf="@id/tv_finish_trip_terms_text"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_finish_trip_terms_text" />
<TextView
android:id="@+id/tv_invite_code"
style="@style/TextAppearance.Doorip.Head4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="a1b2c3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_finish_trip_terms_text"
style="@style/TextAppearance.Doorip.Detail2.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginBottom="20dp"
android:text="@string/finish_trip_tv_copy_code"
android:textColor="@color/gray_300"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/iv_finish_trip_copy"
app:layout_constraintTop_toBottomOf="@id/tv_invite_code"
tools:ignore="MissingConstraints" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_finish_trip_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:src="@drawable/ic_finish_trip_copy"
app:layout_constraintBottom_toBottomOf="@id/tv_finish_trip_terms_text"
app:layout_constraintEnd_toStartOf="@id/tv_finish_trip_terms_text"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_finish_trip_terms_text" />

<View
android:layout_width="0dp"
android:layout_height="1dp"
android:background="@color/gray_300"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/tv_finish_trip_terms_text"
app:layout_constraintStart_toStartOf="@id/iv_finish_trip_copy"
app:layout_constraintTop_toBottomOf="@id/tv_finish_trip_terms_text" />
<TextView
android:id="@+id/tv_finish_trip_terms_text"
style="@style/TextAppearance.Doorip.Detail2.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:="10dp"
android:text="@string/finish_trip_tv_copy_code"
android:textColor="@color/gray_300"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/iv_finish_trip_copy"
app:layout_constraintTop_toBottomOf="@id/tv_invite_code"
tools:ignore="MissingConstraints" />

<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginBottom="20dp"
android:background="@color/gray_300"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/tv_finish_trip_terms_text"
app:layout_constraintStart_toStartOf="@id/iv_finish_trip_copy"
app:layout_constraintTop_toBottomOf="@id/tv_finish_trip_terms_text" />

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>


Expand Down
Loading

0 comments on commit c691c58

Please sign in to comment.