feat: legal hold indication on user profiles [WPB-4780] (#2658)

wireapp · Feb 6, 2024 · fe78d52 · fe78d52
1 parent 9caf09c
commit fe78d52
Show file tree

Hide file tree

Showing 25 changed files with 609 additions and 105 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/di/CoreLogicModule.kt b/app/src/main/kotlin/com/wire/android/di/CoreLogicModule.kt
@@ -440,4 +440,19 @@ class UseCaseModule {
     fun provideObserveIsAppLockEditableUseCase(
         @KaliumCoreLogic coreLogic: CoreLogic
     ): ObserveIsAppLockEditableUseCase = coreLogic.getGlobalScope().observeIsAppLockEditableUseCase
+
+    @ViewModelScoped
+    @Provides
+    fun provideObserveLegalHoldRequestUseCase(@KaliumCoreLogic coreLogic: CoreLogic, @CurrentAccount currentAccount: UserId) =
+        coreLogic.getSessionScope(currentAccount).observeLegalHoldRequest
+
+    @ViewModelScoped
+    @Provides
+    fun provideObserveLegalHoldForSelfUserUseCase(@KaliumCoreLogic coreLogic: CoreLogic, @CurrentAccount currentAccount: UserId) =
+        coreLogic.getSessionScope(currentAccount).observeLegalHoldForSelfUser
+
+    @ViewModelScoped
+    @Provides
+    fun provideObserveLegalHoldForUserUseCase(@KaliumCoreLogic coreLogic: CoreLogic, @CurrentAccount currentAccount: UserId) =
+        coreLogic.getSessionScope(currentAccount).observeLegalHoldStateForUser
 }
diff --git a/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt b/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
@@ -159,6 +159,9 @@ class WireActivity : AppCompatActivity() {
             appLogger.i("$TAG persistent connection status")
             viewModel.observePersistentConnectionStatus()
 
+            appLogger.i("$TAG legal hold requested status")
+            legalHoldRequestedViewModel.observeLegalHoldRequest()
+
             appLogger.i("$TAG start destination")
             val startDestination = when (viewModel.initialAppState) {
                 InitialAppState.NOT_MIGRATED -> MigrationScreenDestination

diff --git a/app/src/main/kotlin/com/wire/android/ui/legalhold/banner/LegalHoldBaseBanner.kt b/app/src/main/kotlin/com/wire/android/ui/legalhold/banner/LegalHoldBaseBanner.kt
@@ -0,0 +1,63 @@
+/*
+ * Wire
+ * Copyright (C) 2024 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+package com.wire.android.ui.legalhold.banner
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import com.wire.android.ui.common.LegalHoldIndicator
+import com.wire.android.ui.common.colorsScheme
+import com.wire.android.ui.common.dimensions
+
+@Composable
+fun LegalHoldBaseBanner(
+    onClick: () -> Unit = {},
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit,
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(dimensions().spacing8x),
+        modifier = modifier
+            .clip(RoundedCornerShape(dimensions().spacing12x))
+            .background(colorsScheme().surface)
+            .border(
+                width = dimensions().spacing1x,
+                shape = RoundedCornerShape(dimensions().spacing12x),
+                color = colorsScheme().error
+            )
+            .clickable(onClick = onClick)
+            .heightIn(min = dimensions().legalHoldBannerMinHeight)
+            .padding(
+                horizontal = dimensions().spacing12x,
+                vertical = dimensions().spacing4x
+            )
+    ) {
+        LegalHoldIndicator()
+        content()
+    }
+}
diff --git a/app/src/main/kotlin/com/wire/android/ui/legalhold/banner/LegalHoldPendingBanner.kt b/app/src/main/kotlin/com/wire/android/ui/legalhold/banner/LegalHoldPendingBanner.kt
@@ -0,0 +1,63 @@
+/*
+ * Wire
+ * Copyright (C) 2024 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+package com.wire.android.ui.legalhold.banner
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextDecoration
+import com.wire.android.R
+import com.wire.android.ui.common.colorsScheme
+import com.wire.android.ui.common.dimensions
+import com.wire.android.ui.common.typography
+import com.wire.android.ui.theme.WireTheme
+import com.wire.android.util.ui.PreviewMultipleThemes
+
+@Composable
+fun LegalHoldPendingBanner(
+    onClick: () -> Unit = {},
+    modifier: Modifier = Modifier,
+) {
+    LegalHoldBaseBanner(onClick = onClick, modifier = modifier) {
+        Row {
+            Text(
+                text = stringResource(id = R.string.legal_hold_is_pending_label),
+                style = typography().label01,
+                color = colorsScheme().onSurface,
+            )
+            Text(
+                text = stringResource(id = R.string.legal_hold_accept),
+                style = typography().label02,
+                textDecoration = TextDecoration.Underline,
+                color = colorsScheme().onSurface,
+                modifier = Modifier.padding(start = dimensions().spacing2x),
+            )
+        }
+    }
+}
+
+@Composable
+@PreviewMultipleThemes
+fun PreviewLegalHoldPendingBanner() {
+    WireTheme {
+        LegalHoldPendingBanner()
+    }
+}
diff --git a/app/src/main/kotlin/com/wire/android/ui/legalhold/banner/LegalHoldSubjectBanner.kt b/app/src/main/kotlin/com/wire/android/ui/legalhold/banner/LegalHoldSubjectBanner.kt
@@ -17,26 +17,13 @@
  */
 package com.wire.android.ui.legalhold.banner
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.unit.dp
 import com.wire.android.R
-import com.wire.android.ui.common.LegalHoldIndicator
 import com.wire.android.ui.common.colorsScheme
-import com.wire.android.ui.common.dimensions
 import com.wire.android.ui.common.typography
 import com.wire.android.ui.theme.WireTheme
 import com.wire.android.util.ui.PreviewMultipleThemes
@@ -47,25 +34,7 @@ fun LegalHoldSubjectBanner(
     onClick: () -> Unit = {},
     modifier: Modifier = Modifier,
 ) {
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(dimensions().spacing8x),
-        modifier = modifier
-            .clip(RoundedCornerShape(dimensions().spacing12x))
-            .background(colorsScheme().surface)
-            .border(
-                width = dimensions().spacing1x,
-                shape = RoundedCornerShape(dimensions().spacing12x),
-                color = colorsScheme().error
-            )
-            .clickable(onClick = onClick)
-            .heightIn(min = 26.dp)
-            .padding(
-                horizontal = dimensions().spacing12x,
-                vertical = dimensions().spacing4x
-            )
-    ) {
-        LegalHoldIndicator()
+    LegalHoldBaseBanner(onClick = onClick, modifier = modifier) {
         val resources = LocalContext.current.resources
         Text(
             text = resources.stringWithStyledArgs(

diff --git a/...main/kotlin/com/wire/android/ui/legalhold/dialog/requested/LegalHoldRequestedViewModel.kt b/...main/kotlin/com/wire/android/ui/legalhold/dialog/requested/LegalHoldRequestedViewModel.kt
@@ -91,7 +91,7 @@ class LegalHoldRequestedViewModel @Inject constructor(
                 }
             }
 
-    init {
+    fun observeLegalHoldRequest() {
         viewModelScope.launch {
             legalHoldRequestDataStateFlow.collectLatest { legalHoldRequestData ->
                 state = when (legalHoldRequestData) {

diff --git a/...rc/main/kotlin/com/wire/android/ui/legalhold/dialog/subject/LegalHoldSubjectBaseDialog.kt b/...rc/main/kotlin/com/wire/android/ui/legalhold/dialog/subject/LegalHoldSubjectBaseDialog.kt
@@ -33,7 +33,7 @@ import com.wire.android.util.ui.PreviewMultipleThemes
 
 @Composable
 fun LegalHoldSubjectBaseDialog(
-    name: String,
+    title: String,
     customInfo: String? = null,
     withDefaultInfo: Boolean,
     cancelText: String,
@@ -45,7 +45,7 @@ fun LegalHoldSubjectBaseDialog(
         if (withDefaultInfo) stringResource(id = R.string.legal_hold_subject_dialog_description) else null
     ).joinToString("\n\n")
     WireDialog(
-        title = stringResource(id = R.string.legal_hold_subject_dialog_title, name),
+        title = title,
         text = text,
         onDismiss = dialogDismissed,
         buttonsHorizontalAlignment = false,

diff --git a/...n/kotlin/com/wire/android/ui/legalhold/dialog/subject/LegalHoldSubjectConnectionDialog.kt b/...n/kotlin/com/wire/android/ui/legalhold/dialog/subject/LegalHoldSubjectConnectionDialog.kt
@@ -30,7 +30,7 @@ fun LegalHoldSubjectConnectionDialog(
     connectClicked: () -> Unit,
 ) {
     LegalHoldSubjectBaseDialog(
-        name = userName,
+        title = stringResource(id = R.string.legal_hold_subject_dialog_title, userName),
         withDefaultInfo = true,
         cancelText = stringResource(id = R.string.label_cancel),
         dialogDismissed = dialogDismissed,

diff --git a/...kotlin/com/wire/android/ui/legalhold/dialog/subject/LegalHoldSubjectConversationDialog.kt b/...kotlin/com/wire/android/ui/legalhold/dialog/subject/LegalHoldSubjectConversationDialog.kt
@@ -29,7 +29,7 @@ fun LegalHoldSubjectConversationDialog(
     dialogDismissed: () -> Unit,
 ) {
     LegalHoldSubjectBaseDialog(
-        name = conversationName,
+        title = stringResource(id = R.string.legal_hold_subject_dialog_title, conversationName),
         customInfo = stringResource(id = R.string.legal_hold_subject_dialog_description_group),
         withDefaultInfo = true,
         cancelText = stringResource(id = R.string.label_close),

diff --git a/...main/kotlin/com/wire/android/ui/legalhold/dialog/subject/LegalHoldSubjectMessageDialog.kt b/...main/kotlin/com/wire/android/ui/legalhold/dialog/subject/LegalHoldSubjectMessageDialog.kt
@@ -30,7 +30,7 @@ fun LegalHoldSubjectMessageDialog(
     sendAnywayClicked: () -> Unit,
 ) {
     LegalHoldSubjectBaseDialog(
-        name = conversationName,
+        title = stringResource(id = R.string.legal_hold_subject_dialog_title, conversationName),
         customInfo = stringResource(id = R.string.legal_hold_subject_dialog_description_message),
         withDefaultInfo = false,
         cancelText = stringResource(id = R.string.label_cancel),

diff --git a/...main/kotlin/com/wire/android/ui/legalhold/dialog/subject/LegalHoldSubjectProfileDialog.kt b/...main/kotlin/com/wire/android/ui/legalhold/dialog/subject/LegalHoldSubjectProfileDialog.kt
@@ -29,7 +29,15 @@ fun LegalHoldSubjectProfileDialog(
     dialogDismissed: () -> Unit,
 ) {
     LegalHoldSubjectBaseDialog(
-        name = userName,
+        title = stringResource(id = R.string.legal_hold_subject_dialog_title, userName),
+        withDefaultInfo = true,
+        cancelText = stringResource(id = R.string.label_close),
+        dialogDismissed = dialogDismissed)
+}
+@Composable
+fun LegalHoldSubjectProfileSelfDialog(dialogDismissed: () -> Unit) {
+    LegalHoldSubjectBaseDialog(
+        title = stringResource(id = R.string.legal_hold_subject_self_dialog_title),
         withDefaultInfo = true,
         cancelText = stringResource(id = R.string.label_close),
         dialogDismissed = dialogDismissed)
@@ -42,3 +50,10 @@ fun PreviewLegalHoldSubjectProfileDialog() {
         LegalHoldSubjectProfileDialog("username", {})
     }
 }
+@Composable
+@PreviewMultipleThemes
+fun PreviewLegalHoldSubjectProfileSelfDialog() {
+    WireTheme {
+        LegalHoldSubjectProfileSelfDialog {}
+    }
+}
diff --git a/app/src/main/kotlin/com/wire/android/ui/theme/WireDimensions.kt b/app/src/main/kotlin/com/wire/android/ui/theme/WireDimensions.kt
@@ -192,7 +192,9 @@ data class WireDimensions(
     // Conversation options
     val conversationOptionsItemMinHeight: Dp,
     // Import media
-    val importedMediaAssetSize: Dp
+    val importedMediaAssetSize: Dp,
+    // legal hold banner
+    val legalHoldBannerMinHeight: Dp,
 )
 
 private val DefaultPhonePortraitWireDimensions: WireDimensions = WireDimensions(
@@ -334,7 +336,8 @@ private val DefaultPhonePortraitWireDimensions: WireDimensions = WireDimensions(
     ongoingCallLabelHeight = 28.dp,
     audioMessageHeight = 48.dp,
     importedMediaAssetSize = 120.dp,
-    typingIndicatorHeight = 24.dp
+    typingIndicatorHeight = 24.dp,
+    legalHoldBannerMinHeight = 26.dp,
 )
 
 private val DefaultPhoneLandscapeWireDimensions: WireDimensions = DefaultPhonePortraitWireDimensions

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
@@ -61,8 +61,6 @@ import com.wire.android.ui.common.UserProfileAvatar
 import com.wire.android.ui.common.banner.SecurityClassificationBannerForUser
 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.conversations.details.SearchAndMediaRow
 import com.wire.android.ui.home.conversationslist.model.Membership
 import com.wire.android.ui.theme.wireColorScheme
 import com.wire.android.ui.theme.wireTypography
@@ -91,9 +89,6 @@ fun UserProfileInfo(
     delayToShowPlaceholderIfNoAsset: Duration = 200.milliseconds,
     isProteusVerified: Boolean = false,
     isMLSVerified: Boolean = false,
-    onSearchConversationMessagesClick: () -> Unit = {},
-    onConversationMediaClick: () -> Unit = {},
-    shouldShowSearchButton: Boolean = false
 ) {
     Column(
         horizontalAlignment = CenterHorizontally,
@@ -233,14 +228,6 @@ fun UserProfileInfo(
                 modifier = Modifier.padding(top = dimensions().spacing8x)
             )
         }
-
-        if (shouldShowSearchButton) {
-            VerticalSpace.x24()
-            SearchAndMediaRow(
-                onSearchConversationMessagesClick = onSearchConversationMessagesClick,
-                onConversationMediaClick = onConversationMediaClick
-            )
-        }
     }
 }