Closes #1314: Make AwesomeBar styleable.

Author: pocmo

components/browser/awesomebar/src/main/java/mozilla/components/browser/awesomebar/BrowserAwesomeBar.kt

@@ -18,6 +18,11 @@ import mozilla.components.concept.awesomebar.AwesomeBar
 
 private const val PROVIDER_QUERY_THREADS = 3
 
+private const val DEFAULT_TITLE_TEXT_COLOR = 0xFF272727.toInt()
+private const val DEFAULT_DESCRIPTION_TEXT_COLOR = 0xFF737373.toInt()
+private const val DEFAULT_CHIP_TEXT_COLOR = 0xFF272727.toInt()
+private const val DEFAULT_CHIP_BACKGROUND_COLOR = 0xFFFFEEEE.toInt()
+
 /**
  * A customizable [AwesomeBar] implementation.
  */
@@ -32,10 +37,20 @@ class BrowserAwesomeBar @JvmOverloads constructor(
     internal var scope = CoroutineScope(Dispatchers.Main)
     internal var job: Job? = null
     internal var listener: (() -> Unit)? = null
+    internal val styling: BrowserAwesomeBarStyling
 
     init {
         layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
         adapter = suggestionsAdapter
+
+        val attr = context.obtainStyledAttributes(attrs, R.styleable.BrowserAwesomeBar, defStyleAttr, 0)
+        this@BrowserAwesomeBar.styling = BrowserAwesomeBarStyling(
+            attr.getColor(R.styleable.BrowserAwesomeBar_awesomeBarTitleTextColor, DEFAULT_TITLE_TEXT_COLOR),
+            attr.getColor(R.styleable.BrowserAwesomeBar_awesomeBarDescriptionTextColor, DEFAULT_DESCRIPTION_TEXT_COLOR),
+            attr.getColor(R.styleable.BrowserAwesomeBar_awesomeBarChipTextColor, DEFAULT_CHIP_TEXT_COLOR),
+            attr.getColor(R.styleable.BrowserAwesomeBar_awesomeBarChipBackgroundColor, DEFAULT_CHIP_BACKGROUND_COLOR)
+        )
+        attr.recycle()
     }
 
     @Synchronized
@@ -82,3 +97,10 @@ class BrowserAwesomeBar @JvmOverloads constructor(
         this.listener = listener
     }
 }
+
+internal data class BrowserAwesomeBarStyling(
+    val titleTextColor: Int,
+    val descriptionTextColor: Int,
+    val chipTextColor: Int,
+    val chipBackgroundColor: Int
+)

components/browser/awesomebar/src/main/java/mozilla/components/browser/awesomebar/SuggestionViewHolder.kt

