Skip to content

Commit 2819448

Browse files
bmartybmarty
committed
Use DayNightPreview 
1 parent 1eb9491 commit 2819448

File tree

105 files changed

+505
-1509
lines changed

Some content is hidden

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

105 files changed

+505
-1509
lines changed

‎appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@ import androidx.compose.runtime.Composable
2828
import androidx.compose.ui.Alignment
2929
import androidx.compose.ui.Modifier
3030
import androidx.compose.ui.res.stringResource
31-
import androidx.compose.ui.tooling.preview.Preview
3231
import androidx.compose.ui.tooling.preview.PreviewParameter
3332
import androidx.compose.ui.unit.dp
3433
import io.element.android.features.networkmonitor.api.ui.ConnectivityIndicatorView
3534
import io.element.android.libraries.designsystem.atomic.molecules.IconTitlePlaceholdersRowMolecule
3635
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
3736
import io.element.android.libraries.designsystem.components.button.BackButton
38-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
39-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
37+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
38+
import io.element.android.libraries.designsystem.preview.ElementPreview
4039
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
4140
import io.element.android.libraries.designsystem.theme.components.Scaffold
4241
import io.element.android.libraries.designsystem.theme.components.Text
@@ -101,18 +100,9 @@ private fun LoadingRoomTopBar(
101100
)
102101
}
103102

