Merge pull request #6264 from element-hq/feature/bma/bottomBarIteration

Bottom bar iteration
2026-02-27 16:16:00 +01:00 · 2026-02-27 16:16:00 +01:00 · 1c5f185d6a
commit 1c5f185d6a
parent 8aed1c2ab8 e026f66e3d
28 changed files with 58 additions and 58 deletions
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt
@ -23,7 +23,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.FabPosition
-import androidx.compose.material3.FloatingToolbarDefaults.ScreenOffset
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
@ -239,12 +238,14 @@ private fun HomeScaffold(
                        }
                    },
                )
+            } else {
+                HomeFloatingActionButton(onStartChatClick, CommonStrings.action_create_room)
            }
        },
-        floatingActionButtonPosition = FabPosition.Center,
+        floatingActionButtonPosition = if (state.showNavigationBar) FabPosition.Center else FabPosition.End,
        content = { padding ->
            val contentPadding = PaddingValues(
-                bottom = 112.dp,
+                bottom = 96.dp,
            )
            when (state.currentHomeNavigationBarItem) {
                HomeNavigationBarItem.Chats -> {
@ -324,7 +325,6 @@ private fun HomeBottomBar(
    HorizontalFloatingToolbar(
        floatingActionButton = floatingActionButton,
        modifier = modifier
-            .padding(bottom = ScreenOffset)
            .zIndex(1f),
    ) {
        HomeNavigationBarItem.entries.forEachIndexed { index, item ->
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeViewA11y_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeViewA11y_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4bd92f12e7926f39cf7bb74fedd85b8295bff34da08e45229e2e1a8f83956c3
-size 144306
+oid sha256:2f2357a181fcea22deb153e4d4c570421354cbc74f3e272a6e94c7795cf29c4c
+size 144183
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_0_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f106b4672b1d96665fe731de28b7ccbb98f986580fd95cc6609a7b64348c60e
-size 67665
+oid sha256:96ce82255e49c97179a216124ccfcbc6726a8053acef767041ba44304e7f4735
+size 67756
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_10_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:763715d657faecd68e201b7a110d022c04e27592bff499355662848455e2adc3
-size 36373
+oid sha256:c393b13532fba4d4ef25dda45b6ca3e1f6da6d49c5b2de412beded261a4f9311
+size 36164
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_11_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0ecffc6b05c1bc3d0c6ba578d7ca7d50ac9c7a4948c53fe96d427c3ad6b4e4e
-size 32289
+oid sha256:2339985aba8128dd562491d6575b92338be2338c090d978f553a1e50b44b24f6
+size 32073
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_13_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b659de7521274ae555f962639d7e1652a22958c4b066dae3f2dd1aa70d93b78e
-size 89194
+oid sha256:37c34086d1939b266d9f0825da480c8de53c18c68c4eb420829111759b1d995a
+size 89216
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_14_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd11e404d07f8d790b1554c760f24e4e82614a331e16219c67c326b0375313f9
-size 84336
+oid sha256:5b54ba16e7e2413dd994bedcc31e5ffdf6c291487ccc5ae17178d2572a4fb0ea
+size 87282
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_15_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5406580880491251a8d61fc2fe26dab90153e6337f95dae3d6e4b1c5df7ac8f4
-size 53764
+oid sha256:af36d0e3383935d256b3730e6f955e858ae42a82f54485b879e7a6a71fc25f6c
+size 55237
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_16_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:750a7b57fd2fd99f3cd0ad6e970692cdd8a7ad191dfb8fff0b5d0935461789db
-size 42594
+oid sha256:e55407ac7116b3127a979f630777d0d528a349c38d37829d8bc0c37a316c7c5b
+size 42526
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_1_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f106b4672b1d96665fe731de28b7ccbb98f986580fd95cc6609a7b64348c60e
-size 67665
+oid sha256:96ce82255e49c97179a216124ccfcbc6726a8053acef767041ba44304e7f4735
+size 67756
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_2_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f106b4672b1d96665fe731de28b7ccbb98f986580fd95cc6609a7b64348c60e
-size 67665
+oid sha256:96ce82255e49c97179a216124ccfcbc6726a8053acef767041ba44304e7f4735
+size 67756
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_3_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8bdb8d3e2dbb468115c4077f5bce6415a7708cbd04f825225139c1a2cbf788d
-size 64647
+oid sha256:69fd2195c4d0203b602ba91b822c5e9dc0e902b77dcf1352daabaf91aaea1768
+size 65301
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_4_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ed6905e2833c7e927c84f0407a6218a4859a28f5a36a34c3a9b92f66347308a
-size 56117
+oid sha256:303d13645d55db4f9dcb31d68e49d21254778c500daa887694a6d402735ceac2
+size 57175
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_5_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f106b4672b1d96665fe731de28b7ccbb98f986580fd95cc6609a7b64348c60e
-size 67665
+oid sha256:96ce82255e49c97179a216124ccfcbc6726a8053acef767041ba44304e7f4735
+size 67756
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_9_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:521e3b0b36dbed830eab8cd884a1924381bd9a50c189ff9ef074ed468aaf9b23
-size 84195
+oid sha256:bcd14b5720ecc9a80f6f2cc7133d6c8695096b9c90d3504380464c46c91048c8
+size 87131
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_0_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00af046190654a77e02d1152e8d44f538302b2fecfbd31b8790cdfa6f202dc1b
-size 62502
+oid sha256:e8518ca0e40ddff8b8f8cd1960a5cc8c4419a7f7381459f2bca782df80cb0094
+size 62676
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_10_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86305c47144ed620efd27045239c0ca66f11cb5f2088b4df8e7f9e7a254576fa
-size 31166
+oid sha256:d56c1af9fc73f4aaeed33dd8b6113ec64ddbfdf63506aa31ae6996732870baa2
+size 31127
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_11_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cee0eefc4639ede46fd6539da213f0398de0611fc1e6f2002c6e014318c04380
-size 26665
+oid sha256:14d762574470814f5b37cc05a2167d546f92460bd016206e71ba43026d00f9cc
+size 26743
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_13_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1605040770a4b5d8928b41afab2e2f970f18283942659b2b869451e5c04d3d5b
-size 83224
+oid sha256:bd10af4fb01aa715a0f913f590980da266a9d3a68b5f2222a5f329f98069277c
+size 83328
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_14_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90bf5140e04bd22af001ed9d23513b26d555f2d73864d9012c8e05f452659fd8
-size 78641
+oid sha256:7e841a58c50c98444bcc48316654ee5c664cf845e3c38f4bd02e80ce8d3c9366
+size 81261
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_15_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:828d2d972c03e2cdb837e591c957c93fd61c1f49e3e4fcf19a8bf18963d4eb95
-size 48307
+oid sha256:66d241a4270bef0a1f80c62c302cb5b40b4370f73e8175a746d32c90d1f98208
+size 49882
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_16_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1d6080fd17d90e63b4aae91c6a2c93bd16314eacc6007f57073e981c4dfb1c6
-size 37378
+oid sha256:1838a9839badf62d4d427a66a15a7d220996bdb0b60f0373249d62e4afae2910
+size 37390
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_1_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00af046190654a77e02d1152e8d44f538302b2fecfbd31b8790cdfa6f202dc1b
-size 62502
+oid sha256:e8518ca0e40ddff8b8f8cd1960a5cc8c4419a7f7381459f2bca782df80cb0094
+size 62676
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_2_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00af046190654a77e02d1152e8d44f538302b2fecfbd31b8790cdfa6f202dc1b
-size 62502
+oid sha256:e8518ca0e40ddff8b8f8cd1960a5cc8c4419a7f7381459f2bca782df80cb0094
+size 62676
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_3_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71e33566c0404f1930831b846a2e78952dd33138ffde5257c3d413739e225040
-size 60212
+oid sha256:c10e44c82a7412fd51a651a69b9c643a7b1eafcc4251227009e44a47e9649bb5
+size 60656
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_4_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:363efc8054e6a1e04d0482e5351d7e190febf55167a0358d4251101ee6ebd659
-size 50942
+oid sha256:f38bf5504ece28cfe2bdaf5e958ecf8af30a1a3e97b3b2d9c43924c362673402
+size 52181
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_5_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00af046190654a77e02d1152e8d44f538302b2fecfbd31b8790cdfa6f202dc1b
-size 62502
+oid sha256:e8518ca0e40ddff8b8f8cd1960a5cc8c4419a7f7381459f2bca782df80cb0094
+size 62676
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_9_en.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:465ffe0ea53fe7bde74c9dddb1be5e9f2861436b5292956f889dcf60db621af2
-size 78499
+oid sha256:0b09c1c639b12b0521da9e4b403530d4bd33f6e79823903091870fba56477153
+size 81113