Fixes

majorkik · Dec 31, 2020 · 3759534 · 3759534
1 parent f75e75a
commit 3759534
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/.../majorik/moviebox/feature/details/presentation/movieDetails/MovieDetailsDialogFragment.kt b/.../majorik/moviebox/feature/details/presentation/movieDetails/MovieDetailsDialogFragment.kt
@@ -2,6 +2,7 @@ package com.majorik.moviebox.feature.details.presentation.movieDetails
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.Observer
@@ -81,6 +82,7 @@ class MovieDetailsDialogFragment : DialogFragment(R.layout.dialog_fragment_movie
             "images,credits,videos",
             "ru,en,null"
         )
+
         setClickListeners()
 
         observe(viewModel.stateLiveData, stateObserver)
@@ -107,23 +109,15 @@ class MovieDetailsDialogFragment : DialogFragment(R.layout.dialog_fragment_movie
     }
 
     private fun setClickListeners() {
-        viewBinding.layoutMovieDetails.toggleFavorite.setOnClickListener {
-            viewModel.markMovieIsFavorite(viewBinding.layoutMovieDetails.toggleFavorite.isChecked)
-        }
+        viewBinding.run {
+            layoutMovieDetails.toggleFavorite.setOnClickListener { viewModel.markMovieIsFavorite(layoutMovieDetails.toggleFavorite.isChecked) }
 
-        viewBinding.layoutMovieDetails.toggleWatchlist.setOnClickListener {
-            viewModel.addMovieToWatchlist(viewBinding.layoutMovieDetails.toggleWatchlist.isChecked)
-        }
+            layoutMovieDetails.toggleWatchlist.setOnClickListener { viewModel.addMovieToWatchlist(layoutMovieDetails.toggleWatchlist.isChecked) }
 
-        viewBinding.btnExtraMenu.setSafeOnClickListener {
-            openExtraMenuDialog()
-        }
+            btnExtraMenu.setSafeOnClickListener { openExtraMenuDialog() }
 
-        viewBinding.bottomBar.setSafeOnClickListener {
-            openWatchOnlineDialog()
-        }
+            bottomBar.setSafeOnClickListener { openWatchOnlineDialog() }
 
-        viewBinding.run {
             btnRefresh.setSafeOnClickListener {
                 viewModel.fetchMovieDetails(
                     args.id,
@@ -136,13 +130,11 @@ class MovieDetailsDialogFragment : DialogFragment(R.layout.dialog_fragment_movie
     }
 
     private fun openWatchOnlineDialog() {
-        val watchOnlineDialog = WatchOnlineDialog()
-        watchOnlineDialog.show(childFragmentManager, "watch_online_dialog")
+        findNavController().navigate(R.id.dialog_watch_online)
     }
 
     private fun openExtraMenuDialog() {
-        val extraMenuBottomDialog = MovieExtraMenuBottomDialog()
-        extraMenuBottomDialog.show(childFragmentManager, "extra_menu_dialog")
+        findNavController().navigate(R.id.dialog_movie_extras)
     }
 
     private fun setClickListenerForImages(images: Images) {

diff --git a/feature_details/src/main/res/navigation/navigation_movie_details.xml b/feature_details/src/main/res/navigation/navigation_movie_details.xml
@@ -84,4 +84,14 @@
                 app:nullable="false" />
         </action>
     </dialog>
+
+    <dialog
+        android:id="@+id/dialog_watch_online"
+        android:name="com.majorik.moviebox.feature.details.presentation.watch_online.WatchOnlineDialog"
+        tools:layout="@layout/dialog_watch_online" />
+
+    <dialog
+        android:id="@+id/dialog_movie_extras"
+        android:name="com.majorik.moviebox.feature.details.presentation.watch_online.WatchOnlineDialog"
+        tools:layout="@layout/dialog_watch_online" />
 </navigation>