From 6f7ae227a82c3c2cdc78eda6d232cac40d3986c1 Mon Sep 17 00:00:00 2001
From: Emily Kager <emilykager@gmail.com>
Date: Mon, 5 Aug 2019 14:54:39 -0700
Subject: [PATCH] Closes #4540 - Set correct tint for select bookmark folder
 icon (#4541)

---
 .../SelectBookmarkFolderAdapter.kt            |  6 ++++-
 .../fragment_select_bookmark_folder.xml       | 25 +++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)

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 21d9bb532..3303b3628 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
@@ -6,11 +6,13 @@ package org.mozilla.fenix.library.bookmarks.selectfolder
 
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 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
@@ -67,7 +69,9 @@ class SelectBookmarkFolderAdapter(private val sharedViewModel: BookmarksSharedVi
 
         fun bind(folder: BookmarkNodeWithDepth, selected: Boolean, onSelect: (BookmarkNode) -> Unit) {
             view.changeSelected(selected)
-            view.iconView.setImageResource(R.drawable.ic_folder_icon)
+            view.iconView.image = containerView.context.getDrawable(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/res/layout/fragment_select_bookmark_folder.xml b/app/src/main/res/layout/fragment_select_bookmark_folder.xml
index da9d2933a..4555efa59 100644
--- a/app/src/main/res/layout/fragment_select_bookmark_folder.xml
+++ b/app/src/main/res/layout/fragment_select_bookmark_folder.xml
@@ -2,19 +2,18 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/selectBookmarkLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/selectBookmarkLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recylerViewBookmarkFolders"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:listitem="@layout/bookmark_row"/>
-
+        android:id="@+id/recylerViewBookmarkFolders"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listitem="@layout/library_site_item" />
 </LinearLayout>