@@ -31,8 +31,12 @@ internal sealed class SuggestionViewHolder(
         private val awesomeBar: BrowserAwesomeBar,
         itemView: View
     ) : SuggestionViewHolder(itemView) {
-        private val titleView = itemView.findViewById<TextView>(R.id.mozac_browser_awesomebar_title)
-        private val descriptionView = itemView.findViewById<TextView>(R.id.mozac_browser_awesomebar_description)
+        private val titleView = itemView.findViewById<TextView>(R.id.mozac_browser_awesomebar_title).apply {
+            setTextColor(awesomeBar.styling.titleTextColor)
+        }
+        private val descriptionView = itemView.findViewById<TextView>(R.id.mozac_browser_awesomebar_description).apply {
+            setTextColor(awesomeBar.styling.descriptionTextColor)
+        }
 
         override fun bind(suggestion: AwesomeBar.Suggestion) {
             val title = if (suggestion.title.isNullOrEmpty()) suggestion.description else suggestion.title
@@ -79,6 +83,8 @@ internal sealed class SuggestionViewHolder(
                         false
                     ) as TextView
 
+                    view.setTextColor(awesomeBar.styling.chipTextColor)
+                    view.setBackgroundColor(awesomeBar.styling.chipBackgroundColor)
                     view.text = chip.title
                     view.setOnClickListener {
                         suggestion.onChipClicked?.invoke(chip)

components/browser/awesomebar/src/main/res/layout/mozac_browser_awesomebar_chip.xml

@@ -8,7 +8,6 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_margin="4dp"
-    android:background="#ffeeeeee"
     android:ellipsize="end"
     android:lines="1"
     android:padding="8dp"

components/browser/awesomebar/src/main/res/layout/mozac_browser_awesomebar_item_chips.xml

@@ -15,7 +15,6 @@
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_marginStart="16dp"
-        android:background="#ffcccccc"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -29,7 +28,7 @@
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/mozac_browser_awesomebar_icon"
-        app:layout_constraintTop_toBottomOf="@id/mozac_browser_awesomebar_title"
+        app:layout_constraintTop_toTopOf="parent"
         tools:layout_height="50dp" />
 
 </android.support.constraint.ConstraintLayout>

components/browser/awesomebar/src/main/res/layout/mozac_browser_awesomebar_item_generic.xml

@@ -34,7 +34,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/iconView"
         app:layout_constraintTop_toTopOf="parent"
-        android:textColor="#272727"
         tools:text="Android Components" />
 
     <TextView
@@ -47,7 +46,6 @@
         android:layout_marginBottom="8dp"
         android:ellipsize="end"
         android:lines="1"
-        android:textColor="#737373"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

components/browser/awesomebar/src/main/res/values/attrs.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+<resources>
+    <declare-styleable name="BrowserAwesomeBar">
+        <attr name="awesomeBarTitleTextColor" format="reference|color" />
+        <attr name="awesomeBarDescriptionTextColor" format="reference|color" />
+        <attr name="awesomeBarChipTextColor" format="reference|color" />
+        <attr name="awesomeBarChipBackgroundColor" format="reference|color" />
+    </declare-styleable>
+</resources>

components/browser/awesomebar/src/test/java/mozilla/components/browser/awesomebar/SuggestionViewHolderTest.kt

@@ -4,11 +4,11 @@
 
 package mozilla.components.browser.awesomebar
 
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.TextView
 import mozilla.components.concept.awesomebar.AwesomeBar
-import mozilla.components.support.test.mock
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
@@ -19,12 +19,16 @@ import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
 class SuggestionViewHolderTest {
+    private val context: Context
+        get() = RuntimeEnvironment.application
+
     @Test
     fun `DefaultViewHolder sets title and description`() {
-        val view = LayoutInflater.from(RuntimeEnvironment.application).inflate(
+        val view = LayoutInflater.from(context).inflate(
             R.layout.mozac_browser_awesomebar_item_generic, null, false)
 
-        val viewHolder = SuggestionViewHolder.DefaultSuggestionViewHolder(mock(), view)
+        val viewHolder = SuggestionViewHolder.DefaultSuggestionViewHolder(
+            BrowserAwesomeBar(context), view)
 
         val suggestion = AwesomeBar.Suggestion(
             title = "Hello World",
@@ -41,10 +45,11 @@ class SuggestionViewHolderTest {
 
     @Test
     fun `Clicking on default suggestion view invokes callback`() {
-        val view = LayoutInflater.from(RuntimeEnvironment.application).inflate(
+        val view = LayoutInflater.from(context).inflate(
             R.layout.mozac_browser_awesomebar_item_generic, null, false)
 
-        val viewHolder = SuggestionViewHolder.DefaultSuggestionViewHolder(mock(), view)
+        val viewHolder = SuggestionViewHolder.DefaultSuggestionViewHolder(
+            BrowserAwesomeBar(context), view)
 
         var callbackExecuted = false
         val suggestion = AwesomeBar.Suggestion(
@@ -62,10 +67,11 @@ class SuggestionViewHolderTest {
 
     @Test
     fun `ChipsSuggestionViewHolder adds views for chips`() {
-        val view = LayoutInflater.from(RuntimeEnvironment.application).inflate(
+        val view = LayoutInflater.from(context).inflate(
             R.layout.mozac_browser_awesomebar_item_chips, null, false)
 
-        val viewHolder = SuggestionViewHolder.ChipsSuggestionViewHolder(mock(), view)
+        val viewHolder = SuggestionViewHolder.ChipsSuggestionViewHolder(
+            BrowserAwesomeBar(context), view)
 
         val suggestion = AwesomeBar.Suggestion(
             chips = listOf(
@@ -88,10 +94,11 @@ class SuggestionViewHolderTest {
 
     @Test
     fun `Clicking on a chip invokes callback`() {
-        val view = LayoutInflater.from(RuntimeEnvironment.application).inflate(
+        val view = LayoutInflater.from(context).inflate(
             R.layout.mozac_browser_awesomebar_item_chips, null, false)
 
-        val viewHolder = SuggestionViewHolder.ChipsSuggestionViewHolder(mock(), view)
+        val viewHolder = SuggestionViewHolder.ChipsSuggestionViewHolder(
+            BrowserAwesomeBar(context), view)
 
         var chipClicked: String? = null
 

components/browser/awesomebar/src/test/java/mozilla/components/browser/awesomebar/SuggestionsAdapterTest.kt

@@ -4,6 +4,7 @@
 
 package mozilla.components.browser.awesomebar
 
+import android.content.Context
 import android.widget.LinearLayout
 import mozilla.components.concept.awesomebar.AwesomeBar
 import mozilla.components.support.test.any
@@ -22,6 +23,9 @@ import java.lang.IllegalArgumentException
 
 @RunWith(RobolectricTestRunner::class)
 class SuggestionsAdapterTest {
+    private val context: Context
+        get() = RuntimeEnvironment.application
+
     @Test
     fun `addSuggestions() should add suggestions of provider`() {
         val adapter = SuggestionsAdapter(mock())
@@ -123,9 +127,9 @@ class SuggestionsAdapterTest {
 
     @Test
     fun `onCreateViewHolder() will create view holder matching layout id`() {
-        val adapter = SuggestionsAdapter(mock())
+        val adapter = SuggestionsAdapter(BrowserAwesomeBar(context))
 
-        val parent = LinearLayout(RuntimeEnvironment.application)
+        val parent = LinearLayout(context)
 
         assertTrue(adapter.createViewHolder(parent, SuggestionViewHolder.DefaultSuggestionViewHolder.LAYOUT_ID)
             is SuggestionViewHolder.DefaultSuggestionViewHolder)
@@ -138,7 +142,7 @@ class SuggestionsAdapterTest {
     fun `onCreateViewHolder() will throw for unknown id`() {
         val adapter = SuggestionsAdapter(mock())
 
-        val parent = LinearLayout(RuntimeEnvironment.application)
+        val parent = LinearLayout(context)
 
         adapter.onCreateViewHolder(parent, 0)
     }