From 934cb1f4ed0ed9be9ed4a0b490b213bb799df8e6 Mon Sep 17 00:00:00 2001 From: Josh Vocal Date: Wed, 18 Dec 2019 23:44:32 -0800 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/7253 - Replace anko setters --- .../viewholders/TabInCollectionViewHolder.kt | 3 +-- .../viewholders/TabViewHolder.kt | 3 +-- .../SelectBookmarkFolderAdapter.kt | 16 ++++++++------- .../viewholders/BookmarkFolderViewHolder.kt | 20 ++++++++++++------- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt index 89c479499..8fe9e0c33 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt @@ -13,7 +13,6 @@ import kotlinx.android.extensions.LayoutContainer import kotlinx.android.synthetic.main.tab_in_collection.* import mozilla.components.feature.tab.collections.TabCollection import mozilla.components.support.ktx.android.util.dpToFloat -import org.jetbrains.anko.backgroundColor import org.mozilla.fenix.R import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.getColorFromAttr @@ -77,7 +76,7 @@ class TabInCollectionViewHolder( view.background = AppCompatResources.getDrawable(view.context, R.drawable.rounded_bottom_corners) divider_line.visibility = View.GONE } else { - view.backgroundColor = view.context.getColorFromAttr(R.attr.above) + view.setBackgroundColor(view.context.getColorFromAttr(R.attr.above)) divider_line.visibility = View.VISIBLE } } diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt index dc48c2cfb..98d80dafb 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt @@ -14,7 +14,6 @@ import kotlinx.android.extensions.LayoutContainer import kotlinx.android.synthetic.main.tab_list_row.* import mozilla.components.feature.media.state.MediaState import mozilla.components.support.ktx.android.util.dpToFloat -import org.jetbrains.anko.imageBitmap import org.mozilla.fenix.R import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.ext.components @@ -123,7 +122,7 @@ class TabViewHolder( if (icon == null) { favicon_image.context.components.core.icons.loadIntoView(favicon_image, url) } else { - favicon_image.imageBitmap = icon + favicon_image.setImageBitmap(icon) } } diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt index aac6aa22f..e6ae7c045 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt @@ -15,7 +15,6 @@ import kotlinx.android.extensions.LayoutContainer import mozilla.components.concept.storage.BookmarkNode import mozilla.components.concept.storage.BookmarkNodeType import mozilla.components.support.ktx.android.util.dpToPx -import org.jetbrains.anko.image import org.mozilla.fenix.R import org.mozilla.fenix.library.LibrarySiteItemView 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) { view.changeSelected(selected) - view.iconView.image = AppCompatResources.getDrawable( - containerView.context, - R.drawable.ic_folder_icon - )?.apply { - setTint(ContextCompat.getColor(containerView.context, R.color.primary_text_light_theme)) - } + view.iconView.setImageDrawable( + AppCompatResources.getDrawable( + containerView.context, + R.drawable.ic_folder_icon + )?.apply { + setTint(ContextCompat.getColor(containerView.context, + R.color.primary_text_light_theme)) + } + ) view.titleView.text = folder.node.title view.setOnClickListener { onSelect(folder.node) diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/viewholders/BookmarkFolderViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/viewholders/BookmarkFolderViewHolder.kt index 2fd8b0c92..de1057890 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/viewholders/BookmarkFolderViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/viewholders/BookmarkFolderViewHolder.kt @@ -8,7 +8,6 @@ import android.view.View import androidx.core.content.ContextCompat import androidx.appcompat.content.res.AppCompatResources import mozilla.components.concept.storage.BookmarkNode -import org.jetbrains.anko.image import org.mozilla.fenix.R import org.mozilla.fenix.ext.hideAndDisable import org.mozilla.fenix.ext.showAndEnable @@ -44,12 +43,19 @@ class BookmarkFolderViewHolder( } containerView.changeSelected(item in selectionHolder.selectedItems) - containerView.iconView.image = AppCompatResources.getDrawable( - containerView.context, - R.drawable.ic_folder_icon - )?.apply { - setTint(ContextCompat.getColor(containerView.context, R.color.primary_text_light_theme)) - } + containerView.iconView.setImageDrawable( + AppCompatResources.getDrawable( + containerView.context, + R.drawable.ic_folder_icon + )?.apply { + setTint( + ContextCompat.getColor( + containerView.context, + R.color.primary_text_light_theme + ) + ) + } + ) containerView.titleView.text = item.title } }