diff --git a/Cineapp/.idea/deploymentTargetDropDown.xml b/Cineapp/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..91bcaa8 --- /dev/null +++ b/Cineapp/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Cineapp/app/build.gradle b/Cineapp/app/build.gradle index 3d2adef..89803c0 100644 --- a/Cineapp/app/build.gradle +++ b/Cineapp/app/build.gradle @@ -45,7 +45,8 @@ android { dependencies { - implementation 'com.android.volley:volley:1.2.1' + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-moshi:2.9.0" implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'com.google.android.material:material:1.5.0' @@ -59,7 +60,6 @@ dependencies { implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0' implementation 'androidx.navigation:navigation-ui-ktx:2.3.0' - implementation 'androidx.navigation:navigation-compose:2.4.0-alpha10' implementation 'androidx.compose.ui:ui:1.1.1' implementation 'androidx.compose.material:material-icons-core:1.1.1' implementation 'androidx.compose.material:material-icons-extended:1.1.1' @@ -69,4 +69,8 @@ dependencies { implementation "androidx.compose.material:material:1.1.1" implementation "androidx.compose.material:material-ripple:1.1.1" + implementation 'com.github.bumptech.glide:glide:4.11.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' + + } \ No newline at end of file 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 0865ba3..43565c7 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/MainActivity.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/MainActivity.kt @@ -4,9 +4,9 @@ import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import androidx.fragment.app.Fragment import com.example.cinapp.databinding.ActivityMainBinding -import com.example.cinapp.navigation.MovieFragment -import com.example.cinapp.navigation.SearchFragment -import com.example.cinapp.navigation.SerieFragment +import com.example.cinapp.model.navigation.MovieFragment +import com.example.cinapp.model.navigation.SearchFragment +import com.example.cinapp.model.navigation.SerieFragment class MainActivity : AppCompatActivity() { diff --git a/Cineapp/app/src/main/java/com/example/cinapp/Request/Demmy.kt b/Cineapp/app/src/main/java/com/example/cinapp/Request/Demmy.kt new file mode 100644 index 0000000..3f1d452 --- /dev/null +++ b/Cineapp/app/src/main/java/com/example/cinapp/Request/Demmy.kt @@ -0,0 +1,13 @@ +package com.example.cinapp.Request + +import com.example.cinapp.model.Movie + + +class Demmy ( + var page: Int, + var results: List, + var total_pages: Int, + var total_results: Int + ){ + +} \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/Request/MediaApi.kt b/Cineapp/app/src/main/java/com/example/cinapp/Request/MediaApi.kt new file mode 100644 index 0000000..daa8412 --- /dev/null +++ b/Cineapp/app/src/main/java/com/example/cinapp/Request/MediaApi.kt @@ -0,0 +1,88 @@ +package com.example.cinapp.Request + +import android.util.Log +import com.example.cinapp.model.Media +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.moshi.MoshiConverterFactory + +class MediaApi { + private val retrofit = Retrofit.Builder() + .baseUrl("https://api.themoviedb.org/3/") + .addConverterFactory(MoshiConverterFactory.create()) + .build() + + private val service = retrofit.create(MediaService::class.java) + val mediaMapper = MediaMapper() + + fun search(apiKey: String, language: String, query: String, page: Int, includeAdult: Boolean, callback: (List) -> Unit) { + val response: Call = service.searchMedia(apiKey, language, query, page, includeAdult) + val listMedia: MutableList = mutableListOf() + Log.d("TAG", "search: " + response.request().url()) + + response.enqueue(object : Callback { + override fun onResponse(call: Call, response: Response) { + Log.d("Liste1", response.body().toString()) + val allMedia = response.body() + val listMediaResponse = allMedia?.results + listMediaResponse?.forEach { mediaResponse -> + val media = mediaMapper.searchMapToMedia(mediaResponse) + Log.d("Media", media.toString()) + listMedia.add(media) + } + callback(listMedia) + } + + override fun onFailure(call: Call, t: Throwable) { + Log.d("ErrorRetrofit", t.message.toString()) + } + }) + Log.d("Liste2", listMedia.size.toString()) + } + + fun getPopularMovies(apiKey: String): List { + val response: Call = service.getPopularMovies(apiKey) + val listMedia: MutableList = mutableListOf() + + response.enqueue(object : Callback { + override fun onResponse(call: Call, response: Response) { + Log.d("Liste1", response.body().toString()) + val allMedia = response.body()!! + val listMediaResponse = allMedia.results + listMediaResponse.forEach { mediaResponse -> + listMedia.add(mediaMapper.searchMapToMedia(mediaResponse)) + } + } + + override fun onFailure(call: Call, t: Throwable) { + Log.d("ErrorRetrofit", t.message.toString()) + } + }) + + return listMedia + } + + fun getForrestGump(): List { + val response: Call = service.getForrestGump() + val listMedia: MutableList = mutableListOf() + + response.enqueue(object : Callback { + override fun onResponse(call: Call, response: Response) { + Log.d("Liste1", response.body().toString()) + val allMedia = response.body()!! + val listMediaResponse = allMedia.results + listMediaResponse.forEach { mediaResponse -> + listMedia.add(mediaMapper.searchMapToMedia(mediaResponse)) + } + } + + override fun onFailure(call: Call, t: Throwable) { + Log.d("ErrorRetrofit", t.message.toString()) + } + }) + + return listMedia + } +} \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/Request/MediaMapper.kt b/Cineapp/app/src/main/java/com/example/cinapp/Request/MediaMapper.kt new file mode 100644 index 0000000..ca23294 --- /dev/null +++ b/Cineapp/app/src/main/java/com/example/cinapp/Request/MediaMapper.kt @@ -0,0 +1,56 @@ +package com.example.cinapp.Request + +import com.example.cinapp.model.Media +import com.example.cinapp.model.Movie +import com.example.cinapp.model.Serie + +class MediaMapper { + fun searchMapToMedia(mediaResponse: MediaResponse): Media { + return when (mediaResponse.media_type) { + "movie" -> searchMapToMovie(mediaResponse) + "tv" -> searchMapToSerie(mediaResponse) + else -> throw IllegalArgumentException("Invalid media type") + } + } + + private fun searchMapToMovie(mediaResponse: MediaResponse): Movie { + return Movie( + id = mediaResponse.id, + title = mediaResponse.title, + overview = mediaResponse.overview, + posterPath = mediaResponse.poster_path, + releaseDate = mediaResponse.release_date, + genreIds = mediaResponse.genre_ids, + popularity = mediaResponse.popularity, + voteAverage = mediaResponse.vote_average, + voteCount = mediaResponse.vote_count, + adult = mediaResponse.adult, + backdropPath = mediaResponse.backdrop_path, + originalLanguage = mediaResponse.original_language, + originalName = mediaResponse.original_title, + originCountry = mediaResponse.origin_country + ) + } + + private fun searchMapToSerie(mediaResponse: MediaResponse): Serie { + return Serie( + id = mediaResponse.id, + title = mediaResponse.name, + overview = mediaResponse.overview, + posterPath = mediaResponse.poster_path, + releaseDate = mediaResponse.first_air_date, + genreIds = mediaResponse.genre_ids, + popularity = mediaResponse.popularity, + voteAverage = mediaResponse.vote_average, + voteCount = mediaResponse.vote_count, + adult = mediaResponse.adult, + backdropPath = mediaResponse.backdrop_path, + originalLanguage = mediaResponse.original_language, + originalName = mediaResponse.original_name, + originCountry = mediaResponse.origin_country + //seasons = mediaResponse.seasons, + //numberOfSeasons = mediaResponse.numberOfSeasons, + //numberOfEpisodes = mediaResponse.numberOfEpisodes + ) + } +} diff --git a/Cineapp/app/src/main/java/com/example/cinapp/Request/MediaResponse.kt b/Cineapp/app/src/main/java/com/example/cinapp/Request/MediaResponse.kt new file mode 100644 index 0000000..8bcb195 --- /dev/null +++ b/Cineapp/app/src/main/java/com/example/cinapp/Request/MediaResponse.kt @@ -0,0 +1,30 @@ +package com.example.cinapp.Request + +import com.example.cinapp.model.Season + +class MediaResponse( + val adult: Boolean, + val id: Int, + val name: String, + val media_type: String, + val backdrop_path: String, + val first_air_date: String, + val origin_country: List, + val original_language: String, + val original_name: String, + val overview : String, + val popularity: Double, + val poster_path: String, + val vote_average: Double, + val vote_count: Int, + val genre_ids: List, + val original_title: String, + val title: String, + val video: Boolean, + val release_date: String, + var seasons: List? = null, + var numberOfSeasons: Int? = null, + var numberOfEpisodes: Int? = null +) { + +} \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/Request/MediaService.kt b/Cineapp/app/src/main/java/com/example/cinapp/Request/MediaService.kt new file mode 100644 index 0000000..229bf66 --- /dev/null +++ b/Cineapp/app/src/main/java/com/example/cinapp/Request/MediaService.kt @@ -0,0 +1,22 @@ +package com.example.cinapp.Request + +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Query + +interface MediaService { + @GET("search/movie?api_key=e53e59cf1e29b9afff93d9ca1208f0cf&query=Forrest%20Gump&language=fr") + fun getForrestGump(): Call + + @GET("search/multi") + fun searchMedia( + @Query("api_key") apiKey: String, + @Query("language") language: String, + @Query("query") query: String, + @Query("page") page: Int, + @Query("include_adult") includeAdult: Boolean + ): Call + + @GET("movie/popular") + fun getPopularMovies(@Query("api_key") apiKey: String): Call +} \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/Request/MovieAdapter.kt b/Cineapp/app/src/main/java/com/example/cinapp/Request/MovieAdapter.kt new file mode 100644 index 0000000..274b817 --- /dev/null +++ b/Cineapp/app/src/main/java/com/example/cinapp/Request/MovieAdapter.kt @@ -0,0 +1,32 @@ +package com.example.cinapp.Request + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import com.example.cinapp.R +import com.example.cinapp.model.Movie + +class MoviesAdapter(private val movies: List) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + val view = LayoutInflater.from(parent.context).inflate(R.layout.item_movie, parent, false) + return ViewHolder(view) + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + val movie = movies[position] + //holder.name.text = movie.name + Glide.with(holder.itemView.context).load(movie.posterPath).into(holder.image) + } + + override fun getItemCount() = movies.size + + class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + //val name: TextView = itemView.findViewById(R.id.text_view_movie_name) + val image: ImageView = itemView.findViewById(R.id.image_view_movie) + } +} diff --git a/Cineapp/app/src/main/java/com/example/cinapp/model/Media.kt b/Cineapp/app/src/main/java/com/example/cinapp/model/Media.kt index 516e269..c08eb9c 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/model/Media.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/model/Media.kt @@ -1,17 +1,19 @@ package com.example.cinapp.model -abstract class Media { - abstract val id: Int - abstract val name: String - abstract val backdropPath: String - abstract val releaseDate: String - abstract val originCountry: List - abstract val originalLanguage: String - abstract val originalName: String - abstract val overview : String - abstract val popularity: Double - abstract val posterPath: String - abstract val voteAverage: Double - abstract val voteCount: Int - abstract val genreIds: List +open class Media ( + val adult: Boolean? = null, + val id: Int, + val title: String? = null, + val backdropPath: String? = null, + val releaseDate: String? = null, + val originCountry: List? = null, + val originalLanguage: String? = null, + val originalName: String? = null, + val overview : String? = null, + val popularity: Double? = null, + val posterPath: String? = null, + val voteAverage: Double? = null, + val voteCount: Int? = null, + val genreIds: List? = null + ){ } \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/model/MediasLibrary.kt b/Cineapp/app/src/main/java/com/example/cinapp/model/MediasLibrary.kt index b0099e3..ed32853 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/model/MediasLibrary.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/model/MediasLibrary.kt @@ -1,44 +1,6 @@ package com.example.cinapp.model class MediasLibrary( - var id : Int, - var mediasLibrary: List ){ - override fun toString(): String { - return "MediasLibrary(id=$id, mediasLibrary=$mediasLibrary)" - } - //add a media to the library - fun addMedia(media: Media){ - mediasLibrary += media - } - - //remove a media from the library - fun removeMedia(media: Media){ - mediasLibrary -= media - } - - //get a media from the library - fun getMedia(media: Media): Media?{ - return mediasLibrary.find { it.id == media.id } - } - - //get all medias from the library - fun getAllMedias(): List{ - return mediasLibrary - } - - //get all medias from the library - fun getAllMediasByType(type: String): List{ - var medias = mutableListOf() - for (media in mediasLibrary){ - if (media is Movie && type == "movie"){ - medias.add(media) - } - if (media is Serie && type == "serie"){ - medias.add(media) - } - } - return medias - } } \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/model/Movie.kt b/Cineapp/app/src/main/java/com/example/cinapp/model/Movie.kt index 6abf143..071a49e 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/model/Movie.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/model/Movie.kt @@ -1,19 +1,34 @@ package com.example.cinapp.model class Movie( - override val id: Int, - override val name: String, - override val backdropPath: String, - override val releaseDate: String, - override val originCountry: List, - override val originalLanguage: String, - override val originalName: String, - override val overview: String, - override val popularity: Double, - override val posterPath: String, - override val voteAverage: Double, - override val voteCount: Int, - override val genreIds: List -) : Media() { - + adult: Boolean? = null, + id: Int, + title: String? = null, + backdropPath: String? = null, + releaseDate: String? = null, + originCountry: List? = null, + originalLanguage: String? = null, + originalName: String? = null, + overview : String? = null, + popularity: Double? = null, + posterPath: String? = null, + voteAverage: Double? = null, + voteCount: Int? = null, + genreIds: List? = null +): Media( + adult, + id, + title, + backdropPath, + releaseDate, + originCountry, + originalLanguage, + originalName, + overview, + popularity, + posterPath, + voteAverage, + voteCount, + genreIds +) { } \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/model/Serie.kt b/Cineapp/app/src/main/java/com/example/cinapp/model/Serie.kt index ba2bf19..d93b3b2 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/model/Serie.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/model/Serie.kt @@ -1,21 +1,37 @@ package com.example.cinapp.model class Serie( - override val id: Int, - override val name: String, - override val backdropPath: String, - override val releaseDate: String, - override val originCountry: List, - override val originalLanguage: String, - override val originalName: String, - override val overview: String, - override val popularity: Double, - override val posterPath: String, - override val voteAverage: Double, - override val voteCount: Int, - override val genreIds: List, - var seasons: List, - var numberOfSeasons: Int, - var numberOfEpisodes: Int -) : Media() { + adult: Boolean? = null, + id: Int, + title: String? = null, + backdropPath: String? = null, + releaseDate: String? = null, + originCountry: List? = null, + originalLanguage: String? = null, + originalName: String? = null, + overview : String? = null, + popularity: Double? = null, + posterPath: String? = null, + voteAverage: Double? = null, + voteCount: Int? = null, + genreIds: List? = null, + var seasons: List? = null, + var numberOfSeasons: Int? = null, + var numberOfEpisodes: Int? = null +) : Media( + adult, + id, + title, + backdropPath, + releaseDate, + originCountry, + originalLanguage, + originalName, + overview, + popularity, + posterPath, + voteAverage, + voteCount, + genreIds +) { } \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/navigation/MovieFragment.kt b/Cineapp/app/src/main/java/com/example/cinapp/model/navigation/MovieFragment.kt similarity index 50% rename from Cineapp/app/src/main/java/com/example/cinapp/navigation/MovieFragment.kt rename to Cineapp/app/src/main/java/com/example/cinapp/model/navigation/MovieFragment.kt index 442ea65..da17ce1 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/navigation/MovieFragment.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/model/navigation/MovieFragment.kt @@ -1,11 +1,26 @@ -package com.example.cinapp.navigation +package com.example.cinapp.model.navigation import android.os.Bundle +import android.util.Log import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import com.example.cinapp.R +import com.example.cinapp.Request.Demmy +import com.example.cinapp.Request.MediaApi +import com.example.cinapp.Request.MediaService +import com.example.cinapp.Request.MoviesAdapter +import com.example.cinapp.model.Media +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.moshi.MoshiConverterFactory + // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -28,14 +43,37 @@ class MovieFragment : Fragment() { 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_movie, container, false) + + // Récupération de la vue racine + val rootView = inflater.inflate(R.layout.fragment_movie, container, false) + + // Récupération de la vue souhaitée + val myView = rootView.findViewById(R.id.name) + + //var listMedias : Unit = MediaApi().search("e53e59cf1e29b9afff93d9ca1208f0cf", "en-US", "One Piece", 1, false) { listMedia -> listMedia } + //var listMedia : List = MediaApi().getPopularMovies("e53e59cf1e29b9afff93d9ca1208f0cf") + //var listMedia : List = MediaApi().getForrestGump() + + val apiKey = "e53e59cf1e29b9afff93d9ca1208f0cf" + val language = "en-US" + val query = "One Piece" + val page = 1 + val includeAdult = false + MediaApi().search(apiKey, language, query, page, includeAdult) { listMedia -> + //Do something with listMedia + Log.d("TAG", "onCreateView: " + listMedia) + Log.d("Image", "onCreateView: " + listMedia[0].posterPath.toString()) + myView.text = listMedia[0].title.toString() + " " + listMedia[0].id.toString() + " " + listMedia[0].posterPath.toString() + } + + return rootView } companion object { diff --git a/Cineapp/app/src/main/java/com/example/cinapp/navigation/Movies2SeeFragment.kt b/Cineapp/app/src/main/java/com/example/cinapp/model/navigation/Movies2SeeFragment.kt similarity index 97% rename from Cineapp/app/src/main/java/com/example/cinapp/navigation/Movies2SeeFragment.kt rename to Cineapp/app/src/main/java/com/example/cinapp/model/navigation/Movies2SeeFragment.kt index 17e66cf..716a27f 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/navigation/Movies2SeeFragment.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/model/navigation/Movies2SeeFragment.kt @@ -1,4 +1,4 @@ -package com.example.cinapp.navigation +package com.example.cinapp.model.navigation import android.os.Bundle import androidx.fragment.app.Fragment diff --git a/Cineapp/app/src/main/java/com/example/cinapp/navigation/SearchFragment.kt b/Cineapp/app/src/main/java/com/example/cinapp/model/navigation/SearchFragment.kt similarity index 97% rename from Cineapp/app/src/main/java/com/example/cinapp/navigation/SearchFragment.kt rename to Cineapp/app/src/main/java/com/example/cinapp/model/navigation/SearchFragment.kt index f9658fc..4e628d2 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/navigation/SearchFragment.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/model/navigation/SearchFragment.kt @@ -1,4 +1,4 @@ -package com.example.cinapp.navigation +package com.example.cinapp.model.navigation import android.os.Bundle import androidx.fragment.app.Fragment diff --git a/Cineapp/app/src/main/java/com/example/cinapp/navigation/SeenMoviesFragment.kt b/Cineapp/app/src/main/java/com/example/cinapp/model/navigation/SeenMoviesFragment.kt similarity index 97% rename from Cineapp/app/src/main/java/com/example/cinapp/navigation/SeenMoviesFragment.kt rename to Cineapp/app/src/main/java/com/example/cinapp/model/navigation/SeenMoviesFragment.kt index 4e126c8..3ab085e 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/navigation/SeenMoviesFragment.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/model/navigation/SeenMoviesFragment.kt @@ -1,4 +1,4 @@ -package com.example.cinapp.navigation +package com.example.cinapp.model.navigation import android.os.Bundle import androidx.fragment.app.Fragment diff --git a/Cineapp/app/src/main/java/com/example/cinapp/navigation/SerieFragment.kt b/Cineapp/app/src/main/java/com/example/cinapp/model/navigation/SerieFragment.kt similarity index 97% rename from Cineapp/app/src/main/java/com/example/cinapp/navigation/SerieFragment.kt rename to Cineapp/app/src/main/java/com/example/cinapp/model/navigation/SerieFragment.kt index aee8c25..ecb5d65 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/navigation/SerieFragment.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/model/navigation/SerieFragment.kt @@ -1,4 +1,4 @@ -package com.example.cinapp.navigation +package com.example.cinapp.model.navigation import android.os.Bundle import androidx.fragment.app.Fragment diff --git a/Cineapp/app/src/main/res/layout/fragment_movie.xml b/Cineapp/app/src/main/res/layout/fragment_movie.xml index 7655d7e..b0a23ee 100644 --- a/Cineapp/app/src/main/res/layout/fragment_movie.xml +++ b/Cineapp/app/src/main/res/layout/fragment_movie.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/material_dynamic_secondary30" - tools:context=".navigation.MovieFragment"> + tools:context=".model.navigation.MovieFragment"> - + + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - \ 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 index 273c1e3..723c282 100644 --- a/Cineapp/app/src/main/res/layout/fragment_movies2_see.xml +++ b/Cineapp/app/src/main/res/layout/fragment_movies2_see.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".navigation.Movies2SeeFragment"> + tools:context=".model.navigation.Movies2SeeFragment"> - + tools:context=".model.navigation.SearchFragment"> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + - + + + + + + + android:background="@color/black" + android:queryHint="Search" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:iconifiedByDefault="false" + app:layout_constraintTop_toBottomOf="@+id/tabLayout" /> - \ No newline at end of file + \ 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 index 8668d13..00f28c9 100644 --- a/Cineapp/app/src/main/res/layout/fragment_seen_movies.xml +++ b/Cineapp/app/src/main/res/layout/fragment_seen_movies.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".navigation.SeenMoviesFragment"> + tools:context=".model.navigation.SeenMoviesFragment"> + tools:context=".model.navigation.SerieFragment"> + + + + + + + + + +