From d86d7865e11333fe730d1687c1c2a23516475755 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Mon, 27 Sep 2021 15:51:12 -0300
Subject: [PATCH 01/28] Rate a Screening first commit

---
 app/src/main/res/layout/fragment_detail.xml | 157 ++++++++++++--------
 1 file changed, 92 insertions(+), 65 deletions(-)

diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index 094031cc..1928aca3 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -70,111 +70,138 @@
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_margin="16dp"
-                android:orientation="vertical">
+                android:layout_margin="16dp">
 
-                <TextView
-                    android:id="@+id/first_air_date_detail_textView"
+                <ImageView
+                    android:id="@+id/thumb_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black"
-                    tools:text="2021" />
+                    android:src="@drawable/ic_thumb_up"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:tint="@color/red" />
 
                 <TextView
-                    android:id="@+id/status_detail_textView"
+                    android:id="@+id/genres_detail_textView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"/>
+
+                <TextView
+                    android:id="@+id/overview_textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
+                    android:text="@string/overview"
                     android:textColor="@color/black"
-                    tools:text="Now Streaming" />
+                    android:textSize="20sp"
+                    android:textStyle="bold"
+                    android:layout_marginTop="40dp"
+                    app:layout_constraintTop_toBottomOf="@+id/genres_detail_textView"
+                    app:layout_constraintStart_toStartOf="parent"/>
 
                 <TextView
-                    android:id="@+id/genres_detail_textView"
+                    android:id="@+id/status_detail_textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    tools:text="Animation, Action, Adventure, Sci-Fci, Fantasy " />
+                    android:textColor="@color/black"
+                    android:text="Now Streaming"
+                    android:layout_marginTop="40dp"
+                    app:layout_constraintTop_toBottomOf="@+id/genres_detail_textView"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
                 <TextView
-                    android:id="@+id/number_of_seasons_detail_textView"
+                    android:id="@+id/first_air_date_detail_textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="18dp"
                     android:textColor="@color/black"
-                    tools:visibility="gone"
-                    tools:text="1 Season" />
+                    android:layout_marginTop="24dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_detail_textView"
+                    />
 
                 <TextView
-                    android:id="@+id/number_of_episodes_detail_textView"
+                    android:id="@+id/number_of_seasons_detail_textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    tools:visibility="gone"
                     android:textColor="@color/black"
-                    tools:text="5 Episodes" />
+                    android:layout_marginStart="20dp"
+                    app:layout_constraintStart_toEndOf="@+id/first_air_date_detail_textView"
+                    app:layout_constraintTop_toTopOf="@+id/first_air_date_detail_textView"/>
 
                 <TextView
-                    android:id="@+id/overview_textView"
+                    android:id="@+id/number_of_episodes_detail_textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="18dp"
-                    android:text="@string/overview"
                     android:textColor="@color/black"
-                    android:textSize="18sp"
-                    android:textStyle="bold" />
+                    android:layout_marginStart="20dp"
+                    app:layout_constraintStart_toEndOf="@+id/number_of_seasons_detail_textView"
+                    app:layout_constraintTop_toTopOf="@id/number_of_seasons_detail_textView"/>
 
                 <TextView
                     android:id="@+id/overview_detail_textView"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:lineSpacingExtra="4dp"
                     android:textColor="@color/black"
-                    tools:text="Taking inspiration from the comic books of the same name, each episode explores a pivotal moment from the Marvel Cinematic Universe and turns it on its head, leading the audience into uncharted territory." />
+                    android:textSize="16sp"
+                    app:layout_constraintTop_toBottomOf="@id/overview_textView"
+                    app:layout_constraintStart_toStartOf="parent"
+                    android:layout_marginVertical="20dp"
+                    />
+
+                <Button
+                    android:id="@+id/button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Button"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            </LinearLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
         </androidx.core.widget.NestedScrollView>
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/popularity_card"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_marginEnd="16dp"
-            app:cardBackgroundColor="@color/primaryColor"
-            app:cardCornerRadius="100dp"
-            app:cardElevation="3dp"
-            app:layout_anchor="@id/appBarLayoutDetail"
-            app:layout_anchorGravity="end|bottom"
-            tools:src="@drawable/ic_launcher_foreground">
-
-            <ProgressBar
-                android:id="@+id/circular_percentage"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_centerInParent="true"
-                android:layout_margin="2dp"
-                android:indeterminate="false"
-                android:max="100"
-                android:progressDrawable="@drawable/ring"
-                android:rotation="-90"
-                android:secondaryProgress="100" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/screening_popularity"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:textColor="@color/secondaryColor"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                tools:text="100%" />
-
-        </androidx.cardview.widget.CardView>
+        <!--        <androidx.cardview.widget.CardView-->
+        <!--            android:id="@+id/popularity_card"-->
+        <!--            android:layout_width="60dp"-->
+        <!--            android:layout_height="60dp"-->
+        <!--            android:layout_marginEnd="16dp"-->
+        <!--            app:cardBackgroundColor="@color/primaryColor"-->
+        <!--            app:cardCornerRadius="100dp"-->
+        <!--            app:cardElevation="3dp"-->
+        <!--            app:layout_anchor="@id/appBarLayoutDetail"-->
+        <!--            app:layout_anchorGravity="end|bottom"-->
+        <!--            tools:src="@drawable/ic_launcher_foreground">-->
+
+        <!--            <ProgressBar-->
+        <!--                android:id="@+id/circular_percentage"-->
+        <!--                style="?android:attr/progressBarStyleHorizontal"-->
+        <!--                android:layout_width="match_parent"-->
+        <!--                android:layout_height="match_parent"-->
+        <!--                android:layout_centerInParent="true"-->
+        <!--                android:layout_margin="2dp"-->
+        <!--                android:indeterminate="false"-->
+        <!--                android:max="100"-->
+        <!--                android:progressDrawable="@drawable/ring"-->
+        <!--                android:rotation="-90"-->
+        <!--                android:secondaryProgress="100" />-->
+
+        <!--            <androidx.appcompat.widget.AppCompatTextView-->
+        <!--                android:id="@+id/screening_popularity"-->
+        <!--                android:layout_width="wrap_content"-->
+        <!--                android:layout_height="wrap_content"-->
+        <!--                android:layout_gravity="center"-->
+        <!--                android:textColor="@color/secondaryColor"-->
+        <!--                android:textSize="14sp"-->
+        <!--                android:textStyle="bold"-->
+        <!--                tools:text="100%" />-->
+
+        <!--        </androidx.cardview.widget.CardView>-->
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 

From d9cbbefc4e32aad3329558e233b341371d6ba6e8 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Mon, 27 Sep 2021 15:56:37 -0300
Subject: [PATCH 02/28] Rate a Screening remove error.

---
 .../tmdbandroid/details/ui/DetailFragment.kt  | 57 ++++++++++---------
 app/src/main/res/drawable/ic_thumb_up.xml     |  5 ++
 2 files changed, 34 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_thumb_up.xml

