From 5d8dc32672a5c96e80184b2162cafe909d9b1afe Mon Sep 17 00:00:00 2001 From: k1ngsterr1 Date: Sat, 7 Mar 2026 18:43:58 +0500 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20BasicTex?= =?UTF-8?q?tField=20=D0=BD=D0=B0=20AppleEmojiTextField=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=BD=D0=B0=D0=B7=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=8B?= =?UTF-8?q?=20=D1=81=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=BE=D0=B9=20=D1=8D=D0=BC=D0=BE=D0=B4=D0=B7=D0=B8=20=D0=B8=20?= =?UTF-8?q?=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=BE=D0=B9=20=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messenger/ui/chats/GroupSetupScreen.kt | 50 ++++++------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/GroupSetupScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/GroupSetupScreen.kt index e1a4552..89798ac 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/chats/GroupSetupScreen.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/chats/GroupSetupScreen.kt @@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.foundation.text.BasicTextField import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FloatingActionButton @@ -54,9 +53,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext @@ -66,7 +63,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.platform.LocalView import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp @@ -79,6 +75,7 @@ import com.rosetta.messenger.data.GroupRepository import com.rosetta.messenger.network.GroupStatus import com.rosetta.messenger.network.SearchUser import com.rosetta.messenger.repository.AvatarRepository +import com.rosetta.messenger.ui.components.AppleEmojiTextField import com.rosetta.messenger.ui.components.KeyboardHeightProvider import com.rosetta.messenger.ui.components.OptimizedEmojiPicker import com.rosetta.messenger.ui.components.AppleEmojiText @@ -441,44 +438,29 @@ fun GroupSetupScreen( verticalAlignment = Alignment.CenterVertically ) { Box(modifier = Modifier.weight(1f)) { - BasicTextField( + AppleEmojiTextField( value = title, onValueChange = { newValue -> title = newValue.take(80) }, - singleLine = true, - textStyle = TextStyle( - color = primaryTextColor, - fontSize = 18.sp, - fontWeight = FontWeight.Medium - ), - cursorBrush = SolidColor(accentColor), - enabled = !isLoading, + textColor = primaryTextColor, + textSize = 18f, + hint = "Group name", + hintColor = secondaryTextColor.copy(alpha = 0.88f), modifier = Modifier .fillMaxWidth() .focusRequester(nameFocusRequester) - .onFocusChanged { focusState -> - if (focusState.isFocused && - showEmojiKeyboard && - !coordinator.isTransitioning - ) { - coordinator.closeEmoji(hideEmoji = { showEmojiKeyboard = false }) - } - } .padding(vertical = 2.dp), - decorationBox = { innerTextField -> - Box( - modifier = Modifier.fillMaxWidth(), - contentAlignment = Alignment.CenterStart + onViewCreated = { editText -> + editText.isSingleLine = true + editText.maxLines = 1 + editText.setHorizontallyScrolling(true) + }, + onFocusChanged = { hasFocus -> + if (hasFocus && + showEmojiKeyboard && + !coordinator.isTransitioning ) { - if (title.isBlank()) { - Text( - text = "Group name", - color = secondaryTextColor.copy(alpha = 0.88f), - fontSize = 18.sp, - fontWeight = FontWeight.Normal - ) - } - innerTextField() + coordinator.closeEmoji(hideEmoji = { showEmojiKeyboard = false }) } } )