#68 feat : home 화면간 navigate test

Co-authored-by: plashdof <[email protected]> Co-authored-by: BENDENG1 <[email protected]>
boostcampwm2023 · Nov 21, 2023 · f303be1 · f303be1
1 parent d5c3abb
commit f303be1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/Aos/.idea/deploymentTargetDropDown.xml b/Aos/.idea/deploymentTargetDropDown.xml
diff --git a/.../com/avengers/nibobnebob/presentation/ui/global/restaurant_add/AddMyRestaurantFragment.kt b/.../com/avengers/nibobnebob/presentation/ui/global/restaurant_add/AddMyRestaurantFragment.kt
@@ -2,6 +2,7 @@ package com.avengers.nibobnebob.presentation.ui.global.restaurant_add
 
 import android.os.Bundle
 import android.view.View
+import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import com.avengers.nibobnebob.R
 import com.avengers.nibobnebob.databinding.FragmentAddMyRestaurantBinding
@@ -10,7 +11,7 @@ import com.avengers.nibobnebob.presentation.ui.main.MainViewModel
 
 class AddMyRestaurantFragment : BaseFragment<FragmentAddMyRestaurantBinding>(R.layout.fragment_add_my_restaurant) {
 
- override val parentViewModel: MainViewModel by viewModels()
+ override val parentViewModel: MainViewModel by activityViewModels()
 
  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
  super.onViewCreated(view, savedInstanceState)

diff --git a/.../avengers/nibobnebob/presentation/ui/global/restaurant_detail/RestaurantDetailFragment.kt b/.../avengers/nibobnebob/presentation/ui/global/restaurant_detail/RestaurantDetailFragment.kt
@@ -2,14 +2,15 @@ package com.avengers.nibobnebob.presentation.ui.global.restaurant_detail
 
 import android.os.Bundle
 import android.view.View
+import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import com.avengers.nibobnebob.R
 import com.avengers.nibobnebob.databinding.FragmentRestaurantDetailBinding
 import com.avengers.nibobnebob.presentation.base.BaseFragment
 import com.avengers.nibobnebob.presentation.ui.main.MainViewModel
 
 class RestaurantDetailFragment : BaseFragment<FragmentRestaurantDetailBinding>(R.layout.fragment_restaurant_detail) {
- override val parentViewModel: MainViewModel by viewModels()
+ override val parentViewModel: MainViewModel by activityViewModels()
 
  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
  super.onViewCreated(view, savedInstanceState)

diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/HomeFragment.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/HomeFragment.kt
@@ -16,6 +16,9 @@ import androidx.databinding.BindingAdapter
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.navigation.NavController
+import androidx.navigation.NavDirections
+import androidx.navigation.fragment.findNavController
+import com.avengers.nibobnebob.NavGraphDirections
 import com.avengers.nibobnebob.R
 import com.avengers.nibobnebob.databinding.FragmentHomeBinding
 import com.avengers.nibobnebob.presentation.base.BaseFragment
@@ -191,16 +194,27 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home),
  }
 
  private fun addRestaurantTest(test: Int) {
-
+ findNavController().toAddRestaurant()
  }
 
  private fun goReviewTest(test: Int) {
+ findNavController().toSearchRestaurant()
+ }
 
+ private fun NavController.toAddRestaurant(){
+ val action = NavGraphDirections.globalToAddMyRestaurantFragment()
+ navigate(action)
+ }
+
+ private fun NavController.toSearchRestaurant(){
+ val action = HomeFragmentDirections.actionHomeFragmentToRestaurantSearchFragment()
+ navigate(action)
  }
 
 
 }
 
+
 @BindingAdapter("trackingBtnDrawable")
 fun bindTrackingBtnDrawable(btn: ImageButton, state: TrackingState) {
  when (state) {

diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/BottomSheetManager.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/BottomSheetManager.kt
@@ -23,6 +23,7 @@ internal fun restaurantSheet(
 
  binding.btnAddMyRestaurant.setOnClickListener {
  onClickAddMyRestaurant(restaurantId)
+ dialog.dismiss()
  }
 
  binding.btnAddWishRestaurant.setOnClickListener {
@@ -41,6 +42,7 @@ internal fun restaurantSheet(
 
  binding.btnGoReview.setOnClickListener {
  onClickGoReview(restaurantId)
+ dialog.dismiss()
  }
 
  return dialog

diff --git a/Aos/app/src/main/res/layout/fragment_restaurant_search.xml b/Aos/app/src/main/res/layout/fragment_restaurant_search.xml
@@ -16,7 +16,6 @@
  android:id="@+id/ib_back"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:background="transparent"
  android:layout_marginStart="20dp"
  android:src="@drawable/ic_back"
  app:layout_constraintBottom_toBottomOf="@id/searchBar"