diff --git a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
index 88226fbb..2c1406db 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
@@ -123,7 +123,8 @@ class DetailFragment : Fragment() {
 
         screening.release_date?.let { setDate(binding, it) }
 
-        setPercentageToCircularPercentage(binding, screening.vote_average)
+        //setPercentageToCircularPercentage(binding, screening.vote_average)
+        //setPercentageToCircularPercentage(binding, tvShow.vote_average)
 
         setupToolbar(binding, screening)
 
@@ -165,28 +166,28 @@ class DetailFragment : Fragment() {
         screeningItemId?.let { viewModel.existAsFavorite(it) }
     }
 
-    private fun setPercentageToCircularPercentage(
-        binding: FragmentDetailBinding,
-        voteAverage: Double
-    ) {
-        val percentage = (voteAverage * 10).toInt()
-
-        binding.circularPercentage.progress = percentage
-
-        val context = binding.root.context
-
-        when {
-            percentage < 25 -> binding.circularPercentage.progressTintList =
-                ContextCompat.getColorStateList(context, R.color.red)
-            percentage < 45 -> binding.circularPercentage.progressTintList =
-                ContextCompat.getColorStateList(context, R.color.orange)
-            percentage < 75 -> binding.circularPercentage.progressTintList =
-                ContextCompat.getColorStateList(context, R.color.yellow)
-            else -> binding.circularPercentage.progressTintList =
-                ContextCompat.getColorStateList(context, R.color.green)
-        }
-        binding.screeningPopularity.text = resources.getString(R.string.popularity, percentage)
-    }
+//    private fun setPercentageToCircularPercentage(
+//        binding: FragmentDetailBinding,
+//        voteAverage: Double
+//    ) {
+//        val percentage = (voteAverage * 10).toInt()
+//
+//        binding.circularPercentage.progress = percentage
+//
+//        val context = binding.root.context
+//
+//        when {
+//            percentage < 25 -> binding.circularPercentage.progressTintList =
+//                ContextCompat.getColorStateList(context, R.color.red)
+//            percentage < 45 -> binding.circularPercentage.progressTintList =
+//                ContextCompat.getColorStateList(context, R.color.orange)
+//            percentage < 75 -> binding.circularPercentage.progressTintList =
+//                ContextCompat.getColorStateList(context, R.color.yellow)
+//            else -> binding.circularPercentage.progressTintList =
+//                ContextCompat.getColorStateList(context, R.color.green)
+//        }
+//        binding.screeningPopularity.text = resources.getString(R.string.popularity, percentage)
+//    }
 
     private fun setDate(binding: FragmentDetailBinding, firstAirDate: String) {
         try {
@@ -241,11 +242,11 @@ class DetailFragment : Fragment() {
             navController,
             appBarConfiguration
         )
-        binding.appBarLayoutDetail.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { _, verticalOffset ->
-            if (verticalOffset < -500) {
-                binding.popularityCard.visibility = View.INVISIBLE
-            } else binding.popularityCard.visibility = View.VISIBLE
-        })
+//        binding.appBarLayoutDetail.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { _, verticalOffset ->
+//            if (verticalOffset < -500) {
+//                binding.popularityCard.visibility = View.INVISIBLE
+//            } else binding.popularityCard.visibility = View.VISIBLE
+//        })
     }
 
     private fun selectOrUnselectWatchlistFav(binding: FragmentDetailBinding, isFav: Boolean) {
diff --git a/app/src/main/res/drawable/ic_thumb_up.xml b/app/src/main/res/drawable/ic_thumb_up.xml
new file mode 100644
index 00000000..93706273
--- /dev/null
+++ b/app/src/main/res/drawable/ic_thumb_up.xml
@@ -0,0 +1,5 @@
+<vector android:height="32dp" android:tint="#787878"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-2z"/>
+</vector>

From d8ddabbec060cdf245d55f828df81f20ea205ccc Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Tue, 28 Sep 2021 08:00:39 -0300
Subject: [PATCH 03/28] Rate a Screening post

---
 .../intive/tmdbandroid/datasource/network/ApiClient.kt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
index efd3ce06..1ef84aed 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
@@ -4,9 +4,10 @@ import com.intive.tmdbandroid.entity.ResultListTVShowOrMovies
 import com.intive.tmdbandroid.entity.ResultTVShowsEntity
 import com.intive.tmdbandroid.model.Movie
 import com.intive.tmdbandroid.model.TVShow
-import retrofit2.http.GET
-import retrofit2.http.Path
-import retrofit2.http.Query
+import okhttp3.RequestBody
+import okhttp3.ResponseBody
+import retrofit2.Response
+import retrofit2.http.*
 
 interface ApiClient {
     @GET("tv/popular")
@@ -25,4 +26,7 @@ interface ApiClient {
     suspend fun getTVShowAndMoviesByName(@Query("api_key") apiKey: String,
                                 @Query("query") query: String,
                                 @Query("page") page: Int) : ResultListTVShowOrMovies
+
+    @POST("movie/{movie_id}/rating")
+    suspend fun postRanking(@Query("api_key") apiKey: String, @Path("movie_id") query: String, @Body requestBody : RequestBody): Response<ResponseBody>
 }
\ No newline at end of file

From e166a01fa1f5273861e5094ef43a59fb036aebd0 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Tue, 28 Sep 2021 16:51:49 -0300
Subject: [PATCH 04/28] Rate a Screening like a stash

---
 .../datasource/network/ApiClient.kt           |  5 ++-
 .../tmdbandroid/datasource/network/Service.kt | 37 +++++++++++++++++++
 .../com/intive/tmdbandroid/model/Session.kt   | 21 +++++++++++
 app/src/main/res/layout/fragment_detail.xml   |  2 +-
 4 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/intive/tmdbandroid/model/Session.kt

diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
index 1ef84aed..5b5bea55 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
@@ -28,5 +28,8 @@ interface ApiClient {
                                 @Query("page") page: Int) : ResultListTVShowOrMovies
 
     @POST("movie/{movie_id}/rating")
-    suspend fun postRanking(@Query("api_key") apiKey: String, @Path("movie_id") query: String, @Body requestBody : RequestBody): Response<ResponseBody>
+    suspend fun postMovieRanking(@Query("api_key") apiKey: String, @Path("movie_id") query: Int, @Query("session_id") sessionId:String,@Body requestBody : RequestBody): Response<ResponseBody>
+
+    @POST("tv/{tv_id}/rating")
+    suspend fun postTVRanking(@Query("api_key") apiKey: String, @Path("tv_id") query: Int, @Query("session_id") sessionId:String, @Body requestBody : RequestBody): Response<ResponseBody>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
index 6a2a015a..98e81a70 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
@@ -1,5 +1,6 @@
 package com.intive.tmdbandroid.datasource.network
 
+import android.R.attr
 import com.intive.tmdbandroid.BuildConfig
 import com.intive.tmdbandroid.common.RetrofitHelper
 import com.intive.tmdbandroid.entity.ResultListTVShowOrMovies
@@ -8,9 +9,19 @@ import com.intive.tmdbandroid.model.Movie
 import com.intive.tmdbandroid.model.TVShow
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import android.R.attr.rating
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
+import androidx.lifecycle.LiveData
+import com.intive.tmdbandroid.common.State
+import com.intive.tmdbandroid.model.Session
+
 
 class Service {
     private val retrofit = RetrofitHelper.getRetrofit()
+    private val session: LiveData<State<Session>>? = null
 
     fun getPaginatedPopularTVShows(page: Int): Flow<ResultTVShowsEntity> {
         return flow {
@@ -35,4 +46,30 @@ class Service {
             emit(retrofit.create(ApiClient::class.java).getMovieByID(movieID, BuildConfig.API_KEY))
         }
     }
+
+    suspend fun setMovieRating(movieID: Int, rating: Double): Boolean {
+        var retorno:Boolean = true
+        if(rating < 0.5 || rating > 10){
+            retorno=false
+        }
+        else{
+            // Create JSON using JSONObject
+            val jsonObject = JSONObject()
+            jsonObject.put("value", rating)
+
+            // Convert JSONObject to String
+            val jsonObjectString = jsonObject.toString()
+
+            // Create RequestBody ( We're not using any converter, like GsonConverter, MoshiConverter e.t.c, that's why we use RequestBody )
+            val requestBody = jsonObjectString.toRequestBody("application/json".toMediaTypeOrNull())
+
+            retrofit.create(ApiClient::class.java).postMovieRanking(BuildConfig.API_KEY,movieID, session(),requestBody)
+        }
+
+        return  retorno
+    }
+
+    fun session():String{
+        return session.toString()
+    }
 }
diff --git a/app/src/main/java/com/intive/tmdbandroid/model/Session.kt b/app/src/main/java/com/intive/tmdbandroid/model/Session.kt
new file mode 100644
index 00000000..d934f4ff
--- /dev/null
+++ b/app/src/main/java/com/intive/tmdbandroid/model/Session.kt
@@ -0,0 +1,21 @@
+package com.intive.tmdbandroid.model
+
+class Session {
+    var Success = false
+
+    lateinit var sessionId:String
+    private var accountId = 0
+
+    fun Session(success: Boolean, sessionId: String) {
+        Success = success
+        this.sessionId = sessionId
+    }
+
+    fun getAccountId(): Int {
+        return accountId
+    }
+
+    fun setAccountId(accountId: Int) {
+        this.accountId = accountId
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index 1928aca3..25cf70ed 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -155,7 +155,7 @@
                     />
 
                 <Button
-                    android:id="@+id/button"
+                    android:id="@+id/button_rating"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="Button"

From 5a26438b123cf450596ee56014e4415c73f0a592 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Wed, 29 Sep 2021 07:06:57 -0300
Subject: [PATCH 05/28] Rate a Screening movie and tv show api rating.

---
 .../datasource/network/ApiClient.kt           |  4 ++--
 .../tmdbandroid/datasource/network/Service.kt | 24 ++++++++++++++++++-
 .../tmdbandroid/details/ui/DetailFragment.kt  | 13 ++++++++++
 .../details/viewmodel/DetailsViewModel.kt     | 16 ++++++++++++-
 .../repository/CatalogRepository.kt           |  8 +++++++
 .../tmdbandroid/usecase/RatingMovieUseCase.kt | 10 ++++++++
 .../usecase/RatingTVShowUseCase.kt            | 10 ++++++++
 7 files changed, 81 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/intive/tmdbandroid/usecase/RatingMovieUseCase.kt
 create mode 100644 app/src/main/java/com/intive/tmdbandroid/usecase/RatingTVShowUseCase.kt

diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
index 5b5bea55..a8375748 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
@@ -28,8 +28,8 @@ interface ApiClient {
                                 @Query("page") page: Int) : ResultListTVShowOrMovies
 
     @POST("movie/{movie_id}/rating")
-    suspend fun postMovieRanking(@Query("api_key") apiKey: String, @Path("movie_id") query: Int, @Query("session_id") sessionId:String,@Body requestBody : RequestBody): Response<ResponseBody>
+    suspend fun postMovieRanking(@Path("movie_id") query: Int,@Query("api_key") apiKey: String, @Query("session_id") sessionId:String, @Body requestBody : RequestBody): Response<ResponseBody>
 
     @POST("tv/{tv_id}/rating")
-    suspend fun postTVRanking(@Query("api_key") apiKey: String, @Path("tv_id") query: Int, @Query("session_id") sessionId:String, @Body requestBody : RequestBody): Response<ResponseBody>
+    suspend fun postTVRanking(@Path("tv_id") query: Int,@Query("api_key") apiKey: String,  @Query("session_id") sessionId:String,  @Body requestBody : RequestBody): Response<ResponseBody>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
index 98e81a70..a230995b 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
@@ -63,7 +63,29 @@ class Service {
             // Create RequestBody ( We're not using any converter, like GsonConverter, MoshiConverter e.t.c, that's why we use RequestBody )
             val requestBody = jsonObjectString.toRequestBody("application/json".toMediaTypeOrNull())
 
-            retrofit.create(ApiClient::class.java).postMovieRanking(BuildConfig.API_KEY,movieID, session(),requestBody)
+            retrofit.create(ApiClient::class.java).postMovieRanking(movieID,BuildConfig.API_KEY,session(),requestBody)
+        }
+
+        return  retorno
+    }
+
+    suspend fun setTVShowRating(tvShowID: Int, rating: Double): Boolean {
+        var retorno:Boolean = true
+        if(rating < 0.5 || rating > 10){
+            retorno=false
+        }
+        else{
+            // Create JSON using JSONObject
+            val jsonObject = JSONObject()
+            jsonObject.put("value", rating)
+
+            // Convert JSONObject to String
+            val jsonObjectString = jsonObject.toString()
+
+            // Create RequestBody ( We're not using any converter, like GsonConverter, MoshiConverter e.t.c, that's why we use RequestBody )
+            val requestBody = jsonObjectString.toRequestBody("application/json".toMediaTypeOrNull())
+
+            retrofit.create(ApiClient::class.java).postTVRanking(tvShowID,BuildConfig.API_KEY,session(),requestBody)
         }
 
         return  retorno
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
index 2c1406db..b3c1e3dd 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
@@ -62,6 +63,18 @@ class DetailFragment : Fragment() {
             if (args.isMovieBoolean) viewModel.movie(it)
             else viewModel.tVShows(it)
         }
+        val button_rating=view.findViewById<Button>(R.id.button_rating)
+        button_rating.setOnClickListener{
+            screeningItemId?.let {
+                if (args.isMovieBoolean) viewModel.ratingMovie(it,5.0)
+                else{
+                    viewModel.ratingTvShow(it,5.0)
+                }
+            }
+        }
+
+
+
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
index 5ba52855..2189bcae 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
@@ -19,7 +19,9 @@ class DetailsViewModel @Inject internal constructor(
     private val movieUseCase: DetailMovieUseCase,
     private val insertInWatchlistUseCase: InsertInWatchlistUseCase,
     private val deleteFromWatchlistUseCase: DeleteFromWatchlistUseCase,
-    private val existUseCase: ExistUseCase
+    private val existUseCase: ExistUseCase,
+    private val ratingMovieUseCase: RatingMovieUseCase,
+    private val ratingTVShowUseCase: RatingTVShowUseCase
 ) : ViewModel() {
 
     private val _state = MutableStateFlow<State<Screening>>(State.Loading)
@@ -87,4 +89,16 @@ class DetailsViewModel @Inject internal constructor(
                 }
         }
     }
+
+    fun ratingMovie(idMovie: Int, rating: Double){
+        viewModelScope.launch {
+            ratingMovieUseCase(idMovie,rating)
+        }
+    }
+
+    fun ratingTvShow(idMovie: Int, rating: Double){
+        viewModelScope.launch {
+            ratingTVShowUseCase(idMovie,rating)
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
index cce1c065..8efc5fa0 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
@@ -52,4 +52,12 @@ class CatalogRepository @Inject constructor(
             }
         ).flow
     }
+
+    suspend fun setMovieRating(idMovie: Int,rating: Double):Boolean{
+        return service.setMovieRating(idMovie,rating)
+    }
+
+    suspend fun setTVShowRating(idMovie: Int,rating: Double):Boolean{
+        return service.setTVShowRating(idMovie,rating)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/RatingMovieUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/RatingMovieUseCase.kt
new file mode 100644
index 00000000..175ebe37
--- /dev/null
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/RatingMovieUseCase.kt
@@ -0,0 +1,10 @@
+package com.intive.tmdbandroid.usecase
+
+import com.intive.tmdbandroid.model.Movie
+import com.intive.tmdbandroid.repository.CatalogRepository
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class RatingMovieUseCase @Inject constructor(private val repository: CatalogRepository) {
+    suspend operator fun invoke(id: Int, rating: Double): Boolean = repository.setMovieRating(id, rating)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/RatingTVShowUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/RatingTVShowUseCase.kt
new file mode 100644
index 00000000..0659ef6a
--- /dev/null
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/RatingTVShowUseCase.kt
@@ -0,0 +1,10 @@
+package com.intive.tmdbandroid.usecase
+
+import com.intive.tmdbandroid.model.Movie
+import com.intive.tmdbandroid.repository.CatalogRepository
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class RatingTVShowUseCase @Inject constructor(private val repository: CatalogRepository) {
+    suspend operator fun invoke(id: Int, rating: Double): Boolean = repository.setTVShowRating(id, rating)
+}
\ No newline at end of file

From fc9be8fa9d15bd888b5c17cb5d33fb6a2a624563 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Wed, 29 Sep 2021 11:30:05 -0300
Subject: [PATCH 06/28] Rate a Screening add guest session

---
 .../datasource/network/ApiClient.kt           |  8 +++++--
 .../tmdbandroid/datasource/network/Service.kt | 18 +++++++-------
 .../details/viewmodel/DetailsViewModel.kt     |  5 +++-
 .../com/intive/tmdbandroid/model/Session.kt   | 24 ++++---------------
 .../repository/CatalogRepository.kt           |  5 ++++
 .../usecase/GuestSessionUseCase.kt            | 11 +++++++++
 6 files changed, 39 insertions(+), 32 deletions(-)
 create mode 100644 app/src/main/java/com/intive/tmdbandroid/usecase/GuestSessionUseCase.kt

diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
index a8375748..76ce319d 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
@@ -3,6 +3,7 @@ package com.intive.tmdbandroid.datasource.network
 import com.intive.tmdbandroid.entity.ResultListTVShowOrMovies
 import com.intive.tmdbandroid.entity.ResultTVShowsEntity
 import com.intive.tmdbandroid.model.Movie
+import com.intive.tmdbandroid.model.Session
 import com.intive.tmdbandroid.model.TVShow
 import okhttp3.RequestBody
 import okhttp3.ResponseBody
@@ -28,8 +29,11 @@ interface ApiClient {
                                 @Query("page") page: Int) : ResultListTVShowOrMovies
 
     @POST("movie/{movie_id}/rating")
-    suspend fun postMovieRanking(@Path("movie_id") query: Int,@Query("api_key") apiKey: String, @Query("session_id") sessionId:String, @Body requestBody : RequestBody): Response<ResponseBody>
+    suspend fun postMovieRanking(@Path("movie_id") query: Int,@Query("api_key") apiKey: String, @Query("guest_session_id") sessionId:String, @Body requestBody : RequestBody): Response<ResponseBody>
 
     @POST("tv/{tv_id}/rating")
-    suspend fun postTVRanking(@Path("tv_id") query: Int,@Query("api_key") apiKey: String,  @Query("session_id") sessionId:String,  @Body requestBody : RequestBody): Response<ResponseBody>
+    suspend fun postTVRanking(@Path("tv_id") query: Int,@Query("api_key") apiKey: String,  @Query("guest_session_id") sessionId:String,  @Body requestBody : RequestBody): Response<ResponseBody>
+
+    @GET("authentication/guest_session/new")
+    suspend fun getNewGuestSession(@Query("api_key") apiKey: String) : Session
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
index a230995b..5db29ef1 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
@@ -1,6 +1,5 @@
 package com.intive.tmdbandroid.datasource.network
 
-import android.R.attr
 import com.intive.tmdbandroid.BuildConfig
 import com.intive.tmdbandroid.common.RetrofitHelper
 import com.intive.tmdbandroid.entity.ResultListTVShowOrMovies
@@ -9,19 +8,15 @@ import com.intive.tmdbandroid.model.Movie
 import com.intive.tmdbandroid.model.TVShow
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import android.R.attr.rating
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.json.JSONObject
-import androidx.lifecycle.LiveData
-import com.intive.tmdbandroid.common.State
 import com.intive.tmdbandroid.model.Session
 
 
 class Service {
     private val retrofit = RetrofitHelper.getRetrofit()
-    private val session: LiveData<State<Session>>? = null
+    private lateinit var session: Session
 
     fun getPaginatedPopularTVShows(page: Int): Flow<ResultTVShowsEntity> {
         return flow {
@@ -63,7 +58,7 @@ class Service {
             // Create RequestBody ( We're not using any converter, like GsonConverter, MoshiConverter e.t.c, that's why we use RequestBody )
             val requestBody = jsonObjectString.toRequestBody("application/json".toMediaTypeOrNull())
 
-            retrofit.create(ApiClient::class.java).postMovieRanking(movieID,BuildConfig.API_KEY,session(),requestBody)
+            retrofit.create(ApiClient::class.java).postMovieRanking(movieID,BuildConfig.API_KEY,session.guest_session_id,requestBody)
         }
 
         return  retorno
@@ -85,13 +80,16 @@ class Service {
             // Create RequestBody ( We're not using any converter, like GsonConverter, MoshiConverter e.t.c, that's why we use RequestBody )
             val requestBody = jsonObjectString.toRequestBody("application/json".toMediaTypeOrNull())
 
-            retrofit.create(ApiClient::class.java).postTVRanking(tvShowID,BuildConfig.API_KEY,session(),requestBody)
+            retrofit.create(ApiClient::class.java).postTVRanking(tvShowID,BuildConfig.API_KEY,session.guest_session_id,requestBody)
         }
 
         return  retorno
     }
 
-    fun session():String{
-        return session.toString()
+    suspend fun getGuestSession():Session{
+        if(!this::session.isInitialized){
+            session = retrofit.create(ApiClient::class.java).getNewGuestSession(BuildConfig.API_KEY)
+        }
+        return session
     }
 }
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
index 2189bcae..b2f142fa 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
@@ -21,7 +21,8 @@ class DetailsViewModel @Inject internal constructor(
     private val deleteFromWatchlistUseCase: DeleteFromWatchlistUseCase,
     private val existUseCase: ExistUseCase,
     private val ratingMovieUseCase: RatingMovieUseCase,
-    private val ratingTVShowUseCase: RatingTVShowUseCase
+    private val ratingTVShowUseCase: RatingTVShowUseCase,
+    private val guestSessionUseCase: GuestSessionUseCase
 ) : ViewModel() {
 
     private val _state = MutableStateFlow<State<Screening>>(State.Loading)
@@ -92,12 +93,14 @@ class DetailsViewModel @Inject internal constructor(
 
     fun ratingMovie(idMovie: Int, rating: Double){
         viewModelScope.launch {
+            guestSessionUseCase()
             ratingMovieUseCase(idMovie,rating)
         }
     }
 
     fun ratingTvShow(idMovie: Int, rating: Double){
         viewModelScope.launch {
+            guestSessionUseCase()
             ratingTVShowUseCase(idMovie,rating)
         }
     }
diff --git a/app/src/main/java/com/intive/tmdbandroid/model/Session.kt b/app/src/main/java/com/intive/tmdbandroid/model/Session.kt
index d934f4ff..6dce57c3 100644
--- a/app/src/main/java/com/intive/tmdbandroid/model/Session.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/model/Session.kt
@@ -1,21 +1,7 @@
 package com.intive.tmdbandroid.model
 
-class Session {
-    var Success = false
-
-    lateinit var sessionId:String
-    private var accountId = 0
-
-    fun Session(success: Boolean, sessionId: String) {
-        Success = success
-        this.sessionId = sessionId
-    }
-
-    fun getAccountId(): Int {
-        return accountId
-    }
-
-    fun setAccountId(accountId: Int) {
-        this.accountId = accountId
-    }
-}
\ No newline at end of file
+data class Session (
+     val success:Boolean,
+      val guest_session_id:String,
+      val expires_at:String,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
index 8efc5fa0..a2dc3c21 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
@@ -8,6 +8,7 @@ import com.intive.tmdbandroid.datasource.ScreeningSearchSource
 import com.intive.tmdbandroid.datasource.network.Service
 import com.intive.tmdbandroid.model.Movie
 import com.intive.tmdbandroid.model.Screening
+import com.intive.tmdbandroid.model.Session
 import com.intive.tmdbandroid.model.TVShow
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
@@ -60,4 +61,8 @@ class CatalogRepository @Inject constructor(
     suspend fun setTVShowRating(idMovie: Int,rating: Double):Boolean{
         return service.setTVShowRating(idMovie,rating)
     }
+
+    suspend fun getGuestSession():Session{
+        return service.getGuestSession()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/GuestSessionUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/GuestSessionUseCase.kt
new file mode 100644
index 00000000..aa58b385
--- /dev/null
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/GuestSessionUseCase.kt
@@ -0,0 +1,11 @@
+package com.intive.tmdbandroid.usecase
+
+import com.intive.tmdbandroid.model.Movie
+import com.intive.tmdbandroid.model.Session
+import com.intive.tmdbandroid.repository.CatalogRepository
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class GuestSessionUseCase @Inject constructor(private val repository: CatalogRepository) {
+    suspend operator fun invoke(): Session = repository.getGuestSession()
+}
\ No newline at end of file

From 326fb409948fab8ab6f44bfc77d87abcb2b67fe7 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Wed, 29 Sep 2021 15:24:12 -0300
Subject: [PATCH 07/28] Rate a Screening Rate

---
 .../tmdbandroid/details/ui/DetailFragment.kt  | 31 ++++++-
 app/src/main/res/layout/fragment_detail.xml   |  2 +-
 app/src/main/res/layout/rank_dialog.xml       | 80 +++++++++++++++++++
 app/src/main/res/values/themes.xml            |  6 ++
 4 files changed, 114 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/layout/rank_dialog.xml

diff --git a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
index b3c1e3dd..eedc30aa 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
@@ -1,10 +1,15 @@
 package com.intive.tmdbandroid.details.ui
 
+import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.Window
 import android.widget.Button
+import android.widget.RatingBar
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
@@ -65,15 +70,33 @@ class DetailFragment : Fragment() {
         }
         val button_rating=view.findViewById<Button>(R.id.button_rating)
         button_rating.setOnClickListener{
+            screeningItemId?.let { it1 -> showDialog(it1,args) }
+        }
+
+
+
+    }
+
+    private fun showDialog(screeningItemId:Int, args:DetailFragmentArgs) {
+        val dialog = this.context?.let { Dialog(it) }
+        dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog?.setCancelable(false)
+        dialog?.setContentView(R.layout.rank_dialog)
+        val yesBtn = dialog?.findViewById(R.id.rank_dialog_button_rate) as Button
+        val noBtn = dialog.findViewById(R.id.rank_dialog_button_cancel) as TextView
+        yesBtn.setOnClickListener {
+            val ratingBar: RatingBar = dialog?.findViewById(R.id.dialog_ratingbar) as RatingBar
             screeningItemId?.let {
-                if (args.isMovieBoolean) viewModel.ratingMovie(it,5.0)
+                if (args.isMovieBoolean) viewModel.ratingMovie(it,ratingBar.rating.toDouble())
                 else{
-                    viewModel.ratingTvShow(it,5.0)
+                    viewModel.ratingTvShow(it,ratingBar.rating.toDouble())
                 }
             }
-        }
-
 
+            dialog.dismiss()
+        }
+        noBtn.setOnClickListener { dialog.dismiss() }
+        dialog?.show()
 
     }
 
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index 25cf70ed..dc7e6c56 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -158,7 +158,7 @@
                     android:id="@+id/button_rating"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Button"
+                    android:text="+ RATE IT"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/rank_dialog.xml b/app/src/main/res/layout/rank_dialog.xml
new file mode 100644
index 00000000..3f1a4793
--- /dev/null
+++ b/app/src/main/res/layout/rank_dialog.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="2dip">
+
+    <TextView
+        android:id="@+id/rank_dialog_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="10dp"
+        android:text="Add Rating"
+        android:textSize="24dp" />
+
+    <TextView
+        android:id="@+id/rank_dialog_sub_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="10dp"
+        android:text="How would you rate this?"
+        android:textSize="20dp" />
+
+    <RatingBar
+        android:id="@+id/dialog_ratingbar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:clickable="true"
+        android:isIndicator="false"
+        android:numStars="5"
+        android:rating="2.5"
+        android:stepSize="0.5"
+        android:theme="@style/RatingBar"/>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/buttons"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <Button
+            android:id="@+id/rank_dialog_button_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="3dp"
+            android:layout_marginRight="3dp"
+            android:focusable="false"
+            android:text="CANCEL"
+            android:textColor="#FF0000"
+            android:textSize="20dip"
+            android:background="@android:color/transparent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/rank_dialog_button_rate"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <Button
+            android:id="@+id/rank_dialog_button_rate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:focusable="false"
+            android:text="RATE"
+            android:textColor="#000000"
+            android:textSize="20dip"
+            android:background="@android:color/transparent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/rank_dialog_button_cancel" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
+</LinearLayout>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d5140797..3c0a0153 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -16,4 +16,10 @@
     <style name="ProgressBarStyle">
         <item name="colorAccent">#6200EE</item>
     </style>
+
+    <style name="RatingBar" parent="Theme.AppCompat">
+        <item name="colorControlNormal">@color/black</item>
+        <item name="colorControlActivated">@color/black</item>
+    </style>
+
 </resources>
\ No newline at end of file

From 471d19cd73558fa48955c570f9d03f5ae65081ae Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Thu, 30 Sep 2021 09:38:20 -0300
Subject: [PATCH 08/28] Rate a Screening clean

---
 app/src/main/res/layout/rank_dialog.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/layout/rank_dialog.xml b/app/src/main/res/layout/rank_dialog.xml
index 3f1a4793..db339dbd 100644
--- a/app/src/main/res/layout/rank_dialog.xml
+++ b/app/src/main/res/layout/rank_dialog.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"

From f33ab64a0607f68ae138a839a898e4503271433e Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Thu, 30 Sep 2021 09:52:05 -0300
Subject: [PATCH 09/28] Rate a Screening Merge with master

---
 app/src/main/res/layout/fragment_detail.xml | 150 +++++++++-----------
 1 file changed, 65 insertions(+), 85 deletions(-)

diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index dd8d0750..97857430 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -71,89 +71,70 @@
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_margin="16dp">
-
-                <ImageView
-                    android:id="@+id/thumb_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_thumb_up"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:tint="@color/red" />
-
-                <TextView
-                    android:id="@+id/genres_detail_textView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"/>
+                android:layout_margin="16dp"
+                android:orientation="vertical">
 
                 <TextView
-                    android:id="@+id/overview_textView"
+                    android:id="@+id/first_air_date_detail_textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/overview"
                     android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold"
-                    android:layout_marginTop="40dp"
-                    app:layout_constraintTop_toBottomOf="@+id/genres_detail_textView"
-                    app:layout_constraintStart_toStartOf="parent"/>
+                    tools:text="2021" />
 
                 <TextView
                     android:id="@+id/status_detail_textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
                     android:textColor="@color/black"
-                    android:text="Now Streaming"
-                    android:layout_marginTop="40dp"
-                    app:layout_constraintTop_toBottomOf="@+id/genres_detail_textView"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    tools:text="Now Streaming" />
 
                 <TextView
-                    android:id="@+id/first_air_date_detail_textView"
+                    android:id="@+id/genres_detail_textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black"
-                    android:layout_marginTop="24dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/overview_detail_textView"
-                    />
+                    android:layout_marginTop="5dp"
+                    tools:text="Animation, Action, Adventure, Sci-Fci, Fantasy " />
 
                 <TextView
                     android:id="@+id/number_of_seasons_detail_textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="18dp"
                     android:textColor="@color/black"
-                    android:layout_marginStart="20dp"
-                    app:layout_constraintStart_toEndOf="@+id/first_air_date_detail_textView"
-                    app:layout_constraintTop_toTopOf="@+id/first_air_date_detail_textView"/>
+                    tools:visibility="gone"
+                    tools:text="1 Season" />
 
                 <TextView
                     android:id="@+id/number_of_episodes_detail_textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    tools:visibility="gone"
                     android:textColor="@color/black"
-                    android:layout_marginStart="20dp"
-                    app:layout_constraintStart_toEndOf="@+id/number_of_seasons_detail_textView"
-                    app:layout_constraintTop_toTopOf="@id/number_of_seasons_detail_textView"/>
+                    tools:text="5 Episodes" />
+
+                <TextView
+                    android:id="@+id/overview_textView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="18dp"
+                    android:text="@string/overview"
+                    android:textColor="@color/black"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/overview_detail_textView"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:lineSpacingExtra="4dp"
                     android:textColor="@color/black"
-                    android:textSize="16sp"
-                    app:layout_constraintTop_toBottomOf="@id/overview_textView"
-                    app:layout_constraintStart_toStartOf="parent"
-                    android:layout_marginVertical="20dp"
-                    />
+                    tools:text="Taking inspiration from the comic books of the same name, each episode explores a pivotal moment from the Marvel Cinematic Universe and turns it on its head, leading the audience into uncharted territory." />
 
                 <Button
                     android:id="@+id/button_rating"
@@ -162,47 +143,46 @@
                     android:text="+ RATE IT"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
+            </LinearLayout>
 
         </androidx.core.widget.NestedScrollView>
 
-        <!--        <androidx.cardview.widget.CardView-->
-        <!--            android:id="@+id/popularity_card"-->
-        <!--            android:layout_width="60dp"-->
-        <!--            android:layout_height="60dp"-->
-        <!--            android:layout_marginEnd="16dp"-->
-        <!--            app:cardBackgroundColor="@color/primaryColor"-->
-        <!--            app:cardCornerRadius="100dp"-->
-        <!--            app:cardElevation="3dp"-->
-        <!--            app:layout_anchor="@id/appBarLayoutDetail"-->
-        <!--            app:layout_anchorGravity="end|bottom"-->
-        <!--            tools:src="@drawable/ic_launcher_foreground">-->
-
-        <!--            <ProgressBar-->
-        <!--                android:id="@+id/circular_percentage"-->
-        <!--                style="?android:attr/progressBarStyleHorizontal"-->
-        <!--                android:layout_width="match_parent"-->
-        <!--                android:layout_height="match_parent"-->
-        <!--                android:layout_centerInParent="true"-->
-        <!--                android:layout_margin="2dp"-->
-        <!--                android:indeterminate="false"-->
-        <!--                android:max="100"-->
-        <!--                android:progressDrawable="@drawable/ring"-->
-        <!--                android:rotation="-90"-->
-        <!--                android:secondaryProgress="100" />-->
-
-        <!--            <androidx.appcompat.widget.AppCompatTextView-->
-        <!--                android:id="@+id/screening_popularity"-->
-        <!--                android:layout_width="wrap_content"-->
-        <!--                android:layout_height="wrap_content"-->
-        <!--                android:layout_gravity="center"-->
-        <!--                android:textColor="@color/secondaryColor"-->
-        <!--                android:textSize="14sp"-->
-        <!--                android:textStyle="bold"-->
-        <!--                tools:text="100%" />-->
-
-        <!--        </androidx.cardview.widget.CardView>-->
+        <androidx.cardview.widget.CardView
+            android:id="@+id/popularity_card"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_marginEnd="16dp"
+            app:cardBackgroundColor="@color/primaryColor"
+            app:cardCornerRadius="100dp"
+            app:cardElevation="3dp"
+            app:layout_anchor="@id/appBarLayoutDetail"
+            app:layout_anchorGravity="end|bottom"
+            tools:src="@drawable/ic_launcher_foreground">
+
+            <ProgressBar
+                android:id="@+id/circular_percentage"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_centerInParent="true"
+                android:layout_margin="2dp"
+                android:indeterminate="false"
+                android:max="100"
+                android:progressDrawable="@drawable/ring"
+                android:rotation="-90"
+                android:secondaryProgress="100" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/screening_popularity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:textColor="@color/secondaryColor"
+                android:textSize="14sp"
+                android:textStyle="bold"
+                tools:text="100%" />
+
+        </androidx.cardview.widget.CardView>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 

From cec2b6940ccb6f974edde8f34f7932db3ed178fa Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Thu, 30 Sep 2021 10:02:53 -0300
Subject: [PATCH 10/28] Rate a Screening fix DetailsViewModelTest.kt

---
 .../details/viewmodel/DetailsViewModelTest.kt         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt b/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt
index 846424d0..b87e8f18 100644
--- a/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt
@@ -82,6 +82,12 @@ class DetailsViewModelTest {
     private lateinit var getIfExistsUseCase: ExistUseCase
     @Mock
     private lateinit var movieUseCase: DetailMovieUseCase
+    @Mock
+    private lateinit var ratingMovieUseCase: RatingMovieUseCase
+    @Mock
+    private lateinit var ratingTVShowUseCase: RatingTVShowUseCase
+    @Mock
+    private lateinit var guestSessionUseCase: GuestSessionUseCase
 
 
     @Before
@@ -91,7 +97,10 @@ class DetailsViewModelTest {
             movieUseCase,
             saveTVShowInWatchlistUseCase,
             deleteFromWatchlistUseCase,
-            getIfExistsUseCase
+            getIfExistsUseCase,
+            ratingMovieUseCase,
+            ratingTVShowUseCase,
+            guestSessionUseCase
         )
     }
 

From 4e6bd07d5b3f7f0f4c2c3cd61baa466f8e553445 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Mon, 4 Oct 2021 07:53:10 -0300
Subject: [PATCH 11/28] some change.

---
 .../intive/tmdbandroid/datasource/network/Service.kt  | 11 +++++++----
 .../tmdbandroid/details/viewmodel/DetailsViewModel.kt |  8 +++++++-
 .../java/com/intive/tmdbandroid/model/Responses.kt    |  6 ++++++
 .../main/java/com/intive/tmdbandroid/model/Session.kt |  2 ++
 .../tmdbandroid/repository/CatalogRepository.kt       |  5 +++--
 .../intive/tmdbandroid/usecase/GuestSessionUseCase.kt |  3 +--
 6 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/com/intive/tmdbandroid/model/Responses.kt

diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
index 4933d741..535c18de 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
@@ -17,7 +17,7 @@ import com.intive.tmdbandroid.model.Session
 
 class Service {
     private val retrofit = RetrofitHelper.getRetrofit()
-    private lateinit var session: Session
+    private lateinit var session: Flow<Session>
 
     fun getPaginatedPopularTVShows(page: Int): Flow<ResultTVShowsEntity> {
         return flow {
@@ -79,7 +79,8 @@ class Service {
         else{
             // Create JSON using JSONObject
             val jsonObject = JSONObject()
-            jsonObject.put("value", rating)
+            //jsonObject.put("value", rating)
+            jsonObject.put("value", "pepe")
 
             // Convert JSONObject to String
             val jsonObjectString = jsonObject.toString()
@@ -93,9 +94,11 @@ class Service {
         return  retorno
     }
 
-    suspend fun getGuestSession():Session{
+    fun getGuestSession():Flow<Session>{
         if(!this::session.isInitialized){
-            session = retrofit.create(ApiClient::class.java).getNewGuestSession(BuildConfig.API_KEY)
+            session =  flow {
+                emit(retrofit.create(ApiClient::class.java).getNewGuestSession(BuildConfig.API_KEY))
+            }
         }
         return session
     }
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
index b2f142fa..5c32be0a 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.intive.tmdbandroid.common.State
 import com.intive.tmdbandroid.model.Screening
+import com.intive.tmdbandroid.model.Session
 import com.intive.tmdbandroid.usecase.*
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -31,6 +32,9 @@ class DetailsViewModel @Inject internal constructor(
     private val _watchlistState = MutableStateFlow<State<Boolean>>(State.Loading)
     val watchlistUIState: StateFlow<State<Boolean>> = _watchlistState
 
+    private val _sessionState = MutableStateFlow<State<Session>>(State.Loading)
+    val sessionState: StateFlow<State<Session>> = _sessionState
+
     fun tVShows(id: Int) {
         viewModelScope.launch {
             tVShowUseCase(id)
@@ -93,7 +97,9 @@ class DetailsViewModel @Inject internal constructor(
 
     fun ratingMovie(idMovie: Int, rating: Double){
         viewModelScope.launch {
-            guestSessionUseCase()
+            guestSessionUseCase().catch {
+                _sessionState.value= State.Error
+            }
             ratingMovieUseCase(idMovie,rating)
         }
     }
diff --git a/app/src/main/java/com/intive/tmdbandroid/model/Responses.kt b/app/src/main/java/com/intive/tmdbandroid/model/Responses.kt
new file mode 100644
index 00000000..ec3e55f0
--- /dev/null
+++ b/app/src/main/java/com/intive/tmdbandroid/model/Responses.kt
@@ -0,0 +1,6 @@
+package com.intive.tmdbandroid.model
+
+data class Responses (
+     var status_message:String,
+     var status_code:Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/model/Session.kt b/app/src/main/java/com/intive/tmdbandroid/model/Session.kt
index 6dce57c3..1441d245 100644
--- a/app/src/main/java/com/intive/tmdbandroid/model/Session.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/model/Session.kt
@@ -4,4 +4,6 @@ data class Session (
      val success:Boolean,
       val guest_session_id:String,
       val expires_at:String,
+     var status_message:String,
+     var status_code:Int
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
index 8152106f..e79c2503 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
@@ -11,6 +11,7 @@ import com.intive.tmdbandroid.model.Screening
 import com.intive.tmdbandroid.model.Session
 import com.intive.tmdbandroid.model.TVShow
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -74,7 +75,7 @@ class CatalogRepository @Inject constructor(
         return service.setTVShowRating(idMovie,rating)
     }
 
-    suspend fun getGuestSession():Session{
-        return service.getGuestSession()
+    suspend fun getGuestSession():Flow<Session>{
+        return flowOf(service.getGuestSession())
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/GuestSessionUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/GuestSessionUseCase.kt
index aa58b385..da3794fd 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/GuestSessionUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/GuestSessionUseCase.kt
@@ -1,11 +1,10 @@
 package com.intive.tmdbandroid.usecase
 
-import com.intive.tmdbandroid.model.Movie
 import com.intive.tmdbandroid.model.Session
 import com.intive.tmdbandroid.repository.CatalogRepository
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GuestSessionUseCase @Inject constructor(private val repository: CatalogRepository) {
-    suspend operator fun invoke(): Session = repository.getGuestSession()
+    suspend operator fun invoke(): Flow<Session> = repository.getGuestSession()
 }
\ No newline at end of file

From 06fe8729a14d6bcb5f820538ff4c8a1d80bd06f5 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Tue, 5 Oct 2021 14:38:41 -0300
Subject: [PATCH 12/28] like stash

---
 .../1.json                                    | 62 ++++++++++++++++++-
 .../tmdbandroid/datasource/local/Dao.kt       |  7 +++
 .../datasource/local/LocalStorage.kt          |  3 +-
 .../tmdbandroid/datasource/network/Service.kt | 17 +++--
 .../details/viewmodel/DetailsViewModel.kt     | 21 +++++--
 .../tmdbandroid/entity/MovieListItemEntity.kt |  6 +-
 .../tmdbandroid/entity/ResultTVShowOrMovie.kt |  4 +-
 .../tmdbandroid/entity/ScreeningORMEntity.kt  |  6 +-
 .../tmdbandroid/entity/SessionORMEntity.kt    | 27 ++++++++
 .../entity/TVShowListItemEntity.kt            |  7 ++-
 .../com/intive/tmdbandroid/model/Movie.kt     |  6 +-
 .../com/intive/tmdbandroid/model/Screening.kt |  6 +-
 .../com/intive/tmdbandroid/model/Session.kt   | 30 ++++++---
 .../com/intive/tmdbandroid/model/TVShow.kt    |  6 +-
 .../repository/CatalogRepository.kt           |  5 +-
 .../repository/SessionRepository.kt           | 22 +++++++
 .../usecase/GuestSessionUseCase.kt            |  2 +-
 .../tmdbandroid/usecase/RatingMovieUseCase.kt |  2 -
 .../usecase/SaveSessiontUseCase.kt            | 16 +++++
 .../usecase/SessionExistUseCase.kt            | 12 ++++
 20 files changed, 226 insertions(+), 41 deletions(-)
 create mode 100644 app/src/main/java/com/intive/tmdbandroid/entity/SessionORMEntity.kt
 create mode 100644 app/src/main/java/com/intive/tmdbandroid/repository/SessionRepository.kt
 create mode 100644 app/src/main/java/com/intive/tmdbandroid/usecase/SaveSessiontUseCase.kt
 create mode 100644 app/src/main/java/com/intive/tmdbandroid/usecase/SessionExistUseCase.kt

diff --git a/app/schemas/com.intive.tmdbandroid.datasource.local.LocalStorage/1.json b/app/schemas/com.intive.tmdbandroid.datasource.local.LocalStorage/1.json
index 51cb522d..780d7eec 100644
--- a/app/schemas/com.intive.tmdbandroid.datasource.local.LocalStorage/1.json
+++ b/app/schemas/com.intive.tmdbandroid.datasource.local.LocalStorage/1.json
@@ -2,11 +2,11 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "016e4507f17862924f247000e7d4f1c4",
+    "identityHash": "978038702e66361f704cb6bd5fa7d344",
     "entities": [
       {
         "tableName": "ScreeningORMEntity",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `backdrop_path` TEXT, `genres` TEXT, `name` TEXT NOT NULL, `number_of_episodes` INTEGER, `number_of_seasons` INTEGER, `overview` TEXT NOT NULL, `poster_path` TEXT, `status` TEXT, `vote_average` REAL NOT NULL, `vote_count` INTEGER NOT NULL, `popularity` REAL NOT NULL, `release_date` TEXT, `media_type` TEXT NOT NULL, `adult` INTEGER NOT NULL, `genre_ids` TEXT, `video` INTEGER NOT NULL, `networks` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `backdrop_path` TEXT, `genres` TEXT, `name` TEXT NOT NULL, `number_of_episodes` INTEGER, `number_of_seasons` INTEGER, `overview` TEXT NOT NULL, `poster_path` TEXT, `status` TEXT, `vote_average` REAL NOT NULL, `vote_count` INTEGER NOT NULL, `popularity` REAL NOT NULL, `release_date` TEXT, `media_type` TEXT NOT NULL, `adult` INTEGER NOT NULL, `genre_ids` TEXT, `video` INTEGER NOT NULL, `networks` TEXT NOT NULL, `my_rate` REAL NOT NULL, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -115,6 +115,12 @@
             "columnName": "networks",
             "affinity": "TEXT",
             "notNull": true
+          },
+          {
+            "fieldPath": "my_rate",
+            "columnName": "my_rate",
+            "affinity": "REAL",
+            "notNull": true
           }
         ],
         "primaryKey": {
@@ -125,12 +131,62 @@
         },
         "indices": [],
         "foreignKeys": []
+      },
+      {
+        "tableName": "SessionORMEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `success` INTEGER NOT NULL, `guest_session_id` TEXT NOT NULL, `expires_at` TEXT NOT NULL, `status_message` TEXT NOT NULL, `status_code` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "success",
+            "columnName": "success",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "guest_session_id",
+            "columnName": "guest_session_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "expires_at",
+            "columnName": "expires_at",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status_message",
+            "columnName": "status_message",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status_code",
+            "columnName": "status_code",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
       }
     ],
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '016e4507f17862924f247000e7d4f1c4')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '978038702e66361f704cb6bd5fa7d344')"
     ]
   }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt
index a35f1968..4c7b0bc5 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt
@@ -3,6 +3,7 @@ package com.intive.tmdbandroid.datasource.local
 import androidx.room.*
 import androidx.room.Dao
 import com.intive.tmdbandroid.entity.ScreeningORMEntity
+import com.intive.tmdbandroid.entity.SessionORMEntity
 
 @Dao
 interface Dao{
@@ -20,4 +21,10 @@ interface Dao{
 
     @Query("SELECT EXISTS(SELECT * FROM ScreeningORMEntity WHERE id = :id)")
     suspend fun existAsFavorite(id: Int): Boolean
+
+    @Query("SELECT * FROM SessionORMEntity WHERE id = 1")
+    suspend fun existSession(): List<SessionORMEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertSession(sessionORMEntity: SessionORMEntity)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/local/LocalStorage.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/local/LocalStorage.kt
index 82bd9e10..3ebaf7fa 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/local/LocalStorage.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/local/LocalStorage.kt
@@ -4,12 +4,13 @@ import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import com.intive.tmdbandroid.entity.ScreeningORMEntity
+import com.intive.tmdbandroid.entity.SessionORMEntity
 import com.intive.tmdbandroid.model.converter.GenreConverter
 import com.intive.tmdbandroid.model.converter.IntConverter
 import com.intive.tmdbandroid.model.converter.NetworkConverter
 
 @Database(
-    entities = [(ScreeningORMEntity::class)],
+    entities = [ScreeningORMEntity::class,SessionORMEntity::class],
     version = 1,
     exportSchema = true,
 )
diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
index 535c18de..24dc40fb 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
@@ -13,11 +13,14 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.json.JSONObject
 import com.intive.tmdbandroid.model.Session
+import com.intive.tmdbandroid.usecase.SessionExistUseCase
+import kotlinx.coroutines.flow.collect
 
 
 class Service {
     private val retrofit = RetrofitHelper.getRetrofit()
-    private lateinit var session: Flow<Session>
+    private lateinit var sessionFlow: Flow<Session>
+    private lateinit var session:Session
 
     fun getPaginatedPopularTVShows(page: Int): Flow<ResultTVShowsEntity> {
         return flow {
@@ -65,6 +68,9 @@ class Service {
             // Create RequestBody ( We're not using any converter, like GsonConverter, MoshiConverter e.t.c, that's why we use RequestBody )
             val requestBody = jsonObjectString.toRequestBody("application/json".toMediaTypeOrNull())
 
+            sessionFlow.collect {
+                    element-> session=element
+            }
             retrofit.create(ApiClient::class.java).postMovieRanking(movieID,BuildConfig.API_KEY,session.guest_session_id,requestBody)
         }
 
@@ -95,11 +101,14 @@ class Service {
     }
 
     fun getGuestSession():Flow<Session>{
-        if(!this::session.isInitialized){
-            session =  flow {
+        if(!this::sessionFlow.isInitialized){
+            //re
+            //recupero de la bbdd, si es que hay algo. COmpruebo que no este vencido.
+            //Existe bbdd?NO / recupero esta vencido
+            sessionFlow =  flow {
                 emit(retrofit.create(ApiClient::class.java).getNewGuestSession(BuildConfig.API_KEY))
             }
         }
-        return session
+        return sessionFlow
     }
 }
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
index 5c32be0a..786925f8 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
@@ -23,7 +23,8 @@ class DetailsViewModel @Inject internal constructor(
     private val existUseCase: ExistUseCase,
     private val ratingMovieUseCase: RatingMovieUseCase,
     private val ratingTVShowUseCase: RatingTVShowUseCase,
-    private val guestSessionUseCase: GuestSessionUseCase
+    private val guestSessionUseCase: GuestSessionUseCase,
+    private val sessionExistUseCase: SessionExistUseCase
 ) : ViewModel() {
 
     private val _state = MutableStateFlow<State<Screening>>(State.Loading)
@@ -32,9 +33,6 @@ class DetailsViewModel @Inject internal constructor(
     private val _watchlistState = MutableStateFlow<State<Boolean>>(State.Loading)
     val watchlistUIState: StateFlow<State<Boolean>> = _watchlistState
 
-    private val _sessionState = MutableStateFlow<State<Session>>(State.Loading)
-    val sessionState: StateFlow<State<Session>> = _sessionState
-
     fun tVShows(id: Int) {
         viewModelScope.launch {
             tVShowUseCase(id)
@@ -97,9 +95,20 @@ class DetailsViewModel @Inject internal constructor(
 
     fun ratingMovie(idMovie: Int, rating: Double){
         viewModelScope.launch {
-            guestSessionUseCase().catch {
-                _sessionState.value= State.Error
+            //guestSessionUseCase().catch {
+                //_sessionState.value= State.Error
+            //}
+            viewModelScope.launch {
+                sessionExistUseCase()
+                    .catch {
+                        _state.value = State.Error
+                    }
+                    .collect { session ->
+                         sessionExistUseCase
+                    }
             }
+
+            guestSessionUseCase()
             ratingMovieUseCase(idMovie,rating)
         }
     }
diff --git a/app/src/main/java/com/intive/tmdbandroid/entity/MovieListItemEntity.kt b/app/src/main/java/com/intive/tmdbandroid/entity/MovieListItemEntity.kt
index 8cf84279..70889710 100644
--- a/app/src/main/java/com/intive/tmdbandroid/entity/MovieListItemEntity.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/entity/MovieListItemEntity.kt
@@ -11,7 +11,8 @@ data class MovieListItemEntity(
     val overview: String,
     val poster_path: String?,
     val vote_average: Double,
-    val vote_count: Int
+    val vote_count: Int,
+    val my_rate: Double
 ) {
     fun toScreening(): Screening {
         return Screening(
@@ -32,7 +33,8 @@ data class MovieListItemEntity(
             false,
             null,
             false,
-            emptyList()
+            emptyList(),
+            my_rate
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt b/app/src/main/java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt
index e863ea5f..4e6516dc 100644
--- a/app/src/main/java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt
@@ -26,6 +26,7 @@ data class ResultTVShowOrMovie(
     val name: String?,
     val original_name: String?,
     val poster_path: String?,
+    val my_rate: Double
 ) {
     fun toScreening(): Screening {
         return Screening(
@@ -46,7 +47,8 @@ data class ResultTVShowOrMovie(
             adult,
             genre_ids,
             video,
-            emptyList()
+            emptyList(),
+            my_rate
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/entity/ScreeningORMEntity.kt b/app/src/main/java/com/intive/tmdbandroid/entity/ScreeningORMEntity.kt
index fd109562..bb758e09 100644
--- a/app/src/main/java/com/intive/tmdbandroid/entity/ScreeningORMEntity.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/entity/ScreeningORMEntity.kt
@@ -33,7 +33,8 @@ data class ScreeningORMEntity(
     val genre_ids: List<Int>?,
     val video: Boolean,
     @TypeConverters(NetworkConverter::class)
-    val networks: List<Network>
+    val networks: List<Network>,
+    val my_rate: Double,
 ) {
     fun toScreening(): Screening {
         return Screening(
@@ -54,7 +55,8 @@ data class ScreeningORMEntity(
             adult,
             genre_ids,
             video,
-            networks
+            networks,
+            my_rate
         )
     }
 }
diff --git a/app/src/main/java/com/intive/tmdbandroid/entity/SessionORMEntity.kt b/app/src/main/java/com/intive/tmdbandroid/entity/SessionORMEntity.kt
new file mode 100644
index 00000000..8efc2fbf
--- /dev/null
+++ b/app/src/main/java/com/intive/tmdbandroid/entity/SessionORMEntity.kt
@@ -0,0 +1,27 @@
+package com.intive.tmdbandroid.entity
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.intive.tmdbandroid.model.Session
+
+@Entity
+data class SessionORMEntity(
+    @PrimaryKey(autoGenerate = true)
+    val id: Int,
+    val success:Boolean,
+    val guest_session_id: String,
+    val expires_at: String,
+    val status_message: String,
+    val status_code: Int
+) {
+    fun toSession(): Session {
+        return Session(
+            id,
+            success,
+            guest_session_id,
+            expires_at,
+            status_message,
+            status_code
+        )
+    }
+}
diff --git a/app/src/main/java/com/intive/tmdbandroid/entity/TVShowListItemEntity.kt b/app/src/main/java/com/intive/tmdbandroid/entity/TVShowListItemEntity.kt
index 4f350a9c..293652fe 100644
--- a/app/src/main/java/com/intive/tmdbandroid/entity/TVShowListItemEntity.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/entity/TVShowListItemEntity.kt
@@ -11,7 +11,8 @@ data class TVShowListItemEntity(
     val overview: String,
     val poster_path: String?,
     val vote_average: Double,
-    val vote_count: Int
+    val vote_count: Int,
+    val my_rate: Double
 ) {
     fun toScreening(): Screening {
         return Screening(
@@ -32,8 +33,8 @@ data class TVShowListItemEntity(
             false,
             null,
             false,
-            emptyList()
-
+            emptyList(),
+            my_rate
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/model/Movie.kt b/app/src/main/java/com/intive/tmdbandroid/model/Movie.kt
index 85be1250..30e5b383 100644
--- a/app/src/main/java/com/intive/tmdbandroid/model/Movie.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/model/Movie.kt
@@ -12,7 +12,8 @@ data class Movie(
     val title: String,
     val vote_average: Double,
     val vote_count: Int,
-    val status: String
+    val status: String,
+    val my_rate: Double
 ) {
     fun toScreening(): Screening {
         return Screening(
@@ -33,7 +34,8 @@ data class Movie(
             adult = false,
             genre_ids = null,
             false,
-            emptyList()
+            emptyList(),
+            my_rate
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/model/Screening.kt b/app/src/main/java/com/intive/tmdbandroid/model/Screening.kt
index a2cc3ca4..e77657a9 100644
--- a/app/src/main/java/com/intive/tmdbandroid/model/Screening.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/model/Screening.kt
@@ -20,7 +20,8 @@ data class Screening(
     val adult: Boolean,
     val genre_ids: List<Int>?,
     val video: Boolean,
-    val networks: List<Network>
+    val networks: List<Network>,
+    val my_rate: Double
 ) {
     fun toScreeningORMEntity(): ScreeningORMEntity {
         return ScreeningORMEntity(
@@ -41,7 +42,8 @@ data class Screening(
             adult,
             genre_ids,
             video,
-            networks
+            networks,
+            my_rate
         )
     }
 }
diff --git a/app/src/main/java/com/intive/tmdbandroid/model/Session.kt b/app/src/main/java/com/intive/tmdbandroid/model/Session.kt
index 1441d245..38c34f4c 100644
--- a/app/src/main/java/com/intive/tmdbandroid/model/Session.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/model/Session.kt
@@ -1,9 +1,25 @@
 package com.intive.tmdbandroid.model
 
-data class Session (
-     val success:Boolean,
-      val guest_session_id:String,
-      val expires_at:String,
-     var status_message:String,
-     var status_code:Int
-)
\ No newline at end of file
+import com.intive.tmdbandroid.entity.SessionORMEntity
+
+data class Session(
+    val id: Int,
+    val success: Boolean,
+    val guest_session_id: String,
+    val expires_at: String,
+    var status_message: String,
+    var status_code: Int
+
+) {
+    fun toSessionORMEntity(): SessionORMEntity {
+        return SessionORMEntity(
+            id,
+            success,
+            guest_session_id,
+            expires_at,
+            status_message,
+            status_code,
+
+            )
+    }
+}
diff --git a/app/src/main/java/com/intive/tmdbandroid/model/TVShow.kt b/app/src/main/java/com/intive/tmdbandroid/model/TVShow.kt
index f1df4b75..be0c59d1 100644
--- a/app/src/main/java/com/intive/tmdbandroid/model/TVShow.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/model/TVShow.kt
@@ -16,7 +16,8 @@ data class TVShow(
     val status: String?,
     val vote_average: Double,
     val vote_count: Int,
-    val networks: List<Network>
+    val networks: List<Network>,
+    val my_rate:Double
 ) {
     fun toScreening(): Screening {
         return Screening(
@@ -37,7 +38,8 @@ data class TVShow(
             adult = false,
             genre_ids = null,
             video = false,
-            networks
+            networks,
+            my_rate
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
index e79c2503..416df647 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
@@ -11,7 +11,6 @@ import com.intive.tmdbandroid.model.Screening
 import com.intive.tmdbandroid.model.Session
 import com.intive.tmdbandroid.model.TVShow
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flowOf
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -75,7 +74,7 @@ class CatalogRepository @Inject constructor(
         return service.setTVShowRating(idMovie,rating)
     }
 
-    suspend fun getGuestSession():Flow<Session>{
-        return flowOf(service.getGuestSession())
+    fun getGuestSession():Flow<Session>{
+        return (service.getGuestSession())
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/SessionRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/SessionRepository.kt
new file mode 100644
index 00000000..432217d9
--- /dev/null
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/SessionRepository.kt
@@ -0,0 +1,22 @@
+package com.intive.tmdbandroid.repository
+
+import com.intive.tmdbandroid.datasource.local.Dao
+import com.intive.tmdbandroid.model.Session
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+import javax.inject.Inject
+
+class SessionRepository @Inject constructor(
+    private val dao: Dao
+) {
+
+    suspend fun existSession(): Flow<List<Session>> {
+        return flowOf(dao.existSession().map {
+            it.toSession()
+        })
+    }
+
+    suspend fun insert(session: Session) {
+        dao.insertSession(session.toSessionORMEntity())
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/GuestSessionUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/GuestSessionUseCase.kt
index da3794fd..1cefe555 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/GuestSessionUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/GuestSessionUseCase.kt
@@ -6,5 +6,5 @@ import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GuestSessionUseCase @Inject constructor(private val repository: CatalogRepository) {
-    suspend operator fun invoke(): Flow<Session> = repository.getGuestSession()
+    operator fun invoke(): Flow<Session> = repository.getGuestSession()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/RatingMovieUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/RatingMovieUseCase.kt
index 175ebe37..8c4b896f 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/RatingMovieUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/RatingMovieUseCase.kt
@@ -1,8 +1,6 @@
 package com.intive.tmdbandroid.usecase
 
-import com.intive.tmdbandroid.model.Movie
 import com.intive.tmdbandroid.repository.CatalogRepository
-import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class RatingMovieUseCase @Inject constructor(private val repository: CatalogRepository) {
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/SaveSessiontUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/SaveSessiontUseCase.kt
new file mode 100644
index 00000000..baef8b3a
--- /dev/null
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/SaveSessiontUseCase.kt
@@ -0,0 +1,16 @@
+package com.intive.tmdbandroid.usecase
+
+import com.intive.tmdbandroid.model.Session
+import com.intive.tmdbandroid.repository.SessionRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+import javax.inject.Inject
+
+class SaveSessiontUseCase @Inject constructor(private val sessionRepository: SessionRepository) {
+
+    suspend operator fun invoke(session: Session): Flow<Boolean> {
+        sessionRepository.insert(session)
+        return flowOf(true)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/SessionExistUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/SessionExistUseCase.kt
new file mode 100644
index 00000000..52840596
--- /dev/null
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/SessionExistUseCase.kt
@@ -0,0 +1,12 @@
+package com.intive.tmdbandroid.usecase
+
+import com.intive.tmdbandroid.model.Session
+import com.intive.tmdbandroid.repository.SessionRepository
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class SessionExistUseCase @Inject constructor(private val sessionRepository: SessionRepository) {
+
+    suspend operator fun invoke(): Flow<List<Session>> = sessionRepository.existSession()
+
+}
\ No newline at end of file

From e2334ed4082b3d0b3a8894dcebd05a3ad549082f Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Thu, 7 Oct 2021 09:01:03 -0300
Subject: [PATCH 13/28] test

---
 .../1.json                                    | 12 +++-
 .../tmdbandroid/datasource/local/Dao.kt       |  4 +-
 .../tmdbandroid/datasource/network/Service.kt | 26 +++----
 .../tmdbandroid/details/ui/DetailFragment.kt  | 64 ++++++++++-------
 .../details/viewmodel/DetailsViewModel.kt     | 70 +++++++++++--------
 .../tmdbandroid/entity/MovieListItemEntity.kt |  6 +-
 .../tmdbandroid/entity/ResultTVShowOrMovie.kt |  6 +-
 .../tmdbandroid/entity/ScreeningORMEntity.kt  |  4 +-
 .../entity/TVShowListItemEntity.kt            |  6 +-
 .../com/intive/tmdbandroid/model/Movie.kt     |  6 +-
 .../com/intive/tmdbandroid/model/Screening.kt |  7 +-
 .../com/intive/tmdbandroid/model/TVShow.kt    |  6 +-
 .../repository/CatalogRepository.kt           |  8 +--
 .../repository/SessionRepository.kt           | 12 ++--
 .../repository/WatchlistRepository.kt         | 12 +++-
 .../usecase/DeleteFromWatchlistUseCase.kt     |  4 +-
 .../tmdbandroid/usecase/ExistUseCase.kt       |  3 +-
 .../usecase/InsertInSessiontUseCase.kt        | 16 +++++
 .../usecase/InsertInWatchlistUseCase.kt       |  4 +-
 .../tmdbandroid/usecase/RatingMovieUseCase.kt |  3 +-
 .../usecase/RatingTVShowUseCase.kt            |  5 +-
 .../usecase/SessionExistUseCase.kt            |  2 +-
 .../usecase/UpdateFromWatchlistUseCase.kt     | 16 +++++
 23 files changed, 192 insertions(+), 110 deletions(-)
 create mode 100644 app/src/main/java/com/intive/tmdbandroid/usecase/InsertInSessiontUseCase.kt
 create mode 100644 app/src/main/java/com/intive/tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt

diff --git a/app/schemas/com.intive.tmdbandroid.datasource.local.LocalStorage/1.json b/app/schemas/com.intive.tmdbandroid.datasource.local.LocalStorage/1.json
index 780d7eec..a3d5517b 100644
--- a/app/schemas/com.intive.tmdbandroid.datasource.local.LocalStorage/1.json
+++ b/app/schemas/com.intive.tmdbandroid.datasource.local.LocalStorage/1.json
@@ -2,11 +2,11 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "978038702e66361f704cb6bd5fa7d344",
+    "identityHash": "320b71eb2503e195a8d56c17386e39c7",
     "entities": [
       {
         "tableName": "ScreeningORMEntity",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `backdrop_path` TEXT, `genres` TEXT, `name` TEXT NOT NULL, `number_of_episodes` INTEGER, `number_of_seasons` INTEGER, `overview` TEXT NOT NULL, `poster_path` TEXT, `status` TEXT, `vote_average` REAL NOT NULL, `vote_count` INTEGER NOT NULL, `popularity` REAL NOT NULL, `release_date` TEXT, `media_type` TEXT NOT NULL, `adult` INTEGER NOT NULL, `genre_ids` TEXT, `video` INTEGER NOT NULL, `networks` TEXT NOT NULL, `my_rate` REAL NOT NULL, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `backdrop_path` TEXT, `genres` TEXT, `name` TEXT NOT NULL, `number_of_episodes` INTEGER, `number_of_seasons` INTEGER, `overview` TEXT NOT NULL, `poster_path` TEXT, `status` TEXT, `vote_average` REAL NOT NULL, `vote_count` INTEGER NOT NULL, `popularity` REAL NOT NULL, `release_date` TEXT, `media_type` TEXT NOT NULL, `adult` INTEGER NOT NULL, `genre_ids` TEXT, `video` INTEGER NOT NULL, `networks` TEXT NOT NULL, `my_rate` REAL NOT NULL, `my_favorite` INTEGER NOT NULL, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -121,6 +121,12 @@
             "columnName": "my_rate",
             "affinity": "REAL",
             "notNull": true
+          },
+          {
+            "fieldPath": "my_favorite",
+            "columnName": "my_favorite",
+            "affinity": "INTEGER",
+            "notNull": true
           }
         ],
         "primaryKey": {
@@ -186,7 +192,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '978038702e66361f704cb6bd5fa7d344')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '320b71eb2503e195a8d56c17386e39c7')"
     ]
   }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt
index 4c7b0bc5..216bcd5a 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt
@@ -19,8 +19,8 @@ interface Dao{
     @Delete
     suspend fun deleteFavorite(screeningORMEntity: ScreeningORMEntity)
 
-    @Query("SELECT EXISTS(SELECT * FROM ScreeningORMEntity WHERE id = :id)")
-    suspend fun existAsFavorite(id: Int): Boolean
+    @Query("SELECT * FROM ScreeningORMEntity WHERE id = :id")
+    suspend fun existAsFavorite(id: Int): ScreeningORMEntity
 
     @Query("SELECT * FROM SessionORMEntity WHERE id = 1")
     suspend fun existSession(): List<SessionORMEntity>
diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
index 24dc40fb..08c39cc2 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
@@ -13,14 +13,13 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.json.JSONObject
 import com.intive.tmdbandroid.model.Session
-import com.intive.tmdbandroid.usecase.SessionExistUseCase
 import kotlinx.coroutines.flow.collect
 
 
 class Service {
     private val retrofit = RetrofitHelper.getRetrofit()
-    private lateinit var sessionFlow: Flow<Session>
-    private lateinit var session:Session
+    //private lateinit var sessionFlow: Flow<Session>
+    //private lateinit var session:Session
 
     fun getPaginatedPopularTVShows(page: Int): Flow<ResultTVShowsEntity> {
         return flow {
@@ -52,7 +51,7 @@ class Service {
         }
     }
 
-    suspend fun setMovieRating(movieID: Int, rating: Double): Boolean {
+    suspend fun setMovieRating(movieID: Int, rating: Double,session:Session): Boolean {
         var retorno:Boolean = true
         if(rating < 0.5 || rating > 10){
             retorno=false
@@ -68,16 +67,13 @@ class Service {
             // Create RequestBody ( We're not using any converter, like GsonConverter, MoshiConverter e.t.c, that's why we use RequestBody )
             val requestBody = jsonObjectString.toRequestBody("application/json".toMediaTypeOrNull())
 
-            sessionFlow.collect {
-                    element-> session=element
-            }
             retrofit.create(ApiClient::class.java).postMovieRanking(movieID,BuildConfig.API_KEY,session.guest_session_id,requestBody)
         }
 
         return  retorno
     }
 
-    suspend fun setTVShowRating(tvShowID: Int, rating: Double): Boolean {
+    suspend fun setTVShowRating(tvShowID: Int, rating: Double,session:Session): Boolean {
         var retorno:Boolean = true
         if(rating < 0.5 || rating > 10){
             retorno=false
@@ -85,8 +81,7 @@ class Service {
         else{
             // Create JSON using JSONObject
             val jsonObject = JSONObject()
-            //jsonObject.put("value", rating)
-            jsonObject.put("value", "pepe")
+            jsonObject.put("value", rating)
 
             // Convert JSONObject to String
             val jsonObjectString = jsonObject.toString()
@@ -101,14 +96,11 @@ class Service {
     }
 
     fun getGuestSession():Flow<Session>{
-        if(!this::sessionFlow.isInitialized){
-            //re
-            //recupero de la bbdd, si es que hay algo. COmpruebo que no este vencido.
-            //Existe bbdd?NO / recupero esta vencido
-            sessionFlow =  flow {
+        //if(!this::sessionFlow.isInitialized){
+        return   flow {
                 emit(retrofit.create(ApiClient::class.java).getNewGuestSession(BuildConfig.API_KEY))
             }
-        }
-        return sessionFlow
+        //}
+        //return sessionFlow
     }
 }
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
index 20b7af31..f3487ac5 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
@@ -1,6 +1,7 @@
 package com.intive.tmdbandroid.details.ui
 
 import android.app.Dialog
+import android.opengl.Visibility
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -18,11 +19,13 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
+import androidx.recyclerview.widget.GridLayoutManager
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.intive.tmdbandroid.R
 import com.intive.tmdbandroid.common.State
 import com.intive.tmdbandroid.databinding.FragmentDetailBinding
+import com.intive.tmdbandroid.details.ui.adapters.NetworkAdapter
 import com.intive.tmdbandroid.details.viewmodel.DetailsViewModel
 import com.intive.tmdbandroid.model.Screening
 import dagger.hilt.android.AndroidEntryPoint
@@ -32,8 +35,6 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.*
-import androidx.recyclerview.widget.GridLayoutManager
-import com.intive.tmdbandroid.details.ui.adapters.NetworkAdapter
 import kotlin.math.floor
 
 
@@ -47,6 +48,8 @@ class DetailFragment : Fragment() {
 
     private val networkAdapter = NetworkAdapter()
 
+    private lateinit var screening: Screening
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -72,37 +75,42 @@ class DetailFragment : Fragment() {
         val args: DetailFragmentArgs by navArgs()
         screeningItemId?.let {
             Timber.i("MAS - screeningID: $it")
-            if(savedInstanceState==null){
+            if (savedInstanceState == null) {
                 if (args.isMovieBoolean) viewModel.movie(it)
                 else viewModel.tVShows(it)
             }
         }
-        val button_rating=view.findViewById<Button>(R.id.rate_button)
-        button_rating.setOnClickListener{
-            screeningItemId?.let { it1 -> showDialog(it1,args) }
+        val button_rating = view.findViewById<Button>(R.id.rate_button)
+        button_rating.setOnClickListener {
+            screeningItemId?.let { it1 -> showDialogRate(args) }
         }
 
 
-
     }
 
-    private fun showDialog(screeningItemId:Int, args:DetailFragmentArgs) {
+    private fun showDialogRate(args: DetailFragmentArgs) {
         val dialog = this.context?.let { Dialog(it) }
         dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE)
         dialog?.setCancelable(false)
         dialog?.setContentView(R.layout.rank_dialog)
         val yesBtn = dialog?.findViewById(R.id.rank_dialog_button_rate) as Button
         val noBtn = dialog.findViewById(R.id.rank_dialog_button_cancel) as TextView
-        yesBtn.setOnClickListener {
-            val ratingBar: RatingBar = dialog?.findViewById(R.id.dialog_ratingbar) as RatingBar
-            screeningItemId?.let {
-                if (args.isMovieBoolean) viewModel.ratingMovie(it,ratingBar.rating.toDouble())
-                else{
-                    viewModel.ratingTvShow(it,ratingBar.rating.toDouble())
+        val ratingBar: RatingBar = dialog?.findViewById(R.id.dialog_ratingbar) as RatingBar
+        if(screening.my_rate==0.0) {
+            yesBtn.setOnClickListener {
+
+                if (args.isMovieBoolean) viewModel.ratingMovie(args.screeningID, ratingBar.rating.toDouble())
+                else {
+                    viewModel.ratingTvShow(args.screeningID, ratingBar.rating.toDouble())
                 }
+                screening.my_rate = ratingBar.rating.toDouble()
+                viewModel.addToWatchlist(screening)
+                dialog.dismiss()
             }
-
-            dialog.dismiss()
+        }
+        else{
+            yesBtn.visibility = View.GONE
+            ratingBar.rating=(screening.my_rate).toFloat()
         }
         noBtn.setOnClickListener { dialog.dismiss() }
         dialog?.show()
@@ -122,7 +130,8 @@ class DetailFragment : Fragment() {
                     is State.Success -> {
                         binding.layoutErrorDetail.errorContainer.visibility = View.GONE
                         binding.layoutLoadingDetail.progressBar.visibility = View.GONE
-                        setupUI(binding, state.data)
+                        screening = state.data
+                        setupUI(binding)
                     }
                     is State.Error -> {
                         binding.layoutLoadingDetail.progressBar.visibility = View.GONE
@@ -145,8 +154,11 @@ class DetailFragment : Fragment() {
                     is State.Success -> {
                         binding.layoutErrorDetail.errorContainer.visibility = View.GONE
                         binding.layoutLoadingDetail.progressBar.visibility = View.GONE
-                        selectOrUnselectWatchlistFav(binding, it.data)
-                        isSaveOnWatchlist = it.data
+                        selectOrUnselectWatchlistFav(binding, if(it.data==null) false else it.data.my_favorite)
+                        isSaveOnWatchlist = if(it.data==null) false else it.data.my_favorite
+                        //updating screening
+                        screening.my_favorite = isSaveOnWatchlist
+                        screening.my_rate = if(it.data==null) 0.0 else it.data.my_rate
                     }
                     State.Error -> {
                         binding.layoutLoadingDetail.progressBar.visibility = View.GONE
@@ -162,7 +174,7 @@ class DetailFragment : Fragment() {
         }
     }
 
-    private fun setupUI(binding: FragmentDetailBinding, screening: Screening) {
+    private fun setupUI(binding: FragmentDetailBinding) {
 
         setImages(binding, screening)
 
@@ -206,7 +218,7 @@ class DetailFragment : Fragment() {
                 )
             }
 
-        if(screening.overview.isEmpty()) binding.overviewDetailTextView.text = resources.getString(R.string.no_overview)
+        if (screening.overview.isEmpty()) binding.overviewDetailTextView.text = resources.getString(R.string.no_overview)
         else binding.overviewDetailTextView.text = screening.overview
         binding.coordinatorContainerDetail.visibility = View.VISIBLE
 
@@ -274,9 +286,11 @@ class DetailFragment : Fragment() {
             when (it.itemId) {
                 R.id.ic_heart_watchlist -> {
                     if (!isSaveOnWatchlist) {
+                        screening.my_favorite=true
                         viewModel.addToWatchlist(screening)
                     } else {
-                        viewModel.deleteFromWatchlist(screening)
+                        screening.my_favorite=false
+                        viewModel.updateToWatchlist(screening)
                     }
                     true
                 }
@@ -293,7 +307,7 @@ class DetailFragment : Fragment() {
         toolbar.setNavigationOnClickListener {
             if (navController.navigateUp()) {
                 navController.navigateUp()
-            }else {
+            } else {
                 activity?.finish()
             }
         }
@@ -322,8 +336,8 @@ class DetailFragment : Fragment() {
         }
     }
 
-    private fun setNetworkImages(binding: FragmentDetailBinding, screening: Screening){
-        if (screening.networks.isNotEmpty()){
+    private fun setNetworkImages(binding: FragmentDetailBinding, screening: Screening) {
+        if (screening.networks.isNotEmpty()) {
             networkAdapter.submitList(screening.networks)
         } else {
             binding.networksHeader.visibility = View.GONE
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
index 786925f8..ec380c4a 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
@@ -7,10 +7,7 @@ import com.intive.tmdbandroid.model.Screening
 import com.intive.tmdbandroid.model.Session
 import com.intive.tmdbandroid.usecase.*
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -19,19 +16,23 @@ class DetailsViewModel @Inject internal constructor(
     private val tVShowUseCase: DetailTVShowUseCase,
     private val movieUseCase: DetailMovieUseCase,
     private val insertInWatchlistUseCase: InsertInWatchlistUseCase,
-    private val deleteFromWatchlistUseCase: DeleteFromWatchlistUseCase,
+    //private val deleteFromWatchlistUseCase: DeleteFromWatchlistUseCase,
     private val existUseCase: ExistUseCase,
     private val ratingMovieUseCase: RatingMovieUseCase,
     private val ratingTVShowUseCase: RatingTVShowUseCase,
     private val guestSessionUseCase: GuestSessionUseCase,
-    private val sessionExistUseCase: SessionExistUseCase
+    private val sessionExistUseCase: SessionExistUseCase,
+    private val insertInSessiontUseCase: InsertInSessiontUseCase,
+    private val updateInWatchlistUseCase : UpdateFromWatchlistUseCase
 ) : ViewModel() {
 
     private val _state = MutableStateFlow<State<Screening>>(State.Loading)
     val uiState: StateFlow<State<Screening>> = _state
 
-    private val _watchlistState = MutableStateFlow<State<Boolean>>(State.Loading)
-    val watchlistUIState: StateFlow<State<Boolean>> = _watchlistState
+    private val _watchlistState = MutableStateFlow<State<Screening>>(State.Loading)
+    val watchlistUIState: StateFlow<State<Screening>> = _watchlistState
+
+    private lateinit var session:Session
 
     fun tVShows(id: Int) {
         viewModelScope.launch {
@@ -69,9 +70,9 @@ class DetailsViewModel @Inject internal constructor(
         }
     }
 
-    fun deleteFromWatchlist(screening: Screening) {
+    fun updateToWatchlist(screening: Screening) {
         viewModelScope.launch {
-            deleteFromWatchlistUseCase(screening)
+            updateInWatchlistUseCase(screening)
                 .catch {
                     _watchlistState.value = State.Error
                 }
@@ -81,6 +82,18 @@ class DetailsViewModel @Inject internal constructor(
         }
     }
 
+//    fun deleteFromWatchlist(screening: Screening) {
+//        viewModelScope.launch {
+//            deleteFromWatchlistUseCase(screening)
+//                .catch {
+//                    _watchlistState.value = State.Error
+//                }
+//                .collect {
+//                    _watchlistState.value = State.Success(it)
+//                }
+//        }
+//    }
+
     fun existAsFavorite(id: Int) {
         viewModelScope.launch {
             existUseCase(id)
@@ -93,30 +106,29 @@ class DetailsViewModel @Inject internal constructor(
         }
     }
 
-    fun ratingMovie(idMovie: Int, rating: Double){
+    private suspend fun getSession() {
+        session = sessionExistUseCase()
+        if(session.id==0){
+            var sessionFlow = guestSessionUseCase()
+            session = sessionFlow.single()
+            session.status_message="empty"
+            insertInSessiontUseCase(session)
+        }
+
+
+    }
+
+    fun ratingMovie(idMovie: Int, rating: Double) {
         viewModelScope.launch {
-            //guestSessionUseCase().catch {
-                //_sessionState.value= State.Error
-            //}
-            viewModelScope.launch {
-                sessionExistUseCase()
-                    .catch {
-                        _state.value = State.Error
-                    }
-                    .collect { session ->
-                         sessionExistUseCase
-                    }
-            }
-
-            guestSessionUseCase()
-            ratingMovieUseCase(idMovie,rating)
+            getSession()
+            ratingMovieUseCase(idMovie, rating,session)
         }
     }
 
-    fun ratingTvShow(idMovie: Int, rating: Double){
+    fun ratingTvShow(idMovie: Int, rating: Double) {
         viewModelScope.launch {
-            guestSessionUseCase()
-            ratingTVShowUseCase(idMovie,rating)
+            getSession()
+            ratingTVShowUseCase(idMovie, rating,session)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/entity/MovieListItemEntity.kt b/app/src/main/java/com/intive/tmdbandroid/entity/MovieListItemEntity.kt
index 70889710..c70d7dd4 100644
--- a/app/src/main/java/com/intive/tmdbandroid/entity/MovieListItemEntity.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/entity/MovieListItemEntity.kt
@@ -12,7 +12,8 @@ data class MovieListItemEntity(
     val poster_path: String?,
     val vote_average: Double,
     val vote_count: Int,
-    val my_rate: Double
+    val my_rate: Double,
+    val my_favorite: Boolean
 ) {
     fun toScreening(): Screening {
         return Screening(
@@ -34,7 +35,8 @@ data class MovieListItemEntity(
             null,
             false,
             emptyList(),
-            my_rate
+            my_rate,
+            my_favorite
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt b/app/src/main/java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt
index 4e6516dc..09b6046c 100644
--- a/app/src/main/java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt
@@ -26,7 +26,8 @@ data class ResultTVShowOrMovie(
     val name: String?,
     val original_name: String?,
     val poster_path: String?,
-    val my_rate: Double
+    val my_rate: Double,
+    val my_favorite: Boolean
 ) {
     fun toScreening(): Screening {
         return Screening(
@@ -48,7 +49,8 @@ data class ResultTVShowOrMovie(
             genre_ids,
             video,
             emptyList(),
-            my_rate
+            my_rate,
+            my_favorite
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/entity/ScreeningORMEntity.kt b/app/src/main/java/com/intive/tmdbandroid/entity/ScreeningORMEntity.kt
index bb758e09..f8ce5a38 100644
--- a/app/src/main/java/com/intive/tmdbandroid/entity/ScreeningORMEntity.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/entity/ScreeningORMEntity.kt
@@ -35,6 +35,7 @@ data class ScreeningORMEntity(
     @TypeConverters(NetworkConverter::class)
     val networks: List<Network>,
     val my_rate: Double,
+    val my_favorite: Boolean
 ) {
     fun toScreening(): Screening {
         return Screening(
@@ -56,7 +57,8 @@ data class ScreeningORMEntity(
             genre_ids,
             video,
             networks,
-            my_rate
+            my_rate,
+            my_favorite
         )
     }
 }
diff --git a/app/src/main/java/com/intive/tmdbandroid/entity/TVShowListItemEntity.kt b/app/src/main/java/com/intive/tmdbandroid/entity/TVShowListItemEntity.kt
index 293652fe..997e7ec7 100644
--- a/app/src/main/java/com/intive/tmdbandroid/entity/TVShowListItemEntity.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/entity/TVShowListItemEntity.kt
@@ -12,7 +12,8 @@ data class TVShowListItemEntity(
     val poster_path: String?,
     val vote_average: Double,
     val vote_count: Int,
-    val my_rate: Double
+    val my_rate: Double,
+    val my_favorite: Boolean
 ) {
     fun toScreening(): Screening {
         return Screening(
@@ -34,7 +35,8 @@ data class TVShowListItemEntity(
             null,
             false,
             emptyList(),
-            my_rate
+            my_rate,
+            my_favorite
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/model/Movie.kt b/app/src/main/java/com/intive/tmdbandroid/model/Movie.kt
index 30e5b383..46bc9f1d 100644
--- a/app/src/main/java/com/intive/tmdbandroid/model/Movie.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/model/Movie.kt
@@ -13,7 +13,8 @@ data class Movie(
     val vote_average: Double,
     val vote_count: Int,
     val status: String,
-    val my_rate: Double
+    val my_rate: Double,
+    val my_favorite: Boolean
 ) {
     fun toScreening(): Screening {
         return Screening(
@@ -35,7 +36,8 @@ data class Movie(
             genre_ids = null,
             false,
             emptyList(),
-            my_rate
+            my_rate,
+            my_favorite
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/model/Screening.kt b/app/src/main/java/com/intive/tmdbandroid/model/Screening.kt
index e77657a9..b15278dd 100644
--- a/app/src/main/java/com/intive/tmdbandroid/model/Screening.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/model/Screening.kt
@@ -21,7 +21,8 @@ data class Screening(
     val genre_ids: List<Int>?,
     val video: Boolean,
     val networks: List<Network>,
-    val my_rate: Double
+    var my_rate: Double,
+    var my_favorite: Boolean
 ) {
     fun toScreeningORMEntity(): ScreeningORMEntity {
         return ScreeningORMEntity(
@@ -43,7 +44,9 @@ data class Screening(
             genre_ids,
             video,
             networks,
-            my_rate
+            my_rate,
+            my_favorite
+
         )
     }
 }
diff --git a/app/src/main/java/com/intive/tmdbandroid/model/TVShow.kt b/app/src/main/java/com/intive/tmdbandroid/model/TVShow.kt
index be0c59d1..8a85621e 100644
--- a/app/src/main/java/com/intive/tmdbandroid/model/TVShow.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/model/TVShow.kt
@@ -17,7 +17,8 @@ data class TVShow(
     val vote_average: Double,
     val vote_count: Int,
     val networks: List<Network>,
-    val my_rate:Double
+    val my_rate:Double,
+    val my_favorite: Boolean
 ) {
     fun toScreening(): Screening {
         return Screening(
@@ -39,7 +40,8 @@ data class TVShow(
             genre_ids = null,
             video = false,
             networks,
-            my_rate
+            my_rate,
+            my_favorite
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
index 416df647..b9f87263 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
@@ -66,12 +66,12 @@ class CatalogRepository @Inject constructor(
         ).flow
     }
 
-    suspend fun setMovieRating(idMovie: Int,rating: Double):Boolean{
-        return service.setMovieRating(idMovie,rating)
+    suspend fun setMovieRating(idMovie: Int,rating: Double, session:Session):Boolean{
+        return service.setMovieRating(idMovie,rating,session)
     }
 
-    suspend fun setTVShowRating(idMovie: Int,rating: Double):Boolean{
-        return service.setTVShowRating(idMovie,rating)
+    suspend fun setTVShowRating(idMovie: Int,rating: Double, session:Session):Boolean{
+        return service.setTVShowRating(idMovie,rating,session)
     }
 
     fun getGuestSession():Flow<Session>{
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/SessionRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/SessionRepository.kt
index 432217d9..4c96a748 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/SessionRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/SessionRepository.kt
@@ -4,16 +4,20 @@ import com.intive.tmdbandroid.datasource.local.Dao
 import com.intive.tmdbandroid.model.Session
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.single
 import javax.inject.Inject
 
 class SessionRepository @Inject constructor(
     private val dao: Dao
 ) {
 
-    suspend fun existSession(): Flow<List<Session>> {
-        return flowOf(dao.existSession().map {
-            it.toSession()
-        })
+    suspend fun existSession(): Session {
+        val myFlow = flowOf(dao.existSession())
+        var retorno = Session(0,false,"","","",0)
+        if(myFlow.single().size>0){
+            retorno = myFlow.single().last().toSession()
+        }
+        return retorno
     }
 
     suspend fun insert(session: Session) {
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt
index 02dbcaf4..b9c94b22 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt
@@ -4,6 +4,7 @@ import com.intive.tmdbandroid.datasource.local.Dao
 import com.intive.tmdbandroid.model.Screening
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.single
 import javax.inject.Inject
 
 class WatchlistRepository @Inject constructor(
@@ -11,7 +12,7 @@ class WatchlistRepository @Inject constructor(
 ) {
     suspend fun allFavorites(): Flow<List<Screening>> {
         return flowOf(
-            dao.allFavorites().map {
+            dao.allFavorites().filter { it.my_favorite }.map {
                 it.toScreening()
             }
         )
@@ -25,7 +26,12 @@ class WatchlistRepository @Inject constructor(
         dao.deleteFavorite(screening.toScreeningORMEntity())
     }
 
-    suspend fun exist(id: Int): Flow<Boolean> {
-        return flowOf(dao.existAsFavorite(id))
+    suspend fun updateFavorite(screening: Screening) {
+        dao.updateFavorite(screening.toScreeningORMEntity())
+    }
+
+    suspend fun exist(id: Int): Flow<Screening> {
+        var existFlow = dao.existAsFavorite(id)?.toScreening()
+        return flowOf(existFlow)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/DeleteFromWatchlistUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/DeleteFromWatchlistUseCase.kt
index b3195f2f..e1681a10 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/DeleteFromWatchlistUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/DeleteFromWatchlistUseCase.kt
@@ -8,9 +8,9 @@ import javax.inject.Inject
 
 class DeleteFromWatchlistUseCase @Inject constructor(private val watchlistRepository: WatchlistRepository) {
 
-    suspend operator fun invoke(screening: Screening): Flow<Boolean> {
+    suspend operator fun invoke(screening: Screening): Flow<Screening> {
         watchlistRepository.delete(screening)
-        return flowOf(false)
+        return flowOf(screening)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/ExistUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/ExistUseCase.kt
index a704f5a6..eab66601 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/ExistUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/ExistUseCase.kt
@@ -1,11 +1,12 @@
 package com.intive.tmdbandroid.usecase
 
+import com.intive.tmdbandroid.model.Screening
 import com.intive.tmdbandroid.repository.WatchlistRepository
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class ExistUseCase @Inject constructor(private val watchlistRepository: WatchlistRepository) {
 
-    suspend operator fun invoke(id: Int): Flow<Boolean> = watchlistRepository.exist(id)
+    suspend operator fun invoke(id: Int): Flow<Screening> = watchlistRepository.exist(id)
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/InsertInSessiontUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/InsertInSessiontUseCase.kt
new file mode 100644
index 00000000..af56435f
--- /dev/null
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/InsertInSessiontUseCase.kt
@@ -0,0 +1,16 @@
+package com.intive.tmdbandroid.usecase
+
+import com.intive.tmdbandroid.model.Session
+import com.intive.tmdbandroid.repository.SessionRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+import javax.inject.Inject
+
+class InsertInSessiontUseCase @Inject constructor(private val sessionRepository: SessionRepository) {
+
+    suspend operator fun invoke(session: Session): Flow<Boolean> {
+        sessionRepository.insert(session)
+        return flowOf(true)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/InsertInWatchlistUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/InsertInWatchlistUseCase.kt
index f79592d5..c50de4c1 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/InsertInWatchlistUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/InsertInWatchlistUseCase.kt
@@ -8,9 +8,9 @@ import javax.inject.Inject
 
 class InsertInWatchlistUseCase @Inject constructor(private val watchlistRepository: WatchlistRepository) {
 
-    suspend operator fun invoke(screening: Screening): Flow<Boolean> {
+    suspend operator fun invoke(screening: Screening): Flow<Screening> {
         watchlistRepository.insert(screening)
-        return flowOf(true)
+        return flowOf(screening)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/RatingMovieUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/RatingMovieUseCase.kt
index 8c4b896f..8a8227cc 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/RatingMovieUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/RatingMovieUseCase.kt
@@ -1,8 +1,9 @@
 package com.intive.tmdbandroid.usecase
 
+import com.intive.tmdbandroid.model.Session
 import com.intive.tmdbandroid.repository.CatalogRepository
 import javax.inject.Inject
 
 class RatingMovieUseCase @Inject constructor(private val repository: CatalogRepository) {
-    suspend operator fun invoke(id: Int, rating: Double): Boolean = repository.setMovieRating(id, rating)
+    suspend operator fun invoke(id: Int, rating: Double,session: Session): Boolean = repository.setMovieRating(id, rating,session)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/RatingTVShowUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/RatingTVShowUseCase.kt
index 0659ef6a..53cd3da8 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/RatingTVShowUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/RatingTVShowUseCase.kt
@@ -1,10 +1,9 @@
 package com.intive.tmdbandroid.usecase
 
-import com.intive.tmdbandroid.model.Movie
+import com.intive.tmdbandroid.model.Session
 import com.intive.tmdbandroid.repository.CatalogRepository
-import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class RatingTVShowUseCase @Inject constructor(private val repository: CatalogRepository) {
-    suspend operator fun invoke(id: Int, rating: Double): Boolean = repository.setTVShowRating(id, rating)
+    suspend operator fun invoke(id: Int, rating: Double,session: Session): Boolean = repository.setTVShowRating(id, rating,session)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/SessionExistUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/SessionExistUseCase.kt
index 52840596..c9eca9c7 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/SessionExistUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/SessionExistUseCase.kt
@@ -7,6 +7,6 @@ import javax.inject.Inject
 
 class SessionExistUseCase @Inject constructor(private val sessionRepository: SessionRepository) {
 
-    suspend operator fun invoke(): Flow<List<Session>> = sessionRepository.existSession()
+    suspend operator fun invoke(): Session = sessionRepository.existSession()
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt
new file mode 100644
index 00000000..7a11b7f3
--- /dev/null
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt
@@ -0,0 +1,16 @@
+package com.intive.tmdbandroid.usecase
+
+import com.intive.tmdbandroid.model.Screening
+import com.intive.tmdbandroid.repository.WatchlistRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+import javax.inject.Inject
+
+class UpdateFromWatchlistUseCase @Inject constructor(private val watchlistRepository: WatchlistRepository) {
+
+    suspend operator fun invoke(screening: Screening): Flow<Screening> {
+        watchlistRepository.updateFavorite(screening)
+        return flowOf(screening)
+    }
+
+}
\ No newline at end of file

From 961b2d6fe792ee1a5ba98a849a34aa1f1a3b6b49 Mon Sep 17 00:00:00 2001
From: "andres.seoane" <andres.seoane@intive.com>
Date: Thu, 7 Oct 2021 09:12:53 -0300
Subject: [PATCH 14/28] Change return type

---
 .../com/intive/tmdbandroid/datasource/local/Dao.kt     |  4 ++--
 .../tmdbandroid/repository/WatchlistRepository.kt      | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt
index 216bcd5a..acc9f79e 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt
@@ -11,10 +11,10 @@ interface Dao{
     suspend fun allFavorites(): List<ScreeningORMEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertFavorite(screeningORMEntity: ScreeningORMEntity)
+    suspend fun insertFavorite(screeningORMEntity: ScreeningORMEntity) : ScreeningORMEntity
 
     @Update
-    suspend fun updateFavorite(screeningORMEntity: ScreeningORMEntity)
+    suspend fun updateFavorite(screeningORMEntity: ScreeningORMEntity) : ScreeningORMEntity
 
     @Delete
     suspend fun deleteFavorite(screeningORMEntity: ScreeningORMEntity)
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt
index b9c94b22..bbfba2bb 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt
@@ -18,20 +18,16 @@ class WatchlistRepository @Inject constructor(
         )
     }
 
-    suspend fun insert(screening: Screening) {
-        dao.insertFavorite(screening.toScreeningORMEntity())
-    }
+    suspend fun insert(screening: Screening)  = dao.insertFavorite(screening.toScreeningORMEntity())
 
     suspend fun delete(screening: Screening) {
         dao.deleteFavorite(screening.toScreeningORMEntity())
     }
 
-    suspend fun updateFavorite(screening: Screening) {
-        dao.updateFavorite(screening.toScreeningORMEntity())
-    }
+    suspend fun updateFavorite(screening: Screening)  = dao.updateFavorite(screening.toScreeningORMEntity())
 
     suspend fun exist(id: Int): Flow<Screening> {
-        var existFlow = dao.existAsFavorite(id)?.toScreening()
+        val existFlow = dao.existAsFavorite(id).toScreening()
         return flowOf(existFlow)
     }
 }
\ No newline at end of file

From 393a46a7ae92fff4c346067efd7c7f361a887f83 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Thu, 7 Oct 2021 10:11:10 -0300
Subject: [PATCH 15/28] No anda.

---
 .../java/com/intive/tmdbandroid/datasource/local/Dao.kt     | 4 ++--
 .../intive/tmdbandroid/repository/WatchlistRepository.kt    | 6 ++++--
 .../tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt       | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt
index acc9f79e..216bcd5a 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt
@@ -11,10 +11,10 @@ interface Dao{
     suspend fun allFavorites(): List<ScreeningORMEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertFavorite(screeningORMEntity: ScreeningORMEntity) : ScreeningORMEntity
+    suspend fun insertFavorite(screeningORMEntity: ScreeningORMEntity)
 
     @Update
-    suspend fun updateFavorite(screeningORMEntity: ScreeningORMEntity) : ScreeningORMEntity
+    suspend fun updateFavorite(screeningORMEntity: ScreeningORMEntity)
 
     @Delete
     suspend fun deleteFavorite(screeningORMEntity: ScreeningORMEntity)
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt
index bbfba2bb..9ea41cd7 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt
@@ -24,10 +24,12 @@ class WatchlistRepository @Inject constructor(
         dao.deleteFavorite(screening.toScreeningORMEntity())
     }
 
-    suspend fun updateFavorite(screening: Screening)  = dao.updateFavorite(screening.toScreeningORMEntity())
+    suspend fun updateFavorite(screening: Screening) {
+        dao.updateFavorite(screening.toScreeningORMEntity())
+    }
 
     suspend fun exist(id: Int): Flow<Screening> {
-        val existFlow = dao.existAsFavorite(id).toScreening()
+        val existFlow = dao.existAsFavorite(id)?.toScreening()
         return flowOf(existFlow)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt
index 7a11b7f3..d6c2eee8 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt
@@ -10,7 +10,7 @@ class UpdateFromWatchlistUseCase @Inject constructor(private val watchlistReposi
 
     suspend operator fun invoke(screening: Screening): Flow<Screening> {
         watchlistRepository.updateFavorite(screening)
-        return flowOf(screening)
+        return (watchlistRepository.exist(screening.id))
     }
 
 }
\ No newline at end of file

From 671c416e91d295d25da48e7547f483bc0cd9a617 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Thu, 7 Oct 2021 10:57:05 -0300
Subject: [PATCH 16/28] Solve problmes with Favorite and Rate Change color
 CANCEL Button

---
 .../intive/tmdbandroid/details/ui/DetailFragment.kt  |  2 +-
 .../details/viewmodel/DetailsViewModel.kt            | 12 ------------
 .../tmdbandroid/repository/WatchlistRepository.kt    |  6 ++++--
 .../com/intive/tmdbandroid/usecase/ExistUseCase.kt   |  2 +-
 .../tmdbandroid/usecase/InsertInWatchlistUseCase.kt  |  2 +-
 .../usecase/UpdateFromWatchlistUseCase.kt            |  2 +-
 app/src/main/res/layout/rank_dialog.xml              |  2 +-
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
index f3487ac5..4980789d 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
@@ -94,7 +94,7 @@ class DetailFragment : Fragment() {
         dialog?.setCancelable(false)
         dialog?.setContentView(R.layout.rank_dialog)
         val yesBtn = dialog?.findViewById(R.id.rank_dialog_button_rate) as Button
-        val noBtn = dialog.findViewById(R.id.rank_dialog_button_cancel) as TextView
+        val noBtn = dialog.findViewById(R.id.rank_dialog_button_cancel) as Button
         val ratingBar: RatingBar = dialog?.findViewById(R.id.dialog_ratingbar) as RatingBar
         if(screening.my_rate==0.0) {
             yesBtn.setOnClickListener {
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
index ec380c4a..40f100fb 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
@@ -82,18 +82,6 @@ class DetailsViewModel @Inject internal constructor(
         }
     }
 
-//    fun deleteFromWatchlist(screening: Screening) {
-//        viewModelScope.launch {
-//            deleteFromWatchlistUseCase(screening)
-//                .catch {
-//                    _watchlistState.value = State.Error
-//                }
-//                .collect {
-//                    _watchlistState.value = State.Success(it)
-//                }
-//        }
-//    }
-
     fun existAsFavorite(id: Int) {
         viewModelScope.launch {
             existUseCase(id)
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt
index 9ea41cd7..2c7ad130 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/WatchlistRepository.kt
@@ -18,7 +18,9 @@ class WatchlistRepository @Inject constructor(
         )
     }
 
-    suspend fun insert(screening: Screening)  = dao.insertFavorite(screening.toScreeningORMEntity())
+    suspend fun insert(screening: Screening) {
+        dao.insertFavorite(screening.toScreeningORMEntity())
+    }
 
     suspend fun delete(screening: Screening) {
         dao.deleteFavorite(screening.toScreeningORMEntity())
@@ -28,7 +30,7 @@ class WatchlistRepository @Inject constructor(
         dao.updateFavorite(screening.toScreeningORMEntity())
     }
 
-    suspend fun exist(id: Int): Flow<Screening> {
+    suspend fun getScreeningById(id: Int): Flow<Screening> {
         val existFlow = dao.existAsFavorite(id)?.toScreening()
         return flowOf(existFlow)
     }
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/ExistUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/ExistUseCase.kt
index eab66601..4047d678 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/ExistUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/ExistUseCase.kt
@@ -7,6 +7,6 @@ import javax.inject.Inject
 
 class ExistUseCase @Inject constructor(private val watchlistRepository: WatchlistRepository) {
 
-    suspend operator fun invoke(id: Int): Flow<Screening> = watchlistRepository.exist(id)
+    suspend operator fun invoke(id: Int): Flow<Screening> = watchlistRepository.getScreeningById(id)
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/InsertInWatchlistUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/InsertInWatchlistUseCase.kt
index c50de4c1..bf0e67ef 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/InsertInWatchlistUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/InsertInWatchlistUseCase.kt
@@ -10,7 +10,7 @@ class InsertInWatchlistUseCase @Inject constructor(private val watchlistReposito
 
     suspend operator fun invoke(screening: Screening): Flow<Screening> {
         watchlistRepository.insert(screening)
-        return flowOf(screening)
+        return watchlistRepository.getScreeningById(screening.id)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt b/app/src/main/java/com/intive/tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt
index d6c2eee8..4091659d 100644
--- a/app/src/main/java/com/intive/tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/usecase/UpdateFromWatchlistUseCase.kt
@@ -10,7 +10,7 @@ class UpdateFromWatchlistUseCase @Inject constructor(private val watchlistReposi
 
     suspend operator fun invoke(screening: Screening): Flow<Screening> {
         watchlistRepository.updateFavorite(screening)
-        return (watchlistRepository.exist(screening.id))
+        return (watchlistRepository.getScreeningById(screening.id))
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/rank_dialog.xml b/app/src/main/res/layout/rank_dialog.xml
index db339dbd..c0e145ee 100644
--- a/app/src/main/res/layout/rank_dialog.xml
+++ b/app/src/main/res/layout/rank_dialog.xml
@@ -51,7 +51,7 @@
             android:layout_marginRight="3dp"
             android:focusable="false"
             android:text="CANCEL"
-            android:textColor="#FF0000"
+            android:textColor="#2196F3"
             android:textSize="20dip"
             android:background="@android:color/transparent"
             app:layout_constraintBottom_toBottomOf="parent"

From d93a965c8adb11d1c9dd807978c721b905ea01ae Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Thu, 7 Oct 2021 11:22:49 -0300
Subject: [PATCH 17/28] Merge with master

---
 .../intive/tmdbandroid/details/ui/DetailFragment.kt   | 11 ++++-------
 .../tmdbandroid/details/viewmodel/DetailsViewModel.kt |  5 +----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
index 76ba520c..a2dd9092 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
@@ -1,9 +1,7 @@
 package com.intive.tmdbandroid.details.ui
 
 import android.app.Dialog
-import android.opengl.Visibility
 import android.content.Intent
-import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -11,7 +9,6 @@ import android.view.ViewGroup
 import android.view.Window
 import android.widget.Button
 import android.widget.RatingBar
-import android.widget.TextView
 import android.view.*
 import android.widget.Toast
 import androidx.annotation.NonNull
@@ -93,13 +90,13 @@ class DetailFragment : Fragment() {
         }
         val button_rating = view.findViewById<Button>(R.id.rate_button)
         button_rating.setOnClickListener {
-            screeningItemId?.let { it1 -> showDialogRate(args) }
+            screeningItemId?.let { it1 -> showDialogRate(it1) }
         }
 
 
     }
 
-    private fun showDialogRate(args: DetailFragmentArgs) {
+    private fun showDialogRate(idItem:Int) {
         val dialog = this.context?.let { Dialog(it) }
         dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE)
         dialog?.setCancelable(false)
@@ -110,9 +107,9 @@ class DetailFragment : Fragment() {
         if(screening.my_rate==0.0) {
             yesBtn.setOnClickListener {
 
-                if (args.isMovieBoolean) viewModel.ratingMovie(args.screeningID, ratingBar.rating.toDouble())
+                if (isMovie) viewModel.ratingMovie(idItem, ratingBar.rating.toDouble())
                 else {
-                    viewModel.ratingTvShow(args.screeningID, ratingBar.rating.toDouble())
+                    viewModel.ratingTvShow(idItem, ratingBar.rating.toDouble())
                 }
                 screening.my_rate = ratingBar.rating.toDouble()
                 viewModel.addToWatchlist(screening)
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
index 22530568..f1e62f49 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
@@ -9,7 +9,6 @@ import com.intive.tmdbandroid.usecase.*
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -21,9 +20,7 @@ class DetailsViewModel @Inject internal constructor(
     private val deleteFromWatchlistUseCase: DeleteFromWatchlistUseCase,
     private val existUseCase: ExistUseCase,
     private val tvShowTrailerUseCase: GetTVShowTrailer,
-    private val movieTrailerUseCase: GetMovieTrailer
-    //private val deleteFromWatchlistUseCase: DeleteFromWatchlistUseCase,
-    private val existUseCase: ExistUseCase,
+    private val movieTrailerUseCase: GetMovieTrailer,
     private val ratingMovieUseCase: RatingMovieUseCase,
     private val ratingTVShowUseCase: RatingTVShowUseCase,
     private val guestSessionUseCase: GuestSessionUseCase,

From d8c3dfd4f30e331d1dcf57ae7e5a4dab8e21736d Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Thu, 7 Oct 2021 14:46:24 -0300
Subject: [PATCH 18/28] Merge with master

---
 .../details/viewmodel/DetailsViewModel.kt     |  1 -
 .../usecase/DeleteFromWatchlistUseCaseTest.kt |  4 +-
 .../details/usecase/GetIfExistsUseCaseTest.kt | 30 +++++++-
 .../SaveTVShowInWatchlistUseCaseTest.kt       |  4 +-
 .../details/viewmodel/DetailsViewModelTest.kt | 77 ++++++++-----------
 .../home/viewmodel/MoviesViewModelTest.kt     |  8 +-
 .../home/viewmodel/TVShowsViewModelTest.kt    |  8 +-
 .../home/viewmodel/WatchlistViewModelTest.kt  |  4 +-
 .../search/viewmodel/SearchViewModelTest.kt   |  4 +-
 .../usecase/DetailTVShowUseCaseTest.kt        |  4 +-
 .../PaginatedPopularMoviesUseCaseTest.kt      |  8 +-
 .../PaginatedPopularTVShowsUseCaseTest.kt     |  4 +-
 .../usecase/SearchTVShowUseCaseTest.kt        |  4 +-
 13 files changed, 98 insertions(+), 62 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
index f1e62f49..fc9859ca 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
@@ -17,7 +17,6 @@ class DetailsViewModel @Inject internal constructor(
     private val tVShowUseCase: DetailTVShowUseCase,
     private val movieUseCase: DetailMovieUseCase,
     private val insertInWatchlistUseCase: InsertInWatchlistUseCase,
-    private val deleteFromWatchlistUseCase: DeleteFromWatchlistUseCase,
     private val existUseCase: ExistUseCase,
     private val tvShowTrailerUseCase: GetTVShowTrailer,
     private val movieTrailerUseCase: GetMovieTrailer,
diff --git a/app/src/test/java/com/intive/tmdbandroid/details/usecase/DeleteFromWatchlistUseCaseTest.kt b/app/src/test/java/com/intive/tmdbandroid/details/usecase/DeleteFromWatchlistUseCaseTest.kt
index 25ff74ce..2f3c920e 100644
--- a/app/src/test/java/com/intive/tmdbandroid/details/usecase/DeleteFromWatchlistUseCaseTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/details/usecase/DeleteFromWatchlistUseCaseTest.kt
@@ -47,7 +47,9 @@ class DeleteFromWatchlistUseCaseTest {
         adult = false,
         genre_ids = null,
         video = false,
-        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+        my_rate = 3.5,
+        my_favorite = true
     )
 
     private lateinit var deleteFromWatchlistUseCase: DeleteFromWatchlistUseCase
diff --git a/app/src/test/java/com/intive/tmdbandroid/details/usecase/GetIfExistsUseCaseTest.kt b/app/src/test/java/com/intive/tmdbandroid/details/usecase/GetIfExistsUseCaseTest.kt
index e2d31be0..6a49cb44 100644
--- a/app/src/test/java/com/intive/tmdbandroid/details/usecase/GetIfExistsUseCaseTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/details/usecase/GetIfExistsUseCaseTest.kt
@@ -3,6 +3,9 @@ package com.intive.tmdbandroid.details.usecase
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import app.cash.turbine.test
 import com.intive.tmdbandroid.common.MainCoroutineRule
+import com.intive.tmdbandroid.model.Genre
+import com.intive.tmdbandroid.model.Network
+import com.intive.tmdbandroid.model.Screening
 import com.intive.tmdbandroid.repository.WatchlistRepository
 import com.intive.tmdbandroid.usecase.ExistUseCase
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -29,6 +32,29 @@ class GetIfExistsUseCaseTest {
     @get:Rule
     var instantTaskExecutorRule = InstantTaskExecutorRule()
 
+    private val screening = Screening(
+        backdrop_path = "BACKDROP_PATH",
+        release_date = "1983-10-20",
+        genres = listOf(Genre(1, "genre1"), Genre(2, "genre2")),
+        id = 1,
+        name = "Simona la Cacarisa",
+        number_of_episodes = 5,
+        number_of_seasons = 2,
+        overview = "Simona la cacarisa, el cochiloco",
+        poster_path = "POSTER_PATH",
+        status = "Online",
+        vote_average = 10.5,
+        vote_count = 100,
+        popularity = 34.0,
+        media_type = "tv",
+        adult = false,
+        genre_ids = null,
+        video = false,
+        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+        my_rate = 3.5,
+        my_favorite = true
+    )
+
     private lateinit var getIfExistsUseCase: ExistUseCase
     @Mock
     private lateinit var watchlistRepository: WatchlistRepository
@@ -42,7 +68,7 @@ class GetIfExistsUseCaseTest {
     @ExperimentalCoroutinesApi
     @ExperimentalTime
     fun invokeTestEmpty() = mainCoroutineRule.runBlockingTest {
-        BDDMockito.given(watchlistRepository.exist(anyInt())).willReturn(flowOf(false))
+        BDDMockito.given(watchlistRepository.getScreeningById(anyInt())).willReturn(flowOf(screening))
 
         val expected = getIfExistsUseCase(2)
 
@@ -56,7 +82,7 @@ class GetIfExistsUseCaseTest {
     @ExperimentalCoroutinesApi
     @ExperimentalTime
     fun invokeTestNotEmpty() = mainCoroutineRule.runBlockingTest {
-        BDDMockito.given(watchlistRepository.exist(anyInt())).willReturn(flowOf(true))
+        BDDMockito.given(watchlistRepository.getScreeningById(anyInt())).willReturn(flowOf(screening))
 
         val expected = getIfExistsUseCase(2)
 
diff --git a/app/src/test/java/com/intive/tmdbandroid/details/usecase/SaveTVShowInWatchlistUseCaseTest.kt b/app/src/test/java/com/intive/tmdbandroid/details/usecase/SaveTVShowInWatchlistUseCaseTest.kt
index 4a70aef5..9681b6b1 100644
--- a/app/src/test/java/com/intive/tmdbandroid/details/usecase/SaveTVShowInWatchlistUseCaseTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/details/usecase/SaveTVShowInWatchlistUseCaseTest.kt
@@ -47,7 +47,9 @@ class SaveTVShowInWatchlistUseCaseTest {
         adult = false,
         genre_ids = null,
         video = false,
-        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+        my_rate = 3.5,
+        my_favorite = true
     )
 
     private lateinit var saveTVShowInWatchlistUseCase: InsertInWatchlistUseCase
diff --git a/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt b/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt
index 76b03102..50e413b3 100644
--- a/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt
@@ -47,7 +47,9 @@ class DetailsViewModelTest {
         number_of_episodes = 5,
         number_of_seasons = 2,
         status = "Online",
-        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+        my_rate = 3.5,
+        my_favorite = true
     )
 
     private val movie = Movie(
@@ -62,7 +64,9 @@ class DetailsViewModelTest {
         vote_average = 10.5,
         vote_count = 100,
         status = "Online",
-        popularity = 34.0
+        popularity = 34.0,
+        my_rate = 3.5,
+        my_favorite = true
     )
 
     private val screening = Screening(
@@ -83,7 +87,9 @@ class DetailsViewModelTest {
         adult = false,
         genre_ids = null,
         video = false,
-        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+        my_rate = 3.5,
+        my_favorite = true
     )
 
     private val videoKey = "VIDEO_KEY"
@@ -94,9 +100,9 @@ class DetailsViewModelTest {
     @Mock
     private lateinit var saveTVShowInWatchlistUseCase: InsertInWatchlistUseCase
     @Mock
-    private lateinit var deleteFromWatchlistUseCase: DeleteFromWatchlistUseCase
+    private lateinit var insertInWatchlistUseCase: InsertInWatchlistUseCase
     @Mock
-    private lateinit var getIfExistsUseCase: ExistUseCase
+    private lateinit var existUseCase: ExistUseCase
     @Mock
     private lateinit var movieUseCase: DetailMovieUseCase
     @Mock
@@ -109,6 +115,13 @@ class DetailsViewModelTest {
     private lateinit var tvShowTrailerUseCase: GetTVShowTrailer
     @Mock
     private lateinit var movieTrailerUseCase: GetMovieTrailer
+    @Mock
+    private lateinit var sessionExistUseCase: SessionExistUseCase
+    @Mock
+    private lateinit var insertInSessiontUseCase: InsertInSessiontUseCase
+    @Mock
+    private lateinit var updateInWatchlistUseCase : UpdateFromWatchlistUseCase
+
 
 
     @Before
@@ -116,15 +129,17 @@ class DetailsViewModelTest {
         detailViewModel = DetailsViewModel(
             tVShowUseCase,
             movieUseCase,
-            saveTVShowInWatchlistUseCase,
-            deleteFromWatchlistUseCase,
-            getIfExistsUseCase,
+            insertInWatchlistUseCase,
+            existUseCase,
+            tvShowTrailerUseCase,
+            movieTrailerUseCase,
             ratingMovieUseCase,
             ratingTVShowUseCase,
             guestSessionUseCase,
-            getIfExistsUseCase,
-            tvShowTrailerUseCase,
-            movieTrailerUseCase
+            sessionExistUseCase,
+            insertInSessiontUseCase,
+            updateInWatchlistUseCase
+
         )
     }
 
@@ -169,13 +184,13 @@ class DetailsViewModelTest {
     fun addToWatchlistTestSuccess() = mainCoroutineRule.runBlockingTest {
         BDDMockito.given(saveTVShowInWatchlistUseCase(screening)).willReturn(
             flow {
-                emit(true)
+                emit(screening)
             })
 
         detailViewModel.addToWatchlist(screening)
 
         detailViewModel.watchlistUIState.test {
-            Truth.assertThat(awaitItem()).isEqualTo(State.Success(true))
+            Truth.assertThat(awaitItem()).isEqualTo(screening)
         }
     }
 
@@ -195,43 +210,13 @@ class DetailsViewModelTest {
         }
     }
 
-    @Test
-    @ExperimentalTime
-    fun deleteFromWatchlistTestSuccess() = mainCoroutineRule.runBlockingTest {
-        BDDMockito.given(deleteFromWatchlistUseCase(screening)).willReturn(
-            flow {
-                emit(false)
-            })
-
-        detailViewModel.deleteFromWatchlist(screening)
-
-        detailViewModel.watchlistUIState.test {
-            Truth.assertThat(awaitItem()).isEqualTo(State.Success(false))
-        }
-    }
-
-    @Test
-    @ExperimentalTime
-    fun deleteFromWatchlistTestFailure() = mainCoroutineRule.runBlockingTest {
-        val runtimeException = RuntimeException()
-        BDDMockito.given(deleteFromWatchlistUseCase(screening)).willReturn(
-            flow {
-                throw runtimeException
-            })
-
-        detailViewModel.deleteFromWatchlist(screening)
-
-        detailViewModel.watchlistUIState.test {
-            Truth.assertThat(awaitItem()).isEqualTo(State.Error)
-        }
-    }
 
     @Test
     @ExperimentalTime
     fun existAsFavoriteTestSuccess() = mainCoroutineRule.runBlockingTest {
-        BDDMockito.given(getIfExistsUseCase(anyInt())).willReturn(
+        BDDMockito.given(existUseCase(anyInt())).willReturn(
             flow {
-                emit(false)
+                emit(screening)
             })
 
         detailViewModel.existAsFavorite(2)
@@ -245,7 +230,7 @@ class DetailsViewModelTest {
     @ExperimentalTime
     fun existAsFavoriteTestFailure() = mainCoroutineRule.runBlockingTest {
         val runtimeException = RuntimeException()
-        BDDMockito.given(getIfExistsUseCase(anyInt())).willReturn(
+        BDDMockito.given(existUseCase(anyInt())).willReturn(
             flow {
                 throw runtimeException
             })
diff --git a/app/src/test/java/com/intive/tmdbandroid/home/viewmodel/MoviesViewModelTest.kt b/app/src/test/java/com/intive/tmdbandroid/home/viewmodel/MoviesViewModelTest.kt
index e6d076a8..21ff7ea0 100644
--- a/app/src/test/java/com/intive/tmdbandroid/home/viewmodel/MoviesViewModelTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/home/viewmodel/MoviesViewModelTest.kt
@@ -60,7 +60,9 @@ class MoviesViewModelTest {
                 adult = false,
                 genre_ids = null,
                 video = false,
-                networks = emptyList()
+                networks = emptyList(),
+                my_rate = 3.5,
+                my_favorite = true
             ),
             Screening(
                 backdrop_path = "BACKDROP_PATH_2",
@@ -80,7 +82,9 @@ class MoviesViewModelTest {
                 adult = false,
                 genre_ids = null,
                 video = false,
-                networks = emptyList()
+                networks = emptyList(),
+                my_rate = 3.5,
+                my_favorite = true
             )
         )
     )
diff --git a/app/src/test/java/com/intive/tmdbandroid/home/viewmodel/TVShowsViewModelTest.kt b/app/src/test/java/com/intive/tmdbandroid/home/viewmodel/TVShowsViewModelTest.kt
index 40ae4217..f2f6b237 100644
--- a/app/src/test/java/com/intive/tmdbandroid/home/viewmodel/TVShowsViewModelTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/home/viewmodel/TVShowsViewModelTest.kt
@@ -61,7 +61,9 @@ class TVShowsViewModelTest {
                 adult = false,
                 genre_ids = null,
                 video = false,
-                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+                my_rate = 3.5,
+                my_favorite = true
             ),
             Screening(
                 backdrop_path = "BACKDROP_PATH_2",
@@ -81,7 +83,9 @@ class TVShowsViewModelTest {
                 adult = false,
                 genre_ids = null,
                 video = false,
-                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+                my_rate = 3.5,
+                my_favorite = true
             )
         )
     )
diff --git a/app/src/test/java/com/intive/tmdbandroid/home/viewmodel/WatchlistViewModelTest.kt b/app/src/test/java/com/intive/tmdbandroid/home/viewmodel/WatchlistViewModelTest.kt
index 5abc54fd..b5e2a4e7 100644
--- a/app/src/test/java/com/intive/tmdbandroid/home/viewmodel/WatchlistViewModelTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/home/viewmodel/WatchlistViewModelTest.kt
@@ -46,7 +46,9 @@ class WatchlistViewModelTest {
                 adult = false,
                 genre_ids = null,
                 video = false,
-                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+                my_rate = 3.5,
+                my_favorite = true
             )
         )
 
diff --git a/app/src/test/java/com/intive/tmdbandroid/search/viewmodel/SearchViewModelTest.kt b/app/src/test/java/com/intive/tmdbandroid/search/viewmodel/SearchViewModelTest.kt
index b6ca97db..65374b7d 100644
--- a/app/src/test/java/com/intive/tmdbandroid/search/viewmodel/SearchViewModelTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/search/viewmodel/SearchViewModelTest.kt
@@ -50,7 +50,9 @@ class SearchViewModelTest{
                 adult = false,
                 genre_ids = null,
                 video = false,
-                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+                my_rate = 3.5,
+                my_favorite = true
             )
         )
     )
diff --git a/app/src/test/java/com/intive/tmdbandroid/usecase/DetailTVShowUseCaseTest.kt b/app/src/test/java/com/intive/tmdbandroid/usecase/DetailTVShowUseCaseTest.kt
index 0fe45865..db0183c2 100644
--- a/app/src/test/java/com/intive/tmdbandroid/usecase/DetailTVShowUseCaseTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/usecase/DetailTVShowUseCaseTest.kt
@@ -42,7 +42,9 @@ class DetailTVShowUseCaseTest{
         number_of_episodes = 5,
         number_of_seasons = 2,
         status = "Online",
-        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+        my_rate = 3.5,
+        my_favorite = true
     )
 
     private lateinit var detailUseCase: DetailTVShowUseCase
diff --git a/app/src/test/java/com/intive/tmdbandroid/usecase/PaginatedPopularMoviesUseCaseTest.kt b/app/src/test/java/com/intive/tmdbandroid/usecase/PaginatedPopularMoviesUseCaseTest.kt
index ca3697b8..9fbb161a 100644
--- a/app/src/test/java/com/intive/tmdbandroid/usecase/PaginatedPopularMoviesUseCaseTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/usecase/PaginatedPopularMoviesUseCaseTest.kt
@@ -55,7 +55,9 @@ class PaginatedPopularMoviesUseCaseTest {
                 adult = false,
                 genre_ids = null,
                 video = false,
-                networks = emptyList()
+                networks = emptyList(),
+                my_rate = 3.5,
+                my_favorite = true
             ),
             Screening(
                 backdrop_path = "BACKDROP_PATH_2",
@@ -75,7 +77,9 @@ class PaginatedPopularMoviesUseCaseTest {
                 adult = false,
                 genre_ids = null,
                 video = false,
-                networks = emptyList()
+                networks = emptyList(),
+                my_rate = 3.5,
+                my_favorite = true
             )
         )
     )
diff --git a/app/src/test/java/com/intive/tmdbandroid/usecase/PaginatedPopularTVShowsUseCaseTest.kt b/app/src/test/java/com/intive/tmdbandroid/usecase/PaginatedPopularTVShowsUseCaseTest.kt
index 957563e5..5c2792b4 100644
--- a/app/src/test/java/com/intive/tmdbandroid/usecase/PaginatedPopularTVShowsUseCaseTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/usecase/PaginatedPopularTVShowsUseCaseTest.kt
@@ -47,7 +47,9 @@ class PaginatedPopularTVShowsUseCaseTest{
                 adult = false,
                 genre_ids = null,
                 video = false,
-                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+                my_rate = 3.5,
+                my_favorite = true
             )
         )
     )
diff --git a/app/src/test/java/com/intive/tmdbandroid/usecase/SearchTVShowUseCaseTest.kt b/app/src/test/java/com/intive/tmdbandroid/usecase/SearchTVShowUseCaseTest.kt
index 295516ff..d52abbee 100644
--- a/app/src/test/java/com/intive/tmdbandroid/usecase/SearchTVShowUseCaseTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/usecase/SearchTVShowUseCaseTest.kt
@@ -49,7 +49,9 @@ class SearchTVShowUseCaseTest {
                 adult = false,
                 genre_ids = null,
                 video = false,
-                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+                my_rate = 3.5,
+                my_favorite = true
             )
         )
     )

From d6621c6cf3cc5c852c84ab9629ecac566772907c Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Thu, 7 Oct 2021 15:12:38 -0300
Subject: [PATCH 19/28] Merge with master

---
 .../datasource/network/ApiClient.kt           | 88 ++++++++++++-------
 .../tmdbandroid/details/ui/DetailFragment.kt  |  4 +-
 .../details/viewmodel/DetailsViewModel.kt     |  3 +-
 .../details/viewmodel/DetailsViewModelTest.kt | 11 ++-
 4 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
index 55c88bd2..b5ec70f7 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt
@@ -12,68 +12,92 @@ import retrofit2.http.*
 interface ApiClient {
     // HOME
     @GET("tv/popular")
-    suspend fun getPaginatedPopularTVShows(@Query("api_key") apiKey: String,
-                                           @Query("page") page: Int) : ResultTVShowsEntity
+    suspend fun getPaginatedPopularTVShows(
+        @Query("api_key") apiKey: String,
+        @Query("page") page: Int
+    ): ResultTVShowsEntity
 
     @GET("movie/popular")
-    suspend fun getPaginatedPopularMovies(@Query("api_key") apiKey: String,
-                                           @Query("page") page: Int) : ResultMoviesEntity
+    suspend fun getPaginatedPopularMovies(
+        @Query("api_key") apiKey: String,
+        @Query("page") page: Int
+    ): ResultMoviesEntity
 
     // DETAIL
 
     @GET("tv/{tv_id}")
-    suspend fun getTVShowByID(@Path("tv_id") tvShowID: Int,
-                              @Query("api_key") apiKey: String) : TVShow
+    suspend fun getTVShowByID(
+        @Path("tv_id") tvShowID: Int,
+        @Query("api_key") apiKey: String
+    ): TVShow
 
     @GET("movie/{movie_id}")
-    suspend fun getMovieByID(@Path("movie_id") movieID: Int,
-                              @Query("api_key") apiKey: String) : Movie
+    suspend fun getMovieByID(
+        @Path("movie_id") movieID: Int,
+        @Query("api_key") apiKey: String
+    ): Movie
 
     @GET("tv/{tv_id}/videos")
-    suspend fun getTVShowVideos(@Path("tv_id") tvShowID: Int,
-                                @Query("api_key") apiKey: String) : VideoEntity
+    suspend fun getTVShowVideos(
+        @Path("tv_id") tvShowID: Int,
+        @Query("api_key") apiKey: String
+    ): VideoEntity
 
     @GET("movie/{movie_id}/videos")
-    suspend fun getMovieVideos(@Path("movie_id") movieID: Int,
-                              @Query("api_key") apiKey: String) : VideoEntity
+    suspend fun getMovieVideos(
+        @Path("movie_id") movieID: Int,
+        @Query("api_key") apiKey: String
+    ): VideoEntity
 
     @POST("movie/{movie_id}/rating")
-    suspend fun postMovieRanking(@Path("movie_id") query: Int,@Query("api_key") apiKey: String, @Query("guest_session_id") sessionId:String, @Body requestBody : RequestBody): Response<ResponseBody>
+    suspend fun postMovieRanking(@Path("movie_id") query: Int, @Query("api_key") apiKey: String, @Query("guest_session_id") sessionId: String, @Body requestBody: RequestBody): Response<ResponseBody>
 
     @POST("tv/{tv_id}/rating")
-    suspend fun postTVRanking(@Path("tv_id") query: Int,@Query("api_key") apiKey: String,  @Query("guest_session_id") sessionId:String,  @Body requestBody : RequestBody): Response<ResponseBody>
+    suspend fun postTVRanking(@Path("tv_id") query: Int, @Query("api_key") apiKey: String, @Query("guest_session_id") sessionId: String, @Body requestBody: RequestBody): Response<ResponseBody>
 
     @GET("authentication/guest_session/new")
-    suspend fun getNewGuestSession(@Query("api_key") apiKey: String) : Session
-                               @Query("api_key") apiKey: String) : VideoEntity
+    suspend fun getNewGuestSession(@Query("api_key") apiKey: String): Session
+
 
     @GET("tv/{tv_id}/similar")
-    suspend fun getTVShowSimilar(@Path("tv_id") tvShowID: Int,
-                              @Query("api_key") apiKey: String) : ResultTVShowsEntity
+    suspend fun getTVShowSimilar(
+        @Path("tv_id") tvShowID: Int,
+        @Query("api_key") apiKey: String
+    ): ResultTVShowsEntity
 
     @GET("movie/{movie_id}/similar")
-    suspend fun getMovieSimilar(@Path("movie_id") movieID: Int,
-                                @Query("api_key") apiKey: String) : ResultMoviesEntity
+    suspend fun getMovieSimilar(
+        @Path("movie_id") movieID: Int,
+        @Query("api_key") apiKey: String
+    ): ResultMoviesEntity
 
     // SEARCH
 
     @GET("search/multi")
-    suspend fun getTVShowAndMoviesByName(@Query("api_key") apiKey: String,
-                                @Query("query") query: String,
-                                @Query("page") page: Int) : ResultListTVShowOrMovies
+    suspend fun getTVShowAndMoviesByName(
+        @Query("api_key") apiKey: String,
+        @Query("query") query: String,
+        @Query("page") page: Int
+    ): ResultListTVShowOrMovies
 
     @GET("search/movie")
-    suspend fun getMoviesByName(@Query("api_key") apiKey: String,
-                                @Query("query") query: String,
-                                @Query("page") page: Int) : ResultMoviesEntity
+    suspend fun getMoviesByName(
+        @Query("api_key") apiKey: String,
+        @Query("query") query: String,
+        @Query("page") page: Int
+    ): ResultMoviesEntity
 
     @GET("search/tv")
-    suspend fun getTVByName(@Query("api_key") apiKey: String,
-                                @Query("query") query: String,
-                                @Query("page") page: Int) : ResultTVShowsEntity
+    suspend fun getTVByName(
+        @Query("api_key") apiKey: String,
+        @Query("query") query: String,
+        @Query("page") page: Int
+    ): ResultTVShowsEntity
 
     @GET("search/person")
-    suspend fun getPersonByName(@Query("api_key") apiKey: String,
-                                @Query("query") query: String,
-                                @Query("page") page: Int) : ResultPeopleEntity
+    suspend fun getPersonByName(
+        @Query("api_key") apiKey: String,
+        @Query("query") query: String,
+        @Query("page") page: Int
+    ): ResultPeopleEntity
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
index 75304711..57bcf78b 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
@@ -23,7 +23,6 @@ import androidx.navigation.fragment.navArgs
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
@@ -31,7 +30,6 @@ import com.intive.tmdbandroid.R
 import com.intive.tmdbandroid.common.State
 import com.intive.tmdbandroid.databinding.FragmentDetailBinding
 import com.intive.tmdbandroid.details.ui.adapters.NetworkAdapter
-import com.intive.tmdbandroid.details.ui.adapters.NetworkAdapter
 import com.intive.tmdbandroid.details.ui.adapters.RecommendationAdapter
 import com.intive.tmdbandroid.details.viewmodel.DetailsViewModel
 import com.intive.tmdbandroid.model.Screening
@@ -241,7 +239,7 @@ class DetailFragment : Fragment() {
         }
     }
 
-    private fun setupUI(binding: FragmentDetailBinding, screening: Screening) {
+    private fun setupUI(binding: FragmentDetailBinding) {
 
         setImages(binding, screening)
 
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
index e170d4e4..cbf35d52 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
@@ -19,9 +19,8 @@ class DetailsViewModel @Inject internal constructor(
     private val insertInWatchlistUseCase: InsertInWatchlistUseCase,
     private val existUseCase: ExistUseCase,
     private val tvShowTrailerUseCase: GetTVShowTrailer,
-    private val movieTrailerUseCase: GetMovieTrailer,
     private val getTVShowSimilarUseCase: GetTVShowSimilarUseCase,
-    private val getMovieSimilarUseCase: GetMovieSimilarUseCase
+    private val getMovieSimilarUseCase: GetMovieSimilarUseCase,
     private val movieTrailerUseCase: GetMovieTrailer,
     private val ratingMovieUseCase: RatingMovieUseCase,
     private val ratingTVShowUseCase: RatingTVShowUseCase,
diff --git a/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt b/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt
index 893b030c..d1164aa4 100644
--- a/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt
@@ -17,7 +17,8 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.BDDMockito
 import org.mockito.Mock
-import org.mockito.Mockito.*
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.anyInt
 import org.mockito.junit.MockitoJUnitRunner
 import kotlin.time.ExperimentalTime
 
@@ -136,17 +137,15 @@ class DetailsViewModelTest {
             insertInWatchlistUseCase,
             existUseCase,
             tvShowTrailerUseCase,
+            getTVShowSimilarUseCase,
+            getMovieSimilarUseCase,
             movieTrailerUseCase,
             ratingMovieUseCase,
             ratingTVShowUseCase,
             guestSessionUseCase,
             sessionExistUseCase,
             insertInSessiontUseCase,
-            updateInWatchlistUseCase,
-
-            movieTrailerUseCase,
-            getTVShowSimilarUseCase,
-            getMovieSimilarUseCase
+            updateInWatchlistUseCase
         )
     }
 

From 467203ff34d3a2548ffd2c9d2d7e641ec8c27dc9 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Tue, 12 Oct 2021 10:59:38 -0300
Subject: [PATCH 20/28] Solve test problem remove some warning

---
 .../intive/tmdbandroid/datasource/network/Service.kt   |  3 ---
 .../intive/tmdbandroid/details/ui/DetailFragment.kt    |  4 ++--
 .../tmdbandroid/details/viewmodel/DetailsViewModel.kt  |  4 ++--
 .../intive/tmdbandroid/repository/CatalogRepository.kt |  2 +-
 .../intive/tmdbandroid/repository/SessionRepository.kt |  7 +++----
 .../details/usecase/GetMovieSimilarUseCaseTest.kt      |  4 +++-
 .../details/usecase/GetTVShowSimilarUseCaseTest.kt     |  4 +++-
 .../details/viewmodel/DetailsViewModelTest.kt          | 10 ++++------
 8 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
index 6cd0e76e..c20461e0 100644
--- a/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt
@@ -125,12 +125,9 @@ class Service {
     }
 
     fun getGuestSession():Flow<Session>{
-        //if(!this::sessionFlow.isInitialized){
         return   flow {
                 emit(retrofit.create(ApiClient::class.java).getNewGuestSession(BuildConfig.API_KEY))
             }
-        //}
-        //return sessionFlow
     }
 
     fun getTvShowSimilar(tvShowID: Int): Flow<List<Screening>> {
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
index 57bcf78b..31e762bf 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
@@ -114,7 +114,7 @@ class DetailFragment : Fragment() {
         dialog?.setContentView(R.layout.rank_dialog)
         val yesBtn = dialog?.findViewById(R.id.rank_dialog_button_rate) as Button
         val noBtn = dialog.findViewById(R.id.rank_dialog_button_cancel) as Button
-        val ratingBar: RatingBar = dialog?.findViewById(R.id.dialog_ratingbar) as RatingBar
+        val ratingBar: RatingBar = dialog.findViewById(R.id.dialog_ratingbar) as RatingBar
         if(screening.my_rate==0.0) {
             yesBtn.setOnClickListener {
 
@@ -132,7 +132,7 @@ class DetailFragment : Fragment() {
             ratingBar.rating=(screening.my_rate).toFloat()
         }
         noBtn.setOnClickListener { dialog.dismiss() }
-        dialog?.show()
+        dialog.show()
 
     }
 
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
index cbf35d52..89d8301f 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModel.kt
@@ -165,10 +165,10 @@ class DetailsViewModel @Inject internal constructor(
         }
     }
 
-    fun ratingTvShow(idMovie: Int, rating: Double) {
+    fun ratingTvShow(idTVShow: Int, rating: Double) {
         viewModelScope.launch {
             getSession()
-            ratingTVShowUseCase(idMovie, rating,session)
+            ratingTVShowUseCase(idTVShow, rating,session)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
index 00ecdbc1..ec7aa237 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
@@ -83,7 +83,7 @@ class CatalogRepository @Inject constructor(
     }
 
     fun getGuestSession():Flow<Session>{
-        return (service.getGuestSession())
+        return service.getGuestSession()
     }
 
     fun getTVShowSimilar(id: Int): Flow<List<Screening>> {
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/SessionRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/SessionRepository.kt
index 4c96a748..b9fc6fc7 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/SessionRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/SessionRepository.kt
@@ -2,7 +2,6 @@ package com.intive.tmdbandroid.repository
 
 import com.intive.tmdbandroid.datasource.local.Dao
 import com.intive.tmdbandroid.model.Session
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.single
 import javax.inject.Inject
@@ -13,11 +12,11 @@ class SessionRepository @Inject constructor(
 
     suspend fun existSession(): Session {
         val myFlow = flowOf(dao.existSession())
-        var retorno = Session(0,false,"","","",0)
+        var returnSession = Session(0,false,"","","",0)
         if(myFlow.single().size>0){
-            retorno = myFlow.single().last().toSession()
+            returnSession = myFlow.single().last().toSession()
         }
-        return retorno
+        return returnSession
     }
 
     suspend fun insert(session: Session) {
diff --git a/app/src/test/java/com/intive/tmdbandroid/details/usecase/GetMovieSimilarUseCaseTest.kt b/app/src/test/java/com/intive/tmdbandroid/details/usecase/GetMovieSimilarUseCaseTest.kt
index c9eff66a..a6db381f 100644
--- a/app/src/test/java/com/intive/tmdbandroid/details/usecase/GetMovieSimilarUseCaseTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/details/usecase/GetMovieSimilarUseCaseTest.kt
@@ -51,7 +51,9 @@ class GetMovieSimilarUseCaseTest {
                 adult = false,
                 genre_ids = null,
                 video = false,
-                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+                networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+                my_rate = 3.5,
+                my_favorite = true
             )
         )
 
diff --git a/app/src/test/java/com/intive/tmdbandroid/details/usecase/GetTVShowSimilarUseCaseTest.kt b/app/src/test/java/com/intive/tmdbandroid/details/usecase/GetTVShowSimilarUseCaseTest.kt
index ec845960..5973610e 100644
--- a/app/src/test/java/com/intive/tmdbandroid/details/usecase/GetTVShowSimilarUseCaseTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/details/usecase/GetTVShowSimilarUseCaseTest.kt
@@ -51,7 +51,9 @@ class GetTVShowSimilarUseCaseTest {
             adult = false,
             genre_ids = null,
             video = false,
-            networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+            networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG")),
+            my_rate = 3.5,
+            my_favorite = true
         )
     )
 
diff --git a/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt b/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt
index d1164aa4..5eb1a0a0 100644
--- a/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt
+++ b/app/src/test/java/com/intive/tmdbandroid/details/viewmodel/DetailsViewModelTest.kt
@@ -99,8 +99,6 @@ class DetailsViewModelTest {
     @Mock
     private lateinit var tVShowUseCase: DetailTVShowUseCase
     @Mock
-    private lateinit var saveTVShowInWatchlistUseCase: InsertInWatchlistUseCase
-    @Mock
     private lateinit var insertInWatchlistUseCase: InsertInWatchlistUseCase
     @Mock
     private lateinit var existUseCase: ExistUseCase
@@ -188,7 +186,7 @@ class DetailsViewModelTest {
     @Test
     @ExperimentalTime
     fun addToWatchlistTestSuccess() = mainCoroutineRule.runBlockingTest {
-        BDDMockito.given(saveTVShowInWatchlistUseCase(screening)).willReturn(
+        BDDMockito.given(insertInWatchlistUseCase(screening)).willReturn(
             flow {
                 emit(screening)
             })
@@ -196,7 +194,7 @@ class DetailsViewModelTest {
         detailViewModel.addToWatchlist(screening)
 
         detailViewModel.watchlistUIState.test {
-            Truth.assertThat(awaitItem()).isEqualTo(screening)
+            Truth.assertThat(awaitItem()).isEqualTo(State.Success(screening))
         }
     }
 
@@ -204,7 +202,7 @@ class DetailsViewModelTest {
     @ExperimentalTime
     fun addToWatchlistTestFailure() = mainCoroutineRule.runBlockingTest {
         val runtimeException = RuntimeException()
-        BDDMockito.given(saveTVShowInWatchlistUseCase(screening)).willReturn(
+        BDDMockito.given(insertInWatchlistUseCase(screening)).willReturn(
             flow {
                 throw runtimeException
             })
@@ -228,7 +226,7 @@ class DetailsViewModelTest {
         detailViewModel.existAsFavorite(2)
 
         detailViewModel.watchlistUIState.test {
-            Truth.assertThat(awaitItem()).isAnyOf(State.Success(true), State.Success(false))
+            Truth.assertThat(awaitItem()).isAnyOf(State.Success(screening), State.Success(false))
         }
     }
 

From 9f0b545270aeae855bd12b77acb102986e2d2bf9 Mon Sep 17 00:00:00 2001
From: urielgarrido <uriel.garrido@intive.com>
Date: Tue, 12 Oct 2021 11:40:24 -0300
Subject: [PATCH 21/28] Delete warnings

---
 .../tmdbandroid/details/ui/DetailFragment.kt  | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
index 31e762bf..0a1a13c8 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
@@ -7,9 +7,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
+import android.view.WindowManager
 import android.widget.Button
 import android.widget.RatingBar
-import android.view.*
 import android.widget.Toast
 import androidx.annotation.NonNull
 import androidx.appcompat.content.res.AppCompatResources
@@ -99,8 +99,8 @@ class DetailFragment : Fragment() {
                 else viewModel.tVShows(it)
             }
         }
-        val button_rating = view.findViewById<Button>(R.id.rate_button)
-        button_rating.setOnClickListener {
+        val buttonRating = view.findViewById<Button>(R.id.rate_button)
+        buttonRating.setOnClickListener {
             screeningItemId?.let { it1 -> showDialogRate(it1) }
         }
 
@@ -157,7 +157,7 @@ class DetailFragment : Fragment() {
                         binding.layoutErrorDetail.errorContainer.visibility = View.VISIBLE
                         binding.coordinatorContainerDetail.visibility = View.VISIBLE
                     }
-                    is State.Loading -> {
+                    else -> {
                         binding.layoutErrorDetail.errorContainer.visibility = View.GONE
                         binding.layoutLoadingDetail.progressBar.visibility = View.VISIBLE
                     }
@@ -173,18 +173,26 @@ class DetailFragment : Fragment() {
                     is State.Success -> {
                         binding.layoutErrorDetail.errorContainer.visibility = View.GONE
                         binding.layoutLoadingDetail.progressBar.visibility = View.GONE
-                        selectOrUnselectWatchlistFav(binding, if(it.data==null) false else it.data.my_favorite)
-                        isSaveOnWatchlist = if(it.data==null) false else it.data.my_favorite
-                        //updating screening
-                        screening.my_favorite = isSaveOnWatchlist
-                        screening.my_rate = if(it.data==null) 0.0 else it.data.my_rate
+                        if (it.data == null) {
+                            selectOrUnselectWatchlistFav(binding, false)
+                            isSaveOnWatchlist = false
+                            //updating screening
+                            screening.my_favorite = false
+                            screening.my_rate = 0.0
+                        } else {
+                            selectOrUnselectWatchlistFav(binding, it.data.my_favorite)
+                            isSaveOnWatchlist = it.data.my_favorite
+                            //updating screening
+                            screening.my_favorite = isSaveOnWatchlist
+                            screening.my_rate = it.data.my_rate
+                        }
                     }
                     State.Error -> {
                         binding.layoutLoadingDetail.progressBar.visibility = View.GONE
                         binding.layoutErrorDetail.errorContainer.visibility = View.VISIBLE
                         binding.coordinatorContainerDetail.visibility = View.VISIBLE
                     }
-                    State.Loading -> {
+                    else -> {
                         binding.layoutErrorDetail.errorContainer.visibility = View.GONE
                         binding.layoutLoadingDetail.progressBar.visibility = View.VISIBLE
                     }
@@ -312,7 +320,7 @@ class DetailFragment : Fragment() {
     ) {
         val percentage = (voteAverage * 10).toInt()
 
-        binding.popularityRatingNumber.text = "$percentage%"
+        binding.popularityRatingNumber.text = resources.getString(R.string.popularity, percentage)
 
         val context = binding.root.context
 

From eca082b0c329dc0de177be28e8c864c6de484534 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Tue, 12 Oct 2021 12:21:04 -0300
Subject: [PATCH 22/28] rate star

---
 .../tmdbandroid/details/ui/DetailFragment.kt  | 22 ++++++++++++++-----
 app/src/main/res/layout/fragment_detail.xml   | 12 ++++++++++
 app/src/main/res/values/themes.xml            |  4 ++++
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
index 31e762bf..30baec3b 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
@@ -99,12 +99,23 @@ class DetailFragment : Fragment() {
                 else viewModel.tVShows(it)
             }
         }
-        val button_rating = view.findViewById<Button>(R.id.rate_button)
-        button_rating.setOnClickListener {
-            screeningItemId?.let { it1 -> showDialogRate(it1) }
-        }
-
+    }
 
+    private fun showRateOrStar(){
+        val buttonRating = view?.findViewById<Button>(R.id.rate_button)
+        val ratingbarUser = view?.findViewById<RatingBar>(R.id.ratingbar_user)
+        if(screening.my_rate==0.0) {
+            ratingbarUser?.visibility=View.GONE
+            buttonRating?.visibility=View.VISIBLE
+            buttonRating?.setOnClickListener {
+                screeningItemId?.let { it1 -> showDialogRate(it1) }
+            }
+        }
+        else{
+            ratingbarUser?.visibility=View.VISIBLE
+            buttonRating?.visibility=View.GONE
+            ratingbarUser?.rating=(screening.my_rate).toFloat()
+        }
     }
 
     private fun showDialogRate(idItem:Int) {
@@ -178,6 +189,7 @@ class DetailFragment : Fragment() {
                         //updating screening
                         screening.my_favorite = isSaveOnWatchlist
                         screening.my_rate = if(it.data==null) 0.0 else it.data.my_rate
+                        showRateOrStar()
                     }
                     State.Error -> {
                         binding.layoutLoadingDetail.progressBar.visibility = View.GONE
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index ca2858fe..b54b2dcc 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -119,6 +119,18 @@
                     app:layout_constraintTop_toTopOf="parent"
                     style="?attr/materialButtonOutlinedStyle"
                     />
+                <RatingBar
+                    android:id="@+id/ratingbar_user"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:isIndicator="true"
+                    android:numStars="5"
+                    android:rating="2.5"
+                    android:stepSize="0.5"
+                    style="@style/RatingBarS"
+                    />
 
                 <TextView
                     android:id="@+id/overview_textView"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 3c0a0153..60698ced 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -21,5 +21,9 @@
         <item name="colorControlNormal">@color/black</item>
         <item name="colorControlActivated">@color/black</item>
     </style>
+    <style name="RatingBarS" parent="android:style/Widget.Material.RatingBar.Small">
+        <item name="colorControlNormal">@color/black</item>
+        <item name="colorControlActivated">@color/black</item>
+    </style>
 
 </resources>
\ No newline at end of file

From 5b06deba0562708a70d03609052749a4162b9356 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Tue, 12 Oct 2021 16:55:25 -0300
Subject: [PATCH 23/28] Solve problem position star

---
 app/src/main/res/layout/fragment_detail.xml | 20 +++++++++++---------
 app/src/main/res/values/themes.xml          |  5 -----
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index b54b2dcc..48850f95 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -90,9 +90,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_thumb_up"
+                    android:layout_marginTop="7dp"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/rate_button"
-                    app:layout_constraintBottom_toBottomOf="@id/rate_button"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:tint="@color/red"
                     android:contentDescription="@string/thumb_description"/>
 
@@ -110,15 +110,15 @@
 
                 <Button
                     android:id="@+id/rate_button"
+                    style="?attr/materialButtonOutlinedStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/rate_button_text"
-                    app:icon="@drawable/ic_add"
                     android:textColor="@color/black"
+                    app:icon="@drawable/ic_add"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    style="?attr/materialButtonOutlinedStyle"
-                    />
+                    app:layout_constraintTop_toTopOf="parent" />
+
                 <RatingBar
                     android:id="@+id/ratingbar_user"
                     android:layout_width="wrap_content"
@@ -127,9 +127,11 @@
                     app:layout_constraintTop_toTopOf="parent"
                     android:isIndicator="true"
                     android:numStars="5"
-                    android:rating="2.5"
-                    android:stepSize="0.5"
-                    style="@style/RatingBarS"
+                    tools:rating="2.5"
+                    android:layout_marginTop="14dp"
+                    android:layout_marginEnd="11dp"
+                    android:theme="@style/RatingBar"
+                    style="?attr/ratingBarStyleSmall"
                     />
 
                 <TextView
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 60698ced..3b5a7e1b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -21,9 +21,4 @@
         <item name="colorControlNormal">@color/black</item>
         <item name="colorControlActivated">@color/black</item>
     </style>
-    <style name="RatingBarS" parent="android:style/Widget.Material.RatingBar.Small">
-        <item name="colorControlNormal">@color/black</item>
-        <item name="colorControlActivated">@color/black</item>
-    </style>
-
 </resources>
\ No newline at end of file

From 1d47fbe114c2bdb56e30c83f981d35d5ba0aec48 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Tue, 12 Oct 2021 17:11:57 -0300
Subject: [PATCH 24/28] merge with master

---
 .../com/intive/tmdbandroid/entity/ResultCombinedCredits.kt    | 4 +++-
 .../java/com/intive/tmdbandroid/entity/ResultPeopleEntity.kt  | 4 +++-
 .../java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/entity/ResultCombinedCredits.kt b/app/src/main/java/com/intive/tmdbandroid/entity/ResultCombinedCredits.kt
index 22fecafc..0f799374 100644
--- a/app/src/main/java/com/intive/tmdbandroid/entity/ResultCombinedCredits.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/entity/ResultCombinedCredits.kt
@@ -32,7 +32,9 @@ data class CastItem(
             adult = false,
             genre_ids = null,
             video = false,
-            networks = emptyList()
+            networks = emptyList(),
+            my_favorite = false,
+            my_rate = 0.0
         )
     }
 }
diff --git a/app/src/main/java/com/intive/tmdbandroid/entity/ResultPeopleEntity.kt b/app/src/main/java/com/intive/tmdbandroid/entity/ResultPeopleEntity.kt
index 31027e07..068deac5 100644
--- a/app/src/main/java/com/intive/tmdbandroid/entity/ResultPeopleEntity.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/entity/ResultPeopleEntity.kt
@@ -34,7 +34,9 @@ data class PersonItemEntity(
             adult = false,
             genre_ids = null,
             video = false,
-            networks = emptyList()
+            networks = emptyList(),
+            my_favorite = false,
+            my_rate = 0.0
         )
     }
 }
diff --git a/app/src/main/java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt b/app/src/main/java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt
index a6bc3730..46c2452e 100644
--- a/app/src/main/java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/entity/ResultTVShowOrMovie.kt
@@ -27,7 +27,7 @@ data class ResultTVShowOrMovie(
     val original_name: String?,
     val poster_path: String?,
     val my_rate: Double,
-    val my_favorite: Boolean
+    val my_favorite: Boolean,
     val profile_path: String?,
 ) {
     fun toScreening(): Screening {

From 39ea8705ee11b5d631ad72b94df66f43e0274855 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Wed, 13 Oct 2021 12:15:36 -0300
Subject: [PATCH 25/28] some fix  biding

---
 .../tmdbandroid/details/ui/DetailFragment.kt  | 81 +++++++++----------
 .../repository/CatalogRepository.kt           |  4 +-
 2 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
index 18b2daf1..07f4fd46 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
@@ -3,13 +3,7 @@ package com.intive.tmdbandroid.details.ui
 import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.Window
-import android.widget.Button
-import android.widget.RatingBar
-import android.view.WindowManager
+import android.view.*
 import android.widget.Toast
 import androidx.annotation.NonNull
 import androidx.appcompat.content.res.AppCompatResources
@@ -29,6 +23,7 @@ import com.bumptech.glide.request.RequestOptions
 import com.intive.tmdbandroid.R
 import com.intive.tmdbandroid.common.State
 import com.intive.tmdbandroid.databinding.FragmentDetailBinding
+import com.intive.tmdbandroid.databinding.RankDialogBinding
 import com.intive.tmdbandroid.details.ui.adapters.NetworkAdapter
 import com.intive.tmdbandroid.details.ui.adapters.RecommendationAdapter
 import com.intive.tmdbandroid.details.viewmodel.DetailsViewModel
@@ -94,56 +89,53 @@ class DetailFragment : Fragment() {
 
         screeningItemId?.let {
             Timber.i("MAS - screeningID: $it")
-            if(savedInstanceState==null){
+            if (savedInstanceState == null) {
                 if (isMovie) viewModel.movie(it)
                 else viewModel.tVShows(it)
             }
         }
     }
 
-    private fun showRateOrStar(){
-        val buttonRating = view?.findViewById<Button>(R.id.rate_button)
-        val ratingbarUser = view?.findViewById<RatingBar>(R.id.ratingbar_user)
-        if(screening.my_rate==0.0) {
-            ratingbarUser?.visibility=View.GONE
-            buttonRating?.visibility=View.VISIBLE
-            buttonRating?.setOnClickListener {
+    private fun showRateOrStar(binding: FragmentDetailBinding) {
+
+        if (screening.my_rate == 0.0) {
+            binding.ratingbarUser.visibility = View.GONE
+            binding.rateButton.visibility = View.VISIBLE
+            binding.rateButton.setOnClickListener {
                 screeningItemId?.let { it1 -> showDialogRate(it1) }
             }
-        }
-        else{
-            ratingbarUser?.visibility=View.VISIBLE
-            buttonRating?.visibility=View.GONE
-            ratingbarUser?.rating=(screening.my_rate).toFloat()
+        } else {
+            binding.ratingbarUser.visibility = View.VISIBLE
+            binding.rateButton.visibility = View.GONE
+            binding.ratingbarUser.rating = (screening.my_rate).toFloat()
         }
     }
 
-    private fun showDialogRate(idItem:Int) {
-        val dialog = this.context?.let { Dialog(it) }
+    private fun showDialogRate(idItem: Int) {
+        val bindingDialog = RankDialogBinding.inflate(LayoutInflater.from(context))
+        val dialog = activity?.let { Dialog(it) }
         dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE)
         dialog?.setCancelable(false)
-        dialog?.setContentView(R.layout.rank_dialog)
-        val yesBtn = dialog?.findViewById(R.id.rank_dialog_button_rate) as Button
-        val noBtn = dialog.findViewById(R.id.rank_dialog_button_cancel) as Button
-        val ratingBar: RatingBar = dialog.findViewById(R.id.dialog_ratingbar) as RatingBar
-        if(screening.my_rate==0.0) {
-            yesBtn.setOnClickListener {
-
-                if (isMovie) viewModel.ratingMovie(idItem, ratingBar.rating.toDouble())
+        dialog?.setContentView(bindingDialog.root)
+        if (screening.my_rate == 0.0) {
+            bindingDialog.rankDialogButtonRate.setOnClickListener {
+
+                if (isMovie) viewModel.ratingMovie(idItem, bindingDialog.dialogRatingbar.rating.toDouble())
                 else {
-                    viewModel.ratingTvShow(idItem, ratingBar.rating.toDouble())
+                    viewModel.ratingTvShow(idItem, bindingDialog.dialogRatingbar.rating.toDouble())
                 }
-                screening.my_rate = ratingBar.rating.toDouble()
+                screening.my_rate = bindingDialog.dialogRatingbar.rating.toDouble()
                 viewModel.addToWatchlist(screening)
-                dialog.dismiss()
+                dialog?.dismiss()
             }
+        } else {
+            bindingDialog.rankDialogButtonRate.visibility = View.GONE
+            bindingDialog.dialogRatingbar.rating = (screening.my_rate).toFloat()
         }
-        else{
-            yesBtn.visibility = View.GONE
-            ratingBar.rating=(screening.my_rate).toFloat()
+        bindingDialog.rankDialogButtonCancel.setOnClickListener {
+            dialog?.dismiss()
         }
-        noBtn.setOnClickListener { dialog.dismiss() }
-        dialog.show()
+        dialog?.show()
 
     }
 
@@ -197,7 +189,7 @@ class DetailFragment : Fragment() {
                             screening.my_favorite = isSaveOnWatchlist
                             screening.my_rate = it.data.my_rate
                         }
-                        showRateOrStar()
+                        showRateOrStar(binding)
                     }
                     State.Error -> {
                         binding.layoutLoadingDetail.progressBar.visibility = View.GONE
@@ -393,10 +385,10 @@ class DetailFragment : Fragment() {
             when (it.itemId) {
                 R.id.ic_heart_watchlist -> {
                     if (!isSaveOnWatchlist) {
-                        screening.my_favorite=true
+                        screening.my_favorite = true
                         viewModel.addToWatchlist(screening)
                     } else {
-                        screening.my_favorite=false
+                        screening.my_favorite = false
                         viewModel.updateToWatchlist(screening)
                     }
                     true
@@ -407,7 +399,8 @@ class DetailFragment : Fragment() {
                         action = Intent.ACTION_SEND
                         putExtra(
                             Intent.EXTRA_TEXT,
-                            "Check out this $mediaType! \n ${resources.getString(R.string.to_watch_url)}/${screening.media_type}/${screening.id}")
+                            "Check out this $mediaType! \n ${resources.getString(R.string.to_watch_url)}/${screening.media_type}/${screening.id}"
+                        )
                         type = "text/plain"
                     }
 
@@ -504,8 +497,8 @@ class DetailFragment : Fragment() {
         }
     }
 
-    private fun setNetworkImages(binding: FragmentDetailBinding, screening: Screening){
-        if (screening.networks.isNotEmpty()){
+    private fun setNetworkImages(binding: FragmentDetailBinding, screening: Screening) {
+        if (screening.networks.isNotEmpty()) {
             networkAdapter.submitList(screening.networks)
         } else {
             binding.networksHeader.visibility = View.GONE
diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
index 65c345f7..66ef76f8 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
@@ -83,8 +83,8 @@ class CatalogRepository @Inject constructor(
         return service.getMovieVideos(id)
     }
 
-    suspend fun setMovieRating(idMovie: Int,rating: Double, session:Session):Boolean{
-        return service.setMovieRating(idMovie,rating,session)
+    suspend fun setMovieRating(idTVShow: Int,rating: Double, session:Session):Boolean{
+        return service.setMovieRating(idTVShow,rating,session)
     }
 
     suspend fun setTVShowRating(idMovie: Int,rating: Double, session:Session):Boolean{

From 8521771e63b62c2b79af84b2350be3b38bf3e958 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Wed, 13 Oct 2021 12:54:02 -0300
Subject: [PATCH 26/28] some fix  change Dialog.

---
 .github/workflows/android.yml                      |  2 +-
 .../tmdbandroid/details/ui/DetailFragment.kt       | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 656334db..4879d6cb 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -80,6 +80,6 @@ jobs:
           # email body as text
           body: ${{ github.job }} job in worflow ${{ github.workflow }} of ${{ github.repository }} has ${{ job.status }}
           # comma-separated string, send email to
-          to: francisco.beccuti@intive.com
+          to: francisco.beccut@intive.com
           # from email name
           from: TMDB Team! GitHub Actions!
\ No newline at end of file
diff --git a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
index 07f4fd46..84fcde79 100644
--- a/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/details/ui/DetailFragment.kt
@@ -113,10 +113,10 @@ class DetailFragment : Fragment() {
 
     private fun showDialogRate(idItem: Int) {
         val bindingDialog = RankDialogBinding.inflate(LayoutInflater.from(context))
-        val dialog = activity?.let { Dialog(it) }
-        dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE)
-        dialog?.setCancelable(false)
-        dialog?.setContentView(bindingDialog.root)
+        val dialog =  Dialog(requireContext())
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog.setCancelable(false)
+        dialog.setContentView(bindingDialog.root)
         if (screening.my_rate == 0.0) {
             bindingDialog.rankDialogButtonRate.setOnClickListener {
 
@@ -126,16 +126,16 @@ class DetailFragment : Fragment() {
                 }
                 screening.my_rate = bindingDialog.dialogRatingbar.rating.toDouble()
                 viewModel.addToWatchlist(screening)
-                dialog?.dismiss()
+                dialog.dismiss()
             }
         } else {
             bindingDialog.rankDialogButtonRate.visibility = View.GONE
             bindingDialog.dialogRatingbar.rating = (screening.my_rate).toFloat()
         }
         bindingDialog.rankDialogButtonCancel.setOnClickListener {
-            dialog?.dismiss()
+            dialog.dismiss()
         }
-        dialog?.show()
+        dialog.show()
 
     }
 

From 421ec850630e9c3920c94b980c36992a8906b4ff Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Wed, 13 Oct 2021 13:04:15 -0300
Subject: [PATCH 27/28] merge with master change CatalogRepository

---
 .../intive/tmdbandroid/repository/CatalogRepository.kt    | 4 ++--
 app/src/main/res/layout/fragment_detail.xml               | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
index 66ef76f8..daa413e8 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
@@ -87,8 +87,8 @@ class CatalogRepository @Inject constructor(
         return service.setMovieRating(idTVShow,rating,session)
     }
 
-    suspend fun setTVShowRating(idMovie: Int,rating: Double, session:Session):Boolean{
-        return service.setTVShowRating(idMovie,rating,session)
+    suspend fun setTVShowRating(idTVShow: Int,rating: Double, session:Session):Boolean{
+        return service.setTVShowRating(idTVShow,rating,session)
     }
 
     fun getGuestSession():Flow<Session>{
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index bdbcfd9a..8873377e 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -120,6 +120,13 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     style="?attr/materialButtonOutlinedStyle"/>
+
+                <RatingBar
+                    android:id="@+id/ratingbar_user"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
                     android:isIndicator="true"
                     android:numStars="5"
                     tools:rating="2.5"
@@ -129,6 +136,7 @@
                     style="?attr/ratingBarStyleSmall"
                     />
 
+
                 <TextView
                     android:id="@+id/overview_textView"
                     android:layout_width="wrap_content"

From 1622a5e44f0acb0e940925a77a3d8f533b0b7ec2 Mon Sep 17 00:00:00 2001
From: Francisco Beccuti <fbeccuti@synapticlinks.com.ar>
Date: Wed, 13 Oct 2021 13:07:52 -0300
Subject: [PATCH 28/28] change CatalogRepository

---
 .../com/intive/tmdbandroid/repository/CatalogRepository.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
index daa413e8..e482725e 100644
--- a/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
+++ b/app/src/main/java/com/intive/tmdbandroid/repository/CatalogRepository.kt
@@ -83,8 +83,8 @@ class CatalogRepository @Inject constructor(
         return service.getMovieVideos(id)
     }
 
-    suspend fun setMovieRating(idTVShow: Int,rating: Double, session:Session):Boolean{
-        return service.setMovieRating(idTVShow,rating,session)
+    suspend fun setMovieRating(idMovie: Int,rating: Double, session:Session):Boolean{
+        return service.setMovieRating(idMovie,rating,session)
     }
 
     suspend fun setTVShowRating(idTVShow: Int,rating: Double, session:Session):Boolean{