Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2481 from element-hq/feature/bma/fixLayoutRoomEmpty

Browse source 
Feature/bma/fix layout room empty
This commit is contained in:
Benoit Marty 2024-03-01 18:00:04 +01:00 • committed by GitHub
commit 167b460d04
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt
View file

@ -28,7 +28,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme
@ -122,7 +121,6 @@ private fun RoomSpecificNotificationSettingsView(
style = ElementTheme.typography.fontBodyMdRegular
.copy(
color = MaterialTheme.colorScheme.secondary,
textAlign = TextAlign.Center,
)
)
if (state.defaultRoomNotificationMode != null) {

7
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
View file

@ -43,6 +43,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.Velocity
import androidx.compose.ui.unit.dp
@ -140,7 +141,9 @@ private fun EmptyRoomListView(
modifier: Modifier = Modifier
) {
Column(
modifier = modifier.fillMaxSize(),
modifier = modifier
.fillMaxSize()
.padding(horizontal = 16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
@ -148,12 +151,14 @@ private fun EmptyRoomListView(
text = stringResource(R.string.screen_roomlist_empty_title),
style = ElementTheme.typography.fontBodyLgRegular,
color = ElementTheme.colors.textSecondary,
textAlign = TextAlign.Center,
)
Spacer(modifier = Modifier.height(4.dp))
Text(
text = stringResource(R.string.screen_roomlist_empty_message),
style = ElementTheme.typography.fontBodyLgRegular,
color = ElementTheme.colors.textSecondary,
textAlign = TextAlign.Center,
)
Spacer(modifier = Modifier.height(16.dp))
Button(

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.notificationsettings_RoomNotificationSettings_null_RoomNotificationSettings-Day-5_6_null_0,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:edde938a4927d343f9b3b94272d153d10239501dcc53809e5a68f0a1f0e200ca
size 33839
oid sha256:75764ad97caea1246ed9ddaf5650d7fb44ac04c5ecea6fb7658833d238707e00
size 33785

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.notificationsettings_RoomNotificationSettings_null_RoomNotificationSettings-Day-5_6_null_2,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5e388b7cd714bc35c546cb77c16483b59fa54ad9d6af4274c0848d71377203df
size 33902
oid sha256:362eee281ce6365269f0776765037618c27f09907729da2847b4b7dcfb91fbcb
size 33938

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.notificationsettings_RoomNotificationSettings_null_RoomNotificationSettings-Day-5_6_null_3,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3946383dc57c5d21da8ea94f14f208aca0c317ba62d1fd7498f1d63448435cd2
size 41162
oid sha256:382ebf533756cbdd1c6a13ca9a9b98aadc5011c3fef50ac68741694305d02ba7
size 41179

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.notificationsettings_RoomNotificationSettings_null_RoomNotificationSettings-Day-5_6_null_4,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5e388b7cd714bc35c546cb77c16483b59fa54ad9d6af4274c0848d71377203df
size 33902
oid sha256:362eee281ce6365269f0776765037618c27f09907729da2847b4b7dcfb91fbcb
size 33938

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.notificationsettings_RoomNotificationSettings_null_RoomNotificationSettings-Day-5_6_null_5,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3946383dc57c5d21da8ea94f14f208aca0c317ba62d1fd7498f1d63448435cd2
size 41162
oid sha256:382ebf533756cbdd1c6a13ca9a9b98aadc5011c3fef50ac68741694305d02ba7
size 41179

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.notificationsettings_RoomNotificationSettings_null_RoomNotificationSettings-Day-5_6_null_6,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:edde938a4927d343f9b3b94272d153d10239501dcc53809e5a68f0a1f0e200ca
size 33839
oid sha256:75764ad97caea1246ed9ddaf5650d7fb44ac04c5ecea6fb7658833d238707e00
size 33785

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.notificationsettings_RoomNotificationSettings_null_RoomNotificationSettings-Night-5_7_null_0,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f8a5dcdb394fa4b78538baab30b474f7d8ed695e192a49601e901111f1943c7
size 31461
oid sha256:0ba59a09d7c47b187919e7e779bf3ff7fd7ac20bfe580a7dc26c314ce4ad8da1
size 31547

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.notificationsettings_RoomNotificationSettings_null_RoomNotificationSettings-Night-5_7_null_2,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:14b2c2782eb29dfffac833e8b32dfefcd8f6405900afe3546091503b869e20dc
size 30620
oid sha256:8387aa58ec85c8dde5db2ec81f9f2ce8a00cbfe3fa4b06027a61a60a16d754a4
size 30574

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.notificationsettings_RoomNotificationSettings_null_RoomNotificationSettings-Night-5_7_null_3,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d008cc11241d5de71c0e5f7770b283336736ddda0ff83249e0d1940b9fe9875f
size 36635
oid sha256:b970c7f7fd9568b89bd3b2f78aeba495e68f5270cbfdf80da2bfdfc01a4eb0d2
size 36598

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.notificationsettings_RoomNotificationSettings_null_RoomNotificationSettings-Night-5_7_null_4,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:14b2c2782eb29dfffac833e8b32dfefcd8f6405900afe3546091503b869e20dc
size 30620
oid sha256:8387aa58ec85c8dde5db2ec81f9f2ce8a00cbfe3fa4b06027a61a60a16d754a4
size 30574

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.notificationsettings_RoomNotificationSettings_null_RoomNotificationSettings-Night-5_7_null_5,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d008cc11241d5de71c0e5f7770b283336736ddda0ff83249e0d1940b9fe9875f
size 36635
oid sha256:b970c7f7fd9568b89bd3b2f78aeba495e68f5270cbfdf80da2bfdfc01a4eb0d2
size 36598

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.notificationsettings_RoomNotificationSettings_null_RoomNotificationSettings-Night-5_7_null_6,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f8a5dcdb394fa4b78538baab30b474f7d8ed695e192a49601e901111f1943c7
size 31461
oid sha256:0ba59a09d7c47b187919e7e779bf3ff7fd7ac20bfe580a7dc26c314ce4ad8da1
size 31547

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_9,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8052450669c920a11a7d46c6fe12715a06f1bd2ee2e1d813b4fcb67417898e77
size 55043
oid sha256:f2117daf834ffabc8ca24e738c26436b2a4c8bc02e478b928e5bc9f472ae2ef6
size 54995

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_9,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:67b561ca23e0d97c27ca1cc3e3ec39e41096e3fa9a5795a4fe97eddb769c2483
size 57191
oid sha256:b7522060e94ab9a3c221b58c314e8f4680ce1aef07c1820995dd0ece8a3c4ecf
size 57179