[MERGE] #256 -> develop

[FIX/#256] 세연 담당 뷰 / QA 이슈 대응
Team-Going · Mar 14, 2024 · 4e7c782 · 4e7c782
2 parents 87a279d + 0bdae1a
commit 4e7c782
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -87,7 +87,8 @@
         <activity
             android:name="com.going.presentation.entertrip.createtrip.choosedate.CreateTripActivity"
             android:exported="false"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
 
         <activity
             android:name="com.going.presentation.entertrip.StartTripSplashActivity"
@@ -174,7 +175,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"

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
@@ -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
@@ -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)
             }
         }
@@ -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"

diff --git a/presentation/src/main/res/layout/activity_create_trip.xml b/presentation/src/main/res/layout/activity_create_trip.xml
@@ -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"
@@ -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" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -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