104-
@Preview
103+
@DayNightPreviews
105104
@Composable
106-
internal fun LoadingRoomNodeViewLightPreview(@PreviewParameter(LoadingRoomStateProvider::class) state: LoadingRoomState) =
107-
ElementPreviewLight { ContentToPreview(state) }
108-
109-
@Preview
110-
@Composable
111-
internal fun LoadingRoomNodeViewDarkPreview(@PreviewParameter(LoadingRoomStateProvider::class) state: LoadingRoomState) =
112-
ElementPreviewDark { ContentToPreview(state) }
113-
114-
@Composable
115-
private fun ContentToPreview(state: LoadingRoomState) {
105+
internal fun LoadingRoomNodeViewPreview(@PreviewParameter(LoadingRoomStateProvider::class) state: LoadingRoomState) = ElementPreview {
116106
LoadingRoomNodeView(
117107
state = state,
118108
onBackClicked = {},

‎appnav/src/main/kotlin/io/element/android/appnav/root/RootView.kt‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ import androidx.compose.foundation.layout.fillMaxSize
2222
import androidx.compose.runtime.Composable
2323
import androidx.compose.ui.Alignment
2424
import androidx.compose.ui.Modifier
25-
import androidx.compose.ui.tooling.preview.Preview
2625
import androidx.compose.ui.tooling.preview.PreviewParameter
2726
import io.element.android.features.rageshake.api.crash.CrashDetectionEvents
2827
import io.element.android.features.rageshake.api.crash.CrashDetectionView
2928
import io.element.android.features.rageshake.api.detection.RageshakeDetectionEvents
3029
import io.element.android.features.rageshake.api.detection.RageshakeDetectionView
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
import io.element.android.services.apperror.impl.AppErrorView
3534

@@ -67,16 +66,9 @@ fun RootView(
6766
}
6867
}
6968

70-
@Preview
69+
@DayNightPreviews
7170
@Composable
72-
internal fun RootLightPreview(@PreviewParameter(RootStateProvider::class) rootState: RootState) = ElementPreviewLight { ContentToPreview(rootState) }
73-
74-
@Preview
75-
@Composable
76-
internal fun RootDarkPreview(@PreviewParameter(RootStateProvider::class) rootState: RootState) = ElementPreviewDark { ContentToPreview(rootState) }
77-
78-
@Composable
79-
private fun ContentToPreview(rootState: RootState) {
71+
internal fun RootPreview(@PreviewParameter(RootStateProvider::class) rootState: RootState) = ElementPreview {
8072
RootView(rootState) {
8173
Text("Children")
8274
}

‎features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesView.kt‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ import androidx.compose.foundation.layout.Column
2020
import androidx.compose.runtime.Composable
2121
import androidx.compose.ui.Modifier
2222
import androidx.compose.ui.res.stringResource
23-
import androidx.compose.ui.tooling.preview.Preview
2423
import androidx.compose.ui.tooling.preview.PreviewParameter
2524
import io.element.android.features.analytics.api.AnalyticsOptInEvents
2625
import io.element.android.libraries.designsystem.components.LINK_TAG
2726
import io.element.android.libraries.designsystem.components.list.ListItemContent
28-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
29-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
27+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
28+
import io.element.android.libraries.designsystem.preview.ElementPreview
3029
import io.element.android.libraries.designsystem.text.buildAnnotatedStringWithStyledPart
3130
import io.element.android.libraries.designsystem.theme.components.ListItem
3231
import io.element.android.libraries.designsystem.theme.components.ListSupportingText
@@ -71,19 +70,11 @@ fun AnalyticsPreferencesView(
7170
}
7271
}
7372

74-
@Preview
73+
@DayNightPreviews
7574
@Composable
76-
internal fun AnalyticsPreferencesViewLightPreview(@PreviewParameter(AnalyticsPreferencesStateProvider::class) state: AnalyticsPreferencesState) =
77-
ElementPreviewLight { ContentToPreview(state) }
78-
79-
@Preview
80-
@Composable
81-
internal fun AnalyticsPreferencesViewDarkPreview(@PreviewParameter(AnalyticsPreferencesStateProvider::class) state: AnalyticsPreferencesState) =
82-
ElementPreviewDark { ContentToPreview(state) }
83-
84-
@Composable
85-
private fun ContentToPreview(state: AnalyticsPreferencesState) {
86-
AnalyticsPreferencesView(
87-
state = state,
88-
)
89-
}
75+
internal fun AnalyticsPreferencesViewPreview(@PreviewParameter(AnalyticsPreferencesStateProvider::class) state: AnalyticsPreferencesState) =
76+
ElementPreview {
77+
AnalyticsPreferencesView(
78+
state = state,
79+
)
80+
}

‎features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import androidx.compose.ui.Modifier
3939
import androidx.compose.ui.graphics.Color
4040
import androidx.compose.ui.res.stringResource
4141
import androidx.compose.ui.text.style.TextAlign
42-
import androidx.compose.ui.tooling.preview.Preview
4342
import androidx.compose.ui.tooling.preview.PreviewParameter
4443
import androidx.compose.ui.unit.dp
4544
import io.element.android.features.analytics.api.AnalyticsOptInEvents
@@ -49,8 +48,8 @@ import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubti
4948
import io.element.android.libraries.designsystem.atomic.molecules.InfoListItem
5049
import io.element.android.libraries.designsystem.atomic.molecules.InfoListOrganism
5150
import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
52-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
53-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
51+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
52+
import io.element.android.libraries.designsystem.preview.ElementPreview
5453
import io.element.android.libraries.designsystem.text.buildAnnotatedStringWithStyledPart
5554
import io.element.android.libraries.designsystem.theme.components.Button
5655
import io.element.android.libraries.designsystem.theme.components.ButtonSize
@@ -210,20 +209,9 @@ private fun AnalyticsOptInFooter(
210209
}
211210
}
212211

213-
@Preview
212+
@DayNightPreviews
214213
@Composable
215-
internal fun AnalyticsOptInViewLightPreview(@PreviewParameter(AnalyticsOptInStateProvider::class) state: AnalyticsOptInState) = ElementPreviewLight {
216-
ContentToPreview(state)
217-
}
218-
219-
@Preview
220-
@Composable
221-
internal fun AnalyticsOptInViewDarkPreview(@PreviewParameter(AnalyticsOptInStateProvider::class) state: AnalyticsOptInState) = ElementPreviewDark {
222-
ContentToPreview(state)
223-
}
224-
225-
@Composable
226-
private fun ContentToPreview(state: AnalyticsOptInState) {
214+
internal fun AnalyticsOptInViewPreview(@PreviewParameter(AnalyticsOptInStateProvider::class) state: AnalyticsOptInState) = ElementPreview {
227215
AnalyticsOptInView(
228216
state = state,
229217
onClickTerms = {},

‎features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ import androidx.compose.material3.ExperimentalMaterial3Api
2626
import androidx.compose.runtime.Composable
2727
import androidx.compose.ui.Modifier
2828
import androidx.compose.ui.res.stringResource
29-
import androidx.compose.ui.tooling.preview.Preview
3029
import androidx.compose.ui.tooling.preview.PreviewParameter
3130
import io.element.android.features.createroom.impl.R
3231
import io.element.android.features.createroom.impl.components.UserListView
3332
import io.element.android.features.createroom.impl.userlist.UserListEvents
3433
import io.element.android.features.createroom.impl.userlist.UserListState
3534
import io.element.android.libraries.designsystem.components.button.BackButton
36-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
37-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
35+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
36+
import io.element.android.libraries.designsystem.preview.ElementPreview
3837
import io.element.android.libraries.designsystem.theme.aliasScreenTitle
3938
import io.element.android.libraries.designsystem.theme.components.Scaffold
4039
import io.element.android.libraries.designsystem.theme.components.Text
@@ -110,17 +109,8 @@ fun AddPeopleViewTopBar(
110109
)
111110
}
112111

113-
@Preview
112+
@DayNightPreviews
114113
@Composable
115-
internal fun AddPeopleViewLightPreview(@PreviewParameter(AddPeopleUserListStateProvider::class) state: UserListState) =
116-
ElementPreviewLight { ContentToPreview(state) }
117-
118-
@Preview
119-
@Composable
120-
internal fun AddPeopleViewDarkPreview(@PreviewParameter(AddPeopleUserListStateProvider::class) state: UserListState) =
121-
ElementPreviewDark { ContentToPreview(state) }
122-
123-
@Composable
124-
private fun ContentToPreview(state: UserListState) {
114+
internal fun AddPeopleViewPreview(@PreviewParameter(AddPeopleUserListStateProvider::class) state: UserListState) = ElementPreview {
125115
AddPeopleView(state = state)
126116
}

‎features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ import androidx.compose.runtime.Composable
2828
import androidx.compose.ui.Alignment
2929
import androidx.compose.ui.Modifier
3030
import androidx.compose.ui.semantics.Role
31-
import androidx.compose.ui.tooling.preview.Preview
3231
import androidx.compose.ui.unit.dp
3332
import io.element.android.features.createroom.impl.configureroom.RoomPrivacyItem
3433
import io.element.android.features.createroom.impl.configureroom.roomPrivacyItems
35-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
36-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
34+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
35+
import io.element.android.libraries.designsystem.preview.ElementPreview
3736
import io.element.android.libraries.designsystem.theme.components.Icon
3837
import io.element.android.libraries.designsystem.theme.components.RadioButton
3938
import io.element.android.libraries.designsystem.theme.components.Text
@@ -91,16 +90,9 @@ fun RoomPrivacyOption(
9190
}
9291
}
9392

94-
@Preview
93+
@DayNightPreviews
9594
@Composable
96-
internal fun RoomPrivacyOptionLightPreview() = ElementPreviewLight { ContentToPreview() }
97-
98-
@Preview
99-
@Composable
100-
internal fun RoomPrivacyOptionDarkPreview() = ElementPreviewDark { ContentToPreview() }
101-
102-
@Composable
103-
private fun ContentToPreview() {
95+
internal fun RoomPrivacyOptionPreview() = ElementPreview {
10496
val aRoomPrivacyItem = roomPrivacyItems().first()
10597
Column {
10698
RoomPrivacyOption(

‎features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/UserListView.kt‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ import androidx.compose.foundation.layout.PaddingValues
2121
import androidx.compose.foundation.layout.fillMaxWidth
2222
import androidx.compose.runtime.Composable
2323
import androidx.compose.ui.Modifier
24-
import androidx.compose.ui.tooling.preview.Preview
2524
import androidx.compose.ui.tooling.preview.PreviewParameter
2625
import androidx.compose.ui.unit.dp
2726
import io.element.android.features.createroom.impl.userlist.UserListEvents
2827
import io.element.android.features.createroom.impl.userlist.UserListState
2928
import io.element.android.features.createroom.impl.userlist.UserListStateProvider
30-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
31-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
29+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
30+
import io.element.android.libraries.designsystem.preview.ElementPreview
3231
import io.element.android.libraries.matrix.api.user.MatrixUser
3332
import io.element.android.libraries.matrix.ui.components.SelectedUsersList
3433

@@ -77,17 +76,8 @@ fun UserListView(
7776
}
7877
}
7978

80-
@Preview
79+
@DayNightPreviews
8180
@Composable
82-
internal fun UserListViewLightPreview(@PreviewParameter(UserListStateProvider::class) state: UserListState) =
83-
ElementPreviewLight { ContentToPreview(state) }
84-
85-
@Preview
86-
@Composable
87-
internal fun UserListViewDarkPreview(@PreviewParameter(UserListStateProvider::class) state: UserListState) =
88-
ElementPreviewDark { ContentToPreview(state) }
89-
90-
@Composable
91-
private fun ContentToPreview(state: UserListState) {
81+
internal fun UserListViewPreview(@PreviewParameter(UserListStateProvider::class) state: UserListState) = ElementPreview {
9282
UserListView(state = state)
9383
}

‎features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import androidx.compose.ui.input.pointer.pointerInput
4545
import androidx.compose.ui.platform.LocalFocusManager
4646
import androidx.compose.ui.res.stringResource
4747
import androidx.compose.ui.text.input.KeyboardCapitalization
48-
import androidx.compose.ui.tooling.preview.Preview
4948
import androidx.compose.ui.tooling.preview.PreviewParameter
5049
import androidx.compose.ui.unit.dp
5150
import io.element.android.features.createroom.impl.R
@@ -55,8 +54,8 @@ import io.element.android.libraries.designsystem.components.LabelledTextField
5554
import io.element.android.libraries.designsystem.components.ProgressDialog
5655
import io.element.android.libraries.designsystem.components.button.BackButton
5756
import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
58-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
59-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
57+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
58+
import io.element.android.libraries.designsystem.preview.ElementPreview
6059
import io.element.android.libraries.designsystem.theme.aliasScreenTitle
6160
import io.element.android.libraries.designsystem.theme.components.Scaffold
6261
import io.element.android.libraries.designsystem.theme.components.Text
@@ -274,20 +273,10 @@ private fun Modifier.clearFocusOnTap(focusManager: FocusManager): Modifier =
274273
})
275274
}
276275

277-
@Preview
276+
@DayNightPreviews
278277
@Composable
279-
internal fun ConfigureRoomViewLightPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) =
280-
ElementPreviewLight { ContentToPreview(state) }
281-
282-
@Preview
283-
@Composable
284-
internal fun ConfigureRoomViewDarkPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) =
285-
ElementPreviewDark { ContentToPreview(state) }
286-
287-
@Composable
288-
private fun ContentToPreview(state: ConfigureRoomState) {
278+
internal fun ConfigureRoomViewPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) = ElementPreview {
289279
ConfigureRoomView(
290280
state = state,
291281
)
292282
}
293-

‎features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import androidx.compose.runtime.LaunchedEffect
3636
import androidx.compose.ui.Alignment
3737
import androidx.compose.ui.Modifier
3838
import androidx.compose.ui.res.stringResource
39-
import androidx.compose.ui.tooling.preview.Preview
4039
import androidx.compose.ui.tooling.preview.PreviewParameter
4140
import androidx.compose.ui.unit.dp
4241
import io.element.android.features.createroom.impl.R
@@ -45,8 +44,8 @@ import io.element.android.libraries.architecture.Async
4544
import io.element.android.libraries.designsystem.VectorIcons
4645
import io.element.android.libraries.designsystem.components.ProgressDialog
4746
import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
48-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
49-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
47+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
48+
import io.element.android.libraries.designsystem.preview.ElementPreview
5049
import io.element.android.libraries.designsystem.theme.aliasScreenTitle
5150
import io.element.android.libraries.designsystem.theme.components.Icon
5251
import io.element.android.libraries.designsystem.theme.components.IconButton
@@ -203,19 +202,11 @@ fun CreateRoomActionButton(
203202
}
204203
}
205204

206-
@Preview
205+
@DayNightPreviews
207206
@Composable
208-
internal fun CreateRoomRootViewLightPreview(@PreviewParameter(CreateRoomRootStateProvider::class) state: CreateRoomRootState) =
209-
ElementPreviewLight { ContentToPreview(state) }
210-
211-
@Preview
212-
@Composable
213-
internal fun CreateRoomRootViewDarkPreview(@PreviewParameter(CreateRoomRootStateProvider::class) state: CreateRoomRootState) =
214-
ElementPreviewDark { ContentToPreview(state) }
215-
216-
@Composable
217-
private fun ContentToPreview(state: CreateRoomRootState) {
218-
CreateRoomRootView(
219-
state = state,
220-
)
221-
}
207+
internal fun CreateRoomRootViewPreview(@PreviewParameter(CreateRoomRootStateProvider::class) state: CreateRoomRootState) =
208+
ElementPreview {
209+
CreateRoomRootView(
210+
state = state,
211+
)
212+
}

‎features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListView.kt‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@ import androidx.compose.runtime.LaunchedEffect
3232
import androidx.compose.ui.Modifier
3333
import androidx.compose.ui.res.stringResource
3434
import androidx.compose.ui.text.style.TextAlign
35-
import androidx.compose.ui.tooling.preview.Preview
3635
import androidx.compose.ui.tooling.preview.PreviewParameter
3736
import androidx.compose.ui.unit.dp
3837
import io.element.android.features.invitelist.impl.components.InviteSummaryRow
3938
import io.element.android.libraries.architecture.Async
4039
import io.element.android.libraries.designsystem.components.button.BackButton
4140
import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
4241
import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
43-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
44-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
42+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
43+
import io.element.android.libraries.designsystem.preview.ElementPreview
4544
import io.element.android.libraries.designsystem.theme.aliasScreenTitle
4645
import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
4746
import io.element.android.libraries.designsystem.theme.components.Scaffold
@@ -171,17 +170,8 @@ fun InviteListContent(
171170
)
172171
}
173172

174-
@Preview
173+
@DayNightPreviews
175174
@Composable
176-
internal fun InviteListViewLightPreview(@PreviewParameter(InviteListStateProvider::class) state: InviteListState) =
177-
ElementPreviewLight { ContentToPreview(state) }
178-
179-
@Preview
180-
@Composable
181-
internal fun InviteListViewDarkPreview(@PreviewParameter(InviteListStateProvider::class) state: InviteListState) =
182-
ElementPreviewDark { ContentToPreview(state) }
183-
184-
@Composable
185-
private fun ContentToPreview(state: InviteListState) {
175+
internal fun InviteListViewPreview(@PreviewParameter(InviteListStateProvider::class) state: InviteListState) = ElementPreview {
186176
InviteListView(state)
187177
}

0 commit comments

Comments
 (0)