fix: device list dividers [WPB-8829] (#3137)

wireapp · Jun 27, 2024 · 96e3720 · 96e3720
1 parent 1ab655a
commit 96e3720
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/WireActivityDialogs.kt b/app/src/main/kotlin/com/wire/android/ui/WireActivityDialogs.kt
@@ -240,7 +240,7 @@ fun MaxAccountDialog(shouldShow: Boolean, onConfirm: () -> Unit, onDismiss: () -
 @Composable
 fun AccountLoggedOutDialog(blockUserUI: CurrentSessionErrorState?, navigateAway: () -> Unit) {
     blockUserUI?.let {
-        accountLoggedOutDialog(reason = it, navigateAway)
+        AccountLoggedOutDialogContent(reason = it, navigateAway)
     }
 }
 
@@ -259,7 +259,7 @@ fun GuestCallWasEndedBecauseOfVerificationDegradedDialog(onDismiss: () -> Unit)
 }
 
 @Composable
-private fun accountLoggedOutDialog(reason: CurrentSessionErrorState, navigateAway: () -> Unit) {
+private fun AccountLoggedOutDialogContent(reason: CurrentSessionErrorState, navigateAway: () -> Unit) {
     appLogger.e("AccountLongedOutDialog: $reason")
     val (@StringRes title: Int, text: String) = when (reason) {
         CurrentSessionErrorState.SessionExpired -> {
@@ -365,39 +365,39 @@ fun NewClientDialog(
 
 @PreviewMultipleThemes
 @Composable
-fun previewFileRestrictionDialog() {
+fun PreviewFileRestrictionDialog() {
     WireTheme {
         FileRestrictionDialog(true) {}
     }
 }
 
 @PreviewMultipleThemes
 @Composable
-fun previewGuestRoomLinkFeatureFlagDialog() {
+fun PreviewGuestRoomLinkFeatureFlagDialog() {
     WireTheme {
         GuestRoomLinkFeatureFlagDialog(true) {}
     }
 }
 
 @PreviewMultipleThemes
 @Composable
-fun previewTeamAppLockFeatureFlagDialog() {
+fun PreviewTeamAppLockFeatureFlagDialog() {
     WireTheme {
         TeamAppLockFeatureFlagDialog(true) {}
     }
 }
 
 @PreviewMultipleThemes
 @Composable
-fun previewUpdateAppDialog() {
+fun PreviewUpdateAppDialog() {
     WireTheme {
         UpdateAppDialog(true) {}
     }
 }
 
 @PreviewMultipleThemes
 @Composable
-fun previewJoinConversationDialogWithPassword() {
+fun PreviewJoinConversationDialogWithPassword() {
     WireTheme {
         JoinConversationDialog(
             JoinConversationViaCodeState.Show("convName", "code", "key", "domain", true),
@@ -407,7 +407,7 @@ fun previewJoinConversationDialogWithPassword() {
 
 @PreviewMultipleThemes
 @Composable
-fun previewJoinConversationDialogWithoutPassword() {
+fun PreviewJoinConversationDialogWithoutPassword() {
     WireTheme {
         JoinConversationDialog(
             JoinConversationViaCodeState.Show("convName", "code", "key", "domain", false),
@@ -417,7 +417,7 @@ fun previewJoinConversationDialogWithoutPassword() {
 
 @PreviewMultipleThemes
 @Composable
-fun previewJoinConversationDialogError() {
+fun PreviewJoinConversationDialogError() {
     WireTheme {
         JoinConversationDialog(
             JoinConversationViaCodeState.Error(CheckConversationInviteCodeUseCase.Result.Failure.InvalidCodeOrKey),
@@ -427,7 +427,7 @@ fun previewJoinConversationDialogError() {
 
 @PreviewMultipleThemes
 @Composable
-fun previewCustomBackendDialog() {
+fun PreviewCustomBackendDialog() {
     WireTheme {
         CustomBackendDialog(
             GlobalAppState(
@@ -440,31 +440,31 @@ fun previewCustomBackendDialog() {
 
 @PreviewMultipleThemes
 @Composable
-fun previewMaxAccountDialog() {
+fun PreviewMaxAccountDialog() {
     WireTheme {
         MaxAccountDialog(true, {}, {})
     }
 }
 
 @PreviewMultipleThemes
 @Composable
-fun previewAccountLoggedOutDialog() {
+fun PreviewAccountLoggedOutDialog() {
     WireTheme {
-        AccountLoggedOutDialog(CurrentSessionErrorState.DeletedAccount) {}
+        AccountLoggedOutDialogContent(CurrentSessionErrorState.DeletedAccount) {}
     }
 }
 
 @PreviewMultipleThemes
 @Composable
-fun previewGuestCallWasEndedBecauseOfVerificationDegradedDialog() {
+fun PreviewGuestCallWasEndedBecauseOfVerificationDegradedDialog() {
     WireTheme {
         GuestCallWasEndedBecauseOfVerificationDegradedDialog {}
     }
 }
 
 @PreviewMultipleThemes
 @Composable
-fun previewNewClientDialog() {
+fun PreviewNewClientDialog() {
     WireTheme {
         NewClientDialog(
             NewClientsData.CurrentUser(listOf(NewClientInfo("date", UIText.DynamicString("name"))), UserId("id", "domain")),
@@ -474,7 +474,7 @@ fun previewNewClientDialog() {
 
 @PreviewMultipleThemes
 @Composable
-fun previewTestDialog() {
+fun PreviewTestDialog() {
     WireTheme {
         FileRestrictionDialog(true) {}
     }

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
@@ -149,7 +149,6 @@ private fun LazyListScope.folderDeviceItems(
         items = items.associateBy { it.clientId.value },
         divider = {
             HorizontalDivider(
-                thickness = Dp.Hairline,
                 color = MaterialTheme.wireColorScheme.background
             )
         }