From d1e66386f51ab1abc35c4b1810802f4cf97ca673 Mon Sep 17 00:00:00 2001
From: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
Date: Thu, 12 Dec 2024 22:56:59 +0700
Subject: [PATCH] android: fix bottom bar positon in chat item info page
 (#5373)

* android: fix bottom bar positon in chat item info page

* change
---
 .../simplex/common/views/chat/ChatItemInfoView.kt   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemInfoView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemInfoView.kt
index d6744a0a0d..e62235bd7c 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemInfoView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemInfoView.kt
@@ -296,6 +296,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
         }
       }
       SectionBottomSpacer()
+      SectionBottomSpacer()
     }
   }
 
@@ -309,6 +310,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
         QuotedMsgView(qi)
       }
       SectionBottomSpacer()
+      SectionBottomSpacer()
     }
   }
 
@@ -324,6 +326,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
         ForwardedFromView(forwardedFromItem)
       }
       SectionBottomSpacer()
+      SectionBottomSpacer()
     }
   }
 
@@ -395,6 +398,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
         }
       }
       SectionBottomSpacer()
+      SectionBottomSpacer()
     }
   }
 
@@ -433,12 +437,11 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
 
   Column {
     if (numTabs() > 1) {
-      Column(
+      Box(
         Modifier
-          .fillMaxHeight(),
-        verticalArrangement = Arrangement.SpaceBetween
+          .fillMaxHeight()
       ) {
-        Column(Modifier.weight(1f)) {
+        Column {
           when (val sel = selection.value) {
             is CIInfoTab.Delivery -> {
               DeliveryTab(sel.memberDeliveryStatuses)
@@ -479,7 +482,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
           }
         }
         val oneHandUI = remember { appPrefs.oneHandUI.state }
-        Box(Modifier.offset(x = 0.dp, y = if (oneHandUI.value) -AppBarHeight * fontSizeSqrtMultiplier else 0.dp)) {
+        Box(Modifier.align(Alignment.BottomCenter).navigationBarsPadding().offset(x = 0.dp, y = if (oneHandUI.value) -AppBarHeight * fontSizeSqrtMultiplier else 0.dp)) {
           TabRow(
             selectedTabIndex = availableTabs.indexOfFirst { it::class == selection.value::class },
             Modifier.height(AppBarHeight * fontSizeSqrtMultiplier),