Compare commits

...

14 Commits

@ -2,7 +2,10 @@
## Overview
___
Description of my project
This project use the API of [The Movie Database](https://www.themoviedb.org/?language=fr)
This project is still in development :construction:
## Documentation
___
@ -19,7 +22,17 @@ Here are the prerequisites before launching the project.
| ---- | ---- |
| The integrated Development Environment (IDE) Android Studios |<img src="Documentation/images/Android_Studio_Trademark.png" alt="drawing" width="95" height="30" /> |
### Dependencies
- AndroidX
- Retrofit2 to use the api requests and moshi to parse data
- Coil for load the images
- Room Database to store local data
- The databinding
- JUnit is included too because i want to add tests on the project in the future
### Installation
To launch the project, open `Android Studios` and click on `file` on the left corner.
Click on `open` and open the `Sources` folder in the project.
Click on `open` and open the `Sources` folder in the project and let the IDE index the files

@ -8,7 +8,14 @@ android {
namespace 'fr.iut.pm.movieapplication'
compileSdk 33
def apikeyPropertiesFile = rootProject.file("apikey.properties")
def apikeyProperties = new Properties()
apikeyProperties.load(new FileInputStream(apikeyPropertiesFile))
defaultConfig {
buildConfigField("String", "API_KEY", apikeyProperties['API_KEY'])
applicationId "fr.iut.pm.movieapplication"
minSdk 16
targetSdk 33
@ -45,14 +52,15 @@ dependencies {
implementation 'androidx.core:core-ktx:1.9.0'
implementation "androidx.appcompat:appcompat:$rootProject.appCompatVersion"
implementation "androidx.activity:activity-ktx:$rootProject.activityVersion"
implementation "androidx.fragment:fragment-ktx:1.5.5"
implementation "androidx.activity:activity-ktx:$rootProject.activityVersion"
implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraintLayoutVersion"
implementation "com.google.android.material:material:$rootProject.materialVersion"
// Room components
implementation "androidx.room:room-runtime:$rootProject.roomVersion"
implementation "androidx.room:room-ktx:$rootProject.roomVersion"
kapt "androidx.room:room-compiler:$rootProject.roomVersion"
androidTestImplementation "androidx.room:room-testing:$rootProject.roomVersion"
// Lifecycle components
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$rootProject.lifecycleVersion"
@ -68,17 +76,14 @@ dependencies {
implementation "io.coil-kt:coil:1.1.1"
// UI
implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraintLayoutVersion"
implementation "com.google.android.material:material:$rootProject.materialVersion"
// Moshi
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
// Retrofit
// Retrofit & Moshi
implementation "com.squareup.retrofit2:retrofit:2.9.0"
// Retrofit with Scalar Converter
implementation "com.squareup.retrofit2:converter-scalars:2.9.0"
// Retrofit with Moshi Converter
implementation "com.squareup.retrofit2:converter-moshi:2.9.0"
// Testing

@ -5,6 +5,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<application
android:name=".MovieApplication"
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
@ -13,9 +14,10 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.MovieApplication"
tools:targetApi="31">
tools:targetApi="33">
<activity
android:name=".ui.activity.MainActivity"
android:screenOrientation="portrait"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

@ -0,0 +1,12 @@
package fr.iut.pm.movieapplication
import android.app.Application
import androidx.room.Room
import fr.iut.pm.movieapplication.data.database.MovieDataBase
class MovieApplication : Application() {
override fun onCreate() {
super.onCreate()
MovieDataBase.initialize(this)
}
}

@ -1,10 +1,8 @@
package fr.iut.pm.movieapplication.api
import fr.iut.pm.movieapplication.api.dtos.MovieDTO
import fr.iut.pm.movieapplication.api.dtos.MovieDetailsDTO
import fr.iut.pm.movieapplication.api.dtos.PopularDTO
import fr.iut.pm.movieapplication.api.dtos.ResultDTO
import fr.iut.pm.movieapplication.utils.Constants.Companion.API_KEY
import retrofit2.Call
import retrofit2.Response
import retrofit2.http.GET
import retrofit2.http.Path
@ -14,16 +12,16 @@ interface MovieApplicationAPI {
// Movie
@GET("movie/popular")
suspend fun getPopularMovies(@Query("api_key") apiKey : String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<PopularDTO>
suspend fun getPopularMovies(@Query("api_key") apiKey : String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<ResultDTO>
@GET("movie/now_playing")
suspend fun getNowPlayingMovies(@Query("api_key") apiKey : String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<PopularDTO>
suspend fun getNowPlayingMovies(@Query("api_key") apiKey : String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<ResultDTO>
@GET("movie/upcoming")
suspend fun getUpcomingMovies(@Query("api_key") apiKey: String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<PopularDTO>
suspend fun getUpcomingMovies(@Query("api_key") apiKey: String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<ResultDTO>
@GET("movie/top_rated")
suspend fun getTopRatedMovies(@Query("api_key") apiKey: String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<PopularDTO>
suspend fun getTopRatedMovies(@Query("api_key") apiKey: String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<ResultDTO>
// Movie details
@GET("movie/{movie_id}")
@ -32,18 +30,26 @@ interface MovieApplicationAPI {
// TvShow
@GET("tv/popular")
suspend fun getPopularTvShows(@Query("api_key") apiKey : String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<PopularDTO>
suspend fun getPopularTvShows(@Query("api_key") apiKey : String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<ResultDTO>
@GET("tv/airing_today")
suspend fun getAiringTodayTvShows(@Query("api_key") apiKey: String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<PopularDTO>
suspend fun getAiringTodayTvShows(@Query("api_key") apiKey: String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<ResultDTO>
@GET("tv/on_the_air")
suspend fun getTvOnTheAirTvShows(@Query("api_key") apiKey: String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<PopularDTO>
suspend fun getTvOnTheAirTvShows(@Query("api_key") apiKey: String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<ResultDTO>
@GET("tv/top_rated")
suspend fun getTopRatedTvShows(@Query("api_key") apiKey: String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<PopularDTO>
suspend fun getTopRatedTvShows(@Query("api_key") apiKey: String = API_KEY, @Query("language") language : String = "fr", @Query("page") page : Int = 1) : Response<ResultDTO>
@GET("trending/{media_type}/{time_window}")
suspend fun getTrending(@Path("media_type") mediaType : String = "all", @Path("time_window") timeWindow : String = "day", @Query("api_key") apiKey: String = API_KEY ) : Response<PopularDTO>
suspend fun getTrending(@Path("media_type") mediaType : String = "all", @Path("time_window") timeWindow : String = "day", @Query("api_key") apiKey: String = API_KEY ) : Response<ResultDTO>
@GET("search/multi")
suspend fun searchMedia(
@Query("query") query: String,
@Query("page") page: Int = 1,
@Query("api_key") apiKey: String = API_KEY,
@Query("language") language: String = "fr",
@Query("include_adult") includeAdult: Boolean = true
): Response<ResultDTO>
@GET("tv/{tv_id}")
fun getShowDetails(@Path("tv_id") tvId : Int, @Query("api_key") apiKey: String = API_KEY)

@ -22,16 +22,16 @@ open class MediaResultDTO(
@Json(name = "original_title")
val originalTitle : String? = null,
@Json(name = "original_language")
val originalLanguage : String,
val originalLanguage : String? = null,
val title : String? = null,
@Json(name = "backdrop_path")
val backdropPath : String?,
val popularity : Double,
val popularity : Double?,
@Json(name = "vote_count")
val voteCount : Int,
val voteCount : Int?,
//val video : Boolean?,
@Json(name = "vote_average")
val voteAverage : Double,
val voteAverage : Double?,
val name: String? = null,
@Json(name = "original_name")
val originalName : String? = null,

@ -24,7 +24,7 @@ data class MovieDetailsDTO(
//prod countries
@Json(name = "release_date")
val releaseDate: String,
val revenue: Int,
val revenue: Long,
//spoken language
val status: String,
val title: String,

@ -5,7 +5,7 @@ import com.squareup.moshi.Json
class PopularDTO(
class ResultDTO(
@Json(name = "page")
val page : Int,
@Json(name = "results")

@ -1,23 +1,61 @@
package fr.iut.pm.movieapplication.data.dao
import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import androidx.room.*
import fr.iut.pm.movieapplication.data.entities.*
import fr.iut.pm.movieapplication.model.media.movie.MovieDetails
import kotlinx.coroutines.flow.Flow
@Dao
interface MovieDAO {
@Query("SELECT * FROM movies_table ORDER BY original_title ASC")
fun getMovieByAlphabetizeMovie() : Flow<List<MovieDetails>>
@Insert(onConflict = OnConflictStrategy.IGNORE)
suspend fun insert(movie : MovieDetails)
suspend fun insert(movieEntity : MovieEntity)
/**
* Get all movies from the movies_table
*/
@Query("SELECT * FROM movies_table")
suspend fun getAllMovies() : List<MovieEntity>
/**
* Get all movies from the movies_details_table
*/
@Query("SELECT * FROM movies_details_table")
suspend fun getAllMoviesDetails() : List<MovieDetailsEntity>
/**
* Get a movie by id
*/
@Query("SELECT * FROM movies_table WHERE id = :id")
fun getMovieById(id : Int) : MovieEntity
//delete a movie
@Query("DELETE FROM movies_table WHERE id = :id")
suspend fun deleteMovieById(id : Int)
@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun insertMovieDetails(movieDetailsEntity: MovieDetailsEntity)
@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun insertGenres(genres : List<GenreEntity>)
@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun insertMovieDetailsGenres(movieDetailsGenresEntity : List<MovieDetailsGenreEntity>)
@Transaction
suspend fun insertMovieDetailsWithGenres(movieDetailsWithGenres : MovieDetailsWithGenres) {
insert(movieDetailsWithGenres.movieDetails.movie)
insertMovieDetails(movieDetailsWithGenres.movieDetails)
insertGenres(movieDetailsWithGenres.genres)
val movieDetailsGenres = movieDetailsWithGenres.genres.map {
MovieDetailsGenreEntity(movieDetailsWithGenres.movieDetails.movieId, it.genreId)
}
insertMovieDetailsGenres(movieDetailsGenres)
}
@Query("DELETE FROM movies_table")
suspend fun deleteAll()
@Transaction
@Query("SELECT * FROM movies_details_table WHERE movie_id = :movieId")
suspend fun getMovieDetailsWithGenresById(movieId: Int): MovieDetailsWithGenres
}

@ -1,9 +0,0 @@
package fr.iut.pm.movieapplication.data.dao
import androidx.room.Entity
@Entity("movies_table")
class MovieEntity {
}

@ -0,0 +1,60 @@
package fr.iut.pm.movieapplication.data.database
import android.app.Application
import androidx.room.Database
import androidx.room.Room
import androidx.room.RoomDatabase
import fr.iut.pm.movieapplication.MovieApplication
import fr.iut.pm.movieapplication.data.dao.MovieDAO
import fr.iut.pm.movieapplication.data.entities.GenreEntity
import fr.iut.pm.movieapplication.data.entities.MovieDetailsEntity
import fr.iut.pm.movieapplication.data.entities.MovieDetailsGenreEntity
import fr.iut.pm.movieapplication.data.entities.MovieEntity
const val MOVIE_DB_NAME = "movies.db"
@Database( entities = [MovieEntity::class, MovieDetailsEntity::class, GenreEntity::class, MovieDetailsGenreEntity::class], version = 3)
abstract class MovieDataBase : RoomDatabase()
{
abstract fun movieDAO() : MovieDAO
companion object
{
private lateinit var application : Application
@Volatile
private var instance : MovieDataBase? = null
fun getInstance() : MovieDataBase
{
if (::application.isInitialized) {
if (instance == null)
synchronized(this)
{
if (instance == null)
instance = Room.databaseBuilder(
application.applicationContext,
MovieDataBase::class.java,
MOVIE_DB_NAME
)
.fallbackToDestructiveMigration()
.build()
}
return instance!!
}
else
throw RuntimeException("the database must be first initialized")
}
@Synchronized
fun initialize(app : MovieApplication)
{
if (::application.isInitialized)
throw RuntimeException("the database must not be initialized twice")
application = app
}
}
}

@ -0,0 +1,12 @@
package fr.iut.pm.movieapplication.data.entities
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
@Entity(tableName = "genres_table")
data class GenreEntity(
@PrimaryKey @ColumnInfo("genre_id") val genreId : Int,
val name : String
) {
}

@ -0,0 +1,19 @@
package fr.iut.pm.movieapplication.data.entities
import androidx.room.*
import fr.iut.pm.movieapplication.model.Genre
@Entity(tableName = "movies_details_table")
data class MovieDetailsEntity(
@PrimaryKey @ColumnInfo("movie_id") val movieId : Int,
@Embedded val movie : MovieEntity,
val budget : Int,
val homepage : String?,
val revenue : Long,
val status : String
//Future attributes to add
) {
}

@ -0,0 +1,17 @@
package fr.iut.pm.movieapplication.data.entities
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.ForeignKey
@Entity(tableName = "movie_details_genre",
primaryKeys = ["movie_id", "genre_id"],
foreignKeys = [
ForeignKey(entity = MovieDetailsEntity::class, parentColumns = ["movie_id"], childColumns = ["movie_id"]),
ForeignKey(entity = GenreEntity::class, parentColumns = ["genre_id"], childColumns = ["genre_id"])
]
)
data class MovieDetailsGenreEntity(
@ColumnInfo("movie_id") val movieId : Int,
@ColumnInfo("genre_id") val genreId : Int
)

@ -0,0 +1,15 @@
package fr.iut.pm.movieapplication.data.entities
import androidx.room.Embedded
import androidx.room.Junction
import androidx.room.Relation
data class MovieDetailsWithGenres(
@Embedded val movieDetails: MovieDetailsEntity,
@Relation(
parentColumn = "movie_id",
entityColumn = "genre_id",
associateBy = Junction(MovieDetailsGenreEntity::class)
)
val genres: List<GenreEntity>
)

@ -0,0 +1,23 @@
package fr.iut.pm.movieapplication.data.entities
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
@Entity(tableName = "movies_table")
data class MovieEntity(
@PrimaryKey val id: Int,
val title: String,
val overview: String?,
@ColumnInfo("poster_path") val posterPath: String?,
@ColumnInfo("backdrop_path") val backdropPath: String?,
@ColumnInfo("release_date") val releaseDate: String,
@ColumnInfo("vote_average") val voteAverage: Double,
@ColumnInfo("vote_count") val voteCount: Int,
val popularity: Double,
@ColumnInfo("original_language") val originalLanguage: String,
@ColumnInfo("original_title") val originalTitle: String,
val adult: Boolean,
@ColumnInfo("is_favorite") val isFavorite: Boolean
) {
}

@ -0,0 +1,34 @@
package fr.iut.pm.movieapplication.data.mapper
import fr.iut.pm.movieapplication.data.entities.GenreEntity
import fr.iut.pm.movieapplication.model.Genre
object GenreLocalMapper {
/**
* Map a [Genre] to a [GenreEntity]
*/
fun mapToGenreEntity(genre : Genre) : GenreEntity {
return GenreEntity(
genreId = genre.id,
name = genre.name
)
}
/**
* Map a list of [Genre] to a list of [GenreEntity]
*/
fun mapToGenreEntities(genres : List<Genre>) : List<GenreEntity> {
return genres.map { mapToGenreEntity(it) }
}
/**
* Map a [GenreEntity] to a [Genre]
*/
fun mapToGenre(genreEntity : GenreEntity) : Genre {
return Genre(
id = genreEntity.genreId,
name = genreEntity.name
)
}
}

@ -0,0 +1,101 @@
package fr.iut.pm.movieapplication.data.mapper
import fr.iut.pm.movieapplication.data.entities.MovieDetailsEntity
import fr.iut.pm.movieapplication.data.entities.MovieDetailsWithGenres
import fr.iut.pm.movieapplication.data.entities.MovieEntity
import fr.iut.pm.movieapplication.model.media.movie.Movie
import fr.iut.pm.movieapplication.model.media.movie.MovieDetails
object MovieLocalMapper {
/**
* Map a [MovieEntity] to a [Movie]
*/
fun mapToMovie(movieEntity : MovieEntity) : Movie {
return Movie(
posterPath = movieEntity.posterPath,
adult = movieEntity.adult,
overview = movieEntity.overview,
releaseDate = movieEntity.releaseDate,
id = movieEntity.id,
originalTitle = movieEntity.originalTitle,
originalLanguage = movieEntity.originalLanguage,
title = movieEntity.title,
backdropPath = movieEntity.backdropPath,
popularity = movieEntity.popularity,
voteCount = movieEntity.voteCount,
voteAverage = movieEntity.voteAverage
)
}
/**
* Map a [Movie] to a [MovieEntity]
*/
fun mapToMovieEntity(movie : Movie) : MovieEntity {
return MovieEntity(
posterPath = movie.posterPath,
adult = movie.adult!!,
overview = movie.overview,
releaseDate = movie.releaseDate!!,
id = movie.id,
originalTitle = movie.originalTitle,
originalLanguage = movie.originalLanguage,
title = movie.title,
backdropPath = movie.backdropPath ,
popularity = movie.popularity,
voteCount = movie.voteCount,
voteAverage = movie.voteAverage,
isFavorite = false
)
}
/**
* Map a [MovieDetails] to a [MovieDetailsEntity]
*/
fun mapToMovieDetailsEntity(movieDetails : MovieDetails) : MovieDetailsEntity {
return MovieDetailsEntity(
movieId = movieDetails.id,
movie = mapToMovieEntity(movieDetails),
budget = movieDetails.budget,
homepage = movieDetails.homepage,
revenue = movieDetails.revenue,
status = movieDetails.status
)
}
/**
* Map a [MovieDetails] to a [MovieDetailsWithGenres]
*/
fun mapToMovieDetailsWithGenres(movieDetails: MovieDetails) : MovieDetailsWithGenres {
return MovieDetailsWithGenres(
movieDetails = mapToMovieDetailsEntity(movieDetails),
genres = movieDetails.genres.map { GenreLocalMapper.mapToGenreEntity(it) }
)
}
/**
* Map a [MovieDetailsWithGenres] to a [MovieDetails]
*/
fun mapToMovieDetails(movieDetailsWithGenres: MovieDetailsWithGenres) : MovieDetails {
return MovieDetails(
id = movieDetailsWithGenres.movieDetails.movieId,
posterPath = movieDetailsWithGenres.movieDetails.movie.posterPath,
adult = movieDetailsWithGenres.movieDetails.movie.adult,
overview = movieDetailsWithGenres.movieDetails.movie.overview,
releaseDate = movieDetailsWithGenres.movieDetails.movie.releaseDate,
originalTitle = movieDetailsWithGenres.movieDetails.movie.originalTitle,
originalLanguage = movieDetailsWithGenres.movieDetails.movie.originalLanguage,
title = movieDetailsWithGenres.movieDetails.movie.title,
backdropPath = movieDetailsWithGenres.movieDetails.movie.backdropPath,
popularity = movieDetailsWithGenres.movieDetails.movie.popularity,
voteCount = movieDetailsWithGenres.movieDetails.movie.voteCount,
voteAverage = movieDetailsWithGenres.movieDetails.movie.voteAverage,
budget = movieDetailsWithGenres.movieDetails.budget,
homepage = movieDetailsWithGenres.movieDetails.homepage,
revenue = movieDetailsWithGenres.movieDetails.revenue,
status = movieDetailsWithGenres.movieDetails.status,
genres = movieDetailsWithGenres.genres.map { GenreLocalMapper.mapToGenre(it) }
)
}
}

@ -19,7 +19,7 @@ class MovieDetails(
//prod companies
//prod countries
releaseDate : String?,
val revenue : Int,
val revenue : Long,
//spoken language
val status : String,
title : String,

@ -1,16 +0,0 @@
package fr.iut.pm.movieapplication.repository
import android.util.Log
import fr.iut.pm.movieapplication.api.RetrofitInstance
import fr.iut.pm.movieapplication.api.dtos.PopularDTO
import fr.iut.pm.movieapplication.utils.Constants.Companion.API_KEY
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
class PopularRepository() {
suspend fun getPopular(): PopularDTO? {
throw NoSuchMethodError()
}
}

@ -1,4 +1,4 @@
package fr.iut.pm.movieapplication.repository
package fr.iut.pm.movieapplication.repository.api
import android.util.Log
import fr.iut.pm.movieapplication.api.RetrofitInstance
@ -68,4 +68,25 @@ class MediaRepository {
else Log.d("ERROR FAILED", response.message())
listMediaResult
}
suspend fun search(query : String, Page : Int = 1) : List<MediaResult> = withContext(Dispatchers.IO) {
val listMediaResult : MutableList<MediaResult> = mutableListOf()
val response = RetrofitInstance.api.searchMedia(query, Page)
if(response.isSuccessful) {
val listMediaResultDTO = response.body()?.results
Log.d("Response",response.body().toString())
listMediaResultDTO?.forEach {
if(it?.mediaType == "movie" || it?.mediaType == "tv") {
val mediaResult = it?.let { it1 -> MediaResultMapper.mapToMediaResult(it1) }
mediaResult?.let { it1 -> listMediaResult.add(it1) }
mediaResult?.let { it1 -> Log.d("Movie", it1.title) }
}
}
}
else Log.d("ERROR FAILED", response.message())
listMediaResult
}
}

@ -1,8 +1,7 @@
package fr.iut.pm.movieapplication.repository
package fr.iut.pm.movieapplication.repository.api
import android.util.Log
import fr.iut.pm.movieapplication.api.RetrofitInstance
import fr.iut.pm.movieapplication.api.dtos.MovieDetailsDTO
import fr.iut.pm.movieapplication.model.media.movie.Movie
import fr.iut.pm.movieapplication.model.media.movie.MovieDetails
import fr.iut.pm.movieapplication.utils.MediaResultMapper
@ -10,7 +9,7 @@ import fr.iut.pm.movieapplication.utils.MovieMapper
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
class MovieRepository {
class MovieAPIRepository {
suspend fun getPopularMovies(page : Int = 1) : List<Movie> = withContext(Dispatchers.IO)
{

@ -1,4 +1,4 @@
package fr.iut.pm.movieapplication.repository
package fr.iut.pm.movieapplication.repository.api
import android.util.Log
import fr.iut.pm.movieapplication.api.RetrofitInstance

@ -0,0 +1,36 @@
package fr.iut.pm.movieapplication.repository.local
import android.util.Log
import fr.iut.pm.movieapplication.data.dao.MovieDAO
import fr.iut.pm.movieapplication.data.mapper.MovieLocalMapper
import fr.iut.pm.movieapplication.model.media.movie.Movie
import fr.iut.pm.movieapplication.model.media.movie.MovieDetails
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
class MovieLocalRepository(private val movieDAO: MovieDAO) {
suspend fun insertMovie(movie : Movie) = withContext(Dispatchers.IO) {
movieDAO.insert(MovieLocalMapper.mapToMovieEntity(movie))
}
suspend fun insertMovieDetails(movieDetails : MovieDetails) = withContext(Dispatchers.IO) {
Log.i("MovieLocalRepository", "INSERT MOVIE DETAILS")
movieDAO.insertMovieDetailsWithGenres(MovieLocalMapper.mapToMovieDetailsWithGenres(movieDetails))
}
suspend fun getMovieDetailsById(id : Int) : MovieDetails {
return MovieLocalMapper.mapToMovieDetails(movieDAO.getMovieDetailsWithGenresById(id))
}
suspend fun getAllMovies() : List<Movie> = withContext(Dispatchers.IO) {
val listMovie : MutableList<Movie> = mutableListOf()
val listMoviesEntities = movieDAO.getAllMovies()
listMoviesEntities.forEach { movieEntity ->
listMovie.add(MovieLocalMapper.mapToMovie(movieEntity))
}
listMovie
}
}

@ -1,19 +1,13 @@
package fr.iut.pm.movieapplication.ui.activity
import android.os.Build
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.Menu
import android.view.View
import androidx.appcompat.widget.SearchView
import androidx.fragment.app.Fragment
import com.google.android.material.bottomnavigation.BottomNavigationView
import fr.iut.pm.movieapplication.R
import fr.iut.pm.movieapplication.repository.MediaRepository
import fr.iut.pm.movieapplication.repository.MovieRepository
import fr.iut.pm.movieapplication.ui.fragments.HomeSectionsFragment
import fr.iut.pm.movieapplication.ui.fragments.MoviesFragment
import fr.iut.pm.movieapplication.ui.fragments.TvShowsFragment
import fr.iut.pm.movieapplication.ui.fragments.*
class MainActivity : AppCompatActivity() {
@ -21,14 +15,14 @@ class MainActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
loadFragments(HomeSectionsFragment(this))
loadFragments(HomeSectionsFragment())
val navigationView = findViewById<BottomNavigationView>(R.id.navigation_view)
navigationView.setOnItemSelectedListener {
when(it.itemId)
{
R.id.home_page -> {
loadFragments(HomeSectionsFragment(this))
loadFragments(HomeSectionsFragment())
return@setOnItemSelectedListener true
}
@ -41,6 +35,10 @@ class MainActivity : AppCompatActivity() {
loadFragments(TvShowsFragment())
return@setOnItemSelectedListener true
}
R.id.favorites_page -> {
loadFragments(FavoritesFragment())
return@setOnItemSelectedListener true
}
else -> false
}
}
@ -56,13 +54,16 @@ class MainActivity : AppCompatActivity() {
override fun onQueryTextSubmit(query: String?): Boolean {
if(!query.isNullOrEmpty()) {
loadFragments(SearchResultFragment.newInstance(query))
}
return true;
}
override fun onQueryTextChange(newText: String?): Boolean {
return false
//A améliorer
override fun onQueryTextChange(query: String?): Boolean {
if(!query.isNullOrEmpty()) {
loadFragments(SearchResultFragment.newInstance(query))
}
return true
}
})

@ -10,17 +10,18 @@ import androidx.recyclerview.widget.RecyclerView
import coil.load
import fr.iut.pm.movieapplication.databinding.ItemHorizontalHomePageBinding
import fr.iut.pm.movieapplication.model.media.MediaResult
import fr.iut.pm.movieapplication.ui.interfaces.MediaSelection
import fr.iut.pm.movieapplication.ui.interfaces.MovieSelection
import fr.iut.pm.movieapplication.utils.Constants
class MediaAdapter(private val listener : MovieSelection): ListAdapter<MediaResult, MediaAdapter.ViewHolder>(DiffUtilMediaCallback) {
class MediaAdapter(private val listener : MediaSelection): ListAdapter<MediaResult, MediaAdapter.ViewHolder>(DiffUtilMediaCallback) {
private object DiffUtilMediaCallback : DiffUtil.ItemCallback<MediaResult>() {
override fun areItemsTheSame(oldItem: MediaResult, newItem: MediaResult) = oldItem.id == newItem.id
override fun areContentsTheSame(oldItem: MediaResult, newItem: MediaResult) = oldItem == newItem
}
class ViewHolder(private val binding : ItemHorizontalHomePageBinding, listener: MovieSelection)
class ViewHolder(private val binding : ItemHorizontalHomePageBinding, listener: MediaSelection)
: RecyclerView.ViewHolder(binding.root) {
val mediaResult : MediaResult? get() = binding.mediaResult

@ -1,4 +1,42 @@
package fr.iut.pm.movieapplication.ui.adapter
class SearchResultAdapter {
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.core.net.toUri
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.ListAdapter
import coil.load
import fr.iut.pm.movieapplication.databinding.ItemSearchResultsBinding
import fr.iut.pm.movieapplication.model.media.MediaResult
import fr.iut.pm.movieapplication.ui.interfaces.MediaSelection
import fr.iut.pm.movieapplication.utils.Constants
class SearchResultAdapter(private val listener : MediaSelection)
: ListAdapter<MediaResult, SearchResultAdapter.ViewHolder>(DiffUtilMediaCallback) {
private object DiffUtilMediaCallback : DiffUtil.ItemCallback<MediaResult>() {
override fun areItemsTheSame(oldItem: MediaResult, newItem: MediaResult) = oldItem.id == newItem.id
override fun areContentsTheSame(oldItem: MediaResult, newItem: MediaResult) = oldItem == newItem
}
class ViewHolder(private val binding : ItemSearchResultsBinding, listener: MediaSelection)
: RecyclerView.ViewHolder(binding.root) {
val mediaResult : MediaResult? get() = binding.mediaResult
fun bind(mediaResult : MediaResult) {
binding.mediaResult = mediaResult
val imgUri = mediaResult.posterPath?.let { (Constants.IMG_URL +it).toUri().buildUpon().scheme("https").build() }
binding.itemImage.load(imgUri)
binding.executePendingBindings()
}
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder =
ViewHolder(ItemSearchResultsBinding.inflate(LayoutInflater.from(parent.context)), listener)
override fun onBindViewHolder(holder: ViewHolder, position: Int) = holder.bind(getItem(position))
}

@ -31,6 +31,11 @@ class MovieDialog : DialogFragment() {
(Constants.IMG_URL + it).toUri().buildUpon().scheme("https").build()
})
}
binding.registerMovieDetailsButton.setOnClickListener {
moviesDialogVM.register(binding.movieDetails!!)
}
return binding.root
}

@ -0,0 +1,57 @@
package fr.iut.pm.movieapplication.ui.fragments
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import fr.iut.pm.movieapplication.databinding.FragmentFavoritesCategoryBinding
import fr.iut.pm.movieapplication.ui.adapter.MovieAdapter
import fr.iut.pm.movieapplication.ui.dialog.MovieDialog
import fr.iut.pm.movieapplication.ui.interfaces.MovieSelection
import fr.iut.pm.movieapplication.ui.viewmodel.FavoritesVM
class FavoritesFragment : Fragment(), MovieSelection {
private val favoritesVM by viewModels<FavoritesVM>()
private val movieAdapter = MovieAdapter(this);
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
val binding = FragmentFavoritesCategoryBinding.inflate(inflater)
binding.favoritesVM = favoritesVM
binding.lifecycleOwner = viewLifecycleOwner
with(binding.moviesItemRecyclerView) {
this.adapter = movieAdapter
}
return binding.root
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
favoritesVM.getFavoritesLiveData().observe(viewLifecycleOwner) {
movieAdapter.submitList(it)
}
}
override fun onMovieSelected(movieId: Int) {
val dialog = MovieDialog()
val args = Bundle()
args.putInt("movieId",movieId)
dialog.arguments = args
dialog.show(parentFragmentManager, "tag")
}
}

@ -1,6 +1,7 @@
package fr.iut.pm.movieapplication.ui.fragments
import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@ -10,12 +11,11 @@ import fr.iut.pm.movieapplication.databinding.FragmentHomeSectionsBinding
import fr.iut.pm.movieapplication.ui.activity.MainActivity
import fr.iut.pm.movieapplication.ui.adapter.MediaAdapter
import fr.iut.pm.movieapplication.ui.adapter.HomeItemDecoration
import fr.iut.pm.movieapplication.ui.interfaces.MediaSelection
import fr.iut.pm.movieapplication.ui.interfaces.MovieSelection
import fr.iut.pm.movieapplication.ui.viewmodel.HomeSectionsVM
class HomeSectionsFragment(
private val context : MainActivity
) : Fragment(), MovieSelection {
class HomeSectionsFragment() : Fragment(), MediaSelection {
private val homeSectionsVM by viewModels<HomeSectionsVM>()
@ -67,8 +67,7 @@ class HomeSectionsFragment(
popularTvShowsAdapter.submitList(it)
}
}
override fun onMovieSelected(movieId: Int) {
TODO("Not yet implemented")
override fun onMediaSelected(mediaId: Int) {
Log.d("ITEM SELECTED", mediaId.toString())
}
}

@ -1,23 +1,60 @@
package fr.iut.pm.movieapplication.ui.fragments
import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import fr.iut.pm.movieapplication.databinding.FragmentSearchResultsBinding
import fr.iut.pm.movieapplication.ui.adapter.MediaAdapter
import fr.iut.pm.movieapplication.ui.adapter.SearchResultAdapter
import fr.iut.pm.movieapplication.ui.interfaces.MediaSelection
import fr.iut.pm.movieapplication.ui.viewmodel.SearchResultVM
import fr.iut.pm.movieapplication.ui.viewmodel.SearchResultVMFactory
class SearchResultFragment : Fragment() {
class SearchResultFragment : Fragment(), MediaSelection {
private val searchResultViewModel by viewModels<SearchResultVM> { SearchResultVMFactory(arguments?.getString("query")!!) }
private val searchResultAdapter = SearchResultAdapter(this)
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return super.onCreateView(inflater, container, savedInstanceState)
): View {
val binding = FragmentSearchResultsBinding.inflate(inflater, container, false)
binding.lifecycleOwner = viewLifecycleOwner
binding.searchResultsVM = searchResultViewModel
with(binding.searchResultsItemRecyclerView) {
this.adapter = searchResultAdapter
}
return binding.root;
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
searchResultViewModel.getSearchResultLiveData().observe(viewLifecycleOwner) {
searchResultAdapter.submitList(it)
}
}
override fun onMediaSelected(mediaId: Int) {
Log.d("ITEM SELECTED", mediaId.toString())
}
companion object {
fun newInstance(query: String): SearchResultFragment {
val fragment = SearchResultFragment()
val args = Bundle()
args.putString("query", query)
fragment.arguments = args
return fragment
}
}
}

@ -0,0 +1,6 @@
package fr.iut.pm.movieapplication.ui.interfaces
interface MediaSelection {
fun onMediaSelected(mediaId : Int)
}

@ -0,0 +1,30 @@
package fr.iut.pm.movieapplication.ui.viewmodel
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import fr.iut.pm.movieapplication.data.database.MovieDataBase
import fr.iut.pm.movieapplication.model.media.movie.Movie
import fr.iut.pm.movieapplication.repository.local.MovieLocalRepository
import kotlinx.coroutines.launch
class FavoritesVM : ViewModel() {
private val repository = MovieLocalRepository(MovieDataBase.getInstance().movieDAO())
private var _favoritesLiveData : MutableLiveData<List<Movie>> = MutableLiveData()
fun getFavoritesLiveData() : MutableLiveData<List<Movie>> = _favoritesLiveData
init {
//with dispatchers.IO
viewModelScope.launch{
_favoritesLiveData.value = repository.getAllMovies()
}
}
}

@ -4,7 +4,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import fr.iut.pm.movieapplication.model.media.MediaResult
import fr.iut.pm.movieapplication.repository.MediaRepository
import fr.iut.pm.movieapplication.repository.api.MediaRepository
import kotlinx.coroutines.launch
class HomeSectionsVM : ViewModel() {

@ -1,13 +1,18 @@
package fr.iut.pm.movieapplication.ui.viewmodel
import androidx.lifecycle.*
import fr.iut.pm.movieapplication.data.database.MovieDataBase
import fr.iut.pm.movieapplication.model.media.movie.MovieDetails
import fr.iut.pm.movieapplication.repository.MovieRepository
import fr.iut.pm.movieapplication.repository.api.MovieAPIRepository
import fr.iut.pm.movieapplication.repository.local.MovieLocalRepository
import kotlinx.coroutines.launch
class MoviesDialogVM(private val movieId : Int) : ViewModel() {
private val repository = MovieRepository()
private val repository = MovieAPIRepository()
private val movieLocalRepository = MovieLocalRepository(
MovieDataBase.getInstance().movieDAO())
private var _movieDetailsLiveData : MutableLiveData<MovieDetails> = MutableLiveData()
fun getMovieDetailLiveData() : LiveData<MovieDetails> = _movieDetailsLiveData
@ -18,6 +23,11 @@ class MoviesDialogVM(private val movieId : Int) : ViewModel() {
}
}
fun register(movieDetails: MovieDetails) = viewModelScope.launch {
movieLocalRepository.insertMovieDetails(movieDetails)
}
}
class MoviesDialogVMFactory(private val movieId : Int) : ViewModelProvider.Factory

@ -4,17 +4,15 @@ import androidx.lifecycle.*
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import fr.iut.pm.movieapplication.model.media.movie.Movie
import fr.iut.pm.movieapplication.repository.MovieRepository
import fr.iut.pm.movieapplication.ui.adapter.MovieAdapter
import fr.iut.pm.movieapplication.repository.api.MovieAPIRepository
import fr.iut.pm.movieapplication.utils.Constants.Companion.MAX_PAGE
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
class MoviesVM() : ViewModel() {
/**
* The movie repository used to get our data
*/
private val repository = MovieRepository()
private val repository = MovieAPIRepository()
/**
* The MutableLiveData

@ -1,16 +1,25 @@
package fr.iut.pm.movieapplication.ui.viewmodel
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.*
import fr.iut.pm.movieapplication.model.media.MediaResult
import fr.iut.pm.movieapplication.repository.api.MediaRepository
import kotlinx.coroutines.launch
class SearchResultVM(private var query : String) : ViewModel() {
private val repository : MediaRepository = MediaRepository()
private var _queryLiveData : MutableLiveData<String> = MutableLiveData()
fun getQueryLiveData() : LiveData<String> = _queryLiveData
private var _searchResultLiveData : MutableLiveData<List<MediaResult>> = MutableLiveData()
fun getSearchResultLiveData() : LiveData<List<MediaResult>> = _searchResultLiveData
init {
_queryLiveData.postValue(query)
_queryLiveData.value = query
viewModelScope.launch {
_searchResultLiveData.postValue(repository.search(query))
}
}
}

@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import fr.iut.pm.movieapplication.model.media.tvshow.TvShow
import fr.iut.pm.movieapplication.repository.TvShowRepository
import fr.iut.pm.movieapplication.repository.api.TvShowRepository
import fr.iut.pm.movieapplication.ui.adapter.TvShowAdapter
import kotlinx.coroutines.launch

@ -1,5 +1,7 @@
package fr.iut.pm.movieapplication.utils
import fr.iut.pm.movieapplication.BuildConfig
class Constants {
companion object {
@ -7,7 +9,7 @@ class Constants {
//API
const val BASE_URL = "https://api.themoviedb.org/3/"
const val IMG_URL = "https://image.tmdb.org/t/p/w500"
const val API_KEY = "8f14a279249638d7f247d0d7298b21b4"
const val API_KEY = BuildConfig.API_KEY
//VIEW PAGINATION

@ -14,16 +14,16 @@ object MediaResultMapper {
fun mapToTvShow(mediaResultDTO: MediaResultDTO): TvShow {
return TvShow(
posterPath = mediaResultDTO.posterPath,
popularity = mediaResultDTO.popularity,
popularity = mediaResultDTO.popularity!!,
id = mediaResultDTO.id,
backdropPath = mediaResultDTO.backdropPath ?: "",
voteAverage = mediaResultDTO.voteAverage,
voteAverage = mediaResultDTO.voteAverage!!,
overview = mediaResultDTO.overview ?: "",
firstAirDate = mediaResultDTO.firstAirDate,
originCountry = mediaResultDTO.originCountry!!,
// genreIds = mediaResultDTO.genreIds,
originalLanguage = mediaResultDTO.originalLanguage,
voteCount = mediaResultDTO.voteCount,
originalLanguage = mediaResultDTO.originalLanguage!!,
voteCount = mediaResultDTO.voteCount!!,
name = mediaResultDTO.name!!,
originalName = mediaResultDTO.originalName!!
)
@ -38,13 +38,13 @@ object MediaResultMapper {
// genreIds = mediaResultDTO.genreIds,
id = mediaResultDTO.id,
originalTitle = mediaResultDTO.originalTitle!!,
originalLanguage = mediaResultDTO.originalLanguage,
originalLanguage = mediaResultDTO.originalLanguage!!,
title = mediaResultDTO.title!!,
backdropPath = mediaResultDTO.backdropPath,
popularity = mediaResultDTO.popularity,
voteCount = mediaResultDTO.voteCount,
popularity = mediaResultDTO.popularity!!,
voteCount = mediaResultDTO.voteCount!!,
//video = mediaResultDTO.video,
voteAverage = mediaResultDTO.voteAverage
voteAverage = mediaResultDTO.voteAverage!!
)
}
@ -58,12 +58,12 @@ object MediaResultMapper {
// genreIds = mediaResultDTO.genreIds,
id = mediaResultDTO.id,
originalTitle = mediaResultDTO.originalTitle ?: mediaResultDTO.originalName!!, //if it's not a movie also it's a tvshow
originalLanguage = mediaResultDTO.originalLanguage,
originalLanguage = mediaResultDTO.originalLanguage!!,
title = mediaResultDTO.title ?: mediaResultDTO.name!!, //if it's not a movie also it's a tvshow
backdropPath = mediaResultDTO.backdropPath,
popularity = mediaResultDTO.popularity,
voteCount = mediaResultDTO.voteCount,
voteAverage = mediaResultDTO.voteAverage,
popularity = mediaResultDTO.popularity!!,
voteCount = mediaResultDTO.voteCount!!,
voteAverage = mediaResultDTO.voteAverage!!,
mediaType = mediaResultDTO.mediaType
)
}

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<variable
name="favoritesVM"
type="fr.iut.pm.movieapplication.ui.viewmodel.FavoritesVM" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/movies_item_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/default_margin"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="3"
tools:listitem="@layout/item_movie_category"
/>
</LinearLayout>
</layout>

@ -41,7 +41,7 @@
android:layout_height="250dp"
android:orientation="horizontal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_vertical_fragment" />
tools:listitem="@layout/item_search_results" />
<TextView
android:id="@+id/home_page_popularity_section_title"
@ -59,7 +59,7 @@
android:layout_height="250dp"
android:orientation="horizontal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_vertical_fragment" />
tools:listitem="@layout/item_search_results" />
<TextView
android:id="@+id/home_page_free_section_title"
@ -74,9 +74,11 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/home_popular_tv_shows_recycler_view"
android:layout_width="match_parent"
android:layout_marginBottom="@dimen/default_margin"
android:layout_height="250dp"
android:orientation="horizontal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
/>
</LinearLayout>

@ -28,7 +28,6 @@
android:layout_marginEnd="@dimen/default_margin"
android:layout_marginTop="@dimen/default_margin"
android:layout_marginBottom="@dimen/default_margin"
android:background="@color/light_grey"
android:layout_marginRight="@dimen/default_margin" />
<ProgressBar

@ -16,10 +16,6 @@
android:layout_width="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/search_results_item_recycler_view"
@ -28,7 +24,7 @@
android:layout_marginBottom="@dimen/default_margin"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="3"
tools:listitem="@layout/item_vertical_fragment" />
tools:listitem="@layout/item_search_results" />
</LinearLayout>

@ -26,7 +26,6 @@
android:layout_marginEnd="@dimen/default_margin"
android:layout_marginTop="@dimen/default_margin"
android:layout_marginBottom="@dimen/default_margin"
android:background="@color/light_grey"
android:layout_marginRight="@dimen/default_margin" />
<androidx.recyclerview.widget.RecyclerView

@ -1,10 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="mediaResult"
type="fr.iut.pm.movieapplication.model.media.MediaResult" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.cardview.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
@ -13,11 +24,7 @@
android:layout_marginEnd="4dp"
android:layout_marginRight="4dp"
android:layout_marginBottom="8dp"
app:cardCornerRadius="10dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:cardCornerRadius="10dp">
<LinearLayout
android:layout_width="match_parent"
@ -36,18 +43,23 @@
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_gravity="center"
android:textAlignment="center" />
android:textAlignment="center"
android:text="@{mediaResult.title}"/>
<TextView
android:id="@+id/item_date"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_gravity="center"
android:textAlignment="center" />
android:textAlignment="center"
android:text="@{mediaResult.releaseDate}"/>
</LinearLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</layout>

@ -60,16 +60,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:text="@{movieDetails.overview.length() > 150 ? movieDetails.overview.substring(0, 150) + `...` : movieDetails.overview}"
android:textAlignment="center"
app:layout_constraintBottom_toTopOf="@+id/button"
app:layout_constraintBottom_toTopOf="@+id/register_movie_details_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/details_image"
app:layout_constraintTop_toBottomOf="@+id/details_image" />
<Button
android:id="@+id/button"
android:id="@+id/register_movie_details_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"

@ -14,7 +14,7 @@
android:icon="@drawable/ic_tv_shows"
android:title="@string/bottom_series_item" />
<item
android:id="@+id/artist_page"
android:id="@+id/favorites_page"
android:icon="@drawable/ic_baseline_star_border_24"
android:title="@string/bottom_artist_item" />
android:title="@string/bottom_favorite_item" />
</menu>

@ -14,7 +14,7 @@
android:icon="@drawable/ic_tv_shows"
android:title="@string/bottom_series_item" />
<item
android:id="@+id/artist_page"
android:id="@+id/favorites_page"
android:icon="@drawable/ic_baseline_star_border_24"
android:title="@string/bottom_artist_item" />
android:title="@string/bottom_favorite_item" />
</menu>

@ -13,4 +13,28 @@
<item name="android:statusBarColor" tools:targetApi="21">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. -->
</style>
<style name="DefaultTextStyle">
<item name="android:textColor">@color/white</item>
<item name="android:textSize">16sp</item>
<item name="android:fontFamily">@font/source_sans_pro</item>
</style>
<style name="SubtitleTextStyle" parent="DefaultTextStyle">
<item name="android:textColor">@color/white</item>
<item name="android:textSize">20sp</item>
</style>
<style name="SectionTitleStyle" parent="DefaultTextStyle">
<item name="android:textSize">24sp</item>
</style>
<style name="TitleTextStyle" parent="SubtitleTextStyle">
<item name="android:textColor">@color/white</item>
<item name="android:textSize">24sp</item>
</style>
<style name="BottomMenuStyle" parent="Widget.Material3.BottomNavigationView">
<item name="android:textSize">16sp</item>
</style>
</resources>

@ -4,7 +4,7 @@
<string name="bottom_home_item">Accueil</string>
<string name="bottom_movies_item">Films</string>
<string name="bottom_series_item">Séries</string>
<string name="bottom_artist_item">Artistes</string>
<string name="bottom_favorite_item">Favoris</string>
<!-- Home page -->
<string name="home_page_title">Bienvenue,</string>

@ -7,7 +7,7 @@ plugins {
ext {
activityVersion = '1.6.1'
appCompatVersion = '1.6.0'
appCompatVersion = '1.6.1'
constraintLayoutVersion = '2.1.4'
coreTestingVersion = '2.1.0'
coroutines = '1.6.4'

Loading…
Cancel
Save