From 3a9f59b7a530c74dcfc8d39fbab489a348c5a984 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 24 May 2020 15:59:14 -0400
Subject: [PATCH] Finally a working comfortable grid

---
 .../tachiyomi/ui/library/LibraryItem.kt       |  36 +---
 .../layout/source_comfortable_grid_item.xml   | 197 ++++++++----------
 2 files changed, 93 insertions(+), 140 deletions(-)

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 725453a43..f0e033901 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
@@ -3,10 +3,7 @@ package eu.kanade.tachiyomi.ui.library
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
-import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.FrameLayout
-import android.widget.ImageView
-import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.tfcporciuncula.flow.Preference
 import eu.davidea.flexibleadapter.FlexibleAdapter
@@ -19,13 +16,10 @@ import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.util.system.dpToPx
 import eu.kanade.tachiyomi.widget.AutofitRecyclerView
-import exh.util.updateLayoutParams
-import kotlinx.android.synthetic.main.source_comfortable_grid_item.view.constraint_layout
+import kotlinx.android.synthetic.main.source_comfortable_grid_item.view.outside
 import kotlinx.android.synthetic.main.source_grid_item.view.card
 import kotlinx.android.synthetic.main.source_grid_item.view.gradient
-import kotlinx.android.synthetic.main.source_grid_item.view.thumbnail
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -62,33 +56,11 @@ class LibraryItem(val manga: LibraryManga, private val libraryViewSetting: Prefe
             } else {
                 view.apply {
                     val coverHeight = parent.itemWidth / 3 * 4
-
+                    card.layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, coverHeight)
                     gradient.layoutParams = FrameLayout.LayoutParams(
-                        MATCH_PARENT,
-                        coverHeight * (66 / 100),
-                        Gravity.BOTTOM
+                        MATCH_PARENT, coverHeight / 2, Gravity.BOTTOM
                     )
-                    card.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                        bottomMargin = 6.dpToPx
-                    }
-
-                    constraint_layout.layoutParams = FrameLayout.LayoutParams(
-                        MATCH_PARENT, WRAP_CONTENT
-                    )
-                    thumbnail.maxHeight = Int.MAX_VALUE
-                    thumbnail.minimumHeight = 0
-                    constraint_layout.minHeight = 0
-                    thumbnail.scaleType = ImageView.ScaleType.CENTER_CROP
-                    thumbnail.adjustViewBounds = false
-                    thumbnail.layoutParams = FrameLayout.LayoutParams(
-                        MATCH_PARENT,
-                        (parent.itemWidth / 3f * 3.7f).toInt()
-                    )
-                    // .layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, coverHeight)
-
-                    // gradient.layoutParams = FrameLayout.LayoutParams(
-                    // MATCH_PARENT, coverHeight / 2, Gravity.BOTTOM
-                    // )
+                    outside.layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, coverHeight + 200)
                 }
                 LibraryComfortableGridHolder(view, adapter)
             }
diff --git a/app/src/main/res/layout/source_comfortable_grid_item.xml b/app/src/main/res/layout/source_comfortable_grid_item.xml
index 971e944ca..bf173c5d4 100644
--- a/app/src/main/res/layout/source_comfortable_grid_item.xml
+++ b/app/src/main/res/layout/source_comfortable_grid_item.xml
@@ -7,108 +7,97 @@
     android:background="@drawable/library_item_selector"
     android:padding="4dp">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/constraint_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+    <FrameLayout
+        android:id="@+id/outside"
+        android:layout_width="wrap_content"
+        android:layout_height="260dp"
+        android:background="@drawable/rounded_rectangle">
 
-        <FrameLayout
-            android:id="@+id/card"
+    <FrameLayout
+        android:id="@+id/card"
+        android:layout_width="wrap_content"
+        android:layout_height="220dp"
+        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:ignore="ContentDescription"
+            tools:src="@mipmap/ic_launcher" />
+
+        <View
+            android:id="@+id/gradient"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:background="@drawable/gradient_shape" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="wrap_content"
-            android:layout_height="220dp"
-            android:layout_gravity="top"
-            android:background="@drawable/rounded_rectangle"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="10dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="1.0">
+            android:layout_height="wrap_content"
+            tools:layout_editor_absoluteX="7dp"
+            tools:layout_editor_absoluteY="7dp">
 
