modif structure projet

CineCool/app/src/main/java/fr/iut/cinecool/data/Stub.kt

@@ -1,13 +1,15 @@
-package fr.iut.cinecool.model
+package fr.iut.cinecool.data
 
-import android.graphics.drawable.Drawable
 import fr.iut.cinecool.R
+import fr.iut.cinecool.model.Cinema
+import fr.iut.cinecool.model.Movie
+import fr.iut.cinecool.model.Session
 import java.util.Date
 
-class Stub( var sessions:ArrayList<Session> = ArrayList(),var movies:ArrayList<Movie> = ArrayList(),var cinemas:ArrayList<Cinema> = ArrayList()) {
+class Stub(var sessions:ArrayList<Session> = ArrayList(), var movies:ArrayList<Movie> = ArrayList(), var cinemas:ArrayList<Cinema> = ArrayList()) {
     fun loading(){
         val date = Date(2023,3,12)
-        sessions.addAll(listOf(Session(0,date,14,16,"2A"),Session(1,date,4,6,"5B")))
+        sessions.addAll(listOf(Session(0,date,14,16,"2A"), Session(1,date,4,6,"5B")))
         movies.add(Movie(1,"trop bg",2,"Pas moi",2.0, R.drawable.no_pictures))
         movies.add(Movie(0,"Imitation Game",4,"Moi",3.0,R.drawable.imitation_game))
         cinemas.add(Cinema(0,12367,67894,"clf","CineJaude"))

CineCool/app/src/main/java/fr/iut/cinecool/fragments/CinemaFragment.kt

@@ -1,10 +1,11 @@
-package fr.iut.cinecool
+package fr.iut.cinecool.fragments
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import fr.iut.cinecool.R
 
 
 class CinemaFragment : Fragment() {

CineCool/app/src/main/java/fr/iut/cinecool/fragments/MovieDetailFragment.kt

@@ -1,4 +1,4 @@
-package fr.iut.cinecool
+package fr.iut.cinecool.fragments
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment

CineCool/app/src/main/java/fr/iut/cinecool/fragments/MoviesFragment.kt

@@ -1,6 +1,5 @@
-package fr.iut.cinecool
+package fr.iut.cinecool.fragments
 
-import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
@@ -10,9 +9,11 @@ import androidx.fragment.app.viewModels
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
+import fr.iut.cinecool.viewModel.MovieViewModel
+import fr.iut.cinecool.R
 import fr.iut.cinecool.adapter.MovieAdapter
 import fr.iut.cinecool.databinding.FragmentMoviesBinding
-import fr.iut.cinecool.model.cineViewModel
+import fr.iut.cinecool.viewModel.cineViewModel
 
 class MoviesFragment : Fragment() {
     private val sharedViewModel: cineViewModel by activityViewModels()

CineCool/app/src/main/java/fr/iut/cinecool/fragments/SessionFragment.kt

@@ -1,4 +1,4 @@
-package fr.iut.cinecool
+package fr.iut.cinecool.fragments
 
 import android.os.Bundle
 import android.text.method.ScrollingMovementMethod
@@ -6,16 +6,14 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.bumptech.glide.Glide
-import fr.iut.cinecool.API.Movie
+import fr.iut.cinecool.R
-import fr.iut.cinecool.databinding.FragmentSessionBinding
+import fr.iut.cinecool.viewModel.cineViewModel
-import fr.iut.cinecool.model.cineViewModel
 
 class SessionFragment : Fragment() {
     private val sharedViewModel: cineViewModel by activityViewModels()

CineCool/app/src/main/java/fr/iut/cinecool/viewModel/CineViewModel.kt

@@ -1,4 +1,4 @@
-package fr.iut.cinecool.model
+package fr.iut.cinecool.viewModel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.LiveData

CineCool/app/src/main/java/fr/iut/cinecool/viewModel/MovieViewModel.kt

@@ -1,4 +1,4 @@
-package fr.iut.cinecool
+package fr.iut.cinecool.viewModel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope

CineCool/app/src/main/res/layout/fragment_cinema.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".CinemaFragment">
+    tools:context=".fragments.CinemaFragment">
     <androidx.recyclerview.widget.RecyclerView
         android:layout_width="match_parent"
         android:layout_height="match_parent"

CineCool/app/src/main/res/layout/fragment_movies.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MoviesFragment">
+    tools:context=".fragments.MoviesFragment">
     <ImageView
         android:id="@+id/imageView"
         android:layout_width="66dp"

CineCool/app/src/main/res/layout/fragment_session.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SessionFragment">
+    tools:context=".fragments.SessionFragment">
 
     <ImageButton
         android:id="@+id/returnButton"

CineCool/app/src/main/res/navigation/nav_graph.xml

@@ -7,13 +7,13 @@
 
     <fragment
         android:id="@+id/CinemaFragment"
-        android:name="fr.iut.cinecool.CinemaFragment"
+        android:name="fr.iut.cinecool.fragments.CinemaFragment"
         android:label="Cinema Fragment"
         tools:layout="@layout/fragment_cinema"/>
 
     <fragment
         android:id="@+id/fragment_movies"
-        android:name="fr.iut.cinecool.MoviesFragment"
+        android:name="fr.iut.cinecool.fragments.MoviesFragment"
         android:label="@string/first_fragment_label"
         tools:layout="@layout/fragment_movies">
 
@@ -28,7 +28,7 @@
 
     <fragment
         android:id="@+id/SessionFragment"
-        android:name="fr.iut.cinecool.SessionFragment"
+        android:name="fr.iut.cinecool.fragments.SessionFragment"
         android:label="SessionFragment"
         tools:layout="@layout/fragment_session">
         <action