fix: duplicated Classification label (WPB-3626) (#2051)

wireapp · Aug 3, 2023 · c4ac90b · c4ac90b
1 parent 21e1629
commit c4ac90b
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 88 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/common/CallerDetails.kt b/app/src/main/kotlin/com/wire/android/ui/calling/common/CallerDetails.kt
@@ -26,9 +26,9 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Text
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -41,8 +41,8 @@ import com.wire.android.R
 import com.wire.android.model.ImageAsset
 import com.wire.android.model.UserAvatarData
 import com.wire.android.ui.calling.ConversationName
-import com.wire.android.ui.common.SecurityClassificationBanner
 import com.wire.android.ui.common.MembershipQualifierLabel
+import com.wire.android.ui.common.SecurityClassificationBanner
 import com.wire.android.ui.common.UserProfileAvatar
 import com.wire.android.ui.common.colorsScheme
 import com.wire.android.ui.common.dimensions
@@ -113,10 +113,11 @@ fun CallerDetails(
             VerticalSpace.x16()
             MembershipQualifierLabel(membership)
         }
-        if (securityClassificationType != SecurityClassificationType.NONE) {
-            VerticalSpace.x8()
-            SecurityClassificationBanner(securityClassificationType = securityClassificationType)
-        }
+
+        SecurityClassificationBanner(
+            securityClassificationType = securityClassificationType,
+            modifier = Modifier.padding(top = dimensions().spacing8x)
+        )
 
         if (!isCameraOn && conversationType == ConversationType.OneOnOne) {
             UserProfileAvatar(

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt
@@ -96,7 +96,8 @@ fun OngoingCallScreen(
     LaunchedEffect(ongoingCallViewModel.state.flowState) {
         when (ongoingCallViewModel.state.flowState) {
             OngoingCallState.FlowState.CallClosed -> navigator.navigateBack()
-            OngoingCallState.FlowState.Default -> { /* do nothing */ }
+            OngoingCallState.FlowState.Default -> { /* do nothing */
+            }
         }
     }
     with(sharedCallingViewModel.callState) {
@@ -321,12 +322,17 @@ private fun CallingControls(
     flipCamera: () -> Unit,
 ) {
     Column {
+        val topPadding = if (classificationType != SecurityClassificationType.NONE) {
+            dimensions().spacing8x
+        } else {
+            dimensions().spacing16x
+        }
         Row(
             horizontalArrangement = Arrangement.SpaceEvenly,
             verticalAlignment = Alignment.CenterVertically,
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(top = dimensions().spacing16x)
+                .padding(top = topPadding)
         ) {
             MicrophoneButton(isMuted = isMuted) { toggleMute() }
             CameraButton(
@@ -349,7 +355,7 @@ private fun CallingControls(
                 onHangUpButtonClicked = onHangUpCall
             )
         }
-        SecurityClassificationBanner(classificationType)
+        SecurityClassificationBanner(classificationType, modifier = Modifier.padding(top = dimensions().spacing8x))
     }
 }
 

diff --git a/app/src/main/kotlin/com/wire/android/ui/common/SecurityClassificationBanner.kt b/app/src/main/kotlin/com/wire/android/ui/common/SecurityClassificationBanner.kt
@@ -28,10 +28,10 @@ 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.Surface
-import androidx.compose.material3.Text
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -40,7 +40,6 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import com.wire.android.R
-import com.wire.android.ui.common.spacers.VerticalSpace
 import com.wire.android.ui.theme.WireTheme
 import com.wire.android.ui.theme.wireTypography
 import com.wire.android.util.ui.PreviewMultipleThemes
@@ -52,13 +51,12 @@ fun SecurityClassificationBanner(
     modifier: Modifier = Modifier
 ) {
     if (securityClassificationType != SecurityClassificationType.NONE) {
-        Column {
-            VerticalSpace.x8()
+        Column(modifier = modifier) {
             Divider(color = getDividerColorFor(securityClassificationType))
             Row(
                 horizontalArrangement = Arrangement.Center,
                 verticalAlignment = Alignment.CenterVertically,
-                modifier = modifier
+                modifier = Modifier
                     .background(getBackgroundColorFor(securityClassificationType))
                     .height(dimensions().spacing24x)
                     .fillMaxWidth()

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
@@ -66,13 +66,12 @@ import com.wire.android.ui.common.SecurityClassificationBanner
 import com.wire.android.ui.common.bottomsheet.WireModalSheetState
 import com.wire.android.ui.common.colorsScheme
 import com.wire.android.ui.common.dimensions
-import com.wire.android.ui.common.spacers.VerticalSpace
 import com.wire.android.ui.home.conversations.MessageComposerViewState
 import com.wire.android.ui.home.conversations.model.UriAsset
 import com.wire.android.ui.home.messagecomposer.state.AdditionalOptionStateHolder
 import com.wire.android.ui.home.messagecomposer.state.AdditionalOptionSubMenuState
-import com.wire.android.ui.home.messagecomposer.state.ComposableMessageBundle.AudioMessageBundle
 import com.wire.android.ui.home.messagecomposer.state.ComposableMessageBundle.AttachmentPickedBundle
+import com.wire.android.ui.home.messagecomposer.state.ComposableMessageBundle.AudioMessageBundle
 import com.wire.android.ui.home.messagecomposer.state.MessageBundle
 import com.wire.android.ui.home.messagecomposer.state.MessageComposerStateHolder
 import com.wire.android.ui.home.messagecomposer.state.MessageComposition
@@ -214,7 +213,7 @@ private fun DisabledInteractionMessageComposer(
                     )
                 }
             }
-            MessageComposerClassifiedBanner(securityClassificationType = securityClassificationType)
+            SecurityClassificationBanner(securityClassificationType = securityClassificationType)
         }
     }
 }
@@ -236,15 +235,6 @@ private fun EnabledMessageComposer(
 ) {
     with(messageComposerStateHolder) {
         Column {
-            val securityClassificationType = messageComposerViewState.value.securityClassificationType
-
-            if (securityClassificationType != SecurityClassificationType.NONE) {
-                Box(Modifier.wrapContentSize()) {
-                    VerticalSpace.x8()
-                    SecurityClassificationBanner(securityClassificationType)
-                }
-            }
-
             when (messageCompositionInputStateHolder.inputState) {
                 MessageCompositionInputState.ACTIVE -> {
                     ActiveMessageComposer(
@@ -418,7 +408,6 @@ private fun ActiveMessageComposer(
                                     messageComposerViewState.value.securityClassificationType != SecurityClassificationType.NONE
                                 if (isClassifiedConversation) {
                                     Box(Modifier.wrapContentSize()) {
-                                        VerticalSpace.x8()
                                         SecurityClassificationBanner(
                                             securityClassificationType = messageComposerViewState.value.securityClassificationType
                                         )
@@ -536,7 +525,7 @@ private fun ActiveMessageComposer(
 
             BackHandler {
                 if (additionalOptionStateHolder
-                    .additionalOptionsSubMenuState != AdditionalOptionSubMenuState.RecordAudio
+                        .additionalOptionsSubMenuState != AdditionalOptionSubMenuState.RecordAudio
                 ) {
                     onTransitionToInActive()
                 }

diff --git a/...c/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerClassifiedBanner.kt b/...c/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerClassifiedBanner.kt
diff --git a/app/src/main/kotlin/com/wire/android/ui/userprofile/common/UserProfileInfo.kt b/app/src/main/kotlin/com/wire/android/ui/userprofile/common/UserProfileInfo.kt
@@ -54,7 +54,6 @@ import com.wire.android.ui.common.UserBadge
 import com.wire.android.ui.common.UserProfileAvatar
 import com.wire.android.ui.common.dimensions
 import com.wire.android.ui.common.progress.WireCircularProgressIndicator
-import com.wire.android.ui.common.spacers.VerticalSpace
 import com.wire.android.ui.home.conversationslist.model.Membership
 import com.wire.android.ui.theme.wireColorScheme
 import com.wire.android.ui.theme.wireDimensions
@@ -182,10 +181,10 @@ fun UserProfileInfo(
                 )
             }
         }
-        if (securityClassificationType != SecurityClassificationType.NONE) {
-            VerticalSpace.x8()
-            SecurityClassificationBanner(securityClassificationType = securityClassificationType)
-        }
+        SecurityClassificationBanner(
+            securityClassificationType = securityClassificationType,
+            modifier = Modifier.padding(top = dimensions().spacing8x)
+        )
     }
 }