diff --git a/Aos/.idea/deploymentTargetDropDown.xml b/Aos/.idea/deploymentTargetDropDown.xml
index 5d418bc..a682024 100644
--- a/Aos/.idea/deploymentTargetDropDown.xml
+++ b/Aos/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/global/restaurant_add/AddMyRestaurantFragment.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/global/restaurant_add/AddMyRestaurantFragment.kt
index 82c48f0..3a171c2 100644
--- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/global/restaurant_add/AddMyRestaurantFragment.kt
+++ b/Aos/app/src/main/java/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(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/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/global/restaurant_detail/RestaurantDetailFragment.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/global/restaurant_detail/RestaurantDetailFragment.kt
index 908766b..224a134 100644
--- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/global/restaurant_detail/RestaurantDetailFragment.kt
+++ b/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/global/restaurant_detail/RestaurantDetailFragment.kt
@@ -2,6 +2,7 @@ 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
@@ -9,7 +10,7 @@ import com.avengers.nibobnebob.presentation.base.BaseFragment
import com.avengers.nibobnebob.presentation.ui.main.MainViewModel
class RestaurantDetailFragment : BaseFragment(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
index 8e1b112..f318ac8 100644
--- 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(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
index 77bdac1..2d010df 100644
--- 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
index 6937480..4ac1055 100644
--- 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"