From 6027671c09677d34d69e7c2fd740c467c02474e1 Mon Sep 17 00:00:00 2001
From: Carlos <cargo8005@gmail.com>
Date: Mon, 8 Jan 2018 08:08:48 -0500
Subject: [PATCH] Address #1154 (#1160)

* change add to library icon add toast

* adjusted toast messages
added toast to catalog long click

* adjusted strings
---
 .../catalogue/browse/BrowseCatalogueController.kt  | 14 ++++++++------
 .../tachiyomi/ui/manga/info/MangaInfoController.kt |  5 ++++-
 .../main/res/drawable/ic_add_to_library_24dp.xml   |  7 +++++++
 app/src/main/res/drawable/ic_in_library_24dp.xml   |  7 +++++++
 app/src/main/res/layout/manga_info_controller.xml  |  2 +-
 app/src/main/res/values/strings.xml                |  3 ++-
 6 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_add_to_library_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_in_library_24dp.xml

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt
index e5edc0297..64b6d6c39 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt
@@ -171,13 +171,13 @@ open class BrowseCatalogueController(bundle: Bundle) :
         numColumnsSubscription?.unsubscribe()
 
         var oldPosition = RecyclerView.NO_POSITION
-            val oldRecycler = catalogue_view?.getChildAt(1)
-            if (oldRecycler is RecyclerView) {
-                oldPosition = (oldRecycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
-                oldRecycler.adapter = null
+        val oldRecycler = catalogue_view?.getChildAt(1)
+        if (oldRecycler is RecyclerView) {
+            oldPosition = (oldRecycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
+            oldRecycler.adapter = null
 
-                catalogue_view?.removeView(oldRecycler)
-            }
+            catalogue_view?.removeView(oldRecycler)
+        }
 
         val recycler = if (presenter.isListMode) {
             RecyclerView(view.context).apply {
@@ -476,6 +476,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
                             0 -> {
                                 presenter.changeMangaFavorite(manga)
                                 adapter?.notifyItemChanged(position)
+                                activity?.toast(activity?.getString(R.string.manga_removed_library))
                             }
                         }
                     }.show()
@@ -498,6 +499,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
                 ChangeMangaCategoriesDialog(this, listOf(manga), categories, preselected)
                         .showDialog(router)
             }
+            activity?.toast(activity?.getString(R.string.manga_added_library))
         }
 
     }
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 95a0f8756..4defb6ec9 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
@@ -242,7 +242,7 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
         fab_favorite?.setImageResource(if (isFavorite)
             R.drawable.ic_bookmark_white_24dp
         else
-            R.drawable.ic_bookmark_border_white_24dp)
+            R.drawable.ic_add_to_library_24dp)
     }
 
     /**
@@ -301,6 +301,9 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
                             .showDialog(router)
                 }
             }
+            activity?.toast(activity?.getString(R.string.manga_added_library))
+        }else{
+            activity?.toast(activity?.getString(R.string.manga_removed_library))
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_add_to_library_24dp.xml b/app/src/main/res/drawable/ic_add_to_library_24dp.xml
new file mode 100644
index 000000000..bba483129
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_to_library_24dp.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path android:fillColor="#FFFFFF" android:pathData="M17,18V5H7V18L12,15.82L17,18M17,3A2,2 0 0,1 19,5V21L12,18L5,21V5C5,3.89 5.9,3 7,3H17M11,7H13V9H15V11H13V13H11V11H9V9H11V7Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_in_library_24dp.xml b/app/src/main/res/drawable/ic_in_library_24dp.xml
new file mode 100644
index 000000000..f95fc68ae
--- /dev/null
+++ b/app/src/main/res/drawable/ic_in_library_24dp.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path android:fillColor="#FFFFFF" android:pathData="M12,8A3,3 0 0,0 15,5A3,3 0 0,0 12,2A3,3 0 0,0 9,5A3,3 0 0,0 12,8M12,11.54C9.64,9.35 6.5,8 3,8V19C6.5,19 9.64,20.35 12,22.54C14.36,20.35 17.5,19 21,19V8C17.5,8 14.36,9.35 12,11.54Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/manga_info_controller.xml b/app/src/main/res/layout/manga_info_controller.xml
index 0f850a342..c1080ead5 100644
--- a/app/src/main/res/layout/manga_info_controller.xml
+++ b/app/src/main/res/layout/manga_info_controller.xml
@@ -58,7 +58,7 @@
         <android.support.design.widget.FloatingActionButton
             android:id="@+id/fab_favorite"
             style="@style/Theme.Widget.FAB"
-            app:srcCompat="@drawable/ic_bookmark_border_white_24dp"
+            app:srcCompat="@drawable/ic_add_to_library_24dp"
             android:layout_marginTop="0dp"
             android:layout_marginBottom="0dp"
             android:layout_marginRight="8dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 86556a0da..8ca36e182 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -299,8 +299,9 @@
     <string name="ongoing">Ongoing</string>
     <string name="unknown">Unknown</string>
     <string name="licensed">Licensed</string>
-    <string name="add_to_library">Add to library</string>
     <string name="remove_from_library">Remove from library</string>
+    <string name="manga_added_library">Added to library</string>
+    <string name="manga_removed_library">Removed from library</string>
     <string name="manga_info_author_label">Author</string>
     <string name="manga_info_artist_label">Artist</string>
     <string name="manga_info_chapters_label">Chapters</string>