diff --git a/Cineapp/app/src/main/java/com/example/cinapp/MainActivity.kt b/Cineapp/app/src/main/java/com/example/cinapp/MainActivity.kt index d8788cb..0865ba3 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/MainActivity.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/MainActivity.kt @@ -2,15 +2,8 @@ package com.example.cinapp import androidx.appcompat.app.AppCompatActivity import android.os.Bundle -import android.widget.TextView -import androidx.activity.compose.setContent -import androidx.compose.material.MaterialTheme import androidx.fragment.app.Fragment -import com.android.volley.VolleyError -import com.android.volley.toolbox.StringRequest -import com.android.volley.toolbox.Volley import com.example.cinapp.databinding.ActivityMainBinding -import com.example.cinapp.model.Movie import com.example.cinapp.navigation.MovieFragment import com.example.cinapp.navigation.SearchFragment import com.example.cinapp.navigation.SerieFragment @@ -38,6 +31,6 @@ class MainActivity : AppCompatActivity() { } private fun replaceFragment(fragment: Fragment){ - supportFragmentManager.beginTransaction().replace(R.id.frame_layout, fragment).commit() + supportFragmentManager.beginTransaction().replace(R.id.main_layout, fragment).commit() } } \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/navigation/Movies2SeeFragment.kt b/Cineapp/app/src/main/java/com/example/cinapp/navigation/Movies2SeeFragment.kt new file mode 100644 index 0000000..17e66cf --- /dev/null +++ b/Cineapp/app/src/main/java/com/example/cinapp/navigation/Movies2SeeFragment.kt @@ -0,0 +1,60 @@ +package com.example.cinapp.navigation + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.example.cinapp.R + +// 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 [Movies2SeeFragment.newInstance] factory method to + * create an instance of this fragment. + */ +class Movies2SeeFragment : 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_movies2_see, 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 Movies2SeeFragment. + */ + // TODO: Rename and change types and number of parameters + @JvmStatic + fun newInstance(param1: String, param2: String) = + Movies2SeeFragment().apply { + arguments = Bundle().apply { + putString(ARG_PARAM1, param1) + putString(ARG_PARAM2, param2) + } + } + } +} \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/navigation/SearchFragment.kt b/Cineapp/app/src/main/java/com/example/cinapp/navigation/SearchFragment.kt index bd4f5a2..f9658fc 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/navigation/SearchFragment.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/navigation/SearchFragment.kt @@ -28,6 +28,7 @@ class SearchFragment : Fragment() { param1 = it.getString(ARG_PARAM1) param2 = it.getString(ARG_PARAM2) } + } override fun onCreateView( diff --git a/Cineapp/app/src/main/java/com/example/cinapp/navigation/SeenMoviesFragment.kt b/Cineapp/app/src/main/java/com/example/cinapp/navigation/SeenMoviesFragment.kt new file mode 100644 index 0000000..4e126c8 --- /dev/null +++ b/Cineapp/app/src/main/java/com/example/cinapp/navigation/SeenMoviesFragment.kt @@ -0,0 +1,60 @@ +package com.example.cinapp.navigation + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.example.cinapp.R + +// 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 [SeenMoviesFragment.newInstance] factory method to + * create an instance of this fragment. + */ +class SeenMoviesFragment : 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_seen_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 SeenMoviesFragment. + */ + // TODO: Rename and change types and number of parameters + @JvmStatic + fun newInstance(param1: String, param2: String) = + SeenMoviesFragment().apply { + arguments = Bundle().apply { + putString(ARG_PARAM1, param1) + putString(ARG_PARAM2, param2) + } + } + } +} \ No newline at end of file diff --git a/Cineapp/app/src/main/res/layout/activity_main.xml b/Cineapp/app/src/main/res/layout/activity_main.xml index 3a407ec..1b3ca71 100644 --- a/Cineapp/app/src/main/res/layout/activity_main.xml +++ b/Cineapp/app/src/main/res/layout/activity_main.xml @@ -6,16 +6,15 @@ android:layout_height="match_parent" tools:context=".MainActivity"> - - - + - - - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="MissingConstraints"> + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/Cineapp/app/src/main/res/layout/fragment_movies2_see.xml b/Cineapp/app/src/main/res/layout/fragment_movies2_see.xml new file mode 100644 index 0000000..273c1e3 --- /dev/null +++ b/Cineapp/app/src/main/res/layout/fragment_movies2_see.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/Cineapp/app/src/main/res/layout/fragment_search.xml b/Cineapp/app/src/main/res/layout/fragment_search.xml index 35d335f..58118ef 100644 --- a/Cineapp/app/src/main/res/layout/fragment_search.xml +++ b/Cineapp/app/src/main/res/layout/fragment_search.xml @@ -1,12 +1,12 @@ - + + \ No newline at end of file diff --git a/Cineapp/app/src/main/res/layout/fragment_seen_movies.xml b/Cineapp/app/src/main/res/layout/fragment_seen_movies.xml new file mode 100644 index 0000000..8668d13 --- /dev/null +++ b/Cineapp/app/src/main/res/layout/fragment_seen_movies.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/Cineapp/app/src/main/res/layout/fragment_serie.xml b/Cineapp/app/src/main/res/layout/fragment_serie.xml index e937f28..2b24699 100644 --- a/Cineapp/app/src/main/res/layout/fragment_serie.xml +++ b/Cineapp/app/src/main/res/layout/fragment_serie.xml @@ -1,17 +1,34 @@ - - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="MissingConstraints"> + + + + + + + + \ No newline at end of file diff --git a/Cineapp/app/src/main/res/menu/serie_nav.xml b/Cineapp/app/src/main/res/menu/serie_nav.xml new file mode 100644 index 0000000..fbae9cf --- /dev/null +++ b/Cineapp/app/src/main/res/menu/serie_nav.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file