From 5ed4ac78886e6e1f3ce27e20b1b104e34094ac92 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 12 Mar 2024 10:51:28 +0100 Subject: [PATCH 1/3] Fix text alignment on empty poll view. --- .../android/features/poll/impl/history/PollHistoryView.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt index 4ea8717688..456eebea72 100644 --- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt +++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt @@ -39,6 +39,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier 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 @@ -195,7 +196,8 @@ private fun PollHistoryList( text = emptyStringResource, style = ElementTheme.typography.fontBodyLgRegular, color = ElementTheme.colors.textSecondary, - modifier = Modifier.padding(vertical = 24.dp, horizontal = 16.dp) + modifier = Modifier.padding(vertical = 24.dp, horizontal = 16.dp), + textAlign = TextAlign.Center, ) } } From 0d0b699aae03006d1a6d19f74f74164c83398630 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 12 Mar 2024 10:52:30 +0100 Subject: [PATCH 2/3] Git ignore copilot folder. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 823b4e4872..e7029fd3cd 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,7 @@ captures/ .idea/libraries # Android Studio 3 in .gitignore file. .idea/caches +.idea/copilot .idea/inspectionProfiles # Shelved changes in the IDE .idea/shelf From 5ffd43ca4d1cd74a9c021699ea1ac44e0364c800 Mon Sep 17 00:00:00 2001 From: ElementBot Date: Tue, 12 Mar 2024 13:50:13 +0000 Subject: [PATCH 3/3] Update screenshots --- ...ew_null_PollHistoryView-Day-1_2_null_2,NEXUS_5,1.0,en].png | 4 ++-- ...ew_null_PollHistoryView-Day-1_2_null_3,NEXUS_5,1.0,en].png | 4 ++-- ..._null_PollHistoryView-Night-1_3_null_2,NEXUS_5,1.0,en].png | 4 ++-- ..._null_PollHistoryView-Night-1_3_null_3,NEXUS_5,1.0,en].png | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_2,NEXUS_5,1.0,en].png index 4e4f13e198..57defae9ba 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_2,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_2,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:240ae2c6b7efac68c972049db5234f71813885ab7f3a93b22db8735e650b78cc -size 16621 +oid sha256:e73c55b17bf0f0c7f9e398e08471e778ce91145a63410b728a33b0ad1d521a52 +size 16586 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_3,NEXUS_5,1.0,en].png index 7cfbf4e018..cba5a1fac6 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_3,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_3,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ebe36dfe126b2d71254116b0ac4c3aec05dca5862f4f134d8f4a5fb179eba61 -size 16085 +oid sha256:2540819ea467d626deab3d29b4e1fcfb385c389b3a22b43308d9974478884c66 +size 16065 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_2,NEXUS_5,1.0,en].png index db6496d300..41327dee0f 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_2,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_2,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a2a347e2b10c3e914c36e33e273e58c8263e6c48417b338390efe877494cb5e -size 15824 +oid sha256:836f4eac4edb453b851c16050db187ce29fe90fb651c60900d41437acd794895 +size 15796 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_3,NEXUS_5,1.0,en].png index 778cb42ff1..aa921af6dc 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_3,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_3,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:980630d02716dbc61840c14d839d6d3a2eac99c85adc78547a2c7f9cf920bf4a -size 15308 +oid sha256:ebd21ad1a1de06c7de5d13134913785557fc743770202292630c20a85875208e +size 15300