feat: attachments popup [WPB-10499] (#3373)

app/src/main/AndroidManifest.xml

@@ -113,7 +113,7 @@
                 android:launchMode="singleTask"
                 android:screenOrientation="portrait"
                 android:theme="@style/AppTheme.SplashScreen"
-                android:windowSoftInputMode="adjustResize|stateHidden">
+                android:windowSoftInputMode="adjustNothing|stateHidden">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/kotlin/com/wire/android/ui/common/AttachmentButton.kt

@@ -48,13 +48,7 @@ import com.wire.android.ui.theme.wireDimensions
 import com.wire.android.ui.theme.wireTypography
 
 @Composable
-fun AttachmentButton(
-    text: String = "",
-    @DrawableRes icon: Int,
-    labelStyle: TextStyle,
-    modifier: Modifier = Modifier,
-    onClick: () -> Unit
-) {
+fun AttachmentButton(@DrawableRes icon: Int, labelStyle: TextStyle, modifier: Modifier = Modifier, text: String = "", onClick: () -> Unit) {
     Column(
         modifier = modifier
             .padding(dimensions().spacing4x)
@@ -96,5 +90,10 @@ fun AttachmentButton(
 @Preview(showBackground = true)
 @Composable
 fun PreviewAttachmentButton() {
-    AttachmentButton("Share Location", R.drawable.ic_location, MaterialTheme.wireTypography.button03) { }
+    AttachmentButton(
+        icon = R.drawable.ic_location,
+        labelStyle = MaterialTheme.wireTypography.button03,
+        modifier = Modifier,
+        text = "Share Location"
+    ) { }
 }

app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreenState.kt

@@ -30,6 +30,7 @@ import androidx.compose.ui.text.AnnotatedString
 import com.wire.android.R
 import com.wire.android.ui.common.bottomsheet.WireModalSheetState
 import com.wire.android.ui.common.bottomsheet.rememberWireModalSheetState
+import com.wire.android.ui.common.bottomsheet.show
 import com.wire.android.ui.common.snackbar.LocalSnackbarHostState
 import com.wire.android.ui.home.conversations.model.UIMessage
 import com.wire.kalium.logic.data.message.SelfDeletionTimer
@@ -40,19 +41,20 @@ import kotlinx.coroutines.launch
 fun rememberConversationScreenState(
     editSheetState: WireModalSheetState<UIMessage.Regular> = rememberWireModalSheetState<UIMessage.Regular>(),
     selfDeletingSheetState: WireModalSheetState<SelfDeletionTimer> = rememberWireModalSheetState<SelfDeletionTimer>(),
+    locationSheetState: WireModalSheetState<Unit> = rememberWireModalSheetState(),
     coroutineScope: CoroutineScope = rememberCoroutineScope()
 ): ConversationScreenState {
     val context = LocalContext.current
     val clipboardManager = LocalClipboardManager.current
     val snackBarHostState = LocalSnackbarHostState.current
-
     return remember {
         ConversationScreenState(
             context = context,
             clipboardManager = clipboardManager,
             snackBarHostState = snackBarHostState,
             editSheetState = editSheetState,
             selfDeletingSheetState = selfDeletingSheetState,
+            locationSheetState = locationSheetState,
             coroutineScope = coroutineScope
         )
     }
@@ -65,10 +67,11 @@ class ConversationScreenState(
     val snackBarHostState: SnackbarHostState,
     val editSheetState: WireModalSheetState<UIMessage.Regular>,
     val selfDeletingSheetState: WireModalSheetState<SelfDeletionTimer>,
+    val locationSheetState: WireModalSheetState<Unit>,
     val coroutineScope: CoroutineScope
 ) {
     fun showEditContextMenu(message: UIMessage.Regular) {
-        editSheetState.show(message)
+        editSheetState.show(message, hideKeyboard = true)
     }
 
     fun copyMessage(text: String) {
@@ -79,9 +82,13 @@ class ConversationScreenState(
     }
 
     fun showSelfDeletionContextMenu(currentlySelected: SelfDeletionTimer) {
-        selfDeletingSheetState.show(currentlySelected)
+        selfDeletingSheetState.show(currentlySelected, hideKeyboard = true)
+    }
+
+    fun showLocationSheet() {
+        locationSheetState.show(hideKeyboard = true)
     }
 
     val isAnySheetVisible: Boolean
-        get() = editSheetState.isVisible || selfDeletingSheetState.isVisible
+        get() = editSheetState.isVisible || selfDeletingSheetState.isVisible || locationSheetState.isVisible
 }

app/src/main/kotlin/com/wire/android/ui/home/conversations/edit/MessageOptionsModalSheetLayout.kt

@@ -47,7 +47,7 @@ fun MessageOptionsModalSheetLayout(
     onEditClick: (messageId: String, messageBody: String, mentions: List<MessageMention>) -> Unit,
     onShareAssetClick: (messageId: String) -> Unit,
     onDownloadAssetClick: (messageId: String) -> Unit,
-    onOpenAssetClick: (messageId: String) -> Unit
+    onOpenAssetClick: (messageId: String) -> Unit,
 ) {
     val context = LocalContext.current
     WireModalSheetLayout(

app/src/main/kotlin/com/wire/android/ui/home/conversations/search/messages/SearchConversationMessagesResultsScreen.kt

@@ -57,6 +57,7 @@ fun SearchConversationMessagesResultsScreen(
                         message = message,
                         conversationDetailsData = ConversationDetailsData.None(null),
                         searchQuery = searchQuery,
+                        audioState = null,
                         onLongClicked = { },
                         onAssetMessageClicked = { },
                         onAudioClick = { },

app/src/main/kotlin/com/wire/android/ui/home/conversations/selfdeletion/SelfDeletionOptionsModalSheetLayout.kt

@@ -19,6 +19,7 @@ package com.wire.android.ui.home.conversations.selfdeletion
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import com.wire.android.R
 import com.wire.android.ui.common.bottomsheet.MenuModalSheetHeader
@@ -36,9 +37,11 @@ import com.wire.kalium.logic.data.message.SelfDeletionTimer
 fun SelfDeletionOptionsModalSheetLayout(
     sheetState: WireModalSheetState<SelfDeletionTimer>,
     onNewSelfDeletingMessagesStatus: (SelfDeletionTimer) -> Unit,
+    modifier: Modifier = Modifier
 ) {
     WireModalSheetLayout(
         sheetState = sheetState,
+        modifier = modifier,
         sheetContent = { currentlySelected ->
             WireMenuModalSheetContent(
                 header = MenuModalSheetHeader.Visible(title = stringResource(R.string.automatically_delete_message_after)),

app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/AdditionalOptions.kt

@@ -30,8 +30,6 @@ import androidx.compose.ui.Modifier
 import com.wire.android.ui.common.colorsScheme
 import com.wire.android.ui.home.conversations.ConversationActionPermissionType
 import com.wire.android.ui.home.conversations.model.UriAsset
-import com.wire.android.ui.home.messagecomposer.location.GeoLocatedAddress
-import com.wire.android.ui.home.messagecomposer.location.LocationPickerComponent
 import com.wire.android.ui.home.messagecomposer.recordaudio.RecordAudioComponent
 import com.wire.android.ui.home.messagecomposer.state.AdditionalOptionMenuState
 import com.wire.android.ui.home.messagecomposer.state.AdditionalOptionSelectItem
@@ -46,6 +44,7 @@ fun AdditionalOptionsMenu(
     conversationId: ConversationId,
     additionalOptionsState: AdditionalOptionMenuState,
     selectedOption: AdditionalOptionSelectItem,
+    attachmentsVisible: Boolean,
     isEditing: Boolean,
     isMentionActive: Boolean,
     onAdditionalOptionsMenuClicked: () -> Unit,
@@ -65,6 +64,7 @@ fun AdditionalOptionsMenu(
                 AttachmentAndAdditionalOptionsMenuItems(
                     conversationId = conversationId,
                     selectedOption = selectedOption,
+                    attachmentsVisible = attachmentsVisible,
                     isEditing = isEditing,
                     isMentionActive = isMentionActive,
                     onMentionButtonClicked = onMentionButtonClicked,
@@ -85,15 +85,14 @@ fun AdditionalOptionsMenu(
                     onCloseRichTextEditingButtonClicked = onCloseRichEditingButtonClicked
                 )
             }
-
-            AdditionalOptionMenuState.Hidden -> {}
         }
     }
 }
 
 @Composable
 fun AdditionalOptionSubMenu(
     isFileSharingEnabled: Boolean,
+    optionsVisible: Boolean,
     onPermissionPermanentlyDenied: (type: ConversationActionPermissionType) -> Unit,
     onLocationPickerClicked: () -> Unit,
     onCloseAdditionalAttachment: () -> Unit,
@@ -102,13 +101,13 @@ fun AdditionalOptionSubMenu(
     onImagesPicked: (List<Uri>) -> Unit,
     onAttachmentPicked: (UriAsset) -> Unit,
     onAudioRecorded: (UriAsset) -> Unit,
-    onLocationPicked: (GeoLocatedAddress) -> Unit,
     tempWritableImageUri: Uri?,
     tempWritableVideoUri: Uri?,
     modifier: Modifier = Modifier,
 ) {
-    Box(modifier = modifier) {
         AttachmentOptionsComponent(
+            modifier = modifier,
+            optionsVisible = optionsVisible,
             onImagesPicked = onImagesPicked,
             onAttachmentPicked = onAttachmentPicked,
             tempWritableImageUri = tempWritableImageUri,
@@ -119,36 +118,23 @@ fun AdditionalOptionSubMenu(
             onPermissionPermanentlyDenied = onPermissionPermanentlyDenied,
         )
         when (additionalOptionsState) {
-            AdditionalOptionSubMenuState.AttachFile -> {
-                /* DO NOTHING, ALREADY DISPLAYED AS PARENT */
-            }
+            AdditionalOptionSubMenuState.Default -> {}
 
             AdditionalOptionSubMenuState.RecordAudio -> {
                 RecordAudioComponent(
                     onAudioRecorded = onAudioRecorded,
                     onCloseRecordAudio = onCloseAdditionalAttachment
                 )
             }
-
-            AdditionalOptionSubMenuState.Location -> {
-                LocationPickerComponent(
-                    onLocationPicked = onLocationPicked,
-                    onLocationClosed = onCloseAdditionalAttachment
-                )
-            }
-            // non functional for now
-            AdditionalOptionSubMenuState.AttachImage -> {}
-            AdditionalOptionSubMenuState.Emoji -> {}
-            AdditionalOptionSubMenuState.Gif -> {}
         }
-    }
 }
 
 @Composable
 fun AttachmentAndAdditionalOptionsMenuItems(
     conversationId: ConversationId,
     isEditing: Boolean,
     selectedOption: AdditionalOptionSelectItem,
+    attachmentsVisible: Boolean,
     isMentionActive: Boolean,
     onMentionButtonClicked: () -> Unit,
     onSelfDeletionOptionButtonClicked: (SelfDeletionTimer) -> Unit,
@@ -164,6 +150,7 @@ fun AttachmentAndAdditionalOptionsMenuItems(
         MessageComposeActions(
             conversationId = conversationId,
             isEditing = isEditing,
+            attachmentsVisible = attachmentsVisible,
             selectedOption = selectedOption,
             isMentionActive = isMentionActive,
             onMentionButtonClicked = onMentionButtonClicked,