From 5a19c1bf4d56ae13962b62d9c7d211a91c7dc31e Mon Sep 17 00:00:00 2001
From: LagradOst <11805592+LagradOst@users.noreply.github.com>
Date: Wed, 27 Apr 2022 21:48:27 +0200
Subject: [PATCH] hopefully fixed ocean-21

---
 .../syncproviders/providers/AniListApi.kt             |  7 ++++---
 .../cloudstream3/ui/home/HomeChildItemAdapter.kt      |  2 +-
 .../cloudstream3/ui/search/SearchResultBuilder.kt     |  2 +-
 app/src/main/res/layout/fragment_home.xml             |  1 +
 app/src/main/res/layout/home_result_big_grid.xml      |  5 +++--
 app/src/main/res/layout/home_result_grid.xml          |  2 +-
 app/src/main/res/layout/home_result_grid_expanded.xml |  2 +-
 app/src/main/res/layout/options_popup_tv.xml          |  2 +-
 app/src/main/res/layout/search_result_compact.xml     |  2 +-
 app/src/main/res/layout/search_result_grid.xml        |  2 +-
 .../main/res/layout/search_result_grid_expanded.xml   | 11 +++--------
 .../main/res/layout/search_result_super_compact.xml   |  2 +-
 12 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
index b7398d05..94aabe21 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
@@ -70,7 +70,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         return user != null
     }
 
