Merge pull request #50 from Nexters/feature/add-proposal-detail-deeplink

eshc123 · web-flow · commit a571929d4fc4 · 2025-08-17T02:03:28.000+09:00
모임 초대장 상세 화면 딥링크를 연결합니다.
diff --git a/core/ui-navigation/src/main/java/com/plottwist/core/ui/navigation/Route.kt b/core/ui-navigation/src/main/java/com/plottwist/core/ui/navigation/Route.kt
@@ -86,4 +86,9 @@ sealed interface Route {
 
     @Serializable
     data object EditName : Route
+
+    @Serializable
+    data class ProposalDetail(
+        val proposalId: Long
+    ) : Route
 }
diff --git a/core/ui/src/main/java/com/plottwist/core/ui/web/client/TukWebViewClient.kt b/core/ui/src/main/java/com/plottwist/core/ui/web/client/TukWebViewClient.kt
@@ -1,4 +1,4 @@
-package com.plottwist.feature.webview.client
+package com.plottwist.core.ui.web.client
 
 import android.webkit.WebView
 import android.webkit.WebViewClient
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
@@ -1,12 +1,12 @@
-package com.plottwist.feature.webview.component
+package com.plottwist.core.ui.web.component
 
 import android.annotation.SuppressLint
 import android.view.ViewGroup
 import android.webkit.WebView
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.viewinterop.AndroidView
-import com.plottwist.feature.webview.client.TukWebViewClient
+import com.plottwist.core.ui.web.client.TukWebViewClient
 
 @SuppressLint("SetJavaScriptEnabled")
 @Composable
@@ -26,6 +26,10 @@ fun TukWebView(
                     ViewGroup.LayoutParams.MATCH_PARENT
                 )
 
+                webViewClient = TukWebViewClient(
+                    onPageFinished = onPageFinished
+                )
+
                 settings.run {
                     javaScriptEnabled = true
                     domStorageEnabled = true
@@ -37,10 +41,6 @@ fun TukWebView(
                     setInitialScale(1)
                 }
 
-                webViewClient = TukWebViewClient(
-                    onPageFinished = onPageFinished
-                )
-
                 addBridge(this)
 
                 onWebViewCreated(this)
diff --git a/feature/main/build.gradle.kts b/feature/main/build.gradle.kts
@@ -18,6 +18,7 @@ dependencies {
     implementation(project(":feature:webview"))
     implementation(project(":feature:invite_gathering"))
     implementation(project(":feature:join_gathering"))
+    implementation(project(":feature:proposal-detail"))
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.espresso.core)
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
@@ -1,9 +1,11 @@
 package com.plottwist.feature.main
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.core.net.toUri
 import com.plottwist.feature.main.ui.theme.TukTheme
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -13,6 +15,7 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
 
+        handleDeepLink(intent)
         setComposeContent()
     }
 
@@ -24,6 +27,16 @@ class MainActivity : ComponentActivity() {
         }
     }
 
+    private fun handleDeepLink(
+        intent: Intent,
+    ) {
+        val deepLink = intent.extras?.getString("deepLink") ?: return
+
+        startActivity(Intent(Intent.ACTION_VIEW).apply {
+            data = deepLink.toUri()
+        })
+    }
+
     companion object {
         const val NOTIFICATION_REQUEST_CODE = 0
     }
diff --git a/feature/main/src/main/java/com/plottwist/feature/main/ui/component/TukNavHost.kt b/feature/main/src/main/java/com/plottwist/feature/main/ui/component/TukNavHost.kt
@@ -35,6 +35,7 @@ import com.plottwist.feature.proposal_create.navigation.navigateToCreateGatherin
 import com.plottwist.feature.proposal_create.navigation.navigateToCreateProposal
 import com.plottwist.feature.proposal_create.navigation.navigateToSelectGathering
 import com.plottwist.feature.proposal_create.navigation.selectGatheringNavGraph
+import com.plottwist.feature.proposal_detail.navigation.proposalDetailNavGraph
 import com.plottwist.feature.webview.navigation.navigateToWebView
 import com.plottwist.feature.webview.navigation.webViewNavGraph
 import com.plottwist.invite_gathering.navigation.inviteGatheringNavGraph
@@ -263,5 +264,10 @@ fun TukNavHost(
                 navController.popBackStack()
             }
         )
+        proposalDetailNavGraph(
+            onBack = {
+                navController.popBackStack()
+            }
+        )
     }
 }
