From 516ff61abd9e3b78783fb79bca3abf7dde9cad38 Mon Sep 17 00:00:00 2001 From: Jay Date: Thu, 21 May 2020 03:29:22 -0400 Subject: [PATCH] Renaming arrow down/up --- .../eu/kanade/tachiyomi/ui/download/DownloadButton.kt | 2 +- .../eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt | 8 ++++---- .../java/eu/kanade/tachiyomi/ui/source/filter/SortItem.kt | 4 ++-- ...{ic_arrow_down_24dp.xml => ic_arrow_downward_24dp.xml} | 0 ...{ic_arrow_down_32dp.xml => ic_arrow_downward_32dp.xml} | 0 .../{ic_arrow_up_24dp.xml => ic_arrow_upward_24dp.xml} | 0 .../{ic_arrow_up_32dp.xml => ic_arrow_upward_32dp.xml} | 0 app/src/main/res/layout/download_button.xml | 2 +- app/src/main/res/layout/menu_sheet_item.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename app/src/main/res/drawable/{ic_arrow_down_24dp.xml => ic_arrow_downward_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_arrow_down_32dp.xml => ic_arrow_downward_32dp.xml} (100%) rename app/src/main/res/drawable/{ic_arrow_up_24dp.xml => ic_arrow_upward_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_arrow_up_32dp.xml => ic_arrow_upward_32dp.xml} (100%) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt index 769832d311..971556a708 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt @@ -30,7 +30,7 @@ class DownloadButton @JvmOverloads constructor(context: Context, attrs: Attribut private val borderCircle = ContextCompat.getDrawable(context, R.drawable.border_circle)?.mutate() private val downloadDrawable = ContextCompat.getDrawable(context, - R.drawable.ic_arrow_down_24dp)?.mutate() + R.drawable.ic_arrow_downward_24dp)?.mutate() private val checkDrawable = ContextCompat.getDrawable(context, R.drawable.ic_check_24dp)?.mutate() private var isAnimating = false diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt index 96a46010fc..8d5a16431d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt @@ -99,8 +99,8 @@ class LibraryHeaderHolder(val view: View, private val adapter: LibraryCategoryAd val sortingMode = category.sortingMode() val sortDrawable = when { sortingMode == LibrarySort.DRAG_AND_DROP || sortingMode == null -> R.drawable.ic_sort_24dp - if (sortingMode == LibrarySort.DATE_ADDED || sortingMode == LibrarySort.LATEST_CHAPTER || sortingMode == LibrarySort.LAST_READ) !isAscending else isAscending -> R.drawable.ic_arrow_down_24dp - else -> R.drawable.ic_arrow_up_24dp + if (sortingMode == LibrarySort.DATE_ADDED || sortingMode == LibrarySort.LATEST_CHAPTER || sortingMode == LibrarySort.LAST_READ) !isAscending else isAscending -> R.drawable.ic_arrow_downward_24dp + else -> R.drawable.ic_arrow_upward_24dp } sortText.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, sortDrawable, 0) @@ -207,8 +207,8 @@ class LibraryHeaderHolder(val view: View, private val adapter: LibraryCategoryAd if (sortingMode == LibrarySort.DATE_ADDED || sortingMode == LibrarySort.LATEST_CHAPTER || sortingMode == LibrarySort.LAST_READ) !isAscending else isAscending -> - R.drawable.ic_arrow_down_24dp - else -> R.drawable.ic_arrow_up_24dp + R.drawable.ic_arrow_downward_24dp + else -> R.drawable.ic_arrow_upward_24dp } private fun onCatSortClicked(category: Category, menuId: Int?) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/SortItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/SortItem.kt index e1ff831df9..eda45fa6f2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/SortItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/SortItem.kt @@ -35,9 +35,9 @@ class SortItem(val name: String, val group: SortGroup) : AbstractSectionableItem val i = filter.values.indexOf(name) fun getIcon() = when (filter.state) { - Filter.Sort.Selection(i, false) -> VectorDrawableCompat.create(view.resources, R.drawable.ic_arrow_down_32dp, null) + Filter.Sort.Selection(i, false) -> VectorDrawableCompat.create(view.resources, R.drawable.ic_arrow_downward_32dp, null) ?.apply { setTint(view.context.getResourceColor(R.attr.colorAccent)) } - Filter.Sort.Selection(i, true) -> VectorDrawableCompat.create(view.resources, R.drawable.ic_arrow_up_32dp, null) + Filter.Sort.Selection(i, true) -> VectorDrawableCompat.create(view.resources, R.drawable.ic_arrow_upward_32dp, null) ?.apply { setTint(view.context.getResourceColor(R.attr.colorAccent)) } else -> ContextCompat.getDrawable(view.context, R.drawable.empty_drawable_32dp) } diff --git a/app/src/main/res/drawable/ic_arrow_down_24dp.xml b/app/src/main/res/drawable/ic_arrow_downward_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_down_24dp.xml rename to app/src/main/res/drawable/ic_arrow_downward_24dp.xml diff --git a/app/src/main/res/drawable/ic_arrow_down_32dp.xml b/app/src/main/res/drawable/ic_arrow_downward_32dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_down_32dp.xml rename to app/src/main/res/drawable/ic_arrow_downward_32dp.xml diff --git a/app/src/main/res/drawable/ic_arrow_up_24dp.xml b/app/src/main/res/drawable/ic_arrow_upward_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_up_24dp.xml rename to app/src/main/res/drawable/ic_arrow_upward_24dp.xml diff --git a/app/src/main/res/drawable/ic_arrow_up_32dp.xml b/app/src/main/res/drawable/ic_arrow_upward_32dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_up_32dp.xml rename to app/src/main/res/drawable/ic_arrow_upward_32dp.xml diff --git a/app/src/main/res/layout/download_button.xml b/app/src/main/res/layout/download_button.xml index cfa0e26fa6..49f3b6e6ed 100644 --- a/app/src/main/res/layout/download_button.xml +++ b/app/src/main/res/layout/download_button.xml @@ -45,5 +45,5 @@ android:layout_height="30dp" android:background="@drawable/round_ripple" android:padding="5dp" - android:src="@drawable/ic_arrow_down_24dp" /> + android:src="@drawable/ic_arrow_downward_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/menu_sheet_item.xml b/app/src/main/res/layout/menu_sheet_item.xml index b1e22f0a15..1ab62a9a73 100644 --- a/app/src/main/res/layout/menu_sheet_item.xml +++ b/app/src/main/res/layout/menu_sheet_item.xml @@ -31,5 +31,5 @@ android:tint="@color/colorAccent" android:visibility="invisible" tools:visibility="visible" - android:src="@drawable/ic_arrow_up_24dp" /> + android:src="@drawable/ic_arrow_upward_24dp" /> \ No newline at end of file