-            <ImageView
-                android:id="@+id/thumbnail"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?attr/colorSurface"
-                tools:ignore="ContentDescription"
-                android:scaleType="centerCrop"
-                tools:src="@mipmap/ic_launcher" />
-
-            <View
-                android:id="@+id/gradient"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:background="@drawable/gradient_shape" />
-
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <TextView
+                android:id="@+id/unread_text"
+                style="@style/TextAppearance.Regular.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                tools:layout_editor_absoluteX="7dp"
-                tools:layout_editor_absoluteY="7dp">
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="4dp"
+                android:background="@color/colorAccentDark"
+                android:paddingStart="3dp"
+                android:paddingTop="1dp"
+                android:paddingEnd="3dp"
+                android:paddingBottom="1dp"
+                android:textColor="@color/md_white_1000"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@+id/download_text"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="120"
+                tools:visibility="visible" />
 
-                <TextView
-                    android:id="@+id/unread_text"
-                    style="@style/TextAppearance.Regular.Caption"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginTop="4dp"
-                    android:background="@color/colorAccentDark"
-                    android:paddingStart="3dp"
-                    android:paddingTop="1dp"
-                    android:paddingEnd="3dp"
-                    android:paddingBottom="1dp"
-                    android:textColor="@color/md_white_1000"
-                    android:visibility="gone"
-                    app:layout_constraintStart_toEndOf="@+id/download_text"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="120"
-                    tools:visibility="visible" />
+            <TextView
+                android:id="@+id/download_text"
+                style="@style/TextAppearance.Regular.Caption"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="4dp"
+                android:background="@color/md_red_500"
+                android:paddingStart="3dp"
+                android:paddingTop="1dp"
+                android:paddingEnd="3dp"
+                android:paddingBottom="1dp"
+                android:textColor="@color/md_white_1000"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@+id/local_text"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="120"
+                tools:visibility="visible" />
 
-                <TextView
-                    android:id="@+id/download_text"
-                    style="@style/TextAppearance.Regular.Caption"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginTop="4dp"
-                    android:background="@color/md_red_500"
-                    android:paddingStart="3dp"
-                    android:paddingTop="1dp"
-                    android:paddingEnd="3dp"
-                    android:paddingBottom="1dp"
-                    android:textColor="@color/md_white_1000"
-                    android:visibility="gone"
-                    app:layout_constraintStart_toEndOf="@+id/local_text"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="120"
-                    tools:visibility="visible" />
+            <TextView
+                android:id="@+id/local_text"
+                style="@style/TextAppearance.Regular.Caption"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="4dp"
+                android:background="@color/md_teal_500"
+                android:paddingStart="3dp"
+                android:paddingTop="1dp"
+                android:paddingEnd="3dp"
+                android:paddingBottom="1dp"
+                android:text="@string/local_source_badge"
+                android:textColor="@color/md_white_1000"
+                android:visibility="gone"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:visibility="visible" />
 
-                <TextView
-                    android:id="@+id/local_text"
-                    style="@style/TextAppearance.Regular.Caption"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginTop="4dp"
-                    android:background="@color/md_teal_500"
-                    android:paddingStart="3dp"
-                    android:paddingTop="1dp"
-                    android:paddingEnd="3dp"
-                    android:paddingBottom="1dp"
-                    android:text="@string/local_source_badge"
-                    android:textColor="@color/md_white_1000"
-                    android:visibility="gone"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:visibility="visible" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </FrameLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <ProgressBar
             android:id="@+id/progress"
@@ -116,30 +105,22 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:visibility="gone" />
+
+    </FrameLayout>
 
         <TextView
             android:id="@+id/title"
             style="@style/TextAppearance.Regular.Body1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
+            android:layout_gravity="bottom|start|end"
             android:ellipsize="end"
             android:fontFamily="@font/ptsans_narrow_bold"
             android:lineSpacingExtra="-4dp"
             android:maxLines="2"
             android:padding="8dp"
             android:shadowColor="@color/textColorPrimaryLight"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            tools:text="Sample name"
-            android:orientation="vertical" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
+            tools:text="Sample name" />
+    </FrameLayout>
 </FrameLayout>
\ No newline at end of file