Fix dark theme issue.
to merge with fix dark theme issue
This commit is contained in:
parent
63ff259d01
commit
e1fe05072b
2 changed files with 4 additions and 2 deletions
|
|
@ -18,6 +18,7 @@ package io.element.android.x.features.messages.textcomposer
|
||||||
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import io.element.android.x.designsystem.LocalIsDarkTheme
|
||||||
import io.element.android.x.textcomposer.TextComposer
|
import io.element.android.x.textcomposer.TextComposer
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
|
|
@ -50,6 +51,7 @@ fun MessageComposerView(
|
||||||
onComposerTextChange = ::onComposerTextChange,
|
onComposerTextChange = ::onComposerTextChange,
|
||||||
composerCanSendMessage = state.isSendButtonVisible,
|
composerCanSendMessage = state.isSendButtonVisible,
|
||||||
composerText = state.text?.charSequence?.toString(),
|
composerText = state.text?.charSequence?.toString(),
|
||||||
|
isInDarkMode = LocalIsDarkTheme.current,
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@ package io.element.android.x.textcomposer
|
||||||
|
|
||||||
import android.graphics.Color
|
import android.graphics.Color
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import androidx.compose.foundation.isSystemInDarkTheme
|
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
|
|
@ -42,6 +41,7 @@ fun TextComposer(
|
||||||
composerText: String?,
|
composerText: String?,
|
||||||
composerMode: MessageComposerMode,
|
composerMode: MessageComposerMode,
|
||||||
composerCanSendMessage: Boolean,
|
composerCanSendMessage: Boolean,
|
||||||
|
isInDarkMode: Boolean,
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
onSendMessage: (String) -> Unit = {},
|
onSendMessage: (String) -> Unit = {},
|
||||||
onFullscreenToggle: () -> Unit = {},
|
onFullscreenToggle: () -> Unit = {},
|
||||||
|
|
@ -51,7 +51,6 @@ fun TextComposer(
|
||||||
if (LocalInspectionMode.current) {
|
if (LocalInspectionMode.current) {
|
||||||
FakeComposer(modifier)
|
FakeComposer(modifier)
|
||||||
} else {
|
} else {
|
||||||
val isInDarkMode = isSystemInDarkTheme()
|
|
||||||
AndroidView(
|
AndroidView(
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
factory = { context ->
|
factory = { context ->
|
||||||
|
|
@ -156,5 +155,6 @@ fun TextComposerPreview() {
|
||||||
onCloseSpecialMode = {},
|
onCloseSpecialMode = {},
|
||||||
composerCanSendMessage = true,
|
composerCanSendMessage = true,
|
||||||
composerText = "Message",
|
composerText = "Message",
|
||||||
|
isInDarkMode = true,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue