Merge pull request #51 from Nexters/qa/1.0.0

eshc123 · web-flow · commit 394aa40df1bb · 2025-08-17T21:38:28.000+09:00
1.0.0 QA 브랜치 dev브랜치에 머지합니다.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@
             android:name="com.plottwist.feature.main.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
+            android:launchMode="singleTop"
             android:theme="@style/Theme.Tuk"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize">
diff --git a/build-logic/convention/src/main/kotlin/com/plottwist/tuk/Extension.kt b/build-logic/convention/src/main/kotlin/com/plottwist/tuk/Extension.kt
@@ -11,7 +11,7 @@ fun ApplicationExtension.configureDefaultConfig() {
     defaultConfig {
         applicationId = "com.plottwist.tuk"
         targetSdk = 36
-        versionCode = 4
+        versionCode = 5
         versionName = "1.0.0"
 
         vectorDrawables {
diff --git a/core/data/src/main/java/com/plottwist/core/data/auth/repository/AuthRepositoryImpl.kt b/core/data/src/main/java/com/plottwist/core/data/auth/repository/AuthRepositoryImpl.kt
@@ -6,6 +6,7 @@ import com.plottwist.core.domain.onboarding.OnboardingRepository
 import com.plottwist.core.domain.push.repository.PushRepository
 import com.plottwist.core.network.model.auth.DeviceInfo
 import com.plottwist.core.network.model.auth.GoogleLoginRequest
+import com.plottwist.core.network.model.auth.TokenRequest
 import com.plottwist.core.network.model.onboarding.MemberNameRequest
 import com.plottwist.core.network.service.AuthApiService
 import com.plottwist.core.network.service.TukApiService
@@ -14,7 +15,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
 
@@ -126,4 +126,25 @@ class AuthRepositoryImpl @Inject constructor(
     override fun setMemberName(name: String): Flow<Unit> {
         return authDataSource.setMemberName(name)
     }
+
+    override suspend fun reissueTokens(): Result<Unit> {
+        try {
+            val refreshToken = authDataSource.getRefreshToken().firstOrNull()
+            if(refreshToken.isNullOrEmpty()){
+                authDataSource.clear()
+                return Result.failure(Exception("Fail Reissue Tokens"))
+            }
+            val result = authApiService.refreshToken(TokenRequest(refreshToken))
+
+            return if (result.success) {
+                authDataSource.setAccessToken(result.data.accessToken).collect()
+                authDataSource.setRefreshToken(result.data.refreshToken).collect()
+                Result.success(Unit)
+            } else {
+                Result.failure(Exception("Fail Delete member"))
+            }
+        } catch (e: Exception) {
+            return Result.failure(e)
+        }
+    }
 }
diff --git a/core/designsystem/src/main/java/com/plottwist/core/designsystem/component/TextField.kt b/core/designsystem/src/main/java/com/plottwist/core/designsystem/component/TextField.kt
@@ -110,7 +110,7 @@ fun TukTextField(
                             innerTextField()
                         }
                     }
-                    if (state.text.isNotEmpty()) {
+                    if (state.text.isNotEmpty() && isFocus) {
                         ClearButton(
                             modifier = Modifier.padding(end = 10.dp),
                             onClick = onClear
diff --git a/core/designsystem/src/main/res/drawable/img_login_card.png b/core/designsystem/src/main/res/drawable/img_login_card.png
diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml
@@ -26,7 +26,7 @@
     
     <string name="create_proposal_title">이렇게 전해질 거예요,\n한번 볼까요?</string>
     <string name="create_proposal_select_gathering">모임 선택</string>
-    <string name="create_proposal_propose">툭, 찔러보기</string>
+    <string name="create_proposal_propose">다음</string>
     <string name="create_proposal_selected_gathering_name">%s 친구들에게</string>
 
     <string name="onboarding_name_title">어떤 이름으로 친구들에게\n인사할까요?</string>
diff --git a/core/domain/src/main/java/com/plottwist/core/domain/auth/repository/AuthRepository.kt b/core/domain/src/main/java/com/plottwist/core/domain/auth/repository/AuthRepository.kt
@@ -11,4 +11,5 @@ interface AuthRepository {
     suspend fun updateMemberName(name: String): Result<Unit>
     fun getMemberName(): Flow<String?>
     fun setMemberName(name: String): Flow<Unit>
+    suspend fun reissueTokens(): Result<Unit>
 }
diff --git a/core/domain/src/main/java/com/plottwist/core/domain/auth/usecase/ReissueTokensUseCase.kt b/core/domain/src/main/java/com/plottwist/core/domain/auth/usecase/ReissueTokensUseCase.kt
@@ -0,0 +1,12 @@
+package com.plottwist.core.domain.auth.usecase
+
+import com.plottwist.core.domain.auth.repository.AuthRepository
+import javax.inject.Inject
+
+class ReissueTokensUseCase @Inject constructor(
+    private val loginRepository: AuthRepository
+) {
+    suspend operator fun invoke(): Result<Unit> {
+        return loginRepository.reissueTokens()
+    }
+}
diff --git a/core/network/src/main/java/com/plottwist/core/network/interceptor/TokenInterceptor.kt b/core/network/src/main/java/com/plottwist/core/network/interceptor/TokenInterceptor.kt
@@ -1,6 +1,8 @@
 package com.plottwist.core.network.interceptor
 
 import com.plottwist.core.network.TokenProvider
+import com.plottwist.core.network.model.auth.TokenRequest
+import com.plottwist.core.network.service.AuthApiService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -13,6 +15,7 @@ import javax.inject.Singleton
 
 @Singleton
 class TokenInterceptor @Inject constructor(
+    private val authApiService: AuthApiService,
     private val tokenProvider: TokenProvider
 ) : Interceptor {
 
@@ -38,6 +41,26 @@ class TokenInterceptor @Inject constructor(
                     }
                 }
             }
+            HttpURLConnection.HTTP_UNAUTHORIZED -> {
+                val retryRequest = chain.request().newBuilder().apply {
+                    runBlocking {
+                        tokenProvider.getRefreshToken()?.let {
+                            val newToken = authApiService.refreshToken(TokenRequest(it))
+                            if (newToken.success) {
+                                newToken.data.let { token ->
+                                    addHeader("Authorization", "Bearer ${token.accessToken}")
+                                    CoroutineScope(Dispatchers.IO).launch {
+                                        tokenProvider.setAccessToken(token.accessToken)
+                                        tokenProvider.setRefreshToken(token.refreshToken)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                response.close()
+                return chain.proceed(retryRequest.build())
+            }
         }
         return response
     }
diff --git a/core/network/src/main/java/com/plottwist/core/network/model/auth/GoogleLoginRequest.kt b/core/network/src/main/java/com/plottwist/core/network/model/auth/GoogleLoginRequest.kt
@@ -21,3 +21,8 @@ data class DeviceInfo(
 data class DeviceInfoRequest(
     val deviceInfo : DeviceInfo
 )
+
+@Serializable
+data class TokenRequest(
+    val refreshToken: String,
+)
diff --git a/core/network/src/main/java/com/plottwist/core/network/model/auth/LoginResponse.kt b/core/network/src/main/java/com/plottwist/core/network/model/auth/LoginResponse.kt
@@ -22,3 +22,17 @@ data class Meta(
     val errorType: String,
     val errorMessage: String?
 )
+
+
+@Serializable
+data class TokenResponse(
+    val success: Boolean,
+    val data: TokenData,
+    val meta: Meta?
+)
+
+@Serializable
+data class TokenData(
+    val accessToken: String,
+    val refreshToken: String
+)
diff --git a/core/network/src/main/java/com/plottwist/core/network/service/AuthApiService.kt b/core/network/src/main/java/com/plottwist/core/network/service/AuthApiService.kt
@@ -2,6 +2,8 @@ package com.plottwist.core.network.service
 
 import com.plottwist.core.network.model.auth.GoogleLoginRequest
 import com.plottwist.core.network.model.auth.LoginResponse
+import com.plottwist.core.network.model.auth.TokenRequest
+import com.plottwist.core.network.model.auth.TokenResponse
 import retrofit2.http.Body
 import retrofit2.http.POST
 
@@ -10,4 +12,9 @@ interface AuthApiService {
     suspend fun googleLogin(
         @Body googleLoginRequest: GoogleLoginRequest
     ): LoginResponse
+
+    @POST("/api/v1/auth/refresh")
+    suspend fun refreshToken(
+        @Body tokenRequest : TokenRequest
+    ) : TokenResponse
 }
diff --git a/core/push/src/main/java/com/plottwist/core/push/TukFirebaseMessagingService.kt b/core/push/src/main/java/com/plottwist/core/push/TukFirebaseMessagingService.kt
@@ -26,14 +26,16 @@ class TukFirebaseMessagingService : FirebaseMessagingService() {
         message.notification?.let { notificationMessage ->
             val title = notificationMessage.title ?: TukNotificationManager.DEFAULT_TITLE
             val description = notificationMessage.body ?: TukNotificationManager.DEFAULT_DESCRIPTION
-
-            sendNotification(title, description)
+            val deeplink = message.data.get("deepLink") ?: ""
+            sendNotification(title, description, deeplink)
         }
     }
 
-    private fun sendNotification(title: String, description: String) {
+    private fun sendNotification(title: String, description: String, deeplink: String) {
         val intent = Intent(this, MainActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        }.apply {
+            putExtra("deepLink", deeplink)
         }
         val pendingIntent = PendingIntent.getActivity(
             this,
diff --git a/core/ui/src/main/java/com/plottwist/core/ui/component/Scaffold.kt b/core/ui/src/main/java/com/plottwist/core/ui/component/Scaffold.kt
@@ -95,7 +95,7 @@ fun TukScaffoldTitle(
     Text(
         modifier = modifier,
         text = title,
-        style = TukSerifTypography.title24M,
+        style = TukSerifTypography.title22M,
         color = Gray900
     )
 }
diff --git a/core/ui/src/main/java/com/plottwist/core/ui/web/component/TukWebView.kt b/core/ui/src/main/java/com/plottwist/core/ui/web/component/TukWebView.kt
@@ -2,6 +2,7 @@ package com.plottwist.core.ui.web.component
 
 import android.annotation.SuppressLint
 import android.view.ViewGroup
+import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -52,3 +53,20 @@ fun TukWebView(
         }
     )
 }
+
+const val BRIDGE_NAME = "AndroidBridge"
+
+class DefaultBridge(
+    val onNavigateBack: () -> Unit,
+    val onRequestTokenRefresh: () -> Unit
+) {
+    @JavascriptInterface
+    fun navigateBack() {
+        onNavigateBack()
+    }
+
+    @JavascriptInterface
+    fun requestTokenRefresh() {
+        onRequestTokenRefresh()
+    }
+}
diff --git a/feature/home/src/main/java/com/plottwist/feature/home/component/RandomProposal.kt b/feature/home/src/main/java/com/plottwist/feature/home/component/RandomProposal.kt
@@ -83,9 +83,10 @@ fun RandomProposal(
     Column (
         modifier = modifier.padding(bottom = 30.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.spacedBy(15.dp)
+        verticalArrangement = Arrangement.spacedBy(10.dp)
     ) {
         Text(
+            modifier = Modifier.padding(bottom = 6.dp),
             text = stringResource(R.string.home_random_proposal_description_prefix),
             style = TukSerifTypography.title18M,
             color = Gray900,
@@ -111,6 +112,7 @@ fun RandomProposal(
         )
 
         Text(
+            modifier = Modifier.padding(top = 6.dp),
             text = stringResource(R.string.home_random_proposal_description_suffix),
             style = TukSerifTypography.title18M,
             color = Gray900,
diff --git a/feature/login/src/main/java/com/plottwist/feature/login/LoginScreen.kt b/feature/login/src/main/java/com/plottwist/feature/login/LoginScreen.kt
@@ -122,33 +122,35 @@ private fun LoginScreen(
     Box(
         modifier = modifier
     ) {
-        StableImage(
-            modifier = Modifier
-                .fillMaxWidth()
-                .align(Alignment.CenterEnd),
-            drawableResId = R.drawable.image_login_gradient,
-            contentScale = ContentScale.FillWidth
-        )
-
         Column(
             modifier = Modifier.fillMaxSize(),
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             LoginAppBar(
                 onCloseClicked = onCloseClicked
             )
-            StableImage(
-                drawableResId = R.drawable.image_app_title
-            )
 
-            LoginContent(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(vertical = 60.dp)
-                    .weight(1f),
-                postCardPadding = postCardPadding
+            Text(
+                modifier = Modifier.padding(top = 48.dp, bottom = 20.dp),
+                text = "누군가 나를 떠올리며 \n" +
+                        "툭, 건넸어요",
+                textAlign = TextAlign.Center,
+                style = TukSerifTypography.body16M
             )
 
+            Box(
+                modifier = Modifier.weight(1f),
+                contentAlignment = Alignment.Center
+            ) {
+                StableImage(
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                    drawableResId = R.drawable.img_login_card,
+                    contentScale = ContentScale.FillWidth
+                )
+            }
+
+
             GoogleLoginButtonColumn(
                 modifier = Modifier.fillMaxWidth(),
                 onGoogleLoginButtonClick = onGoogleLoginButtonClick
@@ -187,14 +189,14 @@ fun LoginContent(
                 .fillMaxWidth()
                 .padding(bottom = 18.dp + postCardPadding)
                 .padding(horizontal = 62.dp)
-                .aspectRatio(260f/334f)
+                .aspectRatio(260f / 334f)
         )
 
         StableImage(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(top = 62.dp)
-                .aspectRatio(260f/364f),
+                .aspectRatio(260f / 364f),
             drawableResId = R.drawable.image_post_cover,
             contentScale = ContentScale.FillWidth
         )
diff --git a/feature/main/src/main/java/com/plottwist/feature/main/MainActivity.kt b/feature/main/src/main/java/com/plottwist/feature/main/MainActivity.kt
@@ -32,9 +32,17 @@ class MainActivity : ComponentActivity() {
     ) {
         val deepLink = intent.extras?.getString("deepLink") ?: return
 
-        startActivity(Intent(Intent.ACTION_VIEW).apply {
-            data = deepLink.toUri()
-        })
+        startActivity(
+            Intent(Intent.ACTION_VIEW).apply {
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                data = deepLink.toUri()
+            }
+        )
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        handleDeepLink(intent)
     }
 
     companion object {
diff --git a/feature/mypage/src/main/java/com/plottwist/feature/mypage/MyPageScreen.kt b/feature/mypage/src/main/java/com/plottwist/feature/mypage/MyPageScreen.kt
diff --git a/feature/mypage/src/main/java/com/plottwist/feature/mypage/notification/NotificationSettingScreen.kt b/feature/mypage/src/main/java/com/plottwist/feature/mypage/notification/NotificationSettingScreen.kt
diff --git a/feature/proposal-detail/src/main/java/com/plottwist/feature/proposal_detail/ProposalDetailScreen.kt b/feature/proposal-detail/src/main/java/com/plottwist/feature/proposal_detail/ProposalDetailScreen.kt
diff --git a/feature/webview/src/main/java/com/plottwist/feature/webview/WebViewContract.kt b/feature/webview/src/main/java/com/plottwist/feature/webview/WebViewContract.kt
diff --git a/feature/webview/src/main/java/com/plottwist/feature/webview/WebViewScreen.kt b/feature/webview/src/main/java/com/plottwist/feature/webview/WebViewScreen.kt
diff --git a/feature/webview/src/main/java/com/plottwist/feature/webview/WebViewViewModel.kt b/feature/webview/src/main/java/com/plottwist/feature/webview/WebViewViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ fun TukTextField(`
`110`	`110`	`innerTextField()`
`111`	`111`	`}`
`112`	`112`	`}`
`113`		`- if (state.text.isNotEmpty()) {`
	`113`	`+ if (state.text.isNotEmpty() && isFocus) {`
`114`	`114`	`ClearButton(`
`115`	`115`	`modifier = Modifier.padding(end = 10.dp),`
`116`	`116`	`onClick = onClear`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,5 @@ interface AuthRepository {`
`11`	`11`	`suspend fun updateMemberName(name: String): Result<Unit>`
`12`	`12`	`fun getMemberName(): Flow<String?>`
`13`	`13`	`fun setMemberName(name: String): Flow<Unit>`
	`14`	`+ suspend fun reissueTokens(): Result<Unit>`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,3 +21,8 @@ data class DeviceInfo(`
`21`	`21`	`data class DeviceInfoRequest(`
`22`	`22`	`val deviceInfo : DeviceInfo`
`23`	`23`	`)`
	`24`	`+`
	`25`	`+@Serializable`
	`26`	`+data class TokenRequest(`
	`27`	`+ val refreshToken: String,`
	`28`	`+)`