Merge branch 'master' of https://github.com/recloudstream/cloudstream

Author: LagradOst

app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncApi.kt

@@ -51,6 +51,7 @@ interface SyncAPI : OAuth2API {
         override var quality: SearchQuality? = null,
         override var posterHeaders: Map<String, String>? = null,
         override var id: Int? = null,
+        override var score: Score? = null,
     ) : SearchResponse
 
     abstract class AbstractSyncStatus {
@@ -163,7 +164,7 @@ interface SyncAPI : OAuth2API {
         val releaseDate: Date?,
         override var id: Int? = null,
         val plot : String? = null,
-        val rating: Score? = null,
+        override var score: Score? = null,
         val tags: List<String>? = null
     ) : SearchResponse
 }

app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt

@@ -2655,7 +2655,7 @@ class ResultViewModel2 : ViewModel() {
         ).apply {
             if (searchResponse is SyncAPI.LibraryItem) {
                 this.plot = searchResponse.plot
-                this.score = Score.from100(searchResponse.personalRating) ?: searchResponse.rating
+                this.score = Score.from100(searchResponse.personalRating) ?: searchResponse.score
                 this.tags = searchResponse.tags
             }
             if (searchResponse is DataStoreHelper.BookmarkedData) {

app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt

@@ -90,6 +90,13 @@ object SearchResultBuilder {
                 val ratingText = ((card.personalRating ?: 0).toDouble() / 10).toString()
                     .replace(".0", "")
 
+                rating?.text = ratingText
+            }
+        } else {
+            val ratingText = card.score?.toString(10, 1)
+            val showRating = (ratingText ?: "") != ""
+            rating?.isVisible = showRating
+            if(showRating) {
                 rating?.text = ratingText
             }
         }

app/src/main/java/com/lagradost/cloudstream3/ui/search/SyncSearchViewModel.kt

@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.search
 
+import com.lagradost.cloudstream3.Score
 import com.lagradost.cloudstream3.SearchQuality
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.TvType
@@ -15,5 +16,6 @@ class SyncSearchViewModel {
         override var id: Int?,
         override var quality: SearchQuality? = null,
         override var posterHeaders: Map<String, String>? = null,
+        override var score: Score? = null,
     ) : SearchResponse
 }

app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt

@@ -259,7 +259,7 @@ object DataStoreHelper {
         @JsonProperty("quality") override var quality: SearchQuality?,
         @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>?,
         @JsonProperty("plot") open val plot: String? = null,
-        @JsonProperty("score") open var score: Score? = null,
+        @JsonProperty("score") override var score: Score? = null,
         @JsonProperty("tags") open val tags: List<String>? = null,
     ) : SearchResponse {
         @JsonProperty("rating", access = JsonProperty.Access.WRITE_ONLY)
@@ -326,7 +326,7 @@ object DataStoreHelper {
                 year?.toYear(),
                 this.id,
                 plot = this.plot,
-                rating = this.score,
+                score = this.score,
                 tags = this.tags
             )
         }
@@ -379,7 +379,7 @@ object DataStoreHelper {
                 year?.toYear(),
                 this.id,
                 plot = this.plot,
-                rating = this.score,
+                score = this.score,
                 tags = this.tags
             )
         }
@@ -432,7 +432,7 @@ object DataStoreHelper {
                 year?.toYear(),
                 this.id,
                 plot = this.plot,
-                rating = this.score,
+                score = this.score,
                 tags = this.tags
             )
         }
@@ -452,6 +452,7 @@ object DataStoreHelper {
         @JsonProperty("isFromDownload") val isFromDownload: Boolean,
         @JsonProperty("quality") override var quality: SearchQuality? = null,
         @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        @JsonProperty("score") override var score: Score? = null,
     ) : SearchResponse
 
     /**

app/src/main/res/drawable/rating_bg_color.xml

@@ -3,4 +3,4 @@
     <solid android:color="?attr/colorPrimary"/>
     <corners android:radius="@dimen/rounded_image_radius"/>
    <!-- <stroke android:color="@color/subColor" android:width="2dp"/>-->
-</shape>
+</shape>

app/src/main/res/layout/home_result_grid.xml

@@ -110,6 +110,12 @@
             style="@style/SubButton"
             android:layout_gravity="end" />
 
+        <TextView
+            android:id="@+id/text_rating"
+            style="@style/RatingButton"
+            android:layout_gravity="end"
+            tools:text="7.7" />
+
         <TextView
             android:id="@+id/text_flag"
             style="@style/SearchBox"

app/src/main/res/layout/home_result_grid_expanded.xml

@@ -109,6 +109,12 @@
                     style="@style/SubButton"
                     android:layout_gravity="end" />
 
+                <TextView
+                    android:id="@+id/text_rating"
+                    style="@style/RatingButton"
+                    android:layout_gravity="end"
+                    tools:text="7.7" />
+
                 <TextView
                     android:id="@+id/text_flag"
                     style="@style/SearchBox"

app/src/main/res/values/styles.xml

@@ -159,7 +159,7 @@
         <item name="android:background">@drawable/rating_bg_color</item>
         <item name="drawableTint">?attr/colorOnPrimary</item>
         <item name="android:textColor">?attr/colorOnPrimary</item>
-        <item name="drawableStartCompat">@drawable/ic_baseline_star_24</item>
+        <!--<item name="drawableStartCompat">@drawable/ic_baseline_star_24</item>-->
     </style>
 
     <style name="TypeButton" parent="@style/SearchBox">

library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt

@@ -1191,6 +1191,7 @@ interface SearchResponse {
     var posterHeaders: Map<String, String>?
     var id: Int?
     var quality: SearchQuality?
+    var score: Score?
 }
 
 fun MainAPI.newTorrentSearchResponse(
@@ -1348,6 +1349,7 @@ constructor(
     override var id: Int? = null,
     override var quality: SearchQuality? = null,
     override var posterHeaders: Map<String, String>? = null,
+    override var score: Score? = null,
 ) : SearchResponse
 
 fun AnimeSearchResponse.addDubStatus(status: DubStatus, episodes: Int? = null) {
@@ -1407,6 +1409,7 @@ constructor(
     override var id: Int? = null,
     override var quality: SearchQuality? = null,
     override var posterHeaders: Map<String, String>? = null,
+    override var score: Score? = null,
 ) : SearchResponse
 
 /** Data class of [SearchResponse] interface for Movies.
@@ -1424,7 +1427,8 @@ constructor(
     var year: Int? = null,
     override var id: Int? = null,
     override var quality: SearchQuality? = null,
-    override var posterHeaders: Map<String, String>? = null
+    override var posterHeaders: Map<String, String>? = null,
+    override var score: Score? = null,
 ) : SearchResponse
 
 /** Data class of [SearchResponse] interface for Live streams.
@@ -1443,6 +1447,7 @@ constructor(
     override var quality: SearchQuality? = null,
     override var posterHeaders: Map<String, String>? = null,
     var lang: String? = null,
+    override var score: Score? = null,
 ) : SearchResponse
 
 /** Data class of [SearchResponse] interface for Tv series.
@@ -1462,6 +1467,7 @@ constructor(
     override var id: Int? = null,
     override var quality: SearchQuality? = null,
     override var posterHeaders: Map<String, String>? = null,
+    override var score: Score? = null,
 ) : SearchResponse
 
 /** Data class of Trailer data.