Skip to content

Commit b6e35de

Browse files
bmartybmarty
authored
Merge pull request #898 from vector-im/feature/bma/fixOnBoardingScreen
Fix on boarding screen
2 parents e7cab7a + 1a51b04 commit b6e35de

File tree

88 files changed

+140
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+140
-174
lines changed

‎.github/workflows/scripts/recordScreenshots.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ if [[ -z ${REPO} ]]; then
5858
exit 1
5959
fi
6060

61+
echo "Deleting previous screenshots"
62+
./gradlew removeOldSnapshots --stacktrace -PpreDexEnable=false --max-workers 4 --warn
63+
6164
echo "Record screenshots"
6265
./gradlew recordPaparazziDebug --stacktrace -PpreDexEnable=false --max-workers 4 --warn
6366

‎features/location/api/src/main/kotlin/io/element/android/features/location/api/StaticMapView.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ fun StaticMapView(
119119
showProgress = painter.state is AsyncImagePainter.State.Loading,
120120
contentDescription = contentDescription,
121121
modifier = Modifier.size(width = maxWidth, height = maxHeight),
122-
darkMode = darkMode,
123122
onLoadMapClick = { retryHash++ }
124123
)
125124
}

‎features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapPlaceholder.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,20 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
3838
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
3939
import io.element.android.libraries.designsystem.theme.components.Icon
4040
import io.element.android.libraries.designsystem.theme.components.Text
41-
import io.element.android.libraries.theme.ElementTheme
4241
import io.element.android.libraries.ui.strings.CommonStrings
4342