diff --git a/feature/proposal-detail/.gitignore b/feature/proposal-detail/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/feature/proposal-detail/build.gradle.kts b/feature/proposal-detail/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+    alias(libs.plugins.tuk.android.library)
+    alias(libs.plugins.tuk.feature)
+}
+
+android {
+    namespace = "com.plottwist.feature.proposal_detail"
+}
+
+dependencies {
+    implementation(project(":core:weburl"))
+
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.espresso.core)
+}
diff --git a/feature/proposal-detail/consumer-rules.pro b/feature/proposal-detail/consumer-rules.pro
diff --git a/feature/proposal-detail/proguard-rules.pro b/feature/proposal-detail/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/feature/proposal-detail/src/androidTest/java/com/plottwist/feature/proposal_detail/ExampleInstrumentedTest.kt b/feature/proposal-detail/src/androidTest/java/com/plottwist/feature/proposal_detail/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.plottwist.feature.proposal_detail
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.plottwist.feature.proposal_detail.test", appContext.packageName)
+    }
+}
diff --git a/feature/proposal-detail/src/main/AndroidManifest.xml b/feature/proposal-detail/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
diff --git a/feature/proposal-detail/src/main/java/com/plottwist/feature/proposal_detail/ProposalDetailContract.kt b/feature/proposal-detail/src/main/java/com/plottwist/feature/proposal_detail/ProposalDetailContract.kt
@@ -0,0 +1,19 @@
+package com.plottwist.feature.proposal_detail
+
+data class ProposalDetailState(
+    val isLoading: Boolean = false,
+    val proposalId: Long? = null
+)
+
+sealed class ProposalDetailAction {
+    data object ClickBack : ProposalDetailAction()
+    data object ClickAccept : ProposalDetailAction()
+    data object ClickReject : ProposalDetailAction()
+}
+
+sealed class ProposalDetailSideEffect {
+    data object NavigateBack : ProposalDetailSideEffect()
+    data object ProposalAccepted : ProposalDetailSideEffect()
+    data object ProposalRejected : ProposalDetailSideEffect()
+    data class ShowToast(val message: String) : ProposalDetailSideEffect()
+}
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
@@ -0,0 +1,101 @@
+package com.plottwist.feature.proposal_detail
+
+import android.webkit.WebView
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+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.tooling.preview.Preview
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.plottwist.core.designsystem.component.TukTopAppBar
+import com.plottwist.core.designsystem.component.TukTopAppBarType
+import com.plottwist.core.ui.component.TopAppBarCloseButton
+import com.plottwist.core.ui.component.TukScaffold
+import com.plottwist.core.ui.web.component.TukWebView
+import org.orbitmvi.orbit.compose.collectAsState
+import org.orbitmvi.orbit.compose.collectSideEffect
+
+@Composable
+fun ProposalDetailScreen(
+    onBack: () -> Unit,
+    modifier: Modifier = Modifier,
+    viewModel: ProposalDetailViewModel = hiltViewModel(),
+) {
+    val state by viewModel.collectAsState()
+    var webView by remember { mutableStateOf<WebView?>(null) }
+
+    viewModel.collectSideEffect {
+        when (it) {
+            ProposalDetailSideEffect.NavigateBack -> {
+                onBack()
+            }
+            ProposalDetailSideEffect.ProposalAccepted -> { /* Handle accepted */ }
+            ProposalDetailSideEffect.ProposalRejected -> { /* Handle rejected */ }
+            is ProposalDetailSideEffect.ShowToast -> { /* Show toast */ }
+        }
+    }
+
+    ProposalDetailScreen(
+        modifier = modifier,
+        proposalId = state.proposalId,
+        onBackClick = { viewModel.handleAction(ProposalDetailAction.ClickBack) },
+        onPageFinished = {
+
+        },
+        onWebViewCreated = {
+            webView = it
+        }
+    )
+}
+
+@Composable
+private fun ProposalDetailScreen(
+    proposalId: Long?,
+    onBackClick: () -> Unit,
+    onWebViewCreated : (WebView) -> Unit,
+    onPageFinished: (webView: WebView) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier.fillMaxSize()
+    ) {
+        ProposalDetailAppBar(
+            onBackClick = onBackClick,
+        )
+        TukWebView(
+            url = "https://www.tuk.kr/proposal/${proposalId}/detail",
+            onWebViewCreated = onWebViewCreated,
+            onPageFinished = onPageFinished,
+        )
+    }
+}
+
+@Composable
+fun ProposalDetailAppBar(
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    TukTopAppBar(
+        modifier = modifier,
+        actionButtons = {
+            TopAppBarCloseButton(
+                onCloseClicked = onBackClick
+            )
+        }
+    )
+}
+
+@Preview
+@Composable
+private fun ProposalDetailScreenPreview() {
+    ProposalDetailScreen(
+        proposalId = 123L,
+        onBackClick = {},
+        onWebViewCreated = {},
+        onPageFinished = {},
+    )
+}
diff --git a/feature/proposal-detail/src/main/java/com/plottwist/feature/proposal_detail/ProposalDetailViewModel.kt b/feature/proposal-detail/src/main/java/com/plottwist/feature/proposal_detail/ProposalDetailViewModel.kt
@@ -0,0 +1,50 @@
+package com.plottwist.feature.proposal_detail
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.navigation.toRoute
+import com.plottwist.core.ui.navigation.Route
+import dagger.hilt.android.lifecycle.HiltViewModel
+import org.orbitmvi.orbit.ContainerHost
+import org.orbitmvi.orbit.viewmodel.container
+import javax.inject.Inject
+
+@HiltViewModel
+class ProposalDetailViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle
+) : ContainerHost<ProposalDetailState, ProposalDetailSideEffect>, ViewModel() {
+
+    override val container = container<ProposalDetailState, ProposalDetailSideEffect>(ProposalDetailState(
+        proposalId = savedStateHandle.toRoute<Route.ProposalDetail>().proposalId
+    ))
+
+    fun handleAction(action: ProposalDetailAction) {
+        when (action) {
+            ProposalDetailAction.ClickBack -> {
+                navigateBack()
+            }
+            ProposalDetailAction.ClickAccept -> {
+                acceptProposal()
+            }
+            ProposalDetailAction.ClickReject -> {
+                rejectProposal()
+            }
+        }
+    }
+
+    private fun navigateBack() = intent {
+        postSideEffect(ProposalDetailSideEffect.NavigateBack)
+    }
+
+    private fun acceptProposal() = intent {
+        // TODO: Implement actual accept logic
+        postSideEffect(ProposalDetailSideEffect.ProposalAccepted)
+        postSideEffect(ProposalDetailSideEffect.ShowToast("제안이 수락되었습니다."))
+    }
+
+    private fun rejectProposal() = intent {
+        // TODO: Implement actual reject logic
+        postSideEffect(ProposalDetailSideEffect.ProposalRejected)
+        postSideEffect(ProposalDetailSideEffect.ShowToast("제안이 거절되었습니다."))
+    }
+}
diff --git a/feature/proposal-detail/src/main/java/com/plottwist/feature/proposal_detail/navigation/ProposalDetailNavigation.kt b/feature/proposal-detail/src/main/java/com/plottwist/feature/proposal_detail/navigation/ProposalDetailNavigation.kt
@@ -0,0 +1,35 @@
+package com.plottwist.feature.proposal_detail.navigation
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavOptions
+import androidx.navigation.compose.composable
+import androidx.navigation.navDeepLink
+import com.plottwist.core.ui.navigation.Route
+import com.plottwist.feature.proposal_detail.ProposalDetailScreen
+
+fun NavController.navigateToProposalDetail(
+    proposalId: Long,
+    navOptions: NavOptions? = null
+) {
+    this.navigate(route = Route.ProposalDetail(proposalId), navOptions = navOptions)
+}
+
+fun NavGraphBuilder.proposalDetailNavGraph(
+    onBack: () -> Unit,
+) {
+    composable<Route.ProposalDetail> (
+        deepLinks = listOf(
+            navDeepLink<Route.ProposalDetail>(
+                basePath = "https://tuk/proposal-detail"
+            ),
+            navDeepLink<Route.ProposalDetail>(
+                basePath = "tuk-app://tuk/proposal-detail"
+            )
+        ),
+    ) {
+        ProposalDetailScreen(
+            onBack = onBack
+        )
+    }
+}
diff --git a/feature/proposal-detail/src/test/java/com/plottwist/feature/proposal_detail/ExampleUnitTest.kt b/feature/proposal-detail/src/test/java/com/plottwist/feature/proposal_detail/ExampleUnitTest.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/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -86,4 +86,9 @@ sealed interface Route {`
`86`	`86`
`87`	`87`	`@Serializable`
`88`	`88`	`data object EditName : Route`
	`89`	`+`
	`90`	`+ @Serializable`
	`91`	`+ data class ProposalDetail(`
	`92`	`+ val proposalId: Long`
	`93`	`+ ) : Route`
`89`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.plottwist.feature.webview.client`
	`1`	`+package com.plottwist.core.ui.web.client`
`2`	`2`
`3`	`3`	`import android.webkit.WebView`
`4`	`4`	`import android.webkit.WebViewClient`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ import com.plottwist.feature.proposal_create.navigation.navigateToCreateGatherin`
`35`	`35`	`import com.plottwist.feature.proposal_create.navigation.navigateToCreateProposal`
`36`	`36`	`import com.plottwist.feature.proposal_create.navigation.navigateToSelectGathering`
`37`	`37`	`import com.plottwist.feature.proposal_create.navigation.selectGatheringNavGraph`
	`38`	`+import com.plottwist.feature.proposal_detail.navigation.proposalDetailNavGraph`
`38`	`39`	`import com.plottwist.feature.webview.navigation.navigateToWebView`
`39`	`40`	`import com.plottwist.feature.webview.navigation.webViewNavGraph`
`40`	`41`	`import com.plottwist.invite_gathering.navigation.inviteGatheringNavGraph`
`@@ -263,5 +264,10 @@ fun TukNavHost(`
`263`	`264`	`navController.popBackStack()`
`264`	`265`	`}`
`265`	`266`	`)`
	`267`	`+ proposalDetailNavGraph(`
	`268`	`+ onBack = {`
	`269`	`+ navController.popBackStack()`
	`270`	`+ }`
	`271`	`+ )`
`266`	`272`	`}`
`267`	`273`	`}`