Merge pull request #54 from Nexters/fix/navigate-back

웹뷰에서 뒤로가기 브릿지 호출 시 페이지 내에서 뒤로 갈 수 있으면 뒤로 가도록 처리합니다.

Author: eshc123

feature/proposal-detail/src/main/java/com/plottwist/feature/proposal_detail/ProposalDetailScreen.kt

@@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
@@ -17,6 +18,7 @@ import com.plottwist.core.ui.component.TopAppBarCloseButton
 import com.plottwist.core.ui.web.component.BRIDGE_NAME
 import com.plottwist.core.ui.web.component.DefaultBridge
 import com.plottwist.core.ui.web.component.TukWebView
+import kotlinx.coroutines.launch
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 
@@ -28,6 +30,7 @@ fun ProposalDetailScreen(
 ) {
     val state by viewModel.collectAsState()
     var webView by remember { mutableStateOf<WebView?>(null) }
+    val coroutineScope = rememberCoroutineScope()
 
     viewModel.collectSideEffect {
         when (it) {
@@ -43,7 +46,15 @@ fun ProposalDetailScreen(
     ProposalDetailScreen(
         modifier = modifier,
         proposalId = state.proposalId,
-        onBackClick = { viewModel.handleAction(ProposalDetailAction.ClickBack) },
+        onBackClick = {
+            coroutineScope.launch {
+                if (webView?.canGoBack() == true) {
+                    webView?.goBack()
+                } else {
+                    viewModel.handleAction(ProposalDetailAction.ClickBack)
+                }
+            }
+        },
         onPageFinished = {
 
         },

feature/webview/src/main/java/com/plottwist/feature/webview/WebViewScreen.kt

@@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
@@ -17,6 +18,7 @@ import com.plottwist.core.designsystem.component.TukTopAppBarType
 import com.plottwist.core.ui.web.component.BRIDGE_NAME
 import com.plottwist.core.ui.web.component.DefaultBridge
 import com.plottwist.core.ui.web.component.TukWebView
+import kotlinx.coroutines.launch
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 
@@ -28,6 +30,7 @@ fun WebViewScreen(
 ) {
     val state by viewModel.collectAsState()
     var webView : WebView? by remember { mutableStateOf(null) }
+    val coroutineScope = rememberCoroutineScope()
 
     viewModel.collectSideEffect { sideEffect ->
         when (sideEffect) {
@@ -57,7 +60,15 @@ fun WebViewScreen(
 
     WebViewScreen(
         modifier = modifier,
-        onBackClick = { viewModel.handleAction(WebViewAction.ClickBack) },
+        onBackClick = {
+            coroutineScope.launch {
+                if (webView?.canGoBack() == true) {
+                    webView?.goBack()
+                } else {
+                    viewModel.handleAction(WebViewAction.ClickBack)
+                }
+            }
+        },
         onWebViewCreated = {
             webView = it
         },