diff --git a/app/src/main/kotlin/com/wire/android/mapper/SystemMessageContentMapper.kt b/app/src/main/kotlin/com/wire/android/mapper/SystemMessageContentMapper.kt index 649aa2c0701..752eb9dc28d 100644 --- a/app/src/main/kotlin/com/wire/android/mapper/SystemMessageContentMapper.kt +++ b/app/src/main/kotlin/com/wire/android/mapper/SystemMessageContentMapper.kt @@ -37,6 +37,7 @@ import com.wire.kalium.logic.data.user.OtherUser import com.wire.kalium.logic.data.user.SelfUser import com.wire.kalium.logic.data.user.User import com.wire.kalium.logic.data.user.UserId +import java.util.Locale import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds @@ -82,7 +83,7 @@ class SystemMessageContentMapper @Inject constructor( return UIMessageContent.SystemMessage.ConversationMessageCreated( author = authorName, isAuthorSelfUser = sender is SelfUser, - date.formatFullDateShortTime().orDefault(date).toUpperCase() + date.formatFullDateShortTime().orDefault(date).uppercase(Locale.getDefault()) ) } diff --git a/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt b/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt index a1e5dae3b7f..49ac9271c78 100644 --- a/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt +++ b/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt @@ -254,7 +254,7 @@ class WireActivity : AppCompatActivity() { } DisposableEffect(navController) { - val updateScreenSettingsListener = NavController.OnDestinationChangedListener { _, navDestination, _ -> + val updateScreenSettingsListener = NavController.OnDestinationChangedListener { _, _, _ -> currentKeyboardController?.hide() } navController.addOnDestinationChangedListener(updateScreenSettingsListener) diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/login/email/ProxyScreen.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/login/email/ProxyScreen.kt index b2203376ca7..1038d6c276b 100644 --- a/app/src/main/kotlin/com/wire/android/ui/authentication/login/email/ProxyScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/authentication/login/email/ProxyScreen.kt @@ -24,7 +24,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -73,7 +73,7 @@ private fun ProxyContent( Column( modifier = Modifier ) { - Divider(color = MaterialTheme.wireColorScheme.divider, thickness = Dp.Hairline) + HorizontalDivider(thickness = Dp.Hairline, color = MaterialTheme.wireColorScheme.divider) Text( text = stringResource(R.string.label_proxy_credentials), style = MaterialTheme.wireTypography.title03.copy( diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/login/sso/LoginSSOScreen.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/login/sso/LoginSSOScreen.kt index a7ceb4f44f8..93e6b5bd924 100644 --- a/app/src/main/kotlin/com/wire/android/ui/authentication/login/sso/LoginSSOScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/authentication/login/sso/LoginSSOScreen.kt @@ -85,7 +85,6 @@ fun LoginSSOScreen( // TODO: replace with retrieved ServerConfig from sso login onLoginButtonClick = loginSSOViewModel::login, ssoLoginResult = ssoLoginResult, - serverTitle = loginSSOViewModel.serverConfig.title, onCustomServerDialogDismiss = loginSSOViewModel::onCustomServerDialogDismiss, onCustomServerDialogConfirm = loginSSOViewModel::onCustomServerDialogConfirm ) @@ -105,8 +104,7 @@ private fun LoginSSOContent( onLoginButtonClick: () -> Unit, onCustomServerDialogDismiss: () -> Unit, onCustomServerDialogConfirm: () -> Unit, - ssoLoginResult: DeepLinkResult.SSOLogin?, - serverTitle: String + ssoLoginResult: DeepLinkResult.SSOLogin? ) { Column( modifier = Modifier @@ -188,6 +186,6 @@ private fun LoginButton(modifier: Modifier, loading: Boolean, enabled: Boolean, @Composable fun PreviewLoginSSOScreen() { WireTheme { - LoginSSOContent(rememberScrollState(), LoginState(), {}, {}, {}, {}, {}, {}, null, "Test Server") + LoginSSOContent(rememberScrollState(), LoginState(), {}, {}, {}, {}, {}, {}, null) } } diff --git a/app/src/main/kotlin/com/wire/android/ui/common/WireDropDown.kt b/app/src/main/kotlin/com/wire/android/ui/common/WireDropDown.kt index 54408cae233..c4ed6982e9a 100644 --- a/app/src/main/kotlin/com/wire/android/ui/common/WireDropDown.kt +++ b/app/src/main/kotlin/com/wire/android/ui/common/WireDropDown.kt @@ -35,8 +35,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.DropdownMenuItem import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ExpandMore -import androidx.compose.material3.Divider import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -185,7 +185,7 @@ private fun MenuPopUp( ) List(items.size) { index -> - Divider( + HorizontalDivider( color = colorsScheme().divider ) diff --git a/app/src/main/kotlin/com/wire/android/ui/common/banner/SecurityClassificationBanner.kt b/app/src/main/kotlin/com/wire/android/ui/common/banner/SecurityClassificationBanner.kt index 0c5439a545d..27dd9087247 100644 --- a/app/src/main/kotlin/com/wire/android/ui/common/banner/SecurityClassificationBanner.kt +++ b/app/src/main/kotlin/com/wire/android/ui/common/banner/SecurityClassificationBanner.kt @@ -25,7 +25,7 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface @@ -85,7 +85,7 @@ private fun SecurityClassificationBanner( ) { if (state != SecurityClassificationType.NONE) { Column(modifier = modifier) { - Divider(color = getDividerColorFor(state)) + HorizontalDivider(color = getDividerColorFor(state)) Row( horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically, @@ -106,7 +106,7 @@ private fun SecurityClassificationBanner( style = MaterialTheme.wireTypography.label03 ) } - Divider(color = getDividerColorFor(state)) + HorizontalDivider(color = getDividerColorFor(state)) } } } @@ -165,11 +165,11 @@ fun PreviewClassifiedIndicator() { SecurityClassificationBanner( state = SecurityClassificationType.NONE ) - Divider() + HorizontalDivider() SecurityClassificationBanner( state = SecurityClassificationType.NOT_CLASSIFIED ) - Divider() + HorizontalDivider() SecurityClassificationBanner( state = SecurityClassificationType.CLASSIFIED ) diff --git a/app/src/main/kotlin/com/wire/android/ui/emoji/HandleDraggableBottomSheetDialog.kt b/app/src/main/kotlin/com/wire/android/ui/emoji/HandleDraggableBottomSheetDialog.kt index 28f81a75c06..adc6212903e 100644 --- a/app/src/main/kotlin/com/wire/android/ui/emoji/HandleDraggableBottomSheetDialog.kt +++ b/app/src/main/kotlin/com/wire/android/ui/emoji/HandleDraggableBottomSheetDialog.kt @@ -224,7 +224,7 @@ class HandleDraggableBottomSheetDialog : AppCompatDialog { } } ) - bottomSheet!!.setOnTouchListener { _, event -> // Consume the event and prevent it from falling through + bottomSheet!!.setOnTouchListener { _, _ -> // Consume the event and prevent it from falling through true } return container diff --git a/app/src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt index 7b416327417..798dc5db0e0 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt @@ -112,7 +112,7 @@ fun HomeScreen( val lifecycleOwner = LocalLifecycleOwner.current DisposableEffect(lifecycleOwner) { - val observer = LifecycleEventObserver { source, event -> + val observer = LifecycleEventObserver { _, event -> if (event == Lifecycle.Event.ON_RESUME) { appSyncViewModel.startSyncingAppConfig() } diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt index 12c6b6eba22..0a32162abd1 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt @@ -26,7 +26,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -220,7 +220,7 @@ private fun GroupNameItem( onLongClick = { /* not handled */ }), arrowType = if (!canBeChanged) ArrowType.NONE else ArrowType.CENTER_ALIGNED ) - Divider(color = MaterialTheme.wireColorScheme.divider, thickness = Dp.Hairline) + HorizontalDivider(thickness = Dp.Hairline, color = MaterialTheme.wireColorScheme.divider) } @Composable @@ -230,7 +230,7 @@ private fun ProtocolDetails(label: UIText, text: UIText) { title = text.asString(), arrowType = ArrowType.NONE ) - Divider(color = MaterialTheme.wireColorScheme.divider, thickness = Dp.Hairline) + HorizontalDivider(thickness = Dp.Hairline, color = MaterialTheme.wireColorScheme.divider) } @Composable @@ -289,7 +289,7 @@ fun GroupOptionWithSwitch( }, arrowType = ArrowType.NONE ) - Divider(color = MaterialTheme.wireColorScheme.divider, thickness = Dp.Hairline) + HorizontalDivider(thickness = Dp.Hairline, color = MaterialTheme.wireColorScheme.divider) } @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/participants/GroupConversationParticipants.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/participants/GroupConversationParticipants.kt index 43e1344d1f8..1b0f15999f2 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/participants/GroupConversationParticipants.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/participants/GroupConversationParticipants.kt @@ -18,6 +18,7 @@ package com.wire.android.ui.home.conversations.details.participants +import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -34,6 +35,7 @@ import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -71,7 +73,7 @@ fun GroupConversationParticipants( ) { val groupParticipants = groupParticipantsState.data.allParticipants MLSProgressIndicator( - progress = (groupParticipants) + mlsProgress = (groupParticipants) .filter { it.supportedProtocolList.contains(SupportedProtocol.MLS) } .size / (groupParticipantsState.data.allCount).toFloat(), modifier = Modifier @@ -87,11 +89,13 @@ fun GroupConversationParticipants( @Composable fun MLSProgressIndicator( - progress: Float, + mlsProgress: Float, modifier: Modifier = Modifier, color: Color = MaterialTheme.wireColorScheme.primary, trackColor: Color = MaterialTheme.wireColorScheme.uncheckedColor ) { + val progress by animateFloatAsState(targetValue = mlsProgress) + Box( modifier = modifier .fillMaxWidth() @@ -100,16 +104,16 @@ fun MLSProgressIndicator( contentAlignment = Alignment.Center ) { LinearProgressIndicator( - progress = progress, + progress = { progress }, modifier = Modifier .fillMaxWidth() .fillMaxHeight(), color = color, - trackColor = trackColor + trackColor = trackColor, ) Text( style = MaterialTheme.typography.labelLarge, - text = "${SupportedProtocol.MLS.name} (${String.format("%.2f", progress * 100)}%)", + text = "${SupportedProtocol.MLS.name} (${String.format("%.2f", mlsProgress * 100)}%)", textAlign = TextAlign.Center, color = MaterialTheme.wireColorScheme.onPrimary, modifier = Modifier.fillMaxWidth() diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationRouter.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationRouter.kt index 8489c7e8c36..b8cdf494ab8 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationRouter.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationRouter.kt @@ -237,8 +237,7 @@ fun ConversationRouterHomeBridge( callHistory = callHistory, onCallItemClick = onOpenConversation, onEditConversationItem = onEditConversationItem, - onOpenUserProfile = onOpenUserProfile, - openConversationNotificationsSettings = onEditNotifications + onOpenUserProfile = onOpenUserProfile ) ConversationItemType.MENTIONS -> diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/call/CallsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/call/CallsScreen.kt index 5c6dce95ef2..d8b5f051091 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/call/CallsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/call/CallsScreen.kt @@ -61,8 +61,7 @@ fun CallsScreenContent( callHistory: List = emptyList(), onCallItemClick: (ConversationId) -> Unit, onEditConversationItem: (ConversationItem) -> Unit, - onOpenUserProfile: (UserId) -> Unit, - openConversationNotificationsSettings: (ConversationItem) -> Unit, + onOpenUserProfile: (UserId) -> Unit ) { val lazyListState = rememberLazyListState() @@ -72,8 +71,7 @@ fun CallsScreenContent( callHistory = callHistory, onCallItemClick = onCallItemClick, onEditConversationItem = onEditConversationItem, - onOpenUserProfile = onOpenUserProfile, - openConversationNotificationsSettings = openConversationNotificationsSettings, + onOpenUserProfile = onOpenUserProfile ) } @@ -84,8 +82,7 @@ fun CallContent( callHistory: List, onCallItemClick: (ConversationId) -> Unit, onEditConversationItem: (ConversationItem) -> Unit, - onOpenUserProfile: (UserId) -> Unit, - openConversationNotificationsSettings: (ConversationItem) -> Unit + onOpenUserProfile: (UserId) -> Unit ) { val context = LocalContext.current LazyColumn( diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/common/ConversationList.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/common/ConversationList.kt index f8909dc3b75..96b5b59ce6d 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/common/ConversationList.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/common/ConversationList.kt @@ -22,7 +22,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -66,7 +66,7 @@ fun ConversationList( * it so it wants to keep this dummy top item as the first one on list and show all other items below it. */ item("empty-top-header") { - Divider( + HorizontalDivider( thickness = Dp.Hairline, color = Color.Transparent ) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/mention/MentionScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/mention/MentionScreen.kt index 1ebede26463..3fd0a165d5f 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/mention/MentionScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/mention/MentionScreen.kt @@ -73,7 +73,6 @@ fun MentionScreenContent( onMentionItemClick = onMentionItemClick, onEditConversationItem = onEditConversationItem, onOpenUserProfile = onOpenUserProfile, - openConversationNotificationsSettings = openConversationNotificationsSettings, ) } @@ -85,7 +84,6 @@ private fun MentionContent( onMentionItemClick: (ConversationId) -> Unit, onEditConversationItem: (ConversationItem) -> Unit, onOpenUserProfile: (UserId) -> Unit, - openConversationNotificationsSettings: (ConversationItem) -> Unit, ) { val context = LocalContext.current LazyColumn( diff --git a/app/src/main/kotlin/com/wire/android/ui/home/gallery/ZoomableImage.kt b/app/src/main/kotlin/com/wire/android/ui/home/gallery/ZoomableImage.kt index 13c2f1400c2..2a9690429f6 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/gallery/ZoomableImage.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/gallery/ZoomableImage.kt @@ -35,7 +35,7 @@ import androidx.compose.ui.layout.ContentScale import com.wire.android.model.ImageAsset @Composable -fun ZoomableImage(imageAsset: ImageAsset.Remote, contentDescription: String, imageScale: Float = 1.0f) { +fun ZoomableImage(imageAsset: ImageAsset.Remote, contentDescription: String) { var offsetX by remember { mutableStateOf(0f) } var offsetY by remember { mutableStateOf(0f) } var zoom by remember { mutableStateOf(1f) } diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/AdditionalOptions.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/AdditionalOptions.kt index 6ebcf5aa40f..1f315a66f14 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/AdditionalOptions.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/AdditionalOptions.kt @@ -23,7 +23,7 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.wrapContentSize -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -161,7 +161,7 @@ fun AttachmentAndAdditionalOptionsMenuItems( modifier: Modifier = Modifier ) { Column(modifier.wrapContentSize()) { - Divider(color = MaterialTheme.wireColorScheme.outline) + HorizontalDivider(color = MaterialTheme.wireColorScheme.outline) MessageComposeActions( isEditing = isEditing, selectedOption = selectedOption, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/DropDownMentionsSuggestions.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/DropDownMentionsSuggestions.kt index 2fa09f121a5..4dfd765c40d 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/DropDownMentionsSuggestions.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/DropDownMentionsSuggestions.kt @@ -114,7 +114,7 @@ private fun calculateMaxHeight( val baseHeightInt = with(density) { defaultMaxHeightDropdownMenu.toPx().toInt() } var sum = with(density) { DropdownMenuVerticalPadding.toPx().toInt() } * TWO - for ((i, itemSize) in itemHeights.toSortedMap()) { + for ((_, itemSize) in itemHeights.toSortedMap()) { sum += itemSize if (sum >= baseHeightInt) { return with(density) { (sum - itemSize / TWO).toDp() } diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MembersMentionList.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MembersMentionList.kt index 712fa77038b..95333bddbf1 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MembersMentionList.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MembersMentionList.kt @@ -19,7 +19,7 @@ package com.wire.android.ui.home.messagecomposer import androidx.compose.foundation.background import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -38,7 +38,9 @@ fun MembersMentionList( onMentionPicked: (Contact) -> Unit, modifier: Modifier ) { - if (membersToMention.isNotEmpty()) Divider() + if (membersToMention.isNotEmpty()) { + HorizontalDivider() + } LazyColumn( modifier = modifier.background(colorsScheme().background), reverseLayout = true @@ -55,9 +57,9 @@ fun MembersMentionList( searchQuery = searchQuery, modifier = Modifier ) - Divider( - color = MaterialTheme.wireColorScheme.divider, - thickness = Dp.Hairline + HorizontalDivider( + thickness = Dp.Hairline, + color = MaterialTheme.wireColorScheme.divider ) } } diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposer.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposer.kt index eeee01e564a..fa3695895d0 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposer.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposer.kt @@ -27,7 +27,7 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface @@ -198,7 +198,7 @@ private fun DisabledInteractionMessageComposer( messageListContent() } if (warningText != null) { - Divider(color = MaterialTheme.wireColorScheme.outline) + HorizontalDivider(color = MaterialTheme.wireColorScheme.outline) Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt index 7e0dd1c3614..3a1bafc0baa 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt @@ -30,7 +30,7 @@ import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.wrapContentHeight -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -97,7 +97,7 @@ fun ActiveMessageComposerInput( modifier = modifier .background(inputType.backgroundColor()) ) { - Divider(color = MaterialTheme.wireColorScheme.outline) + HorizontalDivider(color = MaterialTheme.wireColorScheme.outline) if (showOptions) { CollapseButton( isCollapsed = !isTextExpanded, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/dialog/create/CreateBackupDialogs.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/dialog/create/CreateBackupDialogs.kt index 9ec742e015c..77ac97978a5 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/dialog/create/CreateBackupDialogs.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/dialog/create/CreateBackupDialogs.kt @@ -155,7 +155,7 @@ fun CreateBackupDialog( } } VerticalSpace.x16() - LinearProgressIndicator(modifier = Modifier.fillMaxWidth(), progress = progress) + LinearProgressIndicator(modifier = Modifier.fillMaxWidth(), progress = { progress }) VerticalSpace.x16() } } diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/dialog/restore/RestoreBackupDialogs.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/dialog/restore/RestoreBackupDialogs.kt index 579b2f5e597..a491ca02966 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/dialog/restore/RestoreBackupDialogs.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/dialog/restore/RestoreBackupDialogs.kt @@ -155,7 +155,10 @@ fun RestoreProgressDialog( } } VerticalSpace.x16() - LinearProgressIndicator(modifier = Modifier.fillMaxWidth(), progress = progress) + LinearProgressIndicator( + progress = { progress }, + modifier = Modifier.fillMaxWidth(), + ) VerticalSpace.x16() } } diff --git a/app/src/main/kotlin/com/wire/android/ui/home/sync/FeatureFlagNotificationViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/sync/FeatureFlagNotificationViewModel.kt index 916e1a12017..0827edf82b4 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/sync/FeatureFlagNotificationViewModel.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/sync/FeatureFlagNotificationViewModel.kt @@ -132,7 +132,7 @@ class FeatureFlagNotificationViewModel @Inject constructor( private suspend fun setFileSharingState(userId: UserId) { coreLogic.getSessionScope(userId).observeFileSharingStatus().collect { fileSharingStatus -> - fileSharingStatus.state?.let { + fileSharingStatus.state.let { // TODO: handle restriction when sending assets val (fileSharingRestrictedState, state) = if (it is FileSharingStatus.Value.EnabledAll) { FeatureFlagState.SharingRestrictedState.NONE to true diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt index 029a283e75a..1e9a71c9e19 100644 --- a/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt @@ -30,7 +30,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.text.ClickableText -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -188,7 +188,7 @@ fun DeviceDetailsContent( state.device.mlsPublicKeys?.forEach { (mlsProtocolType, mlsThumbprint) -> item { DeviceMLSSignatureItem(mlsThumbprint, mlsProtocolType, screenState::copyMessage) - Divider(color = MaterialTheme.wireColorScheme.background) + HorizontalDivider(color = MaterialTheme.wireColorScheme.background) } } @@ -202,7 +202,7 @@ fun DeviceDetailsContent( enrollE2eiCertificate = { enrollE2eiCertificate() }, showCertificate = onNavigateToE2eiCertificateDetailsScreen ) - Divider(color = colorsScheme().background) + HorizontalDivider(color = colorsScheme().background) } } item { @@ -213,7 +213,7 @@ fun DeviceDetailsContent( .fillMaxWidth() ) DeviceIdItem(state, screenState::copyMessage) - Divider(color = MaterialTheme.wireColorScheme.background) + HorizontalDivider(color = MaterialTheme.wireColorScheme.background) } state.device.registrationTime?.deviceDateTimeFormat()?.let { @@ -222,7 +222,7 @@ fun DeviceDetailsContent( stringResource(id = R.string.label_client_added_time), AnnotatedString(it) ) - Divider(color = MaterialTheme.wireColorScheme.background) + HorizontalDivider(color = MaterialTheme.wireColorScheme.background) } } @@ -232,13 +232,13 @@ fun DeviceDetailsContent( stringResource(id = R.string.label_client_last_active_label), AnnotatedString(state.device.lastActiveDescription() ?: "") ) - Divider(color = MaterialTheme.wireColorScheme.background) + HorizontalDivider(color = MaterialTheme.wireColorScheme.background) } } item { DeviceKeyFingerprintItem(state.fingerPrint, screenState::copyMessage) - Divider(color = MaterialTheme.wireColorScheme.background) + HorizontalDivider(color = MaterialTheme.wireColorScheme.background) } if (!state.isCurrentDevice) { @@ -250,7 +250,7 @@ fun DeviceDetailsContent( state.userName, onUpdateClientVerification ) - Divider(color = MaterialTheme.wireColorScheme.background) + HorizontalDivider(color = MaterialTheme.wireColorScheme.background) } } } diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/SelfDevicesScreen.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/SelfDevicesScreen.kt index 9b10b2d1310..ba75f7bddda 100644 --- a/app/src/main/kotlin/com/wire/android/ui/settings/devices/SelfDevicesScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/settings/devices/SelfDevicesScreen.kt @@ -25,7 +25,7 @@ import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ChevronRight -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -126,9 +126,9 @@ private fun LazyListScope.folderDeviceItems( header = header.uppercase(), items = items.associateBy { it.clientId.value }, divider = { - Divider( - color = MaterialTheme.wireColorScheme.background, - thickness = Dp.Hairline + HorizontalDivider( + thickness = Dp.Hairline, + color = MaterialTheme.wireColorScheme.background ) } ) { item: Device -> diff --git a/app/src/main/kotlin/com/wire/android/ui/userprofile/avatarpicker/AvatarPicker.kt b/app/src/main/kotlin/com/wire/android/ui/userprofile/avatarpicker/AvatarPicker.kt index fdb6a8f2c32..4f78ffcca92 100644 --- a/app/src/main/kotlin/com/wire/android/ui/userprofile/avatarpicker/AvatarPicker.kt +++ b/app/src/main/kotlin/com/wire/android/ui/userprofile/avatarpicker/AvatarPicker.kt @@ -29,7 +29,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -178,7 +178,7 @@ private fun AvatarPickerContent( AvatarPreview(viewModel.pictureState) } } - Divider() + HorizontalDivider() Spacer(Modifier.height(4.dp)) AvatarPickerActionButtons( pictureState = viewModel.pictureState, diff --git a/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserDevicesScreen.kt b/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserDevicesScreen.kt index 35121284f79..fa1813b7520 100644 --- a/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserDevicesScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserDevicesScreen.kt @@ -48,6 +48,7 @@ import com.wire.android.ui.common.divider.WireDivider import com.wire.android.ui.theme.wireColorScheme import com.wire.android.ui.theme.wireTypography import com.wire.android.util.CustomTabsHelper +import com.wire.android.util.capitalizeFirstLetter import com.wire.android.util.ui.LinkText import com.wire.android.util.ui.LinkTextData @@ -74,7 +75,7 @@ private fun OtherUserEmptyDevicesContent() { verticalAlignment = Alignment.Top ) { Text( - text = stringResource(id = R.string.label_client_key_fingerprint_not_available).lowercase().capitalize(), + text = stringResource(id = R.string.label_client_key_fingerprint_not_available).capitalizeFirstLetter(), textAlign = TextAlign.Center, style = MaterialTheme.wireTypography.body01.copy(color = MaterialTheme.wireColorScheme.secondaryText) )