Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix dark theme issue.

Browse source 
to merge with fix dark theme issue
This commit is contained in:
Benoit Marty 2023-01-18 15:41:29 +01:00 • committed by Benoit Marty
parent 08bf9aa6f7
commit f3217d90aa
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt
View file

@ -18,6 +18,7 @@ package io.element.android.x.features.messages.textcomposer
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import io.element.android.x.designsystem.LocalIsDarkTheme
import io.element.android.x.textcomposer.TextComposer
@Composable
@ -50,6 +51,7 @@ fun MessageComposerView(
onComposerTextChange = ::onComposerTextChange,
composerCanSendMessage = state.isSendButtonVisible,
composerText = state.text?.charSequence?.toString(),
isInDarkMode = LocalIsDarkTheme.current,
modifier = modifier
)
}

4
libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt
View file

@ -18,7 +18,6 @@ package io.element.android.x.textcomposer
import android.graphics.Color
import android.net.Uri
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@ -42,6 +41,7 @@ fun TextComposer(
composerText: String?,
composerMode: MessageComposerMode,
composerCanSendMessage: Boolean,
isInDarkMode: Boolean,
modifier: Modifier = Modifier,
onSendMessage: (String) -> Unit = {},
onFullscreenToggle: () -> Unit = {},
@ -51,7 +51,6 @@ fun TextComposer(
if (LocalInspectionMode.current) {
FakeComposer(modifier)
} else {
val isInDarkMode = isSystemInDarkTheme()
AndroidView(
modifier = modifier,
factory = { context ->
@ -156,5 +155,6 @@ fun TextComposerPreview() {
onCloseSpecialMode = {},
composerCanSendMessage = true,
composerText = "Message",
isInDarkMode = true,
)
}