For #21483 - Remove light theme tinting of folder icon in the Bookmark view

upstream-sync
TasosB 3 years ago committed by mergify[bot]
parent 54ffe7db03
commit 05e6ba40b4

@ -6,8 +6,6 @@ package org.mozilla.fenix.library.bookmarks.selectfolder
import android.view.View
import android.view.ViewGroup
import androidx.appcompat.content.res.AppCompatResources
import androidx.core.content.ContextCompat
import androidx.core.view.updatePaddingRelative
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
@ -69,19 +67,7 @@ class SelectBookmarkFolderAdapter(private val sharedViewModel: BookmarksSharedVi
fun bind(folder: BookmarkNodeWithDepth, selected: Boolean, onSelect: (BookmarkNode) -> Unit) {
view.changeSelected(selected)
view.iconView.setImageDrawable(
AppCompatResources.getDrawable(
view.context,
R.drawable.ic_folder_icon
)?.apply {
setTint(
ContextCompat.getColor(
view.context,
R.color.primary_text_light_theme
)
)
}
)
view.iconView.setImageResource(R.drawable.ic_folder_icon)
view.titleView.text = folder.node.title
view.setOnClickListener {
onSelect(folder.node)

@ -4,12 +4,10 @@
package org.mozilla.fenix.library.bookmarks.viewholders
import androidx.core.content.ContextCompat
import androidx.core.view.isVisible
import androidx.recyclerview.widget.RecyclerView
import mozilla.components.concept.storage.BookmarkNode
import mozilla.components.concept.storage.BookmarkNodeType
import mozilla.components.support.ktx.android.content.getDrawableWithTint
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.removeAndDisable
import org.mozilla.fenix.ext.hideAndDisable
@ -101,12 +99,7 @@ class BookmarkNodeViewHolder(
when {
// Item is a folder
item.type == BookmarkNodeType.FOLDER ->
iconView.setImageDrawable(
context.getDrawableWithTint(
R.drawable.ic_folder_icon,
ContextCompat.getColor(context, R.color.primary_text_light_theme)
)
)
iconView.setImageResource(R.drawable.ic_folder_icon)
// Item has a http/https URL
url != null && url.startsWith("http") ->
context.components.core.icons.loadIntoView(iconView, url)

Loading…
Cancel
Save