Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX/#256] 세연 담당 뷰 / QA 이슈 대응 #259

Merged
merged 4 commits into from
Mar 14, 2024
Merged

[FIX/#256] 세연 담당 뷰 / QA 이슈 대응 #259

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5035c97
[FIX/#256] QA 반영 수정
crownjoe Mar 13, 2024
b06c584
[FIX/#256] QA 반영 수정
crownjoe Mar 13, 2024
fc84f5a
[FIX/#256] QA 반영 수정
crownjoe Mar 13, 2024
0bdae1a
[FIX/#256] 컨플릭 해결
crownjoe Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@
<activity
android:name="com.going.presentation.entertrip.createtrip.choosedate.CreateTripActivity"
android:exported="false"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize" />
Comment on lines +90 to +91
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

수정 좋습니다~!!


<activity
android:name="com.going.presentation.entertrip.StartTripSplashActivity"
Expand Down Expand Up @@ -157,8 +158,8 @@
<activity
android:name="com.going.presentation.profile.edit.ProfileEditActivity"
android:exported="false"
android:windowSoftInputMode="adjustResize"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize" />

<activity
android:name="com.going.presentation.profile.participant.ParticipantProfileActivity"
Expand All @@ -173,7 +174,8 @@
<activity
android:name="com.going.presentation.todo.edittrip.info.EditTripInfoActivity"
android:exported="false"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize" />

<activity
android:name="com.going.presentation.todo.edittrip.edit.EditTripActivity"
Expand Down
7 changes: 4 additions & 3 deletions presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import androidx.core.widget.doAfterTextChanged
import androidx.lifecycle.flowWithLifecycle
import androidx.lifecycle.lifecycleScope
import com.going.presentation.R
import com.going.presentation.dashboard.DashBoardActivity
import com.going.presentation.databinding.ActivityEditTripInfoBinding
import com.going.presentation.entertrip.invitetrip.invitecode.EnterTripActivity.Companion.TRIP_ID
import com.going.presentation.todo.edittrip.edit.EditTripActivity
import com.going.ui.base.BaseActivity
import com.going.ui.extension.setOnSingleClickListener
import com.going.ui.extension.toast
Expand Down Expand Up @@ -103,7 +104,8 @@ class EditTripInfoActivity :
private fun initEditBtnClickListener() {
binding.btnEditTripSave.setOnSingleClickListener {
viewModel.patchTripInfoFromServer()
Intent(this, DashBoardActivity::class.java).apply {
Intent(this, EditTripActivity::class.java).apply {
putExtra(TRIP_ID, viewModel.tripId)
startActivity(this)
}
}
Expand All @@ -116,7 +118,6 @@ class EditTripInfoActivity :
}

companion object {
private const val TRIP_ID = "TRIP_ID"
private const val TITLE = "TITLE"
private const val START_DATE = "START_DATE"
private const val END_DATE = "END_DATE"
Expand Down
8 changes: 5 additions & 3 deletions presentation/src/main/res/layout/activity_create_trip.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
android:id="@+id/tv_create_trip_on_line_info_title"
style="@style/TextAppearance.Doorip.Body3.Bold"
android:layout_width="wrap_content"
android:layout_marginStart="24dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="16dp"
android:text="@string/create_trip_one_line_info_tv_title"
android:textColor="@color/gray_700"
Expand Down Expand Up @@ -99,7 +99,8 @@
android:maxLines="2"
android:paddingHorizontal="12dp"
android:paddingVertical="16dp"
android:text="@{viewModel.isStartDateAvailable() == true ? @string/create_trip_date(viewModel.startYear, viewModel.startMonth, viewModel.startDay) : @string/create_trip_start_date}" />
android:text="@{viewModel.isStartDateAvailable() == true ? @string/create_trip_date(viewModel.startYear, viewModel.startMonth, viewModel.startDay) : @string/create_trip_start_date}"
android:textColor="@color/gray_200" />
Comment on lines +102 to +103
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

데바의 신 ㄷㄷ

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이슈 연결하겠습니다 ㅋㅋㅋㅋㅋ ㅎㅎ


<TextView
android:layout_width="wrap_content"
Expand All @@ -121,7 +122,8 @@
android:maxLines="2"
android:paddingHorizontal="12dp"
android:paddingVertical="16dp"
android:text="@{viewModel.isEndDateAvailable() == true ? @string/create_trip_date(viewModel.endYear, viewModel.endMonth, viewModel.endDay) : @string/create_trip_end_date}" />
android:text="@{viewModel.isEndDateAvailable() == true ? @string/create_trip_date(viewModel.endYear, viewModel.endMonth, viewModel.endDay) : @string/create_trip_end_date}"
android:textColor="@color/gray_200" />
</LinearLayout>

<androidx.appcompat.widget.AppCompatButton
Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
<string name="edit_trip_info_date">%1$d.%2$d.%3$d</string>
<string name="edit_trip_info_toast_error">시작일을 먼저 입력해 주세요</string>
<string name="edit_trip_info_quit_dialog_title">여행방 나가기</string>
<string name="edit_trip_info_quit_dialog_message">나가기를 하면 정보가 모두 삭제되고,\n 여행 목록에서도 삭제됩니다</string>
<string name="edit_trip_info_quit_dialog_message">나가기를 하면 정보가 모두 삭제되고,\n여행 목록에서도 삭제됩니다</string>
<string name="edit_trip_info_quit_dialog_negative">나가기</string>
<string name="edit_trip_info_quit_dialog_positive">취소</string>
<string name="trip_blank_error">여행 이름에는 공백만 입력할 수 없어요</string>
Expand Down
Loading