Workaround cleanup (#6350)
* Remove material-components workaround that was fixed upstream
* Remove unused toolbar workaround
* Fix cover dialog navigation icon
(cherry picked from commit 38d131be37)
# Conflicts:
# app/src/main/res/menu/library_selection.xml
# app/src/main/res/menu/reader.xml
This commit is contained in:
+1
-1
@@ -463,7 +463,7 @@ class MigrationListController(bundle: Bundle? = null) :
|
||||
)
|
||||
}
|
||||
|
||||
val tintColor = activity?.getResourceColor(R.attr.colorOnToolbar) ?: Color.WHITE
|
||||
val tintColor = activity?.getResourceColor(R.attr.colorOnSurface) ?: Color.WHITE
|
||||
val color = if (allMangasDone) {
|
||||
tintColor
|
||||
} else {
|
||||
|
||||
@@ -157,7 +157,7 @@ class WebViewActivity : BaseViewBindingActivity<WebviewActivityBinding>() {
|
||||
backItem?.isEnabled = binding.webview.canGoBack()
|
||||
forwardItem?.isEnabled = binding.webview.canGoForward()
|
||||
|
||||
val iconTintColor = getResourceColor(R.attr.colorOnToolbar)
|
||||
val iconTintColor = getResourceColor(R.attr.colorOnSurface)
|
||||
val translucentIconTintColor = ColorUtils.setAlphaComponent(iconTintColor, 127)
|
||||
backItem?.icon?.setTint(if (binding.webview.canGoBack()) iconTintColor else translucentIconTintColor)
|
||||
forwardItem?.icon?.setTint(if (binding.webview.canGoForward()) iconTintColor else translucentIconTintColor)
|
||||
|
||||
Reference in New Issue
Block a user