From 5035c97800368cdc46d26bab2102fa614d76e4d9 Mon Sep 17 00:00:00 2001 From: Seyeon CHO <135544903+crownjoe@users.noreply.github.com> Date: Wed, 13 Mar 2024 21:13:52 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[FIX/#256]=20QA=20=EB=B0=98=EC=98=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../todo/edittrip/info/EditTripInfoActivity.kt | 9 ++++++--- presentation/src/main/res/values/strings.xml | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt b/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt index f6993145..abe06d3a 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt +++ b/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt @@ -4,13 +4,15 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle +import android.util.Log import androidx.activity.viewModels 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 @@ -103,7 +105,9 @@ 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) + Log.d("sy", viewModel.tripId.toString()) startActivity(this) } } @@ -116,7 +120,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" diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index b87ec729..034575d3 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -257,7 +257,7 @@ %1$d.%2$d.%3$d 시작일을 먼저 입력해 주세요 여행방 나가기 - 나가기를 하면 정보가 모두 삭제되고,\n 여행 목록에서도 삭제됩니다 + 나가기를 하면 정보가 모두 삭제되고,\n여행 목록에서도 삭제됩니다 나가기 취소 여행 이름에는 공백만 입력할 수 없어요 From b06c584403fbf2dc92734fbd8ea53d28bf917931 Mon Sep 17 00:00:00 2001 From: Seyeon CHO <135544903+crownjoe@users.noreply.github.com> Date: Thu, 14 Mar 2024 00:58:04 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[FIX/#256]=20QA=20=EB=B0=98=EC=98=81=20?= =?UTF-8?q?=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 | 10 ++++++---- .../src/main/res/layout/activity_create_trip.xml | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 753b97e1..5ae0c135 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,7 +86,8 @@ + android:screenOrientation="portrait" + android:windowSoftInputMode="adjustResize" /> + android:screenOrientation="portrait" + android:windowSoftInputMode="adjustResize" /> + android:screenOrientation="portrait" + android:windowSoftInputMode="adjustResize" /> + 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" /> + 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" /> Date: Thu, 14 Mar 2024 01:08:03 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[FIX/#256]=20QA=20=EB=B0=98=EC=98=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/todo/edittrip/info/EditTripInfoActivity.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt b/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt index abe06d3a..bb7ca0e4 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt +++ b/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt @@ -4,7 +4,6 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle -import android.util.Log import androidx.activity.viewModels import androidx.core.widget.doAfterTextChanged import androidx.lifecycle.flowWithLifecycle @@ -107,7 +106,6 @@ class EditTripInfoActivity : viewModel.patchTripInfoFromServer() Intent(this, EditTripActivity::class.java).apply { putExtra(TRIP_ID, viewModel.tripId) - Log.d("sy", viewModel.tripId.toString()) startActivity(this) } }