fix: Activiy의 softInputMode 가 adjustResize 로 변경됩니다. 각 inputMethod 가 있는 화면에 imePadding 이 적용됩니다

sejun2 · sejun2 · commit ef6919e0060a · 2025-03-04T23:55:12.000+09:00
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.kotlin/sessions/kotlin-compiler-6789799685620758647.salive b/.kotlin/sessions/kotlin-compiler-6789799685620758647.salive
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
         <activity
             android:name=".OauthDeepLinkHandlerActivity"
             android:exported="true"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.LanPetApp">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -43,6 +44,7 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.LanPetApp">
             <meta-data
                 android:name="com.google.android.gms.version"
diff --git a/app/src/main/java/com/lanpet/app/MainActivity.kt b/app/src/main/java/com/lanpet/app/MainActivity.kt
@@ -46,6 +46,10 @@ class MainActivity : ComponentActivity() {
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+    }
+
     override fun onDestroy() {
         Timber.e("MainActivity onDestroy")
         super.onDestroy()
diff --git a/core/manager/src/main/java/com/lanpet/core/manager/AuthStateHolder.kt b/core/manager/src/main/java/com/lanpet/core/manager/AuthStateHolder.kt
@@ -11,7 +11,6 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 
-// TODO("Satoshi"): rename as manager
 class AuthStateHolder {
     private val _authState =
         MutableStateFlow<AuthState>(
diff --git a/core/navigation/src/main/java/com/lanpet/core/navigation/AppNavigation.kt b/core/navigation/src/main/java/com/lanpet/core/navigation/AppNavigation.kt
@@ -354,8 +354,8 @@ private fun DestinationLoggerHandler(navController: NavHostController) {
 
             // 각 항목을 "->"로 구분하여 보기 좋게 출력
             val stackLog = stack.joinToString("\n") { "  $${it.destination.id}" }
-            Timber.i("previousBackStackEntry: ${controller.previousBackStackEntry}\n")
-            Timber.i("currentBackStackEntry: ${controller.currentBackStackEntry}\n")
+            Timber.i("previousBackStackEntry: ${controller.previousBackStackEntry?.destination?.route}\n")
+            Timber.i("currentBackStackEntry: ${controller.currentBackStackEntry?.destination?.route}\n")
             Timber.d("Navigation Stack:\n====================\n$stackLog\n====================")
         }
 
diff --git a/data/dto/src/main/java/com/lanpet/data/dto/RegisterPetProfileRequest.kt b/data/dto/src/main/java/com/lanpet/data/dto/RegisterPetProfileRequest.kt
@@ -28,7 +28,7 @@ data class RegisterPetProfileRequest(
                     PetDto(
                         petType = petProfileCreate.pet.petCategory,
                         breed = petProfileCreate.pet.breed,
-                        feature = petProfileCreate.pet.feature.joinToString(","),
+                        feature = petProfileCreate.pet.feature?.joinToString(","),
                         weight = petProfileCreate.pet.weight,
                     ),
             )
@@ -44,7 +44,8 @@ data class RegisterPetProfileRequest(
                         PetDto(
                             petType = it.petCategory,
                             breed = petProfile.pet?.breed,
-                            feature = petProfile.pet?.feature?.joinToString(","),
+                            feature = null,
+//                            feature = petProfile.pet?.feature?.joinToString(","),
                             weight = petProfile.pet?.weight,
                         )
                     },
diff --git a/data/dto/src/main/java/com/lanpet/data/dto/mapper/DataMapper.kt b/data/dto/src/main/java/com/lanpet/data/dto/mapper/DataMapper.kt
@@ -52,7 +52,7 @@ class DomainPetToPetDtoMapper : Mapper<Pet, PetDto> {
         PetDto(
             petType = input.petCategory,
             breed = input.breed,
-            feature = input.feature.joinToString(","),
+            feature = input.feature?.joinToString(","),
             weight = input.weight,
             birthDate = input.birthDate,
         )
diff --git a/domain/model/src/main/java/com/lanpet/domain/model/Profile.kt b/domain/model/src/main/java/com/lanpet/domain/model/Profile.kt
@@ -23,13 +23,13 @@ object Base64StringSerializer : KSerializer<String> {
         value: String,
     ) {
         val base64Encoded =
-            android.util.Base64.encode(value.toByteArray(), android.util.Base64.DEFAULT)
+            android.util.Base64.encode(value.toByteArray(), android.util.Base64.URL_SAFE)
         encoder.encodeString(String(base64Encoded))
     }
 
     override fun deserialize(decoder: Decoder): String {
         val base64Decoded =
-            android.util.Base64.decode(decoder.decodeString(), android.util.Base64.DEFAULT)
+            android.util.Base64.decode(decoder.decodeString(), android.util.Base64.URL_SAFE)
         return String(base64Decoded)
     }
 }
diff --git a/feature/free/src/main/java/com/lanpet/free/navigation/FreeNavGraph.kt b/feature/free/src/main/java/com/lanpet/free/navigation/FreeNavGraph.kt
@@ -147,9 +147,9 @@ fun NavController.navigateToFreeBoardDetailScreen(
             .Builder()
             .setLaunchSingleTop(true)
             .apply {
-//                navOptions?.let { options ->
-//                    setPopUpTo(options.popUpToId, options.isPopUpToInclusive())
-//                }
+                navOptions?.let { options ->
+                    setPopUpTo(options.popUpToId, options.isPopUpToInclusive())
+                }
             }.build()
 
     navigate(
diff --git a/feature/free/src/main/java/com/lanpet/free/screen/FreeBoardCommentDetailScreen.kt b/feature/free/src/main/java/com/lanpet/free/screen/FreeBoardCommentDetailScreen.kt
@@ -2,6 +2,7 @@ package com.lanpet.free.screen
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -126,7 +127,8 @@ fun FreeBoardCommentDetailScreen(
                     modifier =
                         Modifier
                             .fillMaxSize()
-                            .padding(it),
+                            .padding(it)
+                            .imePadding(),
                 ) {
                     Column {
                         Column(
diff --git a/feature/free/src/main/java/com/lanpet/free/screen/FreeBoardDetailScreen.kt b/feature/free/src/main/java/com/lanpet/free/screen/FreeBoardDetailScreen.kt
@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -290,7 +291,8 @@ fun FreeBoardDetailScreen(
                     modifier =
                         Modifier
                             .fillMaxSize()
-                            .padding(it),
+                            .padding(it)
+                            .imePadding(),
                 ) {
                     ContentUI(
                         currentState,
diff --git a/feature/free/src/main/java/com/lanpet/free/screen/FreeBoardWriteScreen.kt b/feature/free/src/main/java/com/lanpet/free/screen/FreeBoardWriteScreen.kt
@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
@@ -163,7 +164,8 @@ fun FreeBoardWriteScreen(
             modifier =
                 Modifier
                     .fillMaxSize()
-                    .padding(it),
+                    .padding(it)
+                    .imePadding(),
         ) {
             Column(
                 modifier =
diff --git a/feature/myprofile/src/main/java/com/lanpet/myprofile/screen/MyProfileAddProfileScreen.kt b/feature/myprofile/src/main/java/com/lanpet/myprofile/screen/MyProfileAddProfileScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
@@ -105,6 +106,7 @@ fun MyProfileAddProfileScreen(
             Column(
                 modifier =
                     Modifier
+                        .imePadding()
                         .verticalScroll(
                             verticalScrollState,
                         ),
diff --git a/feature/myprofile/src/main/java/com/lanpet/myprofile/screen/MyProfileManageProfileScreen.kt b/feature/myprofile/src/main/java/com/lanpet/myprofile/screen/MyProfileManageProfileScreen.kt
@@ -75,7 +75,6 @@ fun MyProfileManageProfileScreen(
     val verticalScrollState = rememberScrollState()
 
     Scaffold(
-        modifier = Modifier.imePadding(),
         topBar = {
             LanPetTopAppBar(
                 navigationIcon = {
@@ -111,6 +110,8 @@ fun MyProfileManageProfileScreen(
             Column(
                 modifier =
                     Modifier
+                        .fillMaxSize()
+                        .imePadding()
                         .verticalScroll(
                             verticalScrollState,
                         ),
diff --git a/feature/myprofile/src/main/java/com/lanpet/myprofile/viewmodel/ManagePetProfileViewModel.kt b/feature/myprofile/src/main/java/com/lanpet/myprofile/viewmodel/ManagePetProfileViewModel.kt
@@ -205,7 +205,7 @@ class ManagePetProfileViewModel
                                                     profileDetail.pet?.petCategory
                                                         ?: PetCategory.OTHER,
                                                 breed = profileDetail.pet?.breed,
-                                                feature = profileDetail.pet?.feature ?: emptyList(),
+                                                feature = profileDetail.pet?.feature,
                                                 weight = profileDetail.pet?.weight,
                                                 birthDate = profileDetail.pet?.birthDate,
                                             ),

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,10 @@ class MainActivity : ComponentActivity() {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ override fun onSaveInstanceState(outState: Bundle) {`
	`50`	`+ super.onSaveInstanceState(outState)`
	`51`	`+ }`
	`52`	`+`
`49`	`53`	`override fun onDestroy() {`
`50`	`54`	`Timber.e("MainActivity onDestroy")`
`51`	`55`	`super.onDestroy()`
Original file line number	Diff line number	Diff line change
`@@ -354,8 +354,8 @@ private fun DestinationLoggerHandler(navController: NavHostController) {`
`354`	`354`
`355`	`355`	`// 각 항목을 "->"로 구분하여 보기 좋게 출력`
`356`	`356`	`val stackLog = stack.joinToString("\n") { " $${it.destination.id}" }`
`357`		`- Timber.i("previousBackStackEntry: ${controller.previousBackStackEntry}\n")`
`358`		`- Timber.i("currentBackStackEntry: ${controller.currentBackStackEntry}\n")`
	`357`	`+ Timber.i("previousBackStackEntry: ${controller.previousBackStackEntry?.destination?.route}\n")`
	`358`	`+ Timber.i("currentBackStackEntry: ${controller.currentBackStackEntry?.destination?.route}\n")`
`359`	`359`	`Timber.d("Navigation Stack:\n====================\n$stackLog\n====================")`
`360`	`360`	`}`
`361`	`361`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class DomainPetToPetDtoMapper : Mapper<Pet, PetDto> {`
`52`	`52`	`PetDto(`
`53`	`53`	`petType = input.petCategory,`
`54`	`54`	`breed = input.breed,`
`55`		`- feature = input.feature.joinToString(","),`
	`55`	`+ feature = input.feature?.joinToString(","),`
`56`	`56`	`weight = input.weight,`
`57`	`57`	`birthDate = input.birthDate,`
`58`	`58`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,13 @@ object Base64StringSerializer : KSerializer<String> {`
`23`	`23`	`value: String,`
`24`	`24`	`) {`
`25`	`25`	`val base64Encoded =`
`26`		`- android.util.Base64.encode(value.toByteArray(), android.util.Base64.DEFAULT)`
	`26`	`+ android.util.Base64.encode(value.toByteArray(), android.util.Base64.URL_SAFE)`
`27`	`27`	`encoder.encodeString(String(base64Encoded))`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`override fun deserialize(decoder: Decoder): String {`
`31`	`31`	`val base64Decoded =`
`32`		`- android.util.Base64.decode(decoder.decodeString(), android.util.Base64.DEFAULT)`
	`32`	`+ android.util.Base64.decode(decoder.decodeString(), android.util.Base64.URL_SAFE)`
`33`	`33`	`return String(base64Decoded)`
`34`	`34`	`}`
`35`	`35`	`}`