Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-10 05:05:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renaming arrow down/up

Browse Source
This commit is contained in:
Jay 2020-05-21 03:29:22 -04:00
parent f98d0238c8
commit 516ff61abd
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt
View File

@ -30,7 +30,7 @@ class DownloadButton @JvmOverloads constructor(context: Context, attrs: Attribut
private val borderCircle = ContextCompat.getDrawable(context, private val borderCircle = ContextCompat.getDrawable(context,
R.drawable.border_circle)?.mutate() R.drawable.border_circle)?.mutate()
private val downloadDrawable = ContextCompat.getDrawable(context, 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, private val checkDrawable = ContextCompat.getDrawable(context,
R.drawable.ic_check_24dp)?.mutate() R.drawable.ic_check_24dp)?.mutate()
private var isAnimating = false private var isAnimating = false

8
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt
View File

@ -99,8 +99,8 @@ class LibraryHeaderHolder(val view: View, private val adapter: LibraryCategoryAd
val sortingMode = category.sortingMode() val sortingMode = category.sortingMode()
val sortDrawable = when { val sortDrawable = when {
sortingMode == LibrarySort.DRAG_AND_DROP || sortingMode == null -> R.drawable.ic_sort_24dp 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 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_up_24dp else -> R.drawable.ic_arrow_upward_24dp
} }
sortText.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, sortDrawable, 0) sortText.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, sortDrawable, 0)
@ -207,8 +207,8 @@ class LibraryHeaderHolder(val view: View, private val adapter: LibraryCategoryAd
if (sortingMode == LibrarySort.DATE_ADDED || if (sortingMode == LibrarySort.DATE_ADDED ||
sortingMode == LibrarySort.LATEST_CHAPTER || sortingMode == LibrarySort.LATEST_CHAPTER ||
sortingMode == LibrarySort.LAST_READ) !isAscending else isAscending -> sortingMode == LibrarySort.LAST_READ) !isAscending else isAscending ->
R.drawable.ic_arrow_down_24dp R.drawable.ic_arrow_downward_24dp
else -> R.drawable.ic_arrow_up_24dp else -> R.drawable.ic_arrow_upward_24dp
} }
private fun onCatSortClicked(category: Category, menuId: Int?) { private fun onCatSortClicked(category: Category, menuId: Int?) {

4
app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/SortItem.kt
View File

@ -35,9 +35,9 @@ class SortItem(val name: String, val group: SortGroup) : AbstractSectionableItem
val i = filter.values.indexOf(name) val i = filter.values.indexOf(name)
fun getIcon() = when (filter.state) { 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)) } ?.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)) } ?.apply { setTint(view.context.getResourceColor(R.attr.colorAccent)) }
else -> ContextCompat.getDrawable(view.context, R.drawable.empty_drawable_32dp) else -> ContextCompat.getDrawable(view.context, R.drawable.empty_drawable_32dp)
} }

0
app/src/main/res/drawable/ic_arrow_down_24dp.xml → app/src/main/res/drawable/ic_arrow_downward_24dp.xml
View File

0
app/src/main/res/drawable/ic_arrow_down_32dp.xml → app/src/main/res/drawable/ic_arrow_downward_32dp.xml
View File

0
app/src/main/res/drawable/ic_arrow_up_24dp.xml → app/src/main/res/drawable/ic_arrow_upward_24dp.xml
View File

0
app/src/main/res/drawable/ic_arrow_up_32dp.xml → app/src/main/res/drawable/ic_arrow_upward_32dp.xml
View File

2
app/src/main/res/layout/download_button.xml
View File

@ -45,5 +45,5 @@
android:layout_height="30dp" android:layout_height="30dp"
android:background="@drawable/round_ripple" android:background="@drawable/round_ripple"
android:padding="5dp" android:padding="5dp"
android:src="@drawable/ic_arrow_down_24dp" /> android:src="@drawable/ic_arrow_downward_24dp" />
</eu.kanade.tachiyomi.ui.download.DownloadButton> </eu.kanade.tachiyomi.ui.download.DownloadButton>

2
app/src/main/res/layout/menu_sheet_item.xml
View File

@ -31,5 +31,5 @@
android:tint="@color/colorAccent" android:tint="@color/colorAccent"
android:visibility="invisible" android:visibility="invisible"
tools:visibility="visible" tools:visibility="visible"
android:src="@drawable/ic_arrow_up_24dp" /> android:src="@drawable/ic_arrow_upward_24dp" />
</LinearLayout> </LinearLayout>