From 5fe1799dab4a9fae92a2e137e748ec84b20b04fe Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Sat, 2 Jul 2016 14:12:52 +0200
Subject: [PATCH] Fix #333

---
 .../tachiyomi/ui/download/DownloadHolder.kt   |  2 +-
 .../tachiyomi/ui/library/LibraryFragment.kt   |  2 +-
 .../tachiyomi/ui/library/LibraryHolder.kt     |  4 -
 app/src/main/res/layout/item_download.xml     | 83 +++++++++----------
 4 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt
index 9d7ab3dff2..bdd6d2bceb 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt
@@ -26,7 +26,7 @@ class DownloadHolder(private val view: View) : RecyclerView.ViewHolder(view) {
         this.download = download
 
         // Update the chapter name.
-        view.download_title.text = download.chapter.name
+        view.chapter_title.text = download.chapter.name
 
         // Update the manga title
         view.manga_title.text = download.manga.title
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
index f4849acef5..5f14d4eecf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
@@ -266,7 +266,7 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
         // Restore active category.
         view_pager.setCurrentItem(activeCat, false)
         // Delay the scroll position to allow the view to be properly measured.
-        view_pager.post { tabs.setScrollPosition(view_pager.currentItem, 0f, true) }
+        view_pager.post { if (isAdded) tabs.setScrollPosition(view_pager.currentItem, 0f, true) }
 
         // Send the manga map to child fragments after the adapter is updated.
         presenter.libraryMangaSubject.onNext(LibraryMangaEvent(mangaMap))
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt
index 075803220e..9cf28ae46a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt
@@ -21,8 +21,6 @@ class LibraryHolder(private val view: View,
                     listener: FlexibleViewHolder.OnListItemClickListener)
 : FlexibleViewHolder(view, adapter, listener) {
 
-    private var manga: Manga? = null
-
     /**
      * Method called from [LibraryCategoryAdapter.onBindViewHolder]. It updates the data for this
      * holder with the given manga.
@@ -30,8 +28,6 @@ class LibraryHolder(private val view: View,
      * @param manga the manga to bind.
      */
     fun onSetValues(manga: Manga) {
-        this.manga = manga
-
         // Update the title of the manga.
         view.title.text = manga.title
 
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index b16d7f07b5..2008002f86 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -1,55 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_marginLeft="15dp"
-              android:layout_marginRight="15dp"
-              android:orientation="vertical">
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="@dimen/material_layout_keylines_screen_edge_margin"
+    android:paddingRight="@dimen/material_layout_keylines_screen_edge_margin"
+    android:paddingTop="@dimen/material_component_lists_padding_above_list">
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/download_progress_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.Regular.Caption.Hint"
+        tools:text="(0/10)"/>
+
+    <TextView
+        android:id="@+id/manga_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:orientation="horizontal">
+        android:layout_toLeftOf="@id/download_progress_text"
+        android:layout_alignParentLeft="true"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:textAppearance="@style/TextAppearance.Regular.Body1"
+        tools:text="Manga title"/>
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-        <TextView
-            android:id="@+id/manga_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Manga Title"
-            android:textAppearance="@style/TextAppearance.Regular.Body1"/>
-
-            <TextView
-                android:id="@+id/download_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Chapter Title"
-                android:textAppearance="@style/TextAppearance.Regular.Caption"/>
-        </LinearLayout>
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/download_progress_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:textAppearance="@style/TextAppearance.Regular.Caption.Hint"
-            android:text="(0/10)"/>
-
-    </LinearLayout>
+    <TextView
+        android:id="@+id/chapter_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/manga_title"
+        android:maxLines="1"
+        android:ellipsize="end"
+        tools:text="Chapter Title"
+        android:textAppearance="@style/TextAppearance.Regular.Caption"/>
 
     <ProgressBar
         android:id="@+id/download_progress"
-        style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_below="@id/chapter_title"
+        style="?android:attr/progressBarStyleHorizontal"/>
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file