diff --git a/CineCool/app/build.gradle b/CineCool/app/build.gradle index e5763d7..6981a31 100644 --- a/CineCool/app/build.gradle +++ b/CineCool/app/build.gradle @@ -9,7 +9,7 @@ android { defaultConfig { applicationId "fr.iut.cinecool" - minSdk 19 + minSdk 21 targetSdk 33 versionCode 1 versionName "1.0" @@ -37,16 +37,16 @@ android { dependencies { - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'com.google.android.material:material:1.5.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' - implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1' - implementation 'androidx.navigation:navigation-ui-ktx:2.4.1' + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.8.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3' + implementation 'androidx.navigation:navigation-ui-ktx:2.5.3' implementation 'com.google.android.gms:play-services-location:21.0.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' // Java language implementation implementation("androidx.navigation:navigation-fragment:2.5.3") diff --git a/CineCool/app/src/main/java/fr/iut/cinecool/CinemaActivity.kt b/CineCool/app/src/main/java/fr/iut/cinecool/CinemaActivity.kt index 6ae3a70..7ad53b5 100644 --- a/CineCool/app/src/main/java/fr/iut/cinecool/CinemaActivity.kt +++ b/CineCool/app/src/main/java/fr/iut/cinecool/CinemaActivity.kt @@ -3,11 +3,16 @@ package fr.iut.cinecool import android.app.Activity import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import androidx.navigation.NavController +import androidx.navigation.fragment.NavHostFragment class CinemaActivity : AppCompatActivity() { + private lateinit var navController: NavController override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_cinema) - Activity.findNavController(viewId: Int) + val navHostFragment = supportFragmentManager.findFragmentById(R.id.fragment) as NavHostFragment + navController = navHostFragment.navController } + } \ No newline at end of file diff --git a/CineCool/app/src/main/java/fr/iut/cinecool/CinemaFragment.kt b/CineCool/app/src/main/java/fr/iut/cinecool/CinemaFragment.kt index 4cfa2be..2bf909b 100644 --- a/CineCool/app/src/main/java/fr/iut/cinecool/CinemaFragment.kt +++ b/CineCool/app/src/main/java/fr/iut/cinecool/CinemaFragment.kt @@ -6,29 +6,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -// TODO: Rename parameter arguments, choose names that match -// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER -private const val ARG_PARAM1 = "param1" -private const val ARG_PARAM2 = "param2" -/** - * A simple [Fragment] subclass. - * Use the [CinemaFragment.newInstance] factory method to - * create an instance of this fragment. - */ class CinemaFragment : Fragment() { - // TODO: Rename and change types of parameters - private var param1: String? = null - private var param2: String? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - arguments?.let { - param1 = it.getString(ARG_PARAM1) - param2 = it.getString(ARG_PARAM2) - } - } - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -36,24 +15,4 @@ class CinemaFragment : Fragment() { // Inflate the layout for this fragment return inflater.inflate(R.layout.fragment_cinema, container, false) } - - companion object { - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment CinemaFragment. - */ - // TODO: Rename and change types and number of parameters - @JvmStatic - fun newInstance(param1: String, param2: String) = - CinemaFragment().apply { - arguments = Bundle().apply { - putString(ARG_PARAM1, param1) - putString(ARG_PARAM2, param2) - } - } - } } \ No newline at end of file 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 76ed5a0..dbb260f 100644 --- a/CineCool/app/src/main/java/fr/iut/cinecool/MoviesFragment.kt +++ b/CineCool/app/src/main/java/fr/iut/cinecool/MoviesFragment.kt @@ -5,55 +5,20 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Button +import androidx.navigation.fragment.findNavController -// TODO: Rename parameter arguments, choose names that match -// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER -private const val ARG_PARAM1 = "param1" -private const val ARG_PARAM2 = "param2" - -/** - * A simple [Fragment] subclass. - * Use the [MoviesFragment.newInstance] factory method to - * create an instance of this fragment. - */ class MoviesFragment : Fragment() { - // TODO: Rename and change types of parameters - private var param1: String? = null - private var param2: String? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - arguments?.let { - param1 = it.getString(ARG_PARAM1) - param2 = it.getString(ARG_PARAM2) - } - } - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_movies, container, false) - } - - companion object { - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment MoviesFragment. - */ - // TODO: Rename and change types and number of parameters - @JvmStatic - fun newInstance(param1: String, param2: String) = - MoviesFragment().apply { - arguments = Bundle().apply { - putString(ARG_PARAM1, param1) - putString(ARG_PARAM2, param2) - } - } + val view = inflater.inflate(R.layout.fragment_movies, container, false) + val button = view.findViewById