-    override fun getIdFromUrl(url : String): String {
+    override fun getIdFromUrl(url: String): String {
         return url.removePrefix("$mainUrl/anime/").removeSuffix("/")
     }
 
@@ -746,8 +746,8 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
   					}
 				}"""
         val data = postApi(q)
-        if (data == "") return null
-        val userData = mapper.readValue<AniListRoot>(data ?: return null)
+        if (data.isNullOrBlank()) return null
+        val userData = mapper.readValue<AniListRoot>(data)
         val u = userData.data?.Viewer
         val user = AniListUser(
             u?.id,
@@ -823,6 +823,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         //@JsonProperty("rating") val rating: Int,
         @JsonProperty("node") val node: Recommendation,
     )
+
     data class Recommendation(
         @JsonProperty("mediaRecommendation") val mediaRecommendation: SeasonMedia,
     )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
index 9ff54b20..b320ac05 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
@@ -92,7 +92,7 @@ class HomeChildItemAdapter(
             itemView.tag = position
 
             if (position == 0) { // to fix tv
-                itemView.backgroundCard?.nextFocusLeftId = R.id.nav_rail_view
+                itemView.background_card?.nextFocusLeftId = R.id.nav_rail_view
             }
             //val ani = ScaleAnimation(0.9f, 1.0f, 0.9f, 1f)
             //ani.fillAfter = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
index 3d2f4c59..806ef07c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
@@ -35,7 +35,7 @@ object SearchResultBuilder {
         val textIsSub: TextView? = itemView.text_is_sub
         val textQuality: TextView? = itemView.text_quality
 
-        val bg: CardView = itemView.backgroundCard
+        val bg: CardView = itemView.background_card
 
         val bar: ProgressBar? = itemView.watchProgress
         val playImg: ImageView? = itemView.search_item_download_play
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 3d017579..4abdef0b 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -198,6 +198,7 @@
                             android:layout_height="40dp">
 
                         <ImageView
+                                android:scaleType="centerCrop"
                                 android:id="@+id/home_profile_picture"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/home_result_big_grid.xml b/app/src/main/res/layout/home_result_big_grid.xml
index 65998375..0482a97c 100644
--- a/app/src/main/res/layout/home_result_big_grid.xml
+++ b/app/src/main/res/layout/home_result_big_grid.xml
@@ -12,7 +12,7 @@
         android:layout_marginBottom="2dp"
         android:elevation="10dp"
         app:cardCornerRadius="@dimen/rounded_image_radius"
-        android:id="@+id/backgroundCard"
+        android:id="@+id/background_card"
         app:cardBackgroundColor="?attr/primaryGrayBackground">
 
     <ImageView
@@ -24,11 +24,12 @@
             android:layout_height="match_parent"
             android:foreground="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/search_poster_img_des" />
+
     <TextView
             tools:text="@string/quality_hd"
             android:id="@+id/text_quality"
             style="@style/SearchBox"
-            android:background="@drawable/type_bg_color"/>
+            android:background="@drawable/type_bg_color" />
     <!--
     <LinearLayout
             android:orientation="vertical"
diff --git a/app/src/main/res/layout/home_result_grid.xml b/app/src/main/res/layout/home_result_grid.xml
index 73fe6cf9..49bbf6d1 100644
--- a/app/src/main/res/layout/home_result_grid.xml
+++ b/app/src/main/res/layout/home_result_grid.xml
@@ -12,7 +12,7 @@
         android:layout_marginBottom="2dp"
         android:elevation="10dp"
         app:cardCornerRadius="@dimen/rounded_image_radius"
-        android:id="@+id/backgroundCard"
+        android:id="@+id/background_card"
         app:cardBackgroundColor="?attr/primaryGrayBackground">
 
     <ImageView
diff --git a/app/src/main/res/layout/home_result_grid_expanded.xml b/app/src/main/res/layout/home_result_grid_expanded.xml
index 84f81eee..eb66c52f 100644
--- a/app/src/main/res/layout/home_result_grid_expanded.xml
+++ b/app/src/main/res/layout/home_result_grid_expanded.xml
@@ -13,6 +13,7 @@
         android:layout_height="wrap_content"
         app:cardCornerRadius="@dimen/rounded_image_radius"
         android:layout_margin="2dp"
+        android:id="@+id/background_card"
         android:layout_width="wrap_content">
 
     <LinearLayout
@@ -25,7 +26,6 @@
                 android:layout_height="180dp"
                 android:elevation="10dp"
                 app:cardCornerRadius="@dimen/rounded_image_radius"
-                android:id="@+id/backgroundCard"
                 app:cardBackgroundColor="?attr/primaryGrayBackground">
 
             <ImageView
diff --git a/app/src/main/res/layout/options_popup_tv.xml b/app/src/main/res/layout/options_popup_tv.xml
index 4205bcd1..022e40b0 100644
--- a/app/src/main/res/layout/options_popup_tv.xml
+++ b/app/src/main/res/layout/options_popup_tv.xml
@@ -14,7 +14,7 @@
             android:layout_marginBottom="2dp"
             android:elevation="10dp"
             app:cardCornerRadius="@dimen/rounded_image_radius"
-            android:id="@+id/backgroundCard"
+            android:id="@+id/background_card"
             app:cardBackgroundColor="?attr/primaryGrayBackground">
 
         <ImageView
diff --git a/app/src/main/res/layout/search_result_compact.xml b/app/src/main/res/layout/search_result_compact.xml
index 8290fa5b..4764f21e 100644
--- a/app/src/main/res/layout/search_result_compact.xml
+++ b/app/src/main/res/layout/search_result_compact.xml
@@ -10,7 +10,7 @@
     <androidx.cardview.widget.CardView
             android:foreground="?android:attr/selectableItemBackgroundBorderless"
 
-            android:id="@+id/backgroundCard"
+            android:id="@+id/background_card"
             android:layout_margin="2dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/search_result_grid.xml b/app/src/main/res/layout/search_result_grid.xml
index 11d0a441..88bc5956 100644
--- a/app/src/main/res/layout/search_result_grid.xml
+++ b/app/src/main/res/layout/search_result_grid.xml
@@ -18,7 +18,7 @@
             android:layout_marginBottom="2dp"
             android:elevation="10dp"
             app:cardCornerRadius="@dimen/rounded_image_radius"
-            android:id="@+id/backgroundCard"
+            android:id="@+id/background_card"
             app:cardBackgroundColor="?attr/primaryGrayBackground">
 
         <ImageView
diff --git a/app/src/main/res/layout/search_result_grid_expanded.xml b/app/src/main/res/layout/search_result_grid_expanded.xml
index 80cee40e..3b5724d8 100644
--- a/app/src/main/res/layout/search_result_grid_expanded.xml
+++ b/app/src/main/res/layout/search_result_grid_expanded.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
@@ -11,10 +11,6 @@
         android:clickable="true"
         android:id="@+id/search_result_root">
 
-    <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
         <androidx.cardview.widget.CardView
                 android:layout_margin="2dp"
                 android:layout_width="match_parent"
@@ -22,7 +18,7 @@
                 android:layout_marginBottom="2dp"
                 android:elevation="10dp"
                 app:cardCornerRadius="@dimen/rounded_image_radius"
-                android:id="@+id/backgroundCard"
+                android:id="@+id/background_card"
                 app:cardBackgroundColor="?attr/primaryGrayBackground">
 
             <ImageView
@@ -80,5 +76,4 @@
                 android:paddingStart="5dp"
                 android:paddingEnd="5dp"
                 android:ellipsize="end" />
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_result_super_compact.xml b/app/src/main/res/layout/search_result_super_compact.xml
index c72a1ec8..69749f96 100644
--- a/app/src/main/res/layout/search_result_super_compact.xml
+++ b/app/src/main/res/layout/search_result_super_compact.xml
@@ -8,7 +8,7 @@
 
     <androidx.cardview.widget.CardView
             android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:id="@+id/backgroundCard"
+            android:id="@+id/background_card"
             android:layout_margin="2dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"