From 3db51c3cb0a91d624a230f274dca29f32237d221 Mon Sep 17 00:00:00 2001
From: louwar <loup6378@gmail.com>
Date: Fri, 7 Apr 2023 09:45:25 +0200
Subject: [PATCH] modif structure projet

---
 .../main/java/fr/iut/cinecool/{model => data}/Stub.kt  | 10 ++++++----
 .../fr/iut/cinecool/{ => fragments}/CinemaFragment.kt  |  3 ++-
 .../cinecool/{ => fragments}/MovieDetailFragment.kt    |  2 +-
 .../fr/iut/cinecool/{ => fragments}/MoviesFragment.kt  |  7 ++++---
 .../fr/iut/cinecool/{ => fragments}/SessionFragment.kt |  8 +++-----
 .../cineViewModel.kt => viewModel/CineViewModel.kt}    |  2 +-
 .../fr/iut/cinecool/{ => viewModel}/MovieViewModel.kt  |  2 +-
 CineCool/app/src/main/res/layout/fragment_cinema.xml   |  2 +-
 CineCool/app/src/main/res/layout/fragment_movies.xml   |  2 +-
 CineCool/app/src/main/res/layout/fragment_session.xml  |  2 +-
 CineCool/app/src/main/res/navigation/nav_graph.xml     |  6 +++---
 11 files changed, 24 insertions(+), 22 deletions(-)
 rename CineCool/app/src/main/java/fr/iut/cinecool/{model => data}/Stub.kt (51%)
 rename CineCool/app/src/main/java/fr/iut/cinecool/{ => fragments}/CinemaFragment.kt (88%)
 rename CineCool/app/src/main/java/fr/iut/cinecool/{ => fragments}/MovieDetailFragment.kt (98%)
 rename CineCool/app/src/main/java/fr/iut/cinecool/{ => fragments}/MoviesFragment.kt (93%)
 rename CineCool/app/src/main/java/fr/iut/cinecool/{ => fragments}/SessionFragment.kt (90%)
 rename CineCool/app/src/main/java/fr/iut/cinecool/{model/cineViewModel.kt => viewModel/CineViewModel.kt} (91%)
 rename CineCool/app/src/main/java/fr/iut/cinecool/{ => viewModel}/MovieViewModel.kt (96%)

