From 5435c2fb536da5db3d0e041062c4fb3cc98b0ad9 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sat, 9 May 2020 11:17:07 -0400
Subject: [PATCH] Lighter weight method of rounding cover art and removed
 rounded covers option

(cherry picked from commit dabca5f09e0d393d2ea77e483c72561341385cb0)
---
 .../data/preference/PreferenceKeys.kt         |  2 --
 .../data/preference/PreferencesHelper.kt      |  2 --
 .../browse/source/browse/SourceGridHolder.kt  |  9 ------
 .../ui/browse/source/browse/SourceItem.kt     |  3 ++
 .../tachiyomi/ui/library/LibraryGridHolder.kt |  9 ------
 .../tachiyomi/ui/library/LibraryItem.kt       |  3 ++
 .../ui/manga/info/MangaInfoController.kt      | 10 ++----
 .../ui/setting/SettingsLibraryController.kt   | 13 --------
 .../main/res/drawable/rounded_rectangle.xml   |  6 ++++
 .../res/layout-land/manga_info_controller.xml | 31 ++++++-------------
 .../main/res/layout/manga_info_controller.xml | 25 +++++----------
 app/src/main/res/layout/source_grid_item.xml  |  7 ++---
 app/src/main/res/values/strings_extra.xml     | 12 -------
 13 files changed, 34 insertions(+), 98 deletions(-)
 create mode 100644 app/src/main/res/drawable/rounded_rectangle.xml

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
index 20a3c0063..b37530493 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@@ -221,7 +221,5 @@ object PreferenceKeys {
 
     const val eh_hl_useHighQualityThumbs = "eh_hl_hq_thumbs"
 
-    const val eh_library_rounded_corners = "eh_library_corners"
-
     const val eh_preload_size = "eh_preload_size"
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 95e3baaa7..7c343b58c 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -356,7 +356,5 @@ class PreferencesHelper(val context: Context) {
 
     fun eh_hl_useHighQualityThumbs() = rxPrefs.getBoolean(Keys.eh_hl_useHighQualityThumbs, false)
 
-    fun eh_library_corner_radius() = rxPrefs.getInteger(Keys.eh_library_rounded_corners, 4)
-
     fun eh_preload_size() = rxPrefs.getInteger(Keys.eh_preload_size, 4)
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt
index 0dffb8457..fd70e8f07 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt
@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.ui.browse.source.browse
 
-import android.util.TypedValue
 import android.view.View
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.davidea.flexibleadapter.FlexibleAdapter
@@ -8,9 +7,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.widget.StateImageViewTarget
-import kotlinx.android.synthetic.main.source_grid_item.card
 import kotlinx.android.synthetic.main.source_grid_item.progress
 import kotlinx.android.synthetic.main.source_grid_item.thumbnail
 import kotlinx.android.synthetic.main.source_grid_item.title
@@ -47,12 +44,6 @@ class SourceGridHolder(private val view: View, private val adapter: FlexibleAdap
         // Set manga title
         title.text = manga.title
 
-        card.radius = TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            preferences.eh_library_corner_radius().getOrDefault().toFloat(),
-            view.context.resources.displayMetrics
-        )
-
         GlideApp.with(view.context).clear(thumbnail)
         if (!manga.thumbnail_url.isNullOrEmpty()) {
             GlideApp.with(view.context)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
index e3f89c896..414523716 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
@@ -34,6 +34,9 @@ class SourceItem(val manga: Manga, private val catalogueAsList: Preference<Boole
         val parent = adapter.recyclerView
         return if (parent is AutofitRecyclerView) {
             view.apply {
+                // Setting this via XML doesn't work
+                card.clipToOutline = true
+
                 card.layoutParams = FrameLayout.LayoutParams(
                     MATCH_PARENT, parent.itemWidth / 3 * 4
                 )
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt
index 0c0b45b65..cc32ff42f 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt
@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.ui.library
 
-import android.util.TypedValue
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.load.engine.DiskCacheStrategy
@@ -9,10 +8,8 @@ import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.util.view.visibleIf
-import kotlinx.android.synthetic.main.source_grid_item.card
 import kotlinx.android.synthetic.main.source_grid_item.download_text
 import kotlinx.android.synthetic.main.source_grid_item.local_text
 import kotlinx.android.synthetic.main.source_grid_item.thumbnail
@@ -58,12 +55,6 @@ class LibraryGridHolder(
         // set local visibility if its local manga
         local_text.visibleIf { item.manga.source == LocalSource.ID }
 
-        card.radius = TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            preferences.eh_library_corner_radius().getOrDefault().toFloat(),
-            view.context.resources.displayMetrics
-        )
-
         // Update the cover.
         GlideApp.with(view.context).clear(thumbnail)
         GlideApp.with(view.context)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
index 3e6955345..3fa6f896b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
@@ -38,6 +38,9 @@ class LibraryItem(val manga: LibraryManga, private val libraryAsList: Preference
         val parent = adapter.recyclerView
         return if (parent is AutofitRecyclerView) {
             view.apply {
+                // Setting this via XML doesn't work
+                card.clipToOutline = true
+
                 val coverHeight = parent.itemWidth / 3 * 4
                 card.layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, coverHeight)
                 gradient.layoutParams = FrameLayout.LayoutParams(
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
index 2c609de78..35e953bf4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
-import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -115,6 +114,9 @@ class MangaInfoController(private val fromSource: Boolean = false) :
     override fun onViewCreated(view: View) {
         super.onViewCreated(view)
 
+        // Setting this via XML doesn't work
+        binding.mangaCover.clipToOutline = true
+
         binding.btnFavorite.clicks()
             .onEach { onFavoriteClick() }
             .launchIn(scope)
@@ -364,12 +366,6 @@ class MangaInfoController(private val fromSource: Boolean = false) :
             thumbnailUrl = manga.thumbnail_url
             val mangaThumbnail = manga.toMangaThumbnail()
 
-            binding.mangaCoverCard.radius = TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP,
-                preferences.eh_library_corner_radius().getOrDefault().toFloat(),
-                view.context.resources.displayMetrics
-            )
-
             GlideApp.with(view.context)
                 .load(mangaThumbnail)
                 .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
index 7dafa7d6f..704e3de62 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
@@ -72,19 +72,6 @@ class SettingsLibraryController : SettingsController() {
                             "${context.getString(R.string.landscape)}: $landscape"
                     }
             }
-            intListPreference {
-                key = Keys.eh_library_rounded_corners
-                title = "Rounded Corner Radius"
-                entriesRes = arrayOf(
-                    R.string.eh_rounded_corner_0, R.string.eh_rounded_corner_1,
-                    R.string.eh_rounded_corner_2, R.string.eh_rounded_corner_3, R.string.eh_rounded_corner_4,
-                    R.string.eh_rounded_corner_5, R.string.eh_rounded_corner_6, R.string.eh_rounded_corner_7,
-                    R.string.eh_rounded_corner_8, R.string.eh_rounded_corner_9, R.string.eh_rounded_corner_10
-                )
-                entryValues = arrayOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10")
-                defaultValue = "4"
-                summaryRes = R.string.eh_rounded_corners_desc
-            }
         }
 
         val dbCategories = db.getCategories().executeAsBlocking()
diff --git a/app/src/main/res/drawable/rounded_rectangle.xml b/app/src/main/res/drawable/rounded_rectangle.xml
new file mode 100644
index 000000000..6af8dc293
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_rectangle.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/card_radius" />
+    <solid android:color="?attr/colorSurface" />
+</shape>
diff --git a/app/src/main/res/layout-land/manga_info_controller.xml b/app/src/main/res/layout-land/manga_info_controller.xml
index 8678e7181..49fcedc40 100644
--- a/app/src/main/res/layout-land/manga_info_controller.xml
+++ b/app/src/main/res/layout-land/manga_info_controller.xml
@@ -11,45 +11,32 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/manga_cover_card"
+        <ImageView
+            android:id="@+id/manga_cover"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
-            app:cardCornerRadius="@dimen/card_radius"
+            android:layout_margin="16dp"
+            android:background="@drawable/rounded_rectangle"
+            android:contentDescription="@string/description_cover"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="h,3:2"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.0">
-
-            <ImageView
-                android:id="@+id/manga_cover"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/description_cover"
-                tools:background="@color/material_grey_700" />
-
-        </androidx.cardview.widget.CardView>
+            app:layout_constraintVertical_bias="0.0" />
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/info_scrollview"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/manga_cover_card"
+            app:layout_constraintStart_toEndOf="@+id/manga_cover"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:padding="16dp">
 
                 <TextView
                     android:id="@+id/manga_full_title"
diff --git a/app/src/main/res/layout/manga_info_controller.xml b/app/src/main/res/layout/manga_info_controller.xml
index 1bf3babd3..1d4f67b63 100755
--- a/app/src/main/res/layout/manga_info_controller.xml
+++ b/app/src/main/res/layout/manga_info_controller.xml
@@ -38,29 +38,18 @@
                     app:layout_constraintTop_toTopOf="parent"
                     tools:background="@color/material_grey_700" />
 
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/manga_cover_card"
+                <ImageView
+                    android:id="@+id/manga_cover"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginBottom="16dp"
-                    app:cardCornerRadius="@dimen/card_radius"
-                    app:layout_constraintDimensionRatio="h,2:3"
+                    android:layout_margin="16dp"
+                    android:background="@drawable/rounded_rectangle"
+                    android:contentDescription="@string/description_cover"
                     app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintDimensionRatio="h,2:3"
                     app:layout_constraintEnd_toStartOf="@+id/guideline2"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <ImageView
-                        android:id="@+id/manga_cover"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/description_cover"
-                        tools:background="@color/material_grey_700" />
-
-                </androidx.cardview.widget.CardView>
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/manga_info_section"
diff --git a/app/src/main/res/layout/source_grid_item.xml b/app/src/main/res/layout/source_grid_item.xml
index 99f6d252c..6329e923f 100644
--- a/app/src/main/res/layout/source_grid_item.xml
+++ b/app/src/main/res/layout/source_grid_item.xml
@@ -7,18 +7,17 @@
     android:background="@drawable/library_item_selector"
     android:padding="4dp">
 
-    <androidx.cardview.widget.CardView
+    <FrameLayout
         android:id="@+id/card"
         android:layout_width="wrap_content"
         android:layout_height="220dp"
-        app:cardCornerRadius="@dimen/card_radius">
+        android:background="@drawable/rounded_rectangle">
 
         <ImageView
             android:id="@+id/thumbnail"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/colorSurface"
-            tools:background="?attr/colorSurface"
             tools:ignore="ContentDescription"
             tools:src="@mipmap/ic_launcher" />
 
@@ -120,6 +119,6 @@
             android:layout_gravity="center"
             android:visibility="gone" />
 
-    </androidx.cardview.widget.CardView>
+    </FrameLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_extra.xml b/app/src/main/res/values/strings_extra.xml
index abb99821a..b0b07d387 100644
--- a/app/src/main/res/values/strings_extra.xml
+++ b/app/src/main/res/values/strings_extra.xml
@@ -84,18 +84,6 @@
     <string name="eh_autoscroll">Autoscroll</string>
     <string name="eh_retry_all">Retry all</string>
     <string name="eh_boost_page">Boost page</string>
-    <string name="eh_rounded_corner_0">No Rounded Corners</string>
-    <string name="eh_rounded_corner_1">Radius of 1</string>
-    <string name="eh_rounded_corner_2">Radius of 2</string>
-    <string name="eh_rounded_corner_3">Radius of 3</string>
-    <string name="eh_rounded_corner_4">Radius of 4</string>
-    <string name="eh_rounded_corner_5">Radius of 5</string>
-    <string name="eh_rounded_corner_6">Radius of 6</string>
-    <string name="eh_rounded_corner_7">Radius of 7</string>
-    <string name="eh_rounded_corner_8">Radius of 8</string>
-    <string name="eh_rounded_corner_9">Radius of 9</string>
-    <string name="eh_rounded_corner_10">Radius of 10</string>
-    <string name="eh_rounded_corners_desc">The level of radius that the corners are rounded to. Current value is: %s</string>
     <string name="merge">Merge with current</string>
     <string name="eh_merge_with_another_source">Merge With Another</string>
     <string name="eh_autoscroll_help">Autoscroll help</string>