From 7e36466e7552a7e656a16682aa7c527bf7aaa91d Mon Sep 17 00:00:00 2001 From: Julien THEME Date: Sun, 12 Feb 2023 22:40:55 +0100 Subject: [PATCH] :recycle: refactor all --- Cineapp/.idea/deploymentTargetDropDown.xml | 2 +- .../com/example/cinapp/api/MediaMapper.kt | 3 -- .../com/example/cinapp/api/MediaRepository.kt | 8 ----- .../java/com/example/cinapp/api/dto/Demmy.kt | 1 - .../example/cinapp/api/dto/MediaResponse.kt | 1 - .../cinapp/data/persistance/DAO/MovieDAO.kt | 15 ---------- .../cinapp/data/persistance/DAO/SerieDAO.kt | 13 -------- .../data/persistance/Entity/AppDatabase.kt | 1 - .../data/persistance/Entity/MovieEntity.kt | 1 - .../data/persistance/Entity/SerieEntity.kt | 1 - .../cinapp/data/persistance/MediaDatabase.kt | 17 ----------- .../persistance/converter/ListIntConverter.kt | 23 -------------- .../cinapp/ui/activity/MediaDetailActivity.kt | 30 ------------------- .../example/cinapp/ui/adapter/MediaAdapter.kt | 8 +---- .../cinapp/ui/extensions/MovieExtensions.kt | 2 -- .../cinapp/ui/extensions/SerieExtensions.kt | 1 - .../cinapp/ui/viewModel/HomeViewModel.kt | 1 - .../cinapp/ui/viewModel/MediaInfoViewModel.kt | 8 ----- .../cinapp/ui/viewModel/MovieViewModel.kt | 2 -- .../cinapp/ui/viewModel/SearchViewModel.kt | 1 - .../cinapp/ui/viewModel/SerieViewModel.kt | 6 ++-- 21 files changed, 4 insertions(+), 141 deletions(-) delete mode 100644 Cineapp/app/src/main/java/com/example/cinapp/data/persistance/converter/ListIntConverter.kt delete mode 100644 Cineapp/app/src/main/java/com/example/cinapp/ui/activity/MediaDetailActivity.kt diff --git a/Cineapp/.idea/deploymentTargetDropDown.xml b/Cineapp/.idea/deploymentTargetDropDown.xml index 2ed3655..228f32e 100644 --- a/Cineapp/.idea/deploymentTargetDropDown.xml +++ b/Cineapp/.idea/deploymentTargetDropDown.xml @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/api/MediaMapper.kt b/Cineapp/app/src/main/java/com/example/cinapp/api/MediaMapper.kt index 8327399..48805e5 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/api/MediaMapper.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/api/MediaMapper.kt @@ -51,9 +51,6 @@ class MediaMapper { originalName = mediaResponse.original_name, originCountry = mediaResponse.origin_country, isView = false - //seasons = mediaResponse.seasons, - //numberOfSeasons = mediaResponse.numberOfSeasons, - //numberOfEpisodes = mediaResponse.numberOfEpisodes ) } } diff --git a/Cineapp/app/src/main/java/com/example/cinapp/api/MediaRepository.kt b/Cineapp/app/src/main/java/com/example/cinapp/api/MediaRepository.kt index 21750a4..30f9a11 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/api/MediaRepository.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/api/MediaRepository.kt @@ -21,16 +21,13 @@ class MediaRepository { fun search(query: String, page: Int, callback: (List) -> Unit) { val response: Call = service.searchMedia(query, page) 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 search", response.body().toString()) val allMedia = response.body() val listMediaResponse = allMedia?.results listMediaResponse?.forEach { mediaResponse -> val media = mediaMapper.searchMapToMedia(mediaResponse) - Log.d("Media", media.toString()) if (media != null) listMedia.add(media) } callback(listMedia) @@ -40,7 +37,6 @@ class MediaRepository { Log.d("ErrorRetrofit", t.message.toString()) } }) - Log.d("Liste2", listMedia.size.toString()) } fun getPopularMovies(callback: (List) -> Unit ) { @@ -49,7 +45,6 @@ class MediaRepository { 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 -> @@ -70,7 +65,6 @@ class MediaRepository { 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 -> @@ -91,7 +85,6 @@ class MediaRepository { 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 -> @@ -112,7 +105,6 @@ class MediaRepository { 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 -> diff --git a/Cineapp/app/src/main/java/com/example/cinapp/api/dto/Demmy.kt b/Cineapp/app/src/main/java/com/example/cinapp/api/dto/Demmy.kt index 5f2c256..621d46b 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/api/dto/Demmy.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/api/dto/Demmy.kt @@ -2,7 +2,6 @@ package com.example.cinapp.api.dto class Demmy ( - var page: Int, var results: List, var total_pages: Int, var total_results: Int diff --git a/Cineapp/app/src/main/java/com/example/cinapp/api/dto/MediaResponse.kt b/Cineapp/app/src/main/java/com/example/cinapp/api/dto/MediaResponse.kt index 8465e86..6120b71 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/api/dto/MediaResponse.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/api/dto/MediaResponse.kt @@ -18,7 +18,6 @@ class MediaResponse( val genre_ids: List, val original_title: String, val title: String, - val video: Boolean, val release_date: String ) { diff --git a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/DAO/MovieDAO.kt b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/DAO/MovieDAO.kt index 2d438bb..90c453a 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/DAO/MovieDAO.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/DAO/MovieDAO.kt @@ -9,21 +9,6 @@ interface MovieDAO { @Query("SELECT * FROM movie") fun getAll(): List - @Query("SELECT * FROM movie WHERE id IN (:movieIds)") - fun loadAllByIds(movieIds: IntArray): List - - @Query("SELECT * FROM movie WHERE name LIKE :name LIMIT 1") - fun findByName(name: String): MovieEntity - - @Query("SELECT * FROM movie WHERE id LIKE :id LIMIT 1") - fun findById(id: Int): MovieEntity - - /* @Query("SELECT * FROM movie WHERE :genreId IN (genreIds)") - fun findByGenre(genreId: Int): List - - @Query("SELECT * FROM movie WHERE :genreId IN (genreIds)") - fun findByGenres(genreId: List): List*/ - @Query("SELECT * FROM movie WHERE id = :id") fun getById(id: Int): MovieEntity diff --git a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/DAO/SerieDAO.kt b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/DAO/SerieDAO.kt index fe510f3..97db544 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/DAO/SerieDAO.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/DAO/SerieDAO.kt @@ -1,7 +1,6 @@ package com.example.cinapp.data.persistance.DAO import androidx.room.* -import com.example.cinapp.data.persistance.Entity.MovieEntity import com.example.cinapp.data.persistance.Entity.SerieEntity @Dao @@ -12,18 +11,6 @@ interface SerieDAO { @Query("SELECT * FROM serie WHERE id IN (:serieIds)") fun loadAllByIds(serieIds: IntArray): List - @Query("SELECT * FROM serie WHERE name LIKE :name LIMIT 1") - fun findByName(name: String): SerieEntity - - @Query("SELECT * FROM serie WHERE id LIKE :id LIMIT 1") - fun findById(id: Int): SerieEntity - -/* @Query("SELECT * FROM serie WHERE :genreId IN (genreIds)") - fun findByGenre(genreId: Int): List - - @Query("SELECT * FROM serie WHERE :genreId IN (genreIds)") - fun findByGenres(genreId: List): List*/ - @Query("SELECT * FROM serie WHERE id = :id") fun getById(id: Int): SerieEntity diff --git a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/Entity/AppDatabase.kt b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/Entity/AppDatabase.kt index d93258a..8247efc 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/Entity/AppDatabase.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/Entity/AppDatabase.kt @@ -33,7 +33,6 @@ class AppDatabase { application = app } - fun destroyInstance() { instance = null } diff --git a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/Entity/MovieEntity.kt b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/Entity/MovieEntity.kt index 7cdea71..e31db7d 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/Entity/MovieEntity.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/Entity/MovieEntity.kt @@ -17,6 +17,5 @@ data class MovieEntity ( val posterPath: String, val voteAverage: Double, val voteCount: Int, - /* val genreIds: List? = null,*/ var isView: Boolean ) \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/Entity/SerieEntity.kt b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/Entity/SerieEntity.kt index eef2c3c..a683838 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/Entity/SerieEntity.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/Entity/SerieEntity.kt @@ -17,6 +17,5 @@ data class SerieEntity ( val posterPath: String, val voteAverage: Double, val voteCount: Int, - /*val genreIds: List,*/ var isView: Boolean ) \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/MediaDatabase.kt b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/MediaDatabase.kt index 2d46e6a..b89ee23 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/MediaDatabase.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/MediaDatabase.kt @@ -1,9 +1,6 @@ package com.example.cinapp.data.persistance import android.app.Application -import android.content.Context -import android.util.Log -import androidx.appcompat.app.AppCompatActivity import androidx.room.* import com.example.cinapp.CinAppApplication import com.example.cinapp.data.persistance.DAO.MovieDAO @@ -32,29 +29,15 @@ abstract class MediaDatabase: RoomDatabase() { .build() } } - Log.d("MediaDatabase", "getInstance: ${instance.toString()}") return instance!! } - /*if (instance == null) - synchronized(this) { - if (instance == null) - instance = Room.databaseBuilder( - application.applicationContext, - DogDatabase::class.java, - DOG_DB_FILENAME - ) - .build() - } - return instance!!*/ - @JvmStatic fun initialize(app: CinAppApplication) { if (::application.isInitialized) throw RuntimeException("the database must not be initialized twice") application = app - Log.d("MediaDatabase", "initialize: ${application.toString()}") } diff --git a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/converter/ListIntConverter.kt b/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/converter/ListIntConverter.kt deleted file mode 100644 index 1c3ad7c..0000000 --- a/Cineapp/app/src/main/java/com/example/cinapp/data/persistance/converter/ListIntConverter.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.cinapp.data.persistance.converter - -import androidx.room.TypeConverter -import com.squareup.moshi.Moshi -import com.squareup.moshi.Types - -class ListIntConverter { - @TypeConverter - fun fromString(value: String): List { - val moshi = Moshi.Builder().build() - val type = Types.newParameterizedType(List::class.java, Int::class.java) - val adapter = moshi.adapter>(type) - return adapter.fromJson(value) ?: emptyList() - } - - @TypeConverter - fun fromList(list: List): String { - val moshi = Moshi.Builder().build() - val type = Types.newParameterizedType(List::class.java, Int::class.java) - val adapter = moshi.adapter>(type) - return adapter.toJson(list) - } -} \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/ui/activity/MediaDetailActivity.kt b/Cineapp/app/src/main/java/com/example/cinapp/ui/activity/MediaDetailActivity.kt deleted file mode 100644 index 052d59c..0000000 --- a/Cineapp/app/src/main/java/com/example/cinapp/ui/activity/MediaDetailActivity.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.example.cinapp.ui.activity - -import android.os.Bundle -import android.widget.TextView -import androidx.appcompat.app.AppCompatActivity -import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProvider -import com.example.cinapp.R -import com.example.cinapp.model.Media -import com.example.cinapp.ui.viewModel.MediaViewModel - -class MediaDetailActivity : AppCompatActivity() { - /*private lateinit var viewModel: MediaViewModel - - public lateinit var media: Media - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.movie_view) - - val media = intent.getIntExtra("MEDIA", 0) - viewModel = ViewModelProvider(this).get(MediaViewModel::class.java) - - var textView = findViewById(R.id.info_name) - - viewModel.getMediaLiveData(mediaId).observe(this, Observer { media -> - textView.text = media.title - }) - }*/ -} \ No newline at end of file diff --git a/Cineapp/app/src/main/java/com/example/cinapp/ui/adapter/MediaAdapter.kt b/Cineapp/app/src/main/java/com/example/cinapp/ui/adapter/MediaAdapter.kt index c57a7cb..c6585de 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/ui/adapter/MediaAdapter.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/ui/adapter/MediaAdapter.kt @@ -1,6 +1,5 @@ package com.example.cinapp.ui.adapter -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -12,7 +11,6 @@ import com.bumptech.glide.Glide import com.example.cinapp.MainActivity import com.example.cinapp.R import com.example.cinapp.model.Media -import com.example.cinapp.ui.fragments.MovieFragment import com.example.cinapp.ui.fragments.MovieInfo class MediaAdapter(private val mediaList: LiveData>, private val main: MainActivity) : RecyclerView.Adapter() { @@ -25,21 +23,17 @@ class MediaAdapter(private val mediaList: LiveData>, private val mai override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val view = LayoutInflater.from(parent.context).inflate(R.layout.item_movie, parent, false) - Log.d("MediaAdapter", "onCreateViewHolder: $view") return ViewHolder(view) } override fun onBindViewHolder(holder: ViewHolder, position: Int) { mediaList.observeForever { - var media = it[position] + val media = it[position] Glide.with(holder.itemView.context) .load("https://image.tmdb.org/t/p/w500" + media.posterPath) .override(400, 600) .into(holder.poster) - Log.d("MediaAdapter", "onBindViewHolder: $media") holder.poster.setOnClickListener { - Log.d("MediaAdapter", "onBindViewHolder: $media") - //changer de fragment val fragment = MovieInfo() fragment.media = media main.replaceFragment(fragment) diff --git a/Cineapp/app/src/main/java/com/example/cinapp/ui/extensions/MovieExtensions.kt b/Cineapp/app/src/main/java/com/example/cinapp/ui/extensions/MovieExtensions.kt index 835ba74..b710e61 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/ui/extensions/MovieExtensions.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/ui/extensions/MovieExtensions.kt @@ -1,6 +1,5 @@ package com.example.cinapp.ui.extensions -import androidx.room.PrimaryKey import com.example.cinapp.data.persistance.Entity.MovieEntity import com.example.cinapp.model.Movie @@ -41,7 +40,6 @@ class MovieExtensions { movie.posterPath?: "", movie.voteAverage?: 0.0, movie.voteCount?: 0, - /* movie.genreIds?: listOf(),*/ movie.isView?: false ) } diff --git a/Cineapp/app/src/main/java/com/example/cinapp/ui/extensions/SerieExtensions.kt b/Cineapp/app/src/main/java/com/example/cinapp/ui/extensions/SerieExtensions.kt index afb42d3..10fcdc2 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/ui/extensions/SerieExtensions.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/ui/extensions/SerieExtensions.kt @@ -19,7 +19,6 @@ class SerieExtensions { serie.posterPath?: "", serie.voteAverage?: 0.0, serie.voteCount?: 0, - /* serie.genreIds?: listOf(),*/ serie.isView?: false ) } diff --git a/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/HomeViewModel.kt b/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/HomeViewModel.kt index 081d394..246c5d3 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/HomeViewModel.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/HomeViewModel.kt @@ -61,7 +61,6 @@ class HomeViewModel(private val main: MainActivity): ViewModel() { } fun addMediaToRecyclerView(recyclerView: RecyclerView, mediaList: MutableLiveData>) { - Log.d("HomeViewModel ------", "addMediaToRecyclerView: $recyclerView") val layoutManager = StaggeredGridLayoutManager(1, StaggeredGridLayoutManager.HORIZONTAL) recyclerView.layoutManager = layoutManager recyclerView.adapter = MediaAdapter(mediaList, main) diff --git a/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/MediaInfoViewModel.kt b/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/MediaInfoViewModel.kt index 123d913..d9b2650 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/MediaInfoViewModel.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/MediaInfoViewModel.kt @@ -13,13 +13,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch class MediaInfoViewModel: ViewModel() { - fun addMovieToWatchList() { - TODO("Not yet implemented") - } - - fun addSerieToWatchList() { - TODO("Not yet implemented") - } fun addMediaToWatchList(db: MediaDatabase, media: Media) { viewModelScope.launch(Dispatchers.IO) { @@ -56,7 +49,6 @@ class MediaInfoViewModel: ViewModel() { isInWatchList = db?.serieDAO()?.getById(serieEntity.id) != null } } - Log.d("isInWatchList", isInWatchList.toString()) return isInWatchList } diff --git a/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/MovieViewModel.kt b/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/MovieViewModel.kt index 37599c6..6469ccc 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/MovieViewModel.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/MovieViewModel.kt @@ -19,13 +19,11 @@ import kotlinx.coroutines.* class MovieViewModel: ViewModel() { var medias = MutableLiveData>() - var mediasEntity = MutableLiveData>() @SuppressLint("StaticFieldLeak") lateinit var main: MainActivity; @JvmName("setSearchView1") fun setMediaList(rootView: View) { - Log.d("SearchViewModel", "View: $rootView") viewModelScope.launch(Dispatchers.IO) { var listMediaEntity = downloadMedia() var listeMedia : MutableList = mutableListOf() diff --git a/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/SearchViewModel.kt b/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/SearchViewModel.kt index 2b8afaa..0a9d416 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/SearchViewModel.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/SearchViewModel.kt @@ -23,7 +23,6 @@ class SearchViewModel : ViewModel() { @JvmName("setSearchView1") fun setSearchView(rootView: View) { searchView = rootView.findViewById(R.id.searchView) - Log.d("SearchViewModel", "setSearchView: $searchView") searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener { override fun onQueryTextSubmit(query: String?): Boolean { diff --git a/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/SerieViewModel.kt b/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/SerieViewModel.kt index 5764e50..6b7238d 100644 --- a/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/SerieViewModel.kt +++ b/Cineapp/app/src/main/java/com/example/cinapp/ui/viewModel/SerieViewModel.kt @@ -24,16 +24,14 @@ import kotlinx.coroutines.withContext class SerieViewModel: ViewModel() { var medias = MutableLiveData>() - var mediasEntity = MutableLiveData>() @SuppressLint("StaticFieldLeak") lateinit var main: MainActivity; @JvmName("setSearchView1") fun setMediaList(rootView: View) { - Log.d("SearchViewModel", "View: $rootView") viewModelScope.launch(Dispatchers.IO) { - var listMediaEntity = downloadMedia() - var listeMedia : MutableList = mutableListOf() + val listMediaEntity = downloadMedia() + val listeMedia : MutableList = mutableListOf() listMediaEntity.forEach() { listeMedia.add(SerieExtensions.toSerie(it)) }