4443
@Composable
4544
internal fun StaticMapPlaceholder(
4645
showProgress: Boolean,
4746
contentDescription: String?,
4847
modifier: Modifier = Modifier,
49-
darkMode: Boolean = !ElementTheme.isLightTheme,
5048
onLoadMapClick: () -> Unit,
5149
) {
5250
Box(
5351
contentAlignment = Alignment.Center,
5452
) {
5553
Image(
56-
painter = painterResource(
57-
id = if (darkMode) R.drawable.blurred_map_dark
58-
else R.drawable.blurred_map_light
59-
),
54+
painter = painterResource(id = R.drawable.blurred_map),
6055
contentDescription = contentDescription,
6156
modifier = modifier,
6257
contentScale = ContentScale.FillBounds,

features/location/api/src/main/res/drawable/blurred_map_dark.png renamed to features/location/api/src/main/res/drawable-night/blurred_map.png

File renamed without changes.

features/location/api/src/main/res/drawable/blurred_map_light.png renamed to features/location/api/src/main/res/drawable/blurred_map.png

File renamed without changes.

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import androidx.compose.ui.Alignment
5151
import androidx.compose.ui.Modifier
5252
import androidx.compose.ui.platform.LocalInspectionMode
5353
import androidx.compose.ui.res.pluralStringResource
54-
import androidx.compose.ui.tooling.preview.Preview
5554
import androidx.compose.ui.tooling.preview.PreviewParameter
5655
import androidx.compose.ui.unit.dp
5756
import io.element.android.features.messages.impl.R
@@ -64,8 +63,8 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
6463
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
6564
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContentProvider
6665
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent
67-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
68-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
66+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
67+
import io.element.android.libraries.designsystem.preview.ElementPreview
6968
import io.element.android.libraries.designsystem.theme.components.FloatingActionButton
7069
import io.element.android.libraries.designsystem.theme.components.Icon
7170
import io.element.android.libraries.matrix.api.core.EventId
@@ -308,20 +307,11 @@ private fun JumpToBottomButton(
308307
}
309308
}
310309

311-
@Preview
310+
@DayNightPreviews
312311
@Composable
313-
fun TimelineViewLightPreview(
312+
fun TimelineViewPreview(
314313
@PreviewParameter(TimelineItemEventContentProvider::class) content: TimelineItemEventContent
315-
) = ElementPreviewLight { ContentToPreview(content) }
316-
317-
@Preview
318-
@Composable
319-
fun TimelineViewDarkPreview(
320-
@PreviewParameter(TimelineItemEventContentProvider::class) content: TimelineItemEventContent
321-
) = ElementPreviewDark { ContentToPreview(content) }
322-
323-
@Composable
324-
private fun ContentToPreview(content: TimelineItemEventContent) {
314+
) = ElementPreview {
325315
val timelineItems = aTimelineItemList(content)
326316
TimelineView(
327317
state = aTimelineState(timelineItems),

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ import androidx.compose.foundation.layout.heightIn
2222
import androidx.compose.foundation.layout.padding
2323
import androidx.compose.runtime.Composable
2424
import androidx.compose.ui.Modifier
25-
import androidx.compose.ui.tooling.preview.Preview
2625
import androidx.compose.ui.tooling.preview.PreviewParameter
2726
import androidx.compose.ui.unit.dp
2827
import io.element.android.features.location.api.StaticMapView
2928
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
3029
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContentProvider
31-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
32-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
30+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
31+
import io.element.android.libraries.designsystem.preview.ElementPreview
3332
import io.element.android.libraries.designsystem.theme.components.Text
3433

3534
@Composable
@@ -57,17 +56,10 @@ fun TimelineItemLocationView(
5756
}
5857
}
5958

60-
@Preview
59+
@DayNightPreviews
6160
@Composable
62-
internal fun TimelineItemLocationViewLightPreview(@PreviewParameter(TimelineItemLocationContentProvider::class) content: TimelineItemLocationContent) =
63-
ElementPreviewLight { ContentToPreview(content) }
64-
65-
@Preview
66-
@Composable
67-
internal fun TimelineItemLocationViewDarkPreview(@PreviewParameter(TimelineItemLocationContentProvider::class) content: TimelineItemLocationContent) =
68-
ElementPreviewDark { ContentToPreview(content) }
61+
internal fun TimelineItemLocationViewPreview(@PreviewParameter(TimelineItemLocationContentProvider::class) content: TimelineItemLocationContent) =
62+
ElementPreview {
63+
TimelineItemLocationView(content)
64+
}
6965

70-
@Composable
71-
private fun ContentToPreview(content: TimelineItemLocationContent) {
72-
TimelineItemLocationView(content)
73-
}

‎features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616

1717
package io.element.android.features.onboarding.impl
1818

19-
import androidx.compose.foundation.Image
2019
import androidx.compose.foundation.layout.Box
2120
import androidx.compose.foundation.layout.Column
2221
import androidx.compose.foundation.layout.Spacer
2322
import androidx.compose.foundation.layout.fillMaxSize
2423
import androidx.compose.foundation.layout.fillMaxWidth
2524
import androidx.compose.foundation.layout.height
2625
import androidx.compose.foundation.layout.padding
27-
import androidx.compose.foundation.layout.size
2826
import androidx.compose.foundation.layout.width
2927
import androidx.compose.material.icons.Icons
3028
import androidx.compose.material.icons.filled.QrCode
@@ -33,17 +31,17 @@ import androidx.compose.runtime.Composable
3331
import androidx.compose.ui.Alignment.Companion.CenterHorizontally
3432
import androidx.compose.ui.BiasAlignment
3533
import androidx.compose.ui.Modifier
36-
import androidx.compose.ui.res.painterResource
3734
import androidx.compose.ui.res.stringResource
3835
import androidx.compose.ui.text.style.TextAlign
39-
import androidx.compose.ui.tooling.preview.Preview
4036
import androidx.compose.ui.tooling.preview.PreviewParameter
4137
import androidx.compose.ui.unit.dp
4238
import androidx.compose.ui.unit.sp
39+
import io.element.android.libraries.designsystem.atomic.atoms.ElementLogoAtom
40+
import io.element.android.libraries.designsystem.atomic.atoms.ElementLogoAtomSize
4341
import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
4442
import io.element.android.libraries.designsystem.atomic.pages.OnBoardingPage
45-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
46-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
43+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
44+
import io.element.android.libraries.designsystem.preview.ElementPreview
4745
import io.element.android.libraries.designsystem.theme.aliasButtonText
4846
import io.element.android.libraries.designsystem.theme.components.Button
4947
import io.element.android.libraries.designsystem.theme.components.Icon
@@ -85,10 +83,6 @@ fun OnBoardingView(
8583

8684
@Composable
8785
private fun OnBoardingContent(modifier: Modifier = Modifier) {
88-
// Note: having a night variant of R.drawable.onboarding_icon in the folder `drawable-night` is working
89-
// at runtime, but is not in Android Studio Preview. So I prefer to handle this manually.
90-
val isLight = ElementTheme.colors.isLight
91-
val iconDrawableRes = if (isLight) R.drawable.onboarding_icon_light else R.drawable.onboarding_icon_dark
9286
Box(
9387
modifier = modifier.fillMaxSize(),
9488
) {
@@ -99,14 +93,9 @@ private fun OnBoardingContent(modifier: Modifier = Modifier) {
9993
verticalBias = -0.4f
10094
)
10195
) {
102-
// Dark and light icon does not have the same size, add padding to the smaller one
103-
val imagePadding = if (isLight) 28.dp else 0.dp
104-
Image(
105-
modifier = Modifier
106-
.size(278.dp)
107-
.padding(imagePadding),
108-
painter = painterResource(id = iconDrawableRes),
109-
contentDescription = null,
96+
ElementLogoAtom(
97+
size = ElementLogoAtomSize.Large,
98+
modifier = Modifier.padding(top = ElementLogoAtomSize.Large.shadowRadius / 2)
11099
)
111100
}
112101
Box(
@@ -200,17 +189,10 @@ private fun OnBoardingButtons(
200189
}
201190
}
202191

203-
@Preview
204-
@Composable
205-
internal fun OnBoardingScreenLightPreview(@PreviewParameter(OnBoardingStateProvider::class) state: OnBoardingState) =
206-
ElementPreviewLight { ContentToPreview(state) }
207-
208-
@Preview
209-
@Composable
210-
internal fun OnBoardingScreenDarkPreview(@PreviewParameter(OnBoardingStateProvider::class) state: OnBoardingState) =
211-
ElementPreviewDark { ContentToPreview(state) }
212-
192+
@DayNightPreviews
213193
@Composable
214-
private fun ContentToPreview(state: OnBoardingState) {
194+
internal fun OnBoardingScreenPreview(
195+
@PreviewParameter(OnBoardingStateProvider::class) state: OnBoardingState
196+
) = ElementPreview {
215197
OnBoardingView(state)
216198
}

‎features/onboarding/impl/src/main/res/drawable/onboarding_icon_dark.png‎

-83.6 KB
Binary file not shown.

‎features/onboarding/impl/src/main/res/drawable/onboarding_icon_light.png‎

-43.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)