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

Upgrade compose-material3 to 1.2.0-alpha05 version (#1011)

Browse source 
Co-authored-by: ElementBot <benoitm+elementbot@element.io>

Also upgrade compileSdk to 34.
This commit is contained in:
Jorge Martin Espinosa 2023-08-17 14:20:54 +02:00 • committed by GitHub
parent 814c8edc4f
commit e3cfbc113b
791 changed files with 1657 additions and 1578 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,6 +49,7 @@ import androidx.compose.material3.TextFieldDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
@ -114,8 +115,8 @@ fun TextComposer(
Spacer(modifier = Modifier.width(12.dp))
val roundCornerSmall = 20.dp.applyScaleUp()
val roundCornerLarge = 28.dp.applyScaleUp()
var lineCount by remember { mutableIntStateOf(0) }
var lineCount by remember { mutableStateOf(0) }
val roundedCornerSize = remember(lineCount, composerMode) {
if (lineCount > 1 || composerMode is MessageComposerMode.Special) {
roundCornerSmall
@ -288,7 +289,7 @@ private fun EditingModeView(
.clickable(
enabled = true,
onClick = onResetComposerMode,
interactionSource = MutableInteractionSource(),
interactionSource = remember { MutableInteractionSource() },
indication = rememberRipple(bounded = false)
),
)
@ -351,7 +352,7 @@ private fun ReplyToModeView(
.clickable(
enabled = true,
onClick = onResetComposerMode,
interactionSource = MutableInteractionSource(),
interactionSource = remember { MutableInteractionSource() },
indication = rememberRipple(bounded = false)
),
)
@ -390,7 +391,7 @@ private fun BoxScope.SendButton(
composerMode: MessageComposerMode,
modifier: Modifier = Modifier,
) {
val interactionSource = MutableInteractionSource()
val interactionSource = remember { MutableInteractionSource() }
Box(
modifier = modifier
.clip(CircleShape)