pull/600/head
Josh Vocal 5 years ago committed by Jeff Boek
parent 1bdda56989
commit 934cb1f4ed

@ -13,7 +13,6 @@ import kotlinx.android.extensions.LayoutContainer
import kotlinx.android.synthetic.main.tab_in_collection.* import kotlinx.android.synthetic.main.tab_in_collection.*
import mozilla.components.feature.tab.collections.TabCollection import mozilla.components.feature.tab.collections.TabCollection
import mozilla.components.support.ktx.android.util.dpToFloat import mozilla.components.support.ktx.android.util.dpToFloat
import org.jetbrains.anko.backgroundColor
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.getColorFromAttr import org.mozilla.fenix.ext.getColorFromAttr
@ -77,7 +76,7 @@ class TabInCollectionViewHolder(
view.background = AppCompatResources.getDrawable(view.context, R.drawable.rounded_bottom_corners) view.background = AppCompatResources.getDrawable(view.context, R.drawable.rounded_bottom_corners)
divider_line.visibility = View.GONE divider_line.visibility = View.GONE
} else { } else {
view.backgroundColor = view.context.getColorFromAttr(R.attr.above) view.setBackgroundColor(view.context.getColorFromAttr(R.attr.above))
divider_line.visibility = View.VISIBLE divider_line.visibility = View.VISIBLE
} }
} }

@ -14,7 +14,6 @@ import kotlinx.android.extensions.LayoutContainer
import kotlinx.android.synthetic.main.tab_list_row.* import kotlinx.android.synthetic.main.tab_list_row.*
import mozilla.components.feature.media.state.MediaState import mozilla.components.feature.media.state.MediaState
import mozilla.components.support.ktx.android.util.dpToFloat import mozilla.components.support.ktx.android.util.dpToFloat
import org.jetbrains.anko.imageBitmap
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
@ -123,7 +122,7 @@ class TabViewHolder(
if (icon == null) { if (icon == null) {
favicon_image.context.components.core.icons.loadIntoView(favicon_image, url) favicon_image.context.components.core.icons.loadIntoView(favicon_image, url)
} else { } else {
favicon_image.imageBitmap = icon favicon_image.setImageBitmap(icon)
} }
} }

@ -15,7 +15,6 @@ import kotlinx.android.extensions.LayoutContainer
import mozilla.components.concept.storage.BookmarkNode import mozilla.components.concept.storage.BookmarkNode
import mozilla.components.concept.storage.BookmarkNodeType import mozilla.components.concept.storage.BookmarkNodeType
import mozilla.components.support.ktx.android.util.dpToPx import mozilla.components.support.ktx.android.util.dpToPx
import org.jetbrains.anko.image
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.library.LibrarySiteItemView import org.mozilla.fenix.library.LibrarySiteItemView
import org.mozilla.fenix.library.bookmarks.BookmarksSharedViewModel import org.mozilla.fenix.library.bookmarks.BookmarksSharedViewModel
@ -72,12 +71,15 @@ class SelectBookmarkFolderAdapter(private val sharedViewModel: BookmarksSharedVi
fun bind(folder: BookmarkNodeWithDepth, selected: Boolean, onSelect: (BookmarkNode) -> Unit) { fun bind(folder: BookmarkNodeWithDepth, selected: Boolean, onSelect: (BookmarkNode) -> Unit) {
view.changeSelected(selected) view.changeSelected(selected)
view.iconView.image = AppCompatResources.getDrawable( view.iconView.setImageDrawable(
containerView.context, AppCompatResources.getDrawable(
R.drawable.ic_folder_icon containerView.context,
)?.apply { R.drawable.ic_folder_icon
setTint(ContextCompat.getColor(containerView.context, R.color.primary_text_light_theme)) )?.apply {
} setTint(ContextCompat.getColor(containerView.context,
R.color.primary_text_light_theme))
}
)
view.titleView.text = folder.node.title view.titleView.text = folder.node.title
view.setOnClickListener { view.setOnClickListener {
onSelect(folder.node) onSelect(folder.node)

@ -8,7 +8,6 @@ import android.view.View
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.appcompat.content.res.AppCompatResources import androidx.appcompat.content.res.AppCompatResources
import mozilla.components.concept.storage.BookmarkNode import mozilla.components.concept.storage.BookmarkNode
import org.jetbrains.anko.image
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.ext.hideAndDisable import org.mozilla.fenix.ext.hideAndDisable
import org.mozilla.fenix.ext.showAndEnable import org.mozilla.fenix.ext.showAndEnable
@ -44,12 +43,19 @@ class BookmarkFolderViewHolder(
} }
containerView.changeSelected(item in selectionHolder.selectedItems) containerView.changeSelected(item in selectionHolder.selectedItems)
containerView.iconView.image = AppCompatResources.getDrawable( containerView.iconView.setImageDrawable(
containerView.context, AppCompatResources.getDrawable(
R.drawable.ic_folder_icon containerView.context,
)?.apply { R.drawable.ic_folder_icon
setTint(ContextCompat.getColor(containerView.context, R.color.primary_text_light_theme)) )?.apply {
} setTint(
ContextCompat.getColor(
containerView.context,
R.color.primary_text_light_theme
)
)
}
)
containerView.titleView.text = item.title containerView.titleView.text = item.title
} }
} }

Loading…
Cancel
Save