From 208552f0b4cf29cbcf97aa61271b7771b8a14154 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Tue, 10 Mar 2020 21:13:55 -0400
Subject: [PATCH] Tweak compact tracker card design

---
 .../tachiyomi/data/track/anilist/Anilist.kt   |   2 +-
 .../tachiyomi/data/track/kitsu/Kitsu.kt       |   2 +-
 .../data/track/myanimelist/MyAnimeList.kt     |   2 +-
 .../data/track/shikimori/Shikimori.kt         |   2 +-
 app/src/main/res/layout/track_item.xml        | 187 ++++++++++--------
 5 files changed, 107 insertions(+), 88 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
index dfa799e6d5..fe52e0e5eb 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
@@ -54,7 +54,7 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
 
     override fun getLogo() = R.drawable.tracker_anilist
 
-    override fun getLogoColor() = Color.rgb(18, 25, 35)
+    override fun getLogoColor() = Color.rgb(0x12, 0x19, 0x23)
 
     override fun getStatusList(): List<Int> {
         return listOf(READING, PLANNING, COMPLETED, REPEATING, PAUSED, DROPPED)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
index 593010e463..75b13b3f90 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
@@ -38,7 +38,7 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
     }
 
     override fun getLogoColor(): Int {
-        return Color.rgb(51, 37, 50)
+        return Color.rgb(0x33, 0x25, 0x32)
     }
 
     override fun getStatusList(): List<Int> {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
index 3003fc9544..76ed885bba 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
@@ -36,7 +36,7 @@ class MyAnimeList(private val context: Context, id: Int) : TrackService(id) {
 
     override fun getLogo() = R.drawable.tracker_mal
 
-    override fun getLogoColor() = Color.rgb(46, 81, 162)
+    override fun getLogoColor() = Color.rgb(0x2E, 0x51, 0xA2)
 
     override fun getStatusList(): List<Int> {
         return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
index ceecb75ed0..35213ea391 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
@@ -82,7 +82,7 @@ class Shikimori(private val context: Context, id: Int) : TrackService(id) {
 
     override fun getLogo() = R.drawable.tracker_shikimori
 
-    override fun getLogoColor() = Color.rgb(40, 40, 40)
+    override fun getLogoColor() = Color.rgb(0x28, 0x28, 0x28)
 
     override fun getStatusList(): List<Int> {
         return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLANNING, REPEATING)
diff --git a/app/src/main/res/layout/track_item.xml b/app/src/main/res/layout/track_item.xml
index 5f4c952e4b..733f742b5d 100644
--- a/app/src/main/res/layout/track_item.xml
+++ b/app/src/main/res/layout/track_item.xml
@@ -8,14 +8,17 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize">
+        android:layout_height="wrap_content">
 
-        <FrameLayout
+        <LinearLayout
             android:id="@+id/logo_container"
             android:layout_width="48dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:clickable="true"
+            android:focusable="true"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="4dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -24,35 +27,43 @@
             <ImageView
                 android:id="@+id/track_logo"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
+                android:layout_height="48dp"
                 tools:src="@drawable/tracker_mal" />
 
-        </FrameLayout>
+            <ImageButton
+                android:id="@+id/track_set"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/action_edit"
+                android:padding="8dp"
+                app:srcCompat="@drawable/ic_create_white_24dp"
+                app:tint="@color/md_white_1000_50" />
 
-        <LinearLayout
+        </LinearLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/track_details"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
+            android:layout_height="0dp"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/track_set"
             app:layout_constraintStart_toEndOf="@+id/logo_container"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintEnd_toEndOf="parent">
 
             <LinearLayout
                 android:id="@+id/status_container"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:background="?attr/selectable_list_drawable"
                 android:clickable="true"
                 android:focusable="true"
-                android:orientation="vertical"
-                android:paddingStart="16dp"
-                android:paddingTop="16dp"
-                android:paddingEnd="8dp"
-                android:paddingBottom="16dp">
+                android:orientation="horizontal"
+                android:padding="16dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
                 <TextView
                     style="@style/TextAppearance.Regular.Body1"
@@ -65,85 +76,93 @@
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="16dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     tools:text="Reading" />
 
             </LinearLayout>
 
+            <View
+                android:id="@+id/divider"
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:alpha="0.25"
+                android:background="?android:attr/textColorHint"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/status_container" />
+
             <LinearLayout
-                android:id="@+id/chapters_container"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="?attr/selectable_list_drawable"
-                android:clickable="true"
-                android:focusable="true"
-                android:orientation="vertical"
-                android:paddingStart="8dp"
-                android:paddingTop="16dp"
-                android:paddingEnd="8dp"
-                android:paddingBottom="16dp">
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/divider">
 
-                <TextView
-                    style="@style/TextAppearance.Regular.Body1"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:id="@+id/chapters_container"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="@string/chapters" />
+                    android:layout_weight="1"
+                    android:background="?attr/selectable_list_drawable"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:padding="16dp">
 
-                <TextView
-                    android:id="@+id/track_chapters"
-                    style="@style/TextAppearance.Regular.Body1.Secondary"
-                    android:layout_width="match_parent"
+                    <TextView
+                        style="@style/TextAppearance.Regular.Body1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/chapters" />
+
+                    <TextView
+                        android:id="@+id/track_chapters"
+                        style="@style/TextAppearance.Regular.Body1.Secondary"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:gravity="end"
+                        tools:text="12/24" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/score_container"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    tools:text="12/24" />
+                    android:layout_weight="1"
+                    android:background="?attr/selectable_list_drawable"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:padding="16dp">
+
+                    <TextView
+                        style="@style/TextAppearance.Regular.Body1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/score" />
+
+                    <TextView
+                        android:id="@+id/track_score"
+                        style="@style/TextAppearance.Regular.Body1.Secondary"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:gravity="end"
+                        tools:text="10" />
+
+                </LinearLayout>
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/score_container"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="?attr/selectable_list_drawable"
-                android:clickable="true"
-                android:focusable="true"
-                android:orientation="vertical"
-                android:paddingStart="8dp"
-                android:paddingTop="16dp"
-                android:paddingEnd="16dp"
-                android:paddingBottom="16dp">
-
-                <TextView
-                    style="@style/TextAppearance.Regular.Body1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/score" />
-
-                <TextView
-                    android:id="@+id/track_score"
-                    style="@style/TextAppearance.Regular.Body1.Secondary"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    tools:text="10" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <ImageButton
-            android:id="@+id/track_set"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?selectableItemBackgroundBorderless"
-            android:contentDescription="@string/action_edit"
-            android:padding="8dp"
-            android:tint="?android:attr/textColorSecondary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_create_white_24dp" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>