6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Fix bad background color in dark theme

Browse Source
This commit is contained in:
Benoit Marty 2019-07-02 21:49:52 +02:00
parent 6e71fb565a
commit af0af6e260
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt
View File

@ -23,7 +23,7 @@ import im.vector.riotx.features.command.Command
import javax.inject.Inject import javax.inject.Inject


class AutocompleteCommandPresenter @Inject constructor(context: Context, class AutocompleteCommandPresenter @Inject constructor(context: Context,
private val controller: AutocompleteCommandController) : private val controller: AutocompleteCommandController) :
EpoxyAutocompletePresenter<Command>(context) { EpoxyAutocompletePresenter<Command>(context) {


init { init {

2
vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserPresenter.kt
View File

@ -25,7 +25,7 @@ import im.vector.riotx.features.autocomplete.EpoxyAutocompletePresenter
import javax.inject.Inject import javax.inject.Inject


class AutocompleteUserPresenter @Inject constructor(context: Context, class AutocompleteUserPresenter @Inject constructor(context: Context,
private val controller: AutocompleteUserController private val controller: AutocompleteUserController
) : EpoxyAutocompletePresenter<User>(context) { ) : EpoxyAutocompletePresenter<User>(context) {


var callback: Callback? = null var callback: Callback? = null

4
vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
View File

@ -20,7 +20,6 @@ import android.annotation.SuppressLint
import android.app.Activity.RESULT_OK import android.app.Activity.RESULT_OK
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.graphics.Color
import android.graphics.drawable.ColorDrawable import android.graphics.drawable.ColorDrawable
import android.net.Uri import android.net.Uri
import android.os.Bundle 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.notifications.NotificationDrawerManager
import im.vector.riotx.features.reactions.EmojiReactionPickerActivity import im.vector.riotx.features.reactions.EmojiReactionPickerActivity
import im.vector.riotx.features.settings.PreferencesManager import im.vector.riotx.features.settings.PreferencesManager
import im.vector.riotx.features.themes.ThemeUtils
import kotlinx.android.parcel.Parcelize import kotlinx.android.parcel.Parcelize
import kotlinx.android.synthetic.main.fragment_room_detail.* import kotlinx.android.synthetic.main.fragment_room_detail.*
import kotlinx.android.synthetic.main.merge_composer_layout.view.* import kotlinx.android.synthetic.main.merge_composer_layout.view.*
@ -350,7 +350,7 @@ class RoomDetailFragment :


private fun setupComposer() { private fun setupComposer() {
val elevation = 6f val elevation = 6f
val backgroundDrawable = ColorDrawable(Color.WHITE) val backgroundDrawable = ColorDrawable(ThemeUtils.getColor(requireContext(), R.attr.riotx_background))
Autocomplete.on<Command>(composerLayout.composerEditText) Autocomplete.on<Command>(composerLayout.composerEditText)
.with(commandAutocompletePolicy) .with(commandAutocompletePolicy)
.with(autocompleteCommandPresenter) .with(autocompleteCommandPresenter)

2
vector/src/main/res/layout/item_autocomplete_user.xml
View File

@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?riotx_background"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="8dp"> android:padding="8dp">


@ -21,6 +22,7 @@
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginLeft="12dp" android:layout_marginLeft="12dp"
android:maxLines="1" android:maxLines="1"
android:textColor="?riotx_text_primary"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold"
tools:text="name" /> tools:text="name" />