TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-28 20:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Animation for group name edit

Browse Source
This commit is contained in:
SessionHero01 2024-10-31 15:21:30 +11:00
parent 02d4741bd7
commit acbeaad71c
No known key found for this signature in database
1 changed files with 75 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
app/src/main/java/org/thoughtcrime/securesms/groups/compose/EditGroupScreen.kt
View File

@ -1,11 +1,14 @@
package org.thoughtcrime.securesms.groups.compose package org.thoughtcrime.securesms.groups.compose
import android.widget.Toast import android.widget.Toast
import androidx.compose.animation.Crossfade
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -150,74 +153,73 @@ fun EditGroup(
GroupMinimumVersionBanner() GroupMinimumVersionBanner()
// Group name title // Group name title
Row( Crossfade(editingName != null, label = "Editable group name") { showNameEditing ->
modifier = Modifier if (showNameEditing) {
.fillMaxWidth() GroupNameContainer {
.heightIn(min = 72.dp), IconButton(
horizontalArrangement = Arrangement.spacedBy( modifier = Modifier.size(LocalDimensions.current.spacing),
LocalDimensions.current.xxxsSpacing, onClick = onEditNameCancelClicked) {
Alignment.CenterHorizontally
),
verticalAlignment = CenterVertically,
) {
if (editingName != null) {
IconButton(
modifier = Modifier.size(LocalDimensions.current.spacing),
onClick = onEditNameCancelClicked) {
Icon(
painter = painterResource(R.drawable.ic_x),
contentDescription = stringResource(R.string.AccessibilityId_cancel),
tint = LocalColors.current.text,
)
}
SessionOutlinedTextField(
modifier = Modifier.widthIn(
min = LocalDimensions.current.mediumSpacing,
max = 240.dp
),
text = editingName,
onChange = onEditingNameValueChanged,
textStyle = LocalType.current.h8,
singleLine = true,
innerPadding = PaddingValues(
horizontal = LocalDimensions.current.spacing,
vertical = LocalDimensions.current.smallSpacing
)
)
IconButton(
modifier = Modifier.size(LocalDimensions.current.spacing),
onClick = onEditNameConfirmed) {
Icon(
painter = painterResource(R.drawable.check),
contentDescription = stringResource(R.string.AccessibilityId_confirm),
tint = LocalColors.current.text,
)
}
} else {
Text(
text = groupName,
style = LocalType.current.h4,
textAlign = TextAlign.Center,
)
if (canEditName) {
IconButton(onClick = onEditNameClicked) {
Icon( Icon(
painterResource(R.drawable.ic_baseline_edit_24), painter = painterResource(R.drawable.ic_x),
contentDescription = stringResource(R.string.groupName), contentDescription = stringResource(R.string.AccessibilityId_cancel),
tint = LocalColors.current.text, tint = LocalColors.current.text,
) )
} }
SessionOutlinedTextField(
modifier = Modifier.widthIn(
min = LocalDimensions.current.mediumSpacing,
max = 240.dp
),
text = editingName.orEmpty(),
onChange = onEditingNameValueChanged,
textStyle = LocalType.current.h8,
singleLine = true,
innerPadding = PaddingValues(
horizontal = LocalDimensions.current.spacing,
vertical = LocalDimensions.current.smallSpacing
)
)
IconButton(
modifier = Modifier.size(LocalDimensions.current.spacing),
onClick = onEditNameConfirmed) {
Icon(
painter = painterResource(R.drawable.check),
contentDescription = stringResource(R.string.AccessibilityId_confirm),
tint = LocalColors.current.text,
)
}
}
} else {
GroupNameContainer {
Text(
text = groupName,
style = LocalType.current.h4,
textAlign = TextAlign.Center,
)
if (canEditName) {
IconButton(onClick = onEditNameClicked) {
Icon(
painterResource(R.drawable.ic_baseline_edit_24),
contentDescription = stringResource(R.string.groupName),
tint = LocalColors.current.text,
)
}
}
} }
} }
} }
// Header & Add member button // Header & Add member button
Row( Row(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), modifier = Modifier.padding(
horizontal = LocalDimensions.current.smallSpacing,
vertical = LocalDimensions.current.xxsSpacing
),
verticalAlignment = CenterVertically verticalAlignment = CenterVertically
) { ) {
Text( Text(
@ -295,6 +297,21 @@ fun EditGroup(
} }
} }
@Composable
private fun GroupNameContainer(content: @Composable RowScope.() -> Unit) {
Row(
modifier = Modifier
.fillMaxWidth()
.heightIn(min = 72.dp),
horizontalArrangement = Arrangement.spacedBy(
LocalDimensions.current.xxxsSpacing,
Alignment.CenterHorizontally
),
verticalAlignment = CenterVertically,
content = content
)
}
@Composable @Composable
private fun ConfirmRemovingMemberDialog( private fun ConfirmRemovingMemberDialog(
onConfirmed: (accountId: AccountId, removeMessages: Boolean) -> Unit, onConfirmed: (accountId: AccountId, removeMessages: Boolean) -> Unit,