From af0af6e260319fbb5b6a1616a3c4ac4dfb091cc6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Jul 2019 21:49:52 +0200
Subject: [PATCH] Fix bad background color in dark theme

---
 .../autocomplete/command/AutocompleteCommandPresenter.kt      | 2 +-
 .../features/autocomplete/user/AutocompleteUserPresenter.kt   | 2 +-
 .../riotx/features/home/room/detail/RoomDetailFragment.kt     | 4 ++--
 vector/src/main/res/layout/item_autocomplete_user.xml         | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt
index 866a68f5..edf72539 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt
@@ -23,7 +23,7 @@ import im.vector.riotx.features.command.Command
 import javax.inject.Inject
 
 class AutocompleteCommandPresenter @Inject constructor(context: Context,
-                                               private val controller: AutocompleteCommandController) :
+                                                       private val controller: AutocompleteCommandController) :
         EpoxyAutocompletePresenter<Command>(context) {
 
     init {
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserPresenter.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserPresenter.kt
index 800e8e77..1e9c404a 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserPresenter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserPresenter.kt
@@ -25,7 +25,7 @@ import im.vector.riotx.features.autocomplete.EpoxyAutocompletePresenter
 import javax.inject.Inject
 
 class AutocompleteUserPresenter @Inject constructor(context: Context,
-                                            private val controller: AutocompleteUserController
+                                                    private val controller: AutocompleteUserController
 ) : EpoxyAutocompletePresenter<User>(context) {
 
     var callback: Callback? = null
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
index 32458f23..72c17f63 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
@@ -20,7 +20,6 @@ import android.annotation.SuppressLint
 import android.app.Activity.RESULT_OK
 import android.content.Context
 import android.content.Intent
-import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
@@ -105,6 +104,7 @@ import im.vector.riotx.features.media.VideoMediaViewerActivity
 import im.vector.riotx.features.notifications.NotificationDrawerManager
 import im.vector.riotx.features.reactions.EmojiReactionPickerActivity
 import im.vector.riotx.features.settings.PreferencesManager
+import im.vector.riotx.features.themes.ThemeUtils
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_room_detail.*
 import kotlinx.android.synthetic.main.merge_composer_layout.view.*
@@ -350,7 +350,7 @@ class RoomDetailFragment :
 
     private fun setupComposer() {
         val elevation = 6f
-        val backgroundDrawable = ColorDrawable(Color.WHITE)
+        val backgroundDrawable = ColorDrawable(ThemeUtils.getColor(requireContext(), R.attr.riotx_background))
         Autocomplete.on<Command>(composerLayout.composerEditText)
                 .with(commandAutocompletePolicy)
                 .with(autocompleteCommandPresenter)
diff --git a/vector/src/main/res/layout/item_autocomplete_user.xml b/vector/src/main/res/layout/item_autocomplete_user.xml
index 873e9c6a..f2fdb354 100644
--- a/vector/src/main/res/layout/item_autocomplete_user.xml
+++ b/vector/src/main/res/layout/item_autocomplete_user.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:background="?riotx_background"
     android:orientation="horizontal"
     android:padding="8dp">
 
@@ -21,6 +22,7 @@
         android:layout_marginStart="12dp"
         android:layout_marginLeft="12dp"
         android:maxLines="1"
+        android:textColor="?riotx_text_primary"
         android:textSize="12sp"
         android:textStyle="bold"
         tools:text="name" />