From b6a06189fb7f260ecd2a47da62b99442027bd257 Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Sun, 31 Jul 2016 01:01:25 +0200
Subject: [PATCH] Fix text overlapping, make icons a bit bigger

---
 app/src/main/res/layout/item_library_list.xml | 54 ++++++++++++-------
 .../main/res/layout/library_list_recycler.xml |  1 -
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/layout/item_library_list.xml b/app/src/main/res/layout/item_library_list.xml
index cad62cfd0..d846ab9d0 100644
--- a/app/src/main/res/layout/item_library_list.xml
+++ b/app/src/main/res/layout/item_library_list.xml
@@ -1,42 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
     android:background="?attr/selectable_list_drawable">
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/thumbnail"
-        android:layout_width="@dimen/material_component_text_fields_icon_height"
-        android:layout_height="@dimen/material_component_text_fields_icon_height"
+        android:layout_width="@dimen/material_component_lists_single_line_with_avatar_height"
+        android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
         android:layout_gravity="center_vertical"
         android:paddingEnd="0dp"
         android:paddingLeft="@dimen/material_component_lists_icon_left_padding"
         android:paddingRight="0dp"
         android:paddingStart="@dimen/material_component_lists_icon_left_padding"
-        android:src="@drawable/icon"/>
+        tools:src="@drawable/icon"/>
 
-    <TextView
-        android:id="@+id/title"
-        style="@style/TextAppearance.Regular.SubHeading"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:paddingEnd="0dp"
         android:paddingLeft="@dimen/material_component_lists_text_left_padding"
-        android:paddingRight="0dp"
-        android:paddingStart="@dimen/material_component_lists_text_left_padding"/>
-
-    <TextView
-        android:id="@+id/unread_text"
-        style="@style/TextAppearance.Regular.Caption.Hint"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical|end"
-        android:paddingEnd="@dimen/material_component_lists_right_padding"
-        android:paddingLeft="0dp"
+        android:paddingStart="@dimen/material_component_lists_text_left_padding"
         android:paddingRight="@dimen/material_component_lists_right_padding"
-        android:paddingStart="0dp"
-        android:visibility="gone"/>
+        android:paddingEnd="@dimen/material_component_lists_right_padding">
+
+        <TextView
+            android:id="@+id/unread_text"
+            style="@style/TextAppearance.Regular.Caption.Hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:paddingStart="4dp"
+            android:paddingLeft="4dp"
+            android:maxLines="1"
+            android:textAppearance="@style/TextAppearance.Regular.Caption.Hint"
+            tools:text="22"/>
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/TextAppearance.Regular.SubHeading"
+            android:layout_toLeftOf="@id/unread_text"
+            android:layout_toStartOf="@id/unread_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:ellipsize="end"
+            tools:text="Manga title"/>
+
+    </RelativeLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/library_list_recycler.xml b/app/src/main/res/layout/library_list_recycler.xml
index d3dfbc044..8f5dc91b3 100644
--- a/app/src/main/res/layout/library_list_recycler.xml
+++ b/app/src/main/res/layout/library_list_recycler.xml
@@ -5,6 +5,5 @@
     android:id="@+id/library_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="@dimen/material_component_lists_padding_above_list"
     tools:listitem="@layout/item_library_list" />