[feat/backstack_after_register]: 맛집 등록 후 백스택 정리

team-JMT · Sep 23, 2023 · 922a45b · 922a45b
1 parent b7c2655
commit 922a45b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 24 deletions.
diff --git a/...main/java/org/gdsc/presentation/view/restaurantregistration/RegisterRestaurantFragment.kt b/...main/java/org/gdsc/presentation/view/restaurantregistration/RegisterRestaurantFragment.kt
@@ -1,6 +1,5 @@
 package org.gdsc.presentation.view.restaurantregistration
 
-import android.content.Intent
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.LayoutInflater
@@ -34,7 +33,6 @@ import org.gdsc.presentation.utils.animateShrinkWidth
 import org.gdsc.presentation.utils.checkMediaPermissions
 import org.gdsc.presentation.view.MainActivity
 import org.gdsc.presentation.view.WEB_BASE_URL
-import org.gdsc.presentation.view.WebViewActivity
 import org.gdsc.presentation.view.custom.FoodCategoryBottomSheetDialog
 import org.gdsc.presentation.view.restaurantregistration.adapter.RegisterRestaurantAdapter
 import org.gdsc.presentation.view.restaurantregistration.viewmodel.RegisterRestaurantViewModel
@@ -224,24 +222,24 @@ class RegisterRestaurantFragment : BaseFragment() {
 
                                 sUri.toUri()
                                     .getCompressedBitmapFromUri(context)
-                                    ?.saveBitmapToFile(context, "$index.jpg")?.let {  imageFile ->
+                                    ?.saveBitmapToFile(context, "$index.jpg")?.let { imageFile ->
 
-                                    val requestFile =
-                                        RequestBody.create(
-                                            MediaType.parse("image/png"),
-                                            imageFile
-                                        )
+                                        val requestFile =
+                                            RequestBody.create(
+                                                MediaType.parse("image/png"),
+                                                imageFile
+                                            )
 
-                                    val body =
-                                        MultipartBody.Part.createFormData(
-                                            "pictures",
-                                            imageFile.name,
-                                            requestFile
-                                        )
+                                        val body =
+                                            MultipartBody.Part.createFormData(
+                                                "pictures",
+                                                imageFile.name,
+                                                requestFile
+                                            )
 
-                                    pictures.add(body)
+                                        pictures.add(body)
 
-                                }
+                                    }
 
                             }
 
@@ -251,15 +249,12 @@ class RegisterRestaurantFragment : BaseFragment() {
                                     navArgs.restaurantLocationInfo ?: throw Exception()
                                 ) { restaurantId ->
 
-                                    val intent =
-                                        Intent(requireContext(), WebViewActivity::class.java)
-
-                                    // 주소는 변경 되어야 함, 현재는 Lucy LocalHost 테스트
-                                    intent.putExtra(
-                                        "url",
-                                        "${WEB_BASE_URL}detail/$restaurantId"
+                                    findNavController().navigate(
+                                        RegisterRestaurantFragmentDirections
+                                            .actionRegisterRestaurantFragmentToSpecificWebViewFragment(
+                                                "${WEB_BASE_URL}detail/$restaurantId"
+                                            )
                                     )
-                                    startActivity(intent)
                                 }
                             }
                         } else {

diff --git a/presentation/src/main/res/navigation/main_nav_graph.xml b/presentation/src/main/res/navigation/main_nav_graph.xml
@@ -80,6 +80,10 @@
         <action
             android:id="@+id/action_registerRestaurantFragment_to_multiImagePickerFragment"
             app:destination="@id/multiImagePicker_fragment"/>
+        <action
+            android:id="@+id/action_registerRestaurant_fragment_to_specificWebViewFragment"
+            app:destination="@id/specificWebViewFragment"
+            app:popUpTo="@id/home_fragment"/>
 
     </fragment>
     <fragment
@@ -135,5 +139,13 @@
         tools:layout="@layout/fragment_account_management">
 
     </fragment>
+    <fragment
+        android:id="@+id/specificWebViewFragment"
+        android:name="org.gdsc.presentation.view.webview.SpecificWebViewFragment"
+        android:label="SpecificWebViewFragment">
+        <argument
+            android:name="url"
+            app:argType="string" />
+    </fragment>
 
 </navigation>