diff --git a/core/ui/src/main/java/org/signal/core/ui/WindowSizeClassExtensions.kt b/core/ui/src/main/java/org/signal/core/ui/WindowSizeClassExtensions.kt index b621e88502..0cfc12386c 100644 --- a/core/ui/src/main/java/org/signal/core/ui/WindowSizeClassExtensions.kt +++ b/core/ui/src/main/java/org/signal/core/ui/WindowSizeClassExtensions.kt @@ -111,6 +111,20 @@ sealed interface WindowBreakpoint { ) : WindowBreakpoint } +enum class FormFactor { + PHONE, + FOLDABLE, + TABLET +} + +/** A best-effort guess at a device's [FormFactor] most likely associated with this [WindowBreakpoint]. */ +val WindowBreakpoint.assumedFormFactor: FormFactor + get() = when (this) { + is WindowBreakpoint.Small -> FormFactor.PHONE + is WindowBreakpoint.Medium -> FormFactor.FOLDABLE + is WindowBreakpoint.Large -> FormFactor.TABLET + } + @Composable fun Resources.rememberIsSplitPane( forceSplitPane: Boolean = CoreUiDependencies.forceSplitPane diff --git a/feature/registration/src/main/java/org/signal/registration/screens/allownotifications/AllowNotificationsScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/allownotifications/AllowNotificationsScreen.kt index d49ef309e7..1a7c1d5da3 100644 --- a/feature/registration/src/main/java/org/signal/registration/screens/allownotifications/AllowNotificationsScreen.kt +++ b/feature/registration/src/main/java/org/signal/registration/screens/allownotifications/AllowNotificationsScreen.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll @@ -73,6 +74,7 @@ private fun OnePane(params: RegistrationScaffold.Params.OnePane, permissionState .padding(paddingValues) ) { FirstPaneContent() + Spacer(modifier = Modifier.height(16.dp)) SecondPaneContent() } }, @@ -147,9 +149,8 @@ private fun FirstPaneContent( private fun SecondPaneContent( modifier: Modifier = Modifier ) { - // TODO [regv5] Final image asset Image( - painter = painterResource(R.drawable.welcome), + painter = painterResource(R.drawable.device_notifications), contentDescription = null, modifier = modifier ) diff --git a/feature/registration/src/main/java/org/signal/registration/screens/linkaccount/LinkAccountScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/linkaccount/LinkAccountScreen.kt index 8c09763f44..239df8fa95 100644 --- a/feature/registration/src/main/java/org/signal/registration/screens/linkaccount/LinkAccountScreen.kt +++ b/feature/registration/src/main/java/org/signal/registration/screens/linkaccount/LinkAccountScreen.kt @@ -64,7 +64,9 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import kotlinx.coroutines.delay +import org.signal.core.ui.FormFactor import org.signal.core.ui.WindowBreakpoint +import org.signal.core.ui.assumedFormFactor import org.signal.core.ui.compose.AllDevicePreviews import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.Dialogs @@ -98,7 +100,7 @@ fun LinkAccountScreen( modifier: Modifier = Modifier ) { val layoutParams = RegistrationScaffold.rememberLayoutParams() - val isPhone = rememberWindowBreakpoint() is WindowBreakpoint.Small + val isPhone = rememberWindowBreakpoint().assumedFormFactor == FormFactor.PHONE // Sequence the expand button animation with the QR morph var expandButtonVisible by remember { mutableStateOf(!state.displayQrOverlay) } diff --git a/feature/registration/src/main/java/org/signal/registration/screens/messagesync/MessageSyncScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/messagesync/MessageSyncScreen.kt index 584156c5b3..e2739d59e5 100644 --- a/feature/registration/src/main/java/org/signal/registration/screens/messagesync/MessageSyncScreen.kt +++ b/feature/registration/src/main/java/org/signal/registration/screens/messagesync/MessageSyncScreen.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.rememberScrollState @@ -37,7 +38,9 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.withLink import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties +import org.signal.core.ui.FormFactor import org.signal.core.ui.WindowBreakpoint +import org.signal.core.ui.assumedFormFactor import org.signal.core.ui.compose.AllDevicePreviews import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.Dialogs @@ -98,6 +101,7 @@ private fun OnePane(params: RegistrationScaffold.Params.OnePane, state: MessageS .padding(paddingValues) ) { FirstPaneContent(state) + Spacer(modifier = Modifier.height(16.dp)) SecondPaneContent() } }, @@ -206,9 +210,14 @@ private fun FirstPaneContent( private fun SecondPaneContent( modifier: Modifier = Modifier ) { - // TODO [regv5] Final image asset + val deviceImage = when (rememberWindowBreakpoint().assumedFormFactor) { + FormFactor.PHONE -> R.drawable.device_phone + FormFactor.FOLDABLE -> R.drawable.device_foldable + FormFactor.TABLET -> R.drawable.device_tablet + } + Image( - painter = painterResource(R.drawable.welcome), + painter = painterResource(deviceImage), contentDescription = null, modifier = modifier ) diff --git a/feature/registration/src/main/res/drawable-night/device_foldable.xml b/feature/registration/src/main/res/drawable-night/device_foldable.xml new file mode 100644 index 0000000000..07de929da1 --- /dev/null +++ b/feature/registration/src/main/res/drawable-night/device_foldable.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable-night/device_notifications.xml b/feature/registration/src/main/res/drawable-night/device_notifications.xml new file mode 100644 index 0000000000..1a72592f96 --- /dev/null +++ b/feature/registration/src/main/res/drawable-night/device_notifications.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable-night/device_phone.xml b/feature/registration/src/main/res/drawable-night/device_phone.xml new file mode 100644 index 0000000000..f74217200b --- /dev/null +++ b/feature/registration/src/main/res/drawable-night/device_phone.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/feature/registration/src/main/res/drawable-night/device_tablet.xml b/feature/registration/src/main/res/drawable-night/device_tablet.xml new file mode 100644 index 0000000000..1cdf30ee8b --- /dev/null +++ b/feature/registration/src/main/res/drawable-night/device_tablet.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable/device_foldable.xml b/feature/registration/src/main/res/drawable/device_foldable.xml new file mode 100644 index 0000000000..5c6a69143c --- /dev/null +++ b/feature/registration/src/main/res/drawable/device_foldable.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable/device_notifications.xml b/feature/registration/src/main/res/drawable/device_notifications.xml new file mode 100644 index 0000000000..eb323c34ca --- /dev/null +++ b/feature/registration/src/main/res/drawable/device_notifications.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable/device_phone.xml b/feature/registration/src/main/res/drawable/device_phone.xml new file mode 100644 index 0000000000..5ced1520ec --- /dev/null +++ b/feature/registration/src/main/res/drawable/device_phone.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable/device_tablet.xml b/feature/registration/src/main/res/drawable/device_tablet.xml new file mode 100644 index 0000000000..522682ae04 --- /dev/null +++ b/feature/registration/src/main/res/drawable/device_tablet.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_foldable landscape (day)_41c0d57c_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_foldable landscape (day)_41c0d57c_0.png index 362b5f2928..d224b67cb1 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_foldable landscape (day)_41c0d57c_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_foldable landscape (day)_41c0d57c_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e1a49095a8f3d1983e54de14e493e69429ea3f45a84326fb85f9db1dfe45fbb -size 127594 +oid sha256:e2df362833444c9a85fa0287793e3d73ac4eb4fec45893c80017937b25d545ff +size 106297 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_foldable landscape (night)_9dae7e43_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_foldable landscape (night)_9dae7e43_0.png index 9fd8b78b91..879374b10d 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_foldable landscape (night)_9dae7e43_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_foldable landscape (night)_9dae7e43_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58a5cb3ae0d20092cce30892d486f2905f61087c0c387026b79b4408e0af746c -size 123136 +oid sha256:b76f3667884aa46dc3d67f0c696fb49e3f56a9bd5feab1235d4d6b0ada385294 +size 105871 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_foldable portrait (day)_bf09cc79_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_foldable portrait (day)_bf09cc79_0.png index 00353c79bc..99d3f52054 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_foldable portrait (day)_bf09cc79_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_foldable portrait (day)_bf09cc79_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb285b2c87cf062cd9de3fcfdd918c1c9b8feeea64ae4f69f46eda11fc1db6b9 -size 128831 +oid sha256:8eed15d8d9e76559b0422dc7057983f11302fea7c5c659d4315a8508ccfefaeb +size 105971 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_phone landscape (day)_38357cfa_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_phone landscape (day)_38357cfa_0.png index c195609745..6cd582501b 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_phone landscape (day)_38357cfa_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_phone landscape (day)_38357cfa_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0e79089d2328ab8de0b5d2dd2b506ad08b01c3fafa45fbdf7c59e0601a6fd2c -size 58318 +oid sha256:736919c4f9d0d7d464d9a7edc971fa0ad20d20621b918cf644104bc708ac4b54 +size 56349 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_phone landscape (night)_2eebbf71_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_phone landscape (night)_2eebbf71_0.png index 97ef50026c..bf91dcfbf8 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_phone landscape (night)_2eebbf71_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_phone landscape (night)_2eebbf71_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9338ca7b89284739aa0d705451c195b082776768a21e0e136b9d510175ac888e -size 57006 +oid sha256:d73c1bf15ed7cce08d3633240f580049f8bd62cc609af4a7453845311fc034ef +size 55000 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_phone portrait (day)_1526b652_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_phone portrait (day)_1526b652_0.png index 978074d457..7d331b1fd9 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_phone portrait (day)_1526b652_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_phone portrait (day)_1526b652_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:208bc63fdff848332c7ccdfb5059034cbb678157e0fd17db2283e961593ffc33 -size 171158 +oid sha256:31101208b8cad353711508b9118776f571e9426877a4b3370fe20670e1df02a6 +size 77490 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_rtl_5cbb5cfd_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_rtl_5cbb5cfd_0.png index f6336abb14..beff851a6a 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_rtl_5cbb5cfd_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_rtl_5cbb5cfd_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a22b3dcceaa4b88be8288cb6c1cef40ea998f47e36fcd6e24e118e3249bfac78 -size 108836 +oid sha256:695d5ef7315cede6c60f6a28e64278d812f91d993d5b41b10c253495c4149c8e +size 88046 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_small foldable landscape (day)_de1bb092_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_small foldable landscape (day)_de1bb092_0.png index 8a2a6b8a9e..2c9e6e2413 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_small foldable landscape (day)_de1bb092_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_small foldable landscape (day)_de1bb092_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d78f8fb723e8a8b867922794fd622b6d9b07c4d6c0cebc6bcd8def7493670511 -size 187303 +oid sha256:b8a60e3821fa030e85468f9c4bbaea32457d92f4d0405e7cd49d07fbd9223a70 +size 87959 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_small foldable landscape (night)_fe962c61_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_small foldable landscape (night)_fe962c61_0.png index 435ea4c848..e014176501 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_small foldable landscape (night)_fe962c61_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_small foldable landscape (night)_fe962c61_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb168e2ae340449062b55ade04419fb47bacaf642a20681038fada63e5249692 -size 176827 +oid sha256:14ca7b50fdf9ba4e1b012de5c1654a5c4486892aebdd613c772ef85168113934 +size 86884 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_small foldable portrait (day)_e269713d_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_small foldable portrait (day)_e269713d_0.png index e2deb1dff8..51ff81847b 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_small foldable portrait (day)_e269713d_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_small foldable portrait (day)_e269713d_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83e71a315c96b6389bf50c4f8def1c152c424b9a5d6e1bfc9ea2766f095daa80 -size 159740 +oid sha256:e2f9eeffe4904acc61ffb8485feeafb836b3a01775bb4dbdcfc5d3c19b045512 +size 84456 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_tablet landscape (day)_308754cb_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_tablet landscape (day)_308754cb_0.png index d604bfc72d..95d5c1e02a 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_tablet landscape (day)_308754cb_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_tablet landscape (day)_308754cb_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb491f348fb2f1367c2200ed334d055a3f621baf51ee99b05c15244480665aa5 -size 135222 +oid sha256:bf369b7103cdda76ebfec9351ce1ede6ae48dd639c3138df76dfdc63d80bc31b +size 116784 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_tablet landscape (night)_d25401fe_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_tablet landscape (night)_d25401fe_0.png index aadab53209..35b324a3b9 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_tablet landscape (night)_d25401fe_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_tablet landscape (night)_d25401fe_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b97307ef0bf3439ee66aa358c66ca6a7f3d5406ab313d24455a139ef6e6729a9 -size 130557 +oid sha256:e55076368c567c64c02129ed28c0153ba801a1aac52ecd2476ce3e8d4a76efbf +size 114846 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_tablet portrait (day)_ae17fb11_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_tablet portrait (day)_ae17fb11_0.png index 1e6dd32621..762c01b72f 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_tablet portrait (day)_ae17fb11_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/allownotifications/AllowNotificationsScreenScreenshotTests/AllowNotificationsScreenPreview_tablet portrait (day)_ae17fb11_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0726923f92d4197867cabc390e5e31cf2e9f309389354b43f8dabd7784c879d1 -size 136099 +oid sha256:32a5382a60325a2e40386e88527d7bc0e3f91dd8a2fd34e317e126529e478c72 +size 118204 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_foldable landscape (day)_41c0d57c_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_foldable landscape (day)_41c0d57c_0.png index afef49565b..8fd3817e9c 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_foldable landscape (day)_41c0d57c_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_foldable landscape (day)_41c0d57c_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c0b27c29f162631dc0674273f8fc6828df7ab5672e1b57aa81e156201567b79 -size 134241 +oid sha256:50f5f08579de6964693b1c9a7f1053ba650e236c9e3bd7069d4c7145e62559d1 +size 134763 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_foldable landscape (night)_9dae7e43_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_foldable landscape (night)_9dae7e43_0.png index 5851da0314..1f0a0facf8 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_foldable landscape (night)_9dae7e43_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_foldable landscape (night)_9dae7e43_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dbadbaf947becaf9ccea000e309f325e431a76b02b6bfe6bf4355f3b917696c -size 129694 +oid sha256:c1efa94fef64c66cd42fd8afd0ab257d2b281396b0fda033862700047ec87fd9 +size 131485 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_foldable portrait (day)_bf09cc79_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_foldable portrait (day)_bf09cc79_0.png index 9a1a31c508..8d9efed23d 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_foldable portrait (day)_bf09cc79_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_foldable portrait (day)_bf09cc79_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83272132744fdda955773eda00290b60cefa2b77d50ee8d4540a675898a431a1 -size 134720 +oid sha256:cd85a7e7271ced4556816d2cdb686542ca19809409363ec3661fa502a7d106cb +size 135406 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_phone portrait (day)_1526b652_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_phone portrait (day)_1526b652_0.png index 68ffe421b6..dd7d5061a5 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_phone portrait (day)_1526b652_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_phone portrait (day)_1526b652_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e21d20aeefc590478c5bb5a619e8970f8d6df11009e2236347d9c9151542ee2 -size 140910 +oid sha256:86d6a387e218d8cc467263a717e680c8bca875eacab6768c45fb9de167b0c699 +size 62630 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_rtl_5cbb5cfd_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_rtl_5cbb5cfd_0.png index e2f52b4c0b..d249e58935 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_rtl_5cbb5cfd_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_rtl_5cbb5cfd_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c35a4904274cd63890dff658e6a3b2622f6a38f1a9180dda72a27fa449ab6c8 -size 118444 +oid sha256:5fca62967c95654dad306300fe4264ed3f927901dda08a6ab452cbf77e648fe5 +size 71063 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_small foldable landscape (day)_de1bb092_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_small foldable landscape (day)_de1bb092_0.png index 2f69e79e36..0f1d36dd60 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_small foldable landscape (day)_de1bb092_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_small foldable landscape (day)_de1bb092_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e541b3e498984fc3d3ce23e6d7b2248ff3580e9e82ec03b178699b20b762c28f -size 192258 +oid sha256:808ec36811290fa5b1ba90c5b6536bd04716d6b119ccd64d8d16c6fb97f5c9b0 +size 116424 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_small foldable landscape (night)_fe962c61_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_small foldable landscape (night)_fe962c61_0.png index bc62e8b7ff..3305eda7fb 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_small foldable landscape (night)_fe962c61_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_small foldable landscape (night)_fe962c61_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cb569e4da00d9797c58a66f792e20260ff92d4d91df33dffc5d7c58ced7f50a -size 181738 +oid sha256:4702407b30d2ed08f2631a0422886e0c8014c0aeb0120fc918277795fa9406b1 +size 115825 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_small foldable portrait (day)_e269713d_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_small foldable portrait (day)_e269713d_0.png index 783aba02c4..97a68e9756 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_small foldable portrait (day)_e269713d_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_small foldable portrait (day)_e269713d_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:163846f014e30036f7547923395af3544b58a77c0f3948369aee369a30d50632 -size 161745 +oid sha256:4461fefd8c336dfcac47d789b8d9f7a24fb72198784a455ef1ca14a9d71ec266 +size 105574 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_tablet landscape (day)_308754cb_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_tablet landscape (day)_308754cb_0.png index 2d567b5a92..3a3924edeb 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_tablet landscape (day)_308754cb_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_tablet landscape (day)_308754cb_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e2d876eb5f65a68e4d3fee1d3109cf471fbc09b5fd3ae67c7a4aefff9219390 -size 143938 +oid sha256:39b8024b67f66a9ad511bd5328351b9af89c0bbec6e5c5434a469fdf8d4f4b04 +size 117955 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_tablet landscape (night)_d25401fe_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_tablet landscape (night)_d25401fe_0.png index 87fea0fa9e..e8d0ae5a2e 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_tablet landscape (night)_d25401fe_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_tablet landscape (night)_d25401fe_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97059570390c1c72cdc344347d044f640f48c786d587fe1be59727069f7c3d51 -size 139573 +oid sha256:de2bb1cd9ee9e8b8af158ae6523baca6f098c9cf8de18eccad7b14cd524fc9e0 +size 99127 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_tablet portrait (day)_ae17fb11_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_tablet portrait (day)_ae17fb11_0.png index ce85fa7012..09460d4fd3 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_tablet portrait (day)_ae17fb11_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/messagesync/MessageSyncScreenScreenshotTests/MessageSyncScreenPreview_tablet portrait (day)_ae17fb11_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d6b357b2dbda106d4b472144712f429e525c0e04e7ab4cbac47a2156c6ca817 -size 144423 +oid sha256:449dda77f8d57a5133033b8e57cf233720e1c65fbc42c75ba82ad88904e9076a +size 126574