diff --git a/CineCool/app/src/main/java/fr/iut/cinecool/MoviesFragment.kt b/CineCool/app/src/main/java/fr/iut/cinecool/MoviesFragment.kt index eede28b..b6e0455 100644 --- a/CineCool/app/src/main/java/fr/iut/cinecool/MoviesFragment.kt +++ b/CineCool/app/src/main/java/fr/iut/cinecool/MoviesFragment.kt @@ -6,17 +6,12 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Button import androidx.fragment.app.viewModels -import android.widget.LinearLayout import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView import fr.iut.cinecool.adapter.MovieAdapter import fr.iut.cinecool.databinding.FragmentMoviesBinding -import fr.iut.cinecool.model.Movie -import fr.iut.cinecool.model.Stub import fr.iut.cinecool.model.cineViewModel class MoviesFragment : Fragment() { @@ -39,10 +34,6 @@ class MoviesFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - binding.button.setOnClickListener { - findNavController().navigate(R.id.movies_to_sessions) - } - initRecyclerView() // Observe les changements des données des films populaires @@ -62,14 +53,7 @@ class MoviesFragment : Fragment() { movieAdapter = MovieAdapter(ArrayList()) binding.recyclerMovie.adapter = movieAdapter movieAdapter.onItemClick = { - /*val fragment = SessionFragment() - fragment.arguments = Bundle().apply { - putParcelable("movie",it) - }*/ - - sharedViewModel.setCine(it) - findNavController().navigate(R.id.movies_to_sessions) } diff --git a/CineCool/app/src/main/java/fr/iut/cinecool/SessionFragment.kt b/CineCool/app/src/main/java/fr/iut/cinecool/SessionFragment.kt index 742f0b4..09acc35 100644 --- a/CineCool/app/src/main/java/fr/iut/cinecool/SessionFragment.kt +++ b/CineCool/app/src/main/java/fr/iut/cinecool/SessionFragment.kt @@ -1,6 +1,7 @@ package fr.iut.cinecool import android.os.Bundle +import android.text.method.ScrollingMovementMethod import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View @@ -8,10 +9,14 @@ import android.view.ViewGroup import android.widget.Button import android.widget.ImageButton import android.widget.TextView +import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController import fr.iut.cinecool.API.Movie +import fr.iut.cinecool.databinding.FragmentSessionBinding +import fr.iut.cinecool.model.cineViewModel class SessionFragment : Fragment() { + private val sharedViewModel: cineViewModel by activityViewModels() override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -29,11 +34,11 @@ class SessionFragment : Fragment() { } } private fun init() { - val movie = arguments?.getParcelable("movie") - if(movie!=null){ - requireView().findViewById(R.id.title).text=movie.title - requireView().findViewById(R.id.description).text=movie.overview - //requireView().findViewById(R.id.afficheFilm).setText()=movie.poster_path - } + requireView().findViewById(R.id.title).text= sharedViewModel.cine.value!!.title + val desc = requireView().findViewById(R.id.description) + desc.text=sharedViewModel.cine.value!!.overview + desc.isScrollContainer = true + desc.movementMethod = ScrollingMovementMethod() + //requireView().findViewById(R.id.afficheFilm).setText()=movie.poster_path } } \ No newline at end of file diff --git a/CineCool/app/src/main/res/layout/fragment_movies.xml b/CineCool/app/src/main/res/layout/fragment_movies.xml index 56b51a7..79b87c9 100644 --- a/CineCool/app/src/main/res/layout/fragment_movies.xml +++ b/CineCool/app/src/main/res/layout/fragment_movies.xml @@ -6,15 +6,6 @@ android:layout_height="match_parent" tools:context=".MoviesFragment"> -