mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 06:55:41 +00:00
Small rework to prepare a bugfix. No behavior / UI change.
This commit is contained in:
+17
-20
@@ -452,7 +452,14 @@ private fun StandardLayout(
|
|||||||
Spacer(Modifier.height(4.dp))
|
Spacer(Modifier.height(4.dp))
|
||||||
}
|
}
|
||||||
Row(verticalAlignment = Alignment.Bottom) {
|
Row(verticalAlignment = Alignment.Bottom) {
|
||||||
if (voiceMessageState !is VoiceMessageState.Idle) {
|
if (voiceMessageState is VoiceMessageState.Idle) {
|
||||||
|
Box(
|
||||||
|
Modifier
|
||||||
|
.padding(bottom = 5.dp, top = 5.dp, start = 3.dp)
|
||||||
|
) {
|
||||||
|
composerOptionsButton()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(bottom = 5.dp, top = 5.dp, end = 3.dp, start = 3.dp)
|
.padding(bottom = 5.dp, top = 5.dp, end = 3.dp, start = 3.dp)
|
||||||
@@ -461,26 +468,16 @@ private fun StandardLayout(
|
|||||||
) {
|
) {
|
||||||
voiceDeleteButton()
|
voiceDeleteButton()
|
||||||
}
|
}
|
||||||
Box(
|
}
|
||||||
modifier = Modifier
|
Box(
|
||||||
.padding(bottom = 8.dp, top = 8.dp)
|
modifier = Modifier
|
||||||
.weight(1f)
|
.padding(bottom = 8.dp, top = 8.dp)
|
||||||
) {
|
.weight(1f)
|
||||||
voiceRecording()
|
) {
|
||||||
}
|
if (voiceMessageState is VoiceMessageState.Idle) {
|
||||||
} else {
|
|
||||||
Box(
|
|
||||||
Modifier
|
|
||||||
.padding(bottom = 5.dp, top = 5.dp, start = 3.dp)
|
|
||||||
) {
|
|
||||||
composerOptionsButton()
|
|
||||||
}
|
|
||||||
Box(
|
|
||||||
modifier = Modifier
|
|
||||||
.padding(bottom = 8.dp, top = 8.dp)
|
|
||||||
.weight(1f)
|
|
||||||
) {
|
|
||||||
textInput()
|
textInput()
|
||||||
|
} else {
|
||||||
|
voiceRecording()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// To avoid loosing keyboard focus, the IconButton has to be defined here and has to be always enabled.
|
// To avoid loosing keyboard focus, the IconButton has to be defined here and has to be always enabled.
|
||||||
|
|||||||
Reference in New Issue
Block a user