[PC-000] 약관 상세 화면 웹뷰가 렌더링 되기 이전 TopBar가 가려지던 것 해결

YAPP-Github · Jan 9, 2025 · ffd0c84 · ffd0c84
2 parents dba8062 + b4e3fb0
commit ffd0c84
Show file tree

Hide file tree

Showing 27 changed files with 213 additions and 95 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,7 +11,7 @@ android {
     defaultConfig {
         versionCode = 1
         versionName = "1.0.0"
-        targetSdk = 34
+        targetSdk = 35
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -21,8 +21,6 @@ android {
         buildConfigField("String", "KAKAO_APP_KEY", "\"${localProperties["KAKAO_APP_KEY"]}\"")
     }
 
-    packaging { resources { excludes += "/META-INF/*" } }
-
     buildTypes {
         release {
             signingConfig = signingConfigs.getByName("debug")

diff --git a/build-logic/src/main/java/com/puzzle/build/logic/KotlinAndroid.kt b/build-logic/src/main/java/com/puzzle/build/logic/KotlinAndroid.kt
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal fun Project.configureKotlinAndroid() {
     pluginManager.apply("org.jetbrains.kotlin.android")
-    pluginManager.apply("org.jetbrains.kotlin.plugin.serialization")
 
     androidExtension.apply {
         compileSdk = 35
@@ -40,8 +39,6 @@ internal fun Project.configureKotlinAndroid() {
 //            add("implementation", libs.findLibrary("firebase-analytics").get())
 //            add("implementation", libs.findLibrary("firebase-crashlytics").get())
 //        }
-
-        packaging { resources.excludes.add("META-INF/*") }
     }
 
     configureKotlin()

diff --git a/build-logic/src/main/java/com/puzzle/build/logic/configure/AndroidComposes.kt b/build-logic/src/main/java/com/puzzle/build/logic/configure/AndroidComposes.kt
@@ -8,6 +8,7 @@ import org.gradle.kotlin.dsl.dependencies
 internal fun Project.configureAndroidCompose() {
     with(plugins) {
         apply("org.jetbrains.kotlin.plugin.compose")
+        apply("org.jetbrains.kotlin.plugin.serialization")
     }
 
     val libs = extensions.libs

diff --git a/core/data/src/main/java/com/puzzle/data/repository/TermsRepositoryImpl.kt b/core/data/src/main/java/com/puzzle/data/repository/TermsRepositoryImpl.kt
@@ -17,23 +17,23 @@ class TermsRepositoryImpl @Inject constructor(
         val terms = termDataSource.loadTerms()
             .getOrThrow()
             .toDomain()
-            .filter { it.termId != UNKNOWN_INT }
+            .filter { it.id != UNKNOWN_INT }
 
         val termsEntity = terms.map {
             TermEntity(
-                id = it.termId,
+                id = it.id,
                 title = it.title,
                 content = it.content,
                 required = it.required,
                 startDate = it.startDate,
             )
         }
 
-        localTermDataSource.clearAndInsertTerms(termsEntity)
+        localTermDataSource.replaceTerms(termsEntity)
     }
 
-    override suspend fun getTerms(): Result<List<Term>> = suspendRunCatching {
-        localTermDataSource.getTerms()
+    override suspend fun getTerms(): Result<List<Term>> = runCatching {
+        localTermDataSource.retrieveTerms()
             .map(TermEntity::toDomain)
     }
 }
diff --git a/core/data/src/test/java/com/puzzle/data/repository/TermsRepositoryImplTest.kt b/core/data/src/test/java/com/puzzle/data/repository/TermsRepositoryImplTest.kt
@@ -48,15 +48,15 @@ class TermsRepositoryImplTest {
 
         coEvery { termDataSource.loadTerms() } returns
                 Result.success(LoadTermsResponse(listOf(invalidTerm, validTerm)))
-        coEvery { localTermDataSource.clearAndInsertTerms(any()) } just Runs
+        coEvery { localTermDataSource.replaceTerms(any()) } just Runs
 
         // when
         val result = termsRepository.loadTerms()
 
         // then
         assertTrue(result.isSuccess)
         coVerify(exactly = 1) {
-            localTermDataSource.clearAndInsertTerms(
+            localTermDataSource.replaceTerms(
                 match {
                     it.size == 1 && it.first().id == validTerm.termId
                 }
@@ -85,14 +85,14 @@ class TermsRepositoryImplTest {
         )
 
         coEvery { termDataSource.loadTerms() } returns Result.success(LoadTermsResponse(validTerms))
-        coEvery { localTermDataSource.clearAndInsertTerms(any()) } just Runs
+        coEvery { localTermDataSource.replaceTerms(any()) } just Runs
 
         // when
         termsRepository.loadTerms()
 
         // then
         coVerify(exactly = 1) {
-            localTermDataSource.clearAndInsertTerms(
+            localTermDataSource.replaceTerms(
                 match {
                     it.size == validTerms.size && it.all { entity ->
                         validTerms.any { term ->

diff --git a/core/database/src/androidTest/java/com/puzzle/database/dao/TermsDaoTest.kt b/core/database/src/androidTest/java/com/puzzle/database/dao/TermsDaoTest.kt
@@ -80,7 +80,7 @@ class TermsDaoTest {
         val expected = listOf(
             TermEntity(2, "새로운 약관", "새로운 내용", false, "2024-06-01T00:00:00".parseDateTime())
         )
-        termsDao.clearAndInsertTerms(*expected.toTypedArray())
+        termsDao.replaceTerms(*expected.toTypedArray())
         val actual = termsDao.getTerms()
 
         // then

diff --git a/core/database/src/main/java/com/puzzle/database/dao/TermsDao.kt b/core/database/src/main/java/com/puzzle/database/dao/TermsDao.kt
@@ -19,7 +19,7 @@ interface TermsDao {
     suspend fun clearTerms()
 
     @Transaction
-    suspend fun clearAndInsertTerms(vararg terms: TermEntity) {
+    suspend fun replaceTerms(vararg terms: TermEntity) {
         clearTerms()
         insertTerms(*terms)
     }

diff --git a/core/database/src/main/java/com/puzzle/database/model/terms/TermEntity.kt b/core/database/src/main/java/com/puzzle/database/model/terms/TermEntity.kt
@@ -16,7 +16,7 @@ data class TermEntity(
     @ColumnInfo(name = "start_date") val startDate: LocalDateTime,
 ) {
     fun toDomain() = Term(
-        termId = id,
+        id = id,
         title = title,
         content = content,
         required = required,

diff --git a/core/database/src/main/java/com/puzzle/database/source/term/LocalTermDataSource.kt b/core/database/src/main/java/com/puzzle/database/source/term/LocalTermDataSource.kt
@@ -9,7 +9,6 @@ import javax.inject.Singleton
 class LocalTermDataSource @Inject constructor(
     private val termsDao: TermsDao,
 ) {
-    suspend fun getTerms() = termsDao.getTerms()
-    suspend fun clearAndInsertTerms(terms: List<TermEntity>) =
-        termsDao.clearAndInsertTerms(*terms.toTypedArray())
+    suspend fun retrieveTerms() = termsDao.getTerms()
+    suspend fun replaceTerms(terms: List<TermEntity>) = termsDao.replaceTerms(*terms.toTypedArray())
 }
diff --git a/core/designsystem/src/main/java/com/puzzle/designsystem/component/TopBar.kt b/core/designsystem/src/main/java/com/puzzle/designsystem/component/TopBar.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Text
@@ -30,7 +31,9 @@ fun PieceMainTopBar(
 ) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
-        modifier = modifier,
+        modifier = modifier
+            .fillMaxWidth()
+            .height(60.dp),
     ) {
         Text(
             text = title,
@@ -54,7 +57,9 @@ fun PieceSubTopBar(
     Row(
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically,
-        modifier = modifier,
+        modifier = modifier
+            .fillMaxWidth()
+            .height(60.dp),
     ) {
         Image(
             painter = painterResource(R.drawable.ic_arrow_left),
@@ -78,7 +83,11 @@ fun PieceSubBackTopBar(
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    Box(modifier = modifier.fillMaxWidth()) {
+    Box(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(60.dp),
+    ) {
         Image(
             painter = painterResource(R.drawable.ic_arrow_left),
             contentDescription = "뒤로 가기 버튼",
@@ -105,7 +114,11 @@ fun PieceSubCloseTopBar(
     closeButtonEnabled: Boolean = true,
     contentColor: Color = PieceTheme.colors.black,
 ) {
-    Box(modifier = modifier.fillMaxWidth()) {
+    Box(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(60.dp),
+    ) {
         Text(
             text = title,
             style = PieceTheme.typography.headingSSB,
@@ -176,9 +189,7 @@ fun PreviewPieceSubTopBar() {
                     modifier = Modifier.size(32.dp),
                 )
             },
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(vertical = 20.dp),
+            modifier = Modifier.padding(vertical = 20.dp),
         )
     }
 }

diff --git a/core/designsystem/src/main/java/com/puzzle/designsystem/component/WebView.kt b/core/designsystem/src/main/java/com/puzzle/designsystem/component/WebView.kt
@@ -0,0 +1,36 @@
+package com.puzzle.designsystem.component
+
+import android.webkit.WebChromeClient
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.viewinterop.AndroidView
+
+@Composable
+fun PieceWebView(
+    url: String,
+    modifier: Modifier = Modifier,
+) {
+    val context = LocalContext.current
+    var webView by remember { mutableStateOf<WebView?>(null) }
+
+    AndroidView(
+        factory = {
+            webView = WebView(context).apply {
+                settings.javaScriptEnabled = true
+                webViewClient = object : WebViewClient() {}
+                webChromeClient = object : WebChromeClient() {}
+            }
+            webView!!
+        },
+        update = { it.loadUrl(url) },
+        onRelease = { webView?.destroy() },
+        modifier = modifier,
+    )
+}
diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!--Term-->
+    <string name="next">다음</string>
+    <string name="agree">동의하기</string>
+    <string name="all_term_agree">약관 전체 동의</string>
+
     <!--Matching-->
     <string name="matching_title">Matching</string>
     <string name="check_the_matching_pieces">매칭 조각을 확인해주세요!</string>

diff --git a/core/domain/src/main/java/com/puzzle/domain/model/terms/Term.kt b/core/domain/src/main/java/com/puzzle/domain/model/terms/Term.kt
@@ -3,7 +3,7 @@ package com.puzzle.domain.model.terms
 import java.time.LocalDateTime
 
 data class Term(
-    val termId: Int,
+    val id: Int,
     val title: String,
     val content: String,
     val required: Boolean,

diff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     id("piece.android.library")
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {

diff --git a/core/network/src/main/java/com/puzzle/network/model/terms/LoadTermsResponse.kt b/core/network/src/main/java/com/puzzle/network/model/terms/LoadTermsResponse.kt
@@ -23,7 +23,7 @@ data class TermResponse(
     val startDate: String?,
 ) {
     fun toDomain(): Term = Term(
-        termId = termId ?: UNKNOWN_INT,
+        id = termId ?: UNKNOWN_INT,
         title = title ?: UNKNOWN_STRING,
         content = content ?: UNKNOWN_STRING,
         required = required ?: false,

diff --git a/feature/auth/src/main/java/com/puzzle/auth/graph/registration/RegistrationDetailScreen.kt b/feature/auth/src/main/java/com/puzzle/auth/graph/registration/RegistrationDetailScreen.kt