diff --git a/CineCool/app/src/main/java/fr/iut/cinecool/model/Stub.kt b/CineCool/app/src/main/java/fr/iut/cinecool/data/Stub.kt
similarity index 51%
rename from CineCool/app/src/main/java/fr/iut/cinecool/model/Stub.kt
rename to CineCool/app/src/main/java/fr/iut/cinecool/data/Stub.kt
index 56d383a..2341384 100644
--- a/CineCool/app/src/main/java/fr/iut/cinecool/model/Stub.kt
+++ b/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"))
diff --git a/CineCool/app/src/main/java/fr/iut/cinecool/CinemaFragment.kt b/CineCool/app/src/main/java/fr/iut/cinecool/fragments/CinemaFragment.kt
similarity index 88%
rename from CineCool/app/src/main/java/fr/iut/cinecool/CinemaFragment.kt
rename to CineCool/app/src/main/java/fr/iut/cinecool/fragments/CinemaFragment.kt
index 2bf909b..4187c35 100644
--- a/CineCool/app/src/main/java/fr/iut/cinecool/CinemaFragment.kt
+++ b/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() {
diff --git a/CineCool/app/src/main/java/fr/iut/cinecool/MovieDetailFragment.kt b/CineCool/app/src/main/java/fr/iut/cinecool/fragments/MovieDetailFragment.kt
similarity index 98%
rename from CineCool/app/src/main/java/fr/iut/cinecool/MovieDetailFragment.kt
rename to CineCool/app/src/main/java/fr/iut/cinecool/fragments/MovieDetailFragment.kt
index de6b77e..c3c933c 100644
--- a/CineCool/app/src/main/java/fr/iut/cinecool/MovieDetailFragment.kt
+++ b/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
diff --git a/CineCool/app/src/main/java/fr/iut/cinecool/MoviesFragment.kt b/CineCool/app/src/main/java/fr/iut/cinecool/fragments/MoviesFragment.kt
similarity index 93%
rename from CineCool/app/src/main/java/fr/iut/cinecool/MoviesFragment.kt
rename to CineCool/app/src/main/java/fr/iut/cinecool/fragments/MoviesFragment.kt
index 0de6f9a..35e6a27 100644
--- a/CineCool/app/src/main/java/fr/iut/cinecool/MoviesFragment.kt
+++ b/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()
diff --git a/CineCool/app/src/main/java/fr/iut/cinecool/SessionFragment.kt b/CineCool/app/src/main/java/fr/iut/cinecool/fragments/SessionFragment.kt
similarity index 90%
rename from CineCool/app/src/main/java/fr/iut/cinecool/SessionFragment.kt
rename to CineCool/app/src/main/java/fr/iut/cinecool/fragments/SessionFragment.kt
index 4734e9b..df62431 100644
--- a/CineCool/app/src/main/java/fr/iut/cinecool/SessionFragment.kt
+++ b/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.databinding.FragmentSessionBinding
-import fr.iut.cinecool.model.cineViewModel
+import fr.iut.cinecool.R
+import fr.iut.cinecool.viewModel.cineViewModel
 
 class SessionFragment : Fragment() {
     private val sharedViewModel: cineViewModel by activityViewModels()
diff --git a/CineCool/app/src/main/java/fr/iut/cinecool/model/cineViewModel.kt b/CineCool/app/src/main/java/fr/iut/cinecool/viewModel/CineViewModel.kt
similarity index 91%
rename from CineCool/app/src/main/java/fr/iut/cinecool/model/cineViewModel.kt
rename to CineCool/app/src/main/java/fr/iut/cinecool/viewModel/CineViewModel.kt
index cbc149f..f8507d8 100644
--- a/CineCool/app/src/main/java/fr/iut/cinecool/model/cineViewModel.kt
+++ b/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
diff --git a/CineCool/app/src/main/java/fr/iut/cinecool/MovieViewModel.kt b/CineCool/app/src/main/java/fr/iut/cinecool/viewModel/MovieViewModel.kt
similarity index 96%
rename from CineCool/app/src/main/java/fr/iut/cinecool/MovieViewModel.kt
rename to CineCool/app/src/main/java/fr/iut/cinecool/viewModel/MovieViewModel.kt
index 14f1a2a..3d0b0c0 100644
--- a/CineCool/app/src/main/java/fr/iut/cinecool/MovieViewModel.kt
+++ b/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
diff --git a/CineCool/app/src/main/res/layout/fragment_cinema.xml b/CineCool/app/src/main/res/layout/fragment_cinema.xml
index f4e118c..891b233 100644
--- a/CineCool/app/src/main/res/layout/fragment_cinema.xml
+++ b/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"
diff --git a/CineCool/app/src/main/res/layout/fragment_movies.xml b/CineCool/app/src/main/res/layout/fragment_movies.xml
index 8dfadcf..306c087 100644
--- a/CineCool/app/src/main/res/layout/fragment_movies.xml
+++ b/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"
diff --git a/CineCool/app/src/main/res/layout/fragment_session.xml b/CineCool/app/src/main/res/layout/fragment_session.xml
index a69b505..15bcbb0 100644
--- a/CineCool/app/src/main/res/layout/fragment_session.xml
+++ b/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"
diff --git a/CineCool/app/src/main/res/navigation/nav_graph.xml b/CineCool/app/src/main/res/navigation/nav_graph.xml
index c05711b..019aa0d 100644
--- a/CineCool/app/src/main/res/navigation/nav_graph.xml
+++ b/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