fix: Small grey rect appears on the bottom of other user profile scre…

…en (WPB-10453) (#3320)
wireapp · Aug 14, 2024 · e55f1b0 · e55f1b0
1 parent 5bd3261
commit e55f1b0
Showing 1 changed file with 48 additions and 14 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreen.kt b/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreen.kt
@@ -178,8 +178,24 @@ fun OtherUserProfileScreen(
             resultNavigator.setResult(it)
             resultNavigator.navigateBack()
         },
-        onOpenConversation = { navigator.navigate(NavigationCommand(ConversationScreenDestination(it), BackStackMode.UPDATE_EXISTED)) },
-        onOpenDeviceDetails = { navigator.navigate(NavigationCommand(DeviceDetailsScreenDestination(navArgs.userId, it.clientId))) },
+        onOpenConversation = {
+            navigator.navigate(
+                NavigationCommand(
+                    ConversationScreenDestination(it),
+                    BackStackMode.UPDATE_EXISTED
+                )
+            )
+        },
+        onOpenDeviceDetails = {
+            navigator.navigate(
+                NavigationCommand(
+                    DeviceDetailsScreenDestination(
+                        navArgs.userId,
+                        it.clientId
+                    )
+                )
+            )
+        },
         onSearchConversationMessagesClick = onSearchConversationMessagesClick,
         navigateBack = navigator::navigateBack,
         navigationIconType = NavigationIconType.Close,
@@ -199,7 +215,10 @@ fun OtherUserProfileScreen(
     }
 
     VisibilityState(legalHoldSubjectDialogState) {
-        LegalHoldSubjectProfileDialog(viewModel.state.userName, legalHoldSubjectDialogState::dismiss)
+        LegalHoldSubjectProfileDialog(
+            viewModel.state.userName,
+            legalHoldSubjectDialogState::dismiss
+        )
     }
 }
 
@@ -274,7 +293,9 @@ fun OtherProfileScreenContent(
     }
     val maxBarElevation = MaterialTheme.wireDimensions.topBarShadowElevation
     val tabBarElevationState by remember(tabItems, lazyListStates, currentTabState) {
-        derivedStateOf { lazyListStates[tabItems[currentTabState]]?.topBarElevation(maxBarElevation) ?: 0.dp }
+        derivedStateOf {
+            lazyListStates[tabItems[currentTabState]]?.topBarElevation(maxBarElevation) ?: 0.dp
+        }
     }
 
     if (!requestInProgress) {
@@ -303,7 +324,16 @@ fun OtherProfileScreenContent(
                 onLegalHoldLearnMoreClick = onLegalHoldLearnMoreClick,
             )
         },
-        topBarFooter = { TopBarFooter(state, pagerState, tabBarElevationState, tabItems, currentTabState, scope) },
+        topBarFooter = {
+            TopBarFooter(
+                state = state,
+                pagerState = pagerState,
+                tabBarElevation = tabBarElevationState,
+                tabItems = tabItems,
+                currentTab = currentTabState,
+                scope = scope
+            )
+        },
         content = {
             Content(
                 state = state,
@@ -325,7 +355,7 @@ fun OtherProfileScreenContent(
                 onOpenConversation
             )
         },
-        isSwipeable = state.connectionState == ConnectionState.ACCEPTED
+        isSwipeable = state.connectionState != ConnectionState.BLOCKED
     )
 
     WireModalSheetLayout(
@@ -502,7 +532,11 @@ private fun Content(
                         ) { pageIndex ->
                             when (val tabItem = tabItems[pageIndex]) {
                                 OtherUserProfileTabItem.DETAILS ->
-                                    OtherUserProfileDetails(state, otherUserProfileScreenState, lazyListStates[tabItem]!!)
+                                    OtherUserProfileDetails(
+                                        state,
+                                        otherUserProfileScreenState,
+                                        lazyListStates[tabItem]!!
+                                    )
 
                                 OtherUserProfileTabItem.GROUP ->
                                     OtherUserProfileGroup(
@@ -554,13 +588,13 @@ fun ContentFooter(
         enter = fadeIn(),
         exit = fadeOut(),
     ) {
-        Surface(
-            shadowElevation = maxBarElevation,
-            color = MaterialTheme.wireColorScheme.background
-        ) {
-            Box(modifier = Modifier.padding(all = dimensions().spacing16x)) {
-                // TODO show open conversation button for service bots after AR-2135
-                if (!state.isMetadataEmpty() && state.membership != Membership.Service && !state.isTemporaryUser()) {
+        // TODO show open conversation button for service bots after AR-2135
+        if (!state.isMetadataEmpty() && state.membership != Membership.Service && !state.isTemporaryUser()) {
+            Surface(
+                shadowElevation = maxBarElevation,
+                color = MaterialTheme.wireColorScheme.background
+            ) {
+                Box(modifier = Modifier.padding(all = dimensions().spacing16x)) {
                     ConnectionActionButton(
                         state.userId,
                         state.userName,