From 0dce05406c8c5a045ac3d56bee6e24f4958159ed Mon Sep 17 00:00:00 2001 From: lihenggui Date: Mon, 11 Mar 2024 16:31:38 -0700 Subject: [PATCH] WIP: Make :core:designsystem as the multiplatform module --- core/designsystem/build.gradle.kts | 45 ++++++++++++------ .../core/designsystem/ThemeTest.kt | 0 .../{main => androidMain}/AndroidManifest.xml | 0 ...re_designsystem_ic_placeholder_default.xml | 0 .../core/designsystem/component/Background.kt | 17 +++---- .../core/designsystem/component/Button.kt | 0 .../core/designsystem/component/Chip.kt | 2 +- .../component/DynamicAsyncImage.kt | 9 ++-- .../core/designsystem/component/IconButton.kt | 0 .../designsystem/component/LoadingWheel.kt | 0 .../core/designsystem/component/Navigation.kt | 0 .../core/designsystem/component/Tabs.kt | 0 .../core/designsystem/component/Tag.kt | 0 .../core/designsystem/component/TopAppBar.kt | 0 .../core/designsystem/component/ViewToggle.kt | 0 .../component/scrollbar/AppScrollbars.kt | 4 -- .../scrollbar/LazyScrollbarUtilities.kt | 0 .../component/scrollbar/Scrollbar.kt | 1 + .../component/scrollbar/ScrollbarExt.kt | 0 .../component/scrollbar/ThumbExt.kt | 0 .../core/designsystem/icon/NiaIcons.kt | 0 .../core/designsystem/theme/Background.kt | 0 .../core/designsystem/theme/Color.kt | 0 .../core/designsystem/theme/Gradient.kt | 0 .../core/designsystem/theme/Theme.kt | 3 -- .../core/designsystem/theme/Tint.kt | 0 .../core/designsystem/theme/Type.kt | 0 .../designsystem/BackgroundScreenshotTests.kt | 0 .../designsystem/ButtonScreenshotTests.kt | 0 .../designsystem/FilterChipScreenshotTests.kt | 0 .../designsystem/IconButtonScreenshotTests.kt | 0 .../LoadingWheelScreenshotTests.kt | 0 .../designsystem/NavigationScreenshotTests.kt | 0 .../core/designsystem/TabsScreenshotTests.kt | 0 .../core/designsystem/TagScreenshotTests.kt | 0 .../designsystem/TopAppBarScreenshotTests.kt | 0 ...ackground_dark_androidTheme_notDynamic.png | Bin .../Background_dark_defaultTheme_dynamic.png | Bin ...ackground_dark_defaultTheme_notDynamic.png | Bin ...ckground_light_androidTheme_notDynamic.png | Bin .../Background_light_defaultTheme_dynamic.png | Bin ...ckground_light_defaultTheme_notDynamic.png | Bin ...ackground_dark_androidTheme_notDynamic.png | Bin ...ntBackground_dark_defaultTheme_dynamic.png | Bin ...ackground_dark_defaultTheme_notDynamic.png | Bin ...ckground_light_androidTheme_notDynamic.png | Bin ...tBackground_light_defaultTheme_dynamic.png | Bin ...ckground_light_defaultTheme_notDynamic.png | Bin ...nLeadingIcon_dark_defaultTheme_dynamic.png | Bin ...adingIcon_dark_defaultTheme_notDynamic.png | Bin ...LeadingIcon_light_defaultTheme_dynamic.png | Bin ...dingIcon_light_defaultTheme_notDynamic.png | Bin .../Button_dark_androidTheme_notDynamic.png | Bin .../Button_dark_defaultTheme_dynamic.png | Bin .../Button_dark_defaultTheme_notDynamic.png | Bin .../Button_light_androidTheme_notDynamic.png | Bin .../Button_light_defaultTheme_dynamic.png | Bin .../Button_light_defaultTheme_notDynamic.png | Bin ...ineButton_dark_androidTheme_notDynamic.png | Bin ...utlineButton_dark_defaultTheme_dynamic.png | Bin ...ineButton_dark_defaultTheme_notDynamic.png | Bin ...neButton_light_androidTheme_notDynamic.png | Bin ...tlineButton_light_defaultTheme_dynamic.png | Bin ...neButton_light_defaultTheme_notDynamic.png | Bin ...pSelected_dark_androidTheme_notDynamic.png | Bin ...ChipSelected_dark_defaultTheme_dynamic.png | Bin ...pSelected_dark_defaultTheme_notDynamic.png | Bin ...Selected_light_androidTheme_notDynamic.png | Bin ...hipSelected_light_defaultTheme_dynamic.png | Bin ...Selected_light_defaultTheme_notDynamic.png | Bin ...ilterChip_dark_androidTheme_notDynamic.png | Bin .../FilterChip_dark_defaultTheme_dynamic.png | Bin ...ilterChip_dark_defaultTheme_notDynamic.png | Bin .../FilterChip/FilterChip_fontScale2.png | Bin ...lterChip_light_androidTheme_notDynamic.png | Bin .../FilterChip_light_defaultTheme_dynamic.png | Bin ...lterChip_light_defaultTheme_notDynamic.png | Bin ...Unchecked_dark_androidTheme_notDynamic.png | Bin ...tonUnchecked_dark_defaultTheme_dynamic.png | Bin ...Unchecked_dark_defaultTheme_notDynamic.png | Bin ...nchecked_light_androidTheme_notDynamic.png | Bin ...onUnchecked_light_defaultTheme_dynamic.png | Bin ...nchecked_light_defaultTheme_notDynamic.png | Bin ...conButton_dark_androidTheme_notDynamic.png | Bin .../IconButton_dark_defaultTheme_dynamic.png | Bin ...conButton_dark_defaultTheme_notDynamic.png | Bin ...onButton_light_androidTheme_notDynamic.png | Bin .../IconButton_light_defaultTheme_dynamic.png | Bin ...onButton_light_defaultTheme_notDynamic.png | Bin .../LoadingWheel_animation_1000.png | Bin .../LoadingWheel_animation_115.png | Bin .../LoadingWheel_animation_20.png | Bin .../LoadingWheel_animation_724.png | Bin ...dingWheel_dark_androidTheme_notDynamic.png | Bin ...LoadingWheel_dark_defaultTheme_dynamic.png | Bin ...dingWheel_dark_defaultTheme_notDynamic.png | Bin ...ingWheel_light_androidTheme_notDynamic.png | Bin ...oadingWheel_light_defaultTheme_dynamic.png | Bin ...ingWheel_light_defaultTheme_notDynamic.png | Bin ...dingWheel_dark_androidTheme_notDynamic.png | Bin ...LoadingWheel_dark_defaultTheme_dynamic.png | Bin ...dingWheel_dark_defaultTheme_notDynamic.png | Bin ...ingWheel_light_androidTheme_notDynamic.png | Bin ...oadingWheel_light_defaultTheme_dynamic.png | Bin ...ingWheel_light_defaultTheme_notDynamic.png | Bin ...avigation_dark_androidTheme_notDynamic.png | Bin .../Navigation_dark_defaultTheme_dynamic.png | Bin ...avigation_dark_defaultTheme_notDynamic.png | Bin .../Navigation/Navigation_fontScale2.png | Bin ...vigation_light_androidTheme_notDynamic.png | Bin .../Navigation_light_defaultTheme_dynamic.png | Bin ...vigation_light_defaultTheme_notDynamic.png | Bin .../Tabs_dark_androidTheme_notDynamic.png | Bin .../Tabs/Tabs_dark_defaultTheme_dynamic.png | Bin .../Tabs_dark_defaultTheme_notDynamic.png | Bin .../screenshots/Tabs/Tabs_fontScale2.png | Bin .../Tabs_light_androidTheme_notDynamic.png | Bin .../Tabs/Tabs_light_defaultTheme_dynamic.png | Bin .../Tabs_light_defaultTheme_notDynamic.png | Bin .../Tag/Tag_dark_androidTheme_notDynamic.png | Bin .../Tag/Tag_dark_defaultTheme_dynamic.png | Bin .../Tag/Tag_dark_defaultTheme_notDynamic.png | Bin .../screenshots/Tag/Tag_fontScale2.png | Bin .../Tag/Tag_light_androidTheme_notDynamic.png | Bin .../Tag/Tag_light_defaultTheme_dynamic.png | Bin .../Tag/Tag_light_defaultTheme_notDynamic.png | Bin ...TopAppBar_dark_androidTheme_notDynamic.png | Bin .../TopAppBar_dark_defaultTheme_dynamic.png | Bin ...TopAppBar_dark_defaultTheme_notDynamic.png | Bin .../TopAppBar/TopAppBar_fontScale2.png | Bin ...opAppBar_light_androidTheme_notDynamic.png | Bin .../TopAppBar_light_defaultTheme_dynamic.png | Bin ...opAppBar_light_defaultTheme_notDynamic.png | Bin core/testing/build.gradle.kts | 38 ++++++++------- .../{main => androidMain}/AndroidManifest.xml | 0 .../GrantPostNotificationsPermissionRule.kt | 0 .../core/testing/NiaTestRunner.kt | 0 .../testing/data/FollowableTopicTestData.kt | 0 .../testing/data/NewsResourcesTestData.kt | 0 .../core/testing/data/TopicsTestData.kt | 0 .../testing/data/UserNewsResourcesTestData.kt | 0 .../core/testing/di/TestDispatcherModule.kt | 0 .../core/testing/di/TestDispatchersModule.kt | 0 .../testing/notifications/TestNotifier.kt | 0 .../testing/repository/TestNewsRepository.kt | 0 .../repository/TestRecentSearchRepository.kt | 0 .../TestSearchContentsRepository.kt | 0 .../repository/TestTopicsRepository.kt | 0 .../repository/TestUserDataRepository.kt | 0 .../core/testing/util/MainDispatcherRule.kt | 0 .../core/testing/util/TestAnalyticsHelper.kt | 0 .../core/testing/util/TestNetworkMonitor.kt | 0 .../core/testing/util/TestSyncManager.kt | 0 .../core/testing/util/TestTimeZoneMonitor.kt | 0 gradle.properties | 5 +- 155 files changed, 72 insertions(+), 52 deletions(-) rename core/designsystem/src/{androidTest => androidInstrumentedTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.kt (100%) rename core/designsystem/src/{main => androidMain}/AndroidManifest.xml (100%) rename core/designsystem/src/{main => androidMain}/res/drawable/core_designsystem_ic_placeholder_default.xml (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt (92%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt (98%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt (93%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/IconButton.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/ViewToggle.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt (97%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/LazyScrollbarUtilities.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt (99%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ScrollbarExt.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ThumbExt.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Background.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Gradient.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt (98%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Tint.kt (100%) rename core/designsystem/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt (100%) rename core/designsystem/src/{test => commonTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/BackgroundScreenshotTests.kt (100%) rename core/designsystem/src/{test => commonTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ButtonScreenshotTests.kt (100%) rename core/designsystem/src/{test => commonTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/FilterChipScreenshotTests.kt (100%) rename core/designsystem/src/{test => commonTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/IconButtonScreenshotTests.kt (100%) rename core/designsystem/src/{test => commonTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt (100%) rename core/designsystem/src/{test => commonTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt (100%) rename core/designsystem/src/{test => commonTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TabsScreenshotTests.kt (100%) rename core/designsystem/src/{test => commonTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt (100%) rename core/designsystem/src/{test => commonTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Background/Background_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Background/Background_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Background/Background_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Background/Background_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Background/Background_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Background/Background_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Background/GradientBackground_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/Button_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/Button_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/Button_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/Button_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/Button_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/Button_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChip_fontScale2.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/LoadingWheel_animation_1000.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/LoadingWheel_animation_115.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/LoadingWheel_animation_20.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/LoadingWheel_animation_724.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Navigation/Navigation_fontScale2.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tabs/Tabs_fontScale2.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tag/Tag_fontScale2.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tag/Tag_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tag/Tag_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/TopAppBar/TopAppBar_fontScale2.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{test => commonTest}/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png (100%) rename core/testing/src/{main => androidMain}/AndroidManifest.xml (100%) rename core/testing/src/{main => androidMain}/kotlin/com/google/samples/apps/nowinandroid/core/rules/GrantPostNotificationsPermissionRule.kt (100%) rename core/testing/src/{main => androidMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/NiaTestRunner.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/FollowableTopicTestData.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/TopicsTestData.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/notifications/TestNotifier.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestRecentSearchRepository.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestSearchContentsRepository.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestAnalyticsHelper.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestNetworkMonitor.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestSyncManager.kt (100%) rename core/testing/src/{main => commonMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestTimeZoneMonitor.kt (100%) diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index f08bae2fc..59862be9a 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -14,8 +14,8 @@ * limitations under the License. */ plugins { - alias(libs.plugins.nowinandroid.android.library) - alias(libs.plugins.nowinandroid.android.library.compose) + alias(libs.plugins.nowinandroid.kmp.library) + alias(libs.plugins.jetbrains.compose) alias(libs.plugins.nowinandroid.android.library.jacoco) alias(libs.plugins.roborazzi) } @@ -27,26 +27,41 @@ android { namespace = "com.google.samples.apps.nowinandroid.core.designsystem" } +kotlin { + sourceSets { + androidMain.dependencies { + implementation(libs.compose.ui.tooling.preview) + implementation(libs.androidx.activity.compose) + } + androidUnitTest.dependencies { + implementation(libs.androidx.compose.ui.test) + implementation(projects.core.testing) + } + commonMain.dependencies { + implementation(libs.coil.compose) + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.material3) + implementation(compose.materialIconsExtended) + implementation(compose.ui) + implementation(compose.uiUtil) + implementation(compose.components.resources) + implementation(compose.components.uiToolingPreview) + } + commonTest.dependencies { + implementation(libs.kotlin.test) + + } + } +} dependencies { lintPublish(projects.lint) - api(libs.androidx.compose.foundation) - api(libs.androidx.compose.foundation.layout) - api(libs.androidx.compose.material.iconsExtended) - api(libs.androidx.compose.material3) - api(libs.androidx.compose.runtime) - api(libs.androidx.compose.ui.util) - - implementation(libs.coil.compose) - testImplementation(libs.androidx.compose.ui.test) testImplementation(libs.accompanist.testharness) - testImplementation(libs.hilt.android.testing) testImplementation(libs.robolectric) testImplementation(libs.roborazzi) testImplementation(projects.core.screenshotTesting) testImplementation(projects.core.testing) - - androidTestImplementation(libs.androidx.compose.ui.test) - androidTestImplementation(projects.core.testing) } diff --git a/core/designsystem/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.kt b/core/designsystem/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.kt similarity index 100% rename from core/designsystem/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.kt rename to core/designsystem/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.kt diff --git a/core/designsystem/src/main/AndroidManifest.xml b/core/designsystem/src/androidMain/AndroidManifest.xml similarity index 100% rename from core/designsystem/src/main/AndroidManifest.xml rename to core/designsystem/src/androidMain/AndroidManifest.xml diff --git a/core/designsystem/src/main/res/drawable/core_designsystem_ic_placeholder_default.xml b/core/designsystem/src/androidMain/res/drawable/core_designsystem_ic_placeholder_default.xml similarity index 100% rename from core/designsystem/src/main/res/drawable/core_designsystem_ic_placeholder_default.xml rename to core/designsystem/src/androidMain/res/drawable/core_designsystem_ic_placeholder_default.xml diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt similarity index 92% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt index 9ef52dd76..e25fd08f3 100644 --- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt +++ b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt @@ -16,7 +16,6 @@ package com.google.samples.apps.nowinandroid.core.designsystem.component -import android.content.res.Configuration import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.size @@ -31,13 +30,14 @@ import androidx.compose.ui.draw.drawWithCache import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.google.samples.apps.nowinandroid.core.designsystem.theme.GradientColors import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalBackgroundTheme import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalGradientColors import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme +import org.jetbrains.compose.ui.tooling.preview.Preview +import kotlin.math.PI import kotlin.math.tan /** @@ -95,14 +95,14 @@ fun NiaGradientBackground( .drawWithCache { // Compute the start and end coordinates such that the gradients are angled 11.06 // degrees off the vertical axis + // Math.toRadians is replaced by deg / 180.0 * PI val offset = size.height * tan( - Math - .toRadians(11.06) + (11.06) / 180.0 * PI .toFloat(), ) - val start = Offset(size.width / 2 + offset / 2, 0f) - val end = Offset(size.width / 2 - offset / 2, size.height) + val start = Offset((size.width / 2 + offset / 2).toFloat(), 0f) + val end = Offset((size.width / 2 - offset / 2).toFloat(), size.height) // Create the top gradient that fades out after the halfway point vertically val topGradient = Brush.linearGradient( @@ -143,8 +143,9 @@ fun NiaGradientBackground( * Multipreview annotation that represents light and dark themes. Add this annotation to a * composable to render the both themes. */ -@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO, name = "Light theme") -@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, name = "Dark theme") +//@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO, name = "Light theme") +//@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, name = "Dark theme") +@Preview annotation class ThemePreviews @ThemePreviews diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt similarity index 98% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt index 9497bd92d..26ac80633 100644 --- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt +++ b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme +import org.jetbrains.compose.ui.tooling.preview.Preview /** * Now in Android filter chip with included leading checked icon as well as text content slot. @@ -43,7 +44,6 @@ import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme * @param label The text label content. */ @Composable -@OptIn(ExperimentalMaterial3Api::class) fun NiaFilterChip( selected: Boolean, onSelectedChange: (Boolean) -> Unit, diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt similarity index 93% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt index 1557cac06..2c936cf13 100644 --- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt +++ b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt @@ -35,12 +35,13 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalInspectionMode import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import coil.compose.AsyncImage -import coil.compose.AsyncImagePainter.State.Error -import coil.compose.AsyncImagePainter.State.Loading -import coil.compose.rememberAsyncImagePainter +import coil3.compose.AsyncImage +import coil3.compose.AsyncImagePainter.State.Error +import coil3.compose.AsyncImagePainter.State.Loading +import coil3.compose.rememberAsyncImagePainter import com.google.samples.apps.nowinandroid.core.designsystem.R import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalTintTheme +import org.jetbrains.compose.resources.painterResource /** * A wrapper around [AsyncImage] which determines the colorFilter based on the theme diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/IconButton.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/IconButton.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/IconButton.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/IconButton.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/ViewToggle.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/ViewToggle.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/ViewToggle.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/ViewToggle.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt similarity index 97% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt index 1086e280b..9ce7b3a60 100644 --- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt +++ b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt @@ -16,7 +16,6 @@ package com.google.samples.apps.nowinandroid.core.designsystem.component.scrollbar -import android.annotation.SuppressLint import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.Spring import androidx.compose.animation.core.SpringSpec @@ -164,9 +163,6 @@ private fun ScrollableState.DecorativeScrollbarThumb( ) } -// TODO: This lint is removed in 1.6 as the recommendation has changed -// remove when project is upgraded -@SuppressLint("ComposableModifierFactory") @Composable private fun Modifier.scrollThumb( scrollableState: ScrollableState, diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/LazyScrollbarUtilities.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/LazyScrollbarUtilities.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/LazyScrollbarUtilities.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/LazyScrollbarUtilities.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt similarity index 99% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt index 002f36b31..fe8a9c605 100644 --- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt +++ b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt @@ -57,6 +57,7 @@ import androidx.compose.ui.util.unpackFloat2 import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.delay import kotlinx.coroutines.withTimeout +import kotlin.jvm.JvmInline import kotlin.math.max import kotlin.math.min import kotlin.math.roundToInt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ScrollbarExt.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ScrollbarExt.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ScrollbarExt.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ScrollbarExt.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ThumbExt.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ThumbExt.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ThumbExt.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ThumbExt.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Background.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Background.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Background.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Background.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Gradient.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Gradient.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Gradient.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Gradient.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt similarity index 98% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt index 582f88473..b2d2d7bca 100644 --- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt +++ b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt @@ -17,8 +17,6 @@ package com.google.samples.apps.nowinandroid.core.designsystem.theme import android.os.Build -import androidx.annotation.ChecksSdkIntAtLeast -import androidx.annotation.VisibleForTesting import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.darkColorScheme @@ -35,7 +33,6 @@ import androidx.compose.ui.unit.dp /** * Light default theme color scheme */ -@VisibleForTesting val LightDefaultColorScheme = lightColorScheme( primary = Purple40, onPrimary = Color.White, diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Tint.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Tint.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Tint.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Tint.kt diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt similarity index 100% rename from core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt rename to core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt diff --git a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/BackgroundScreenshotTests.kt b/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/BackgroundScreenshotTests.kt similarity index 100% rename from core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/BackgroundScreenshotTests.kt rename to core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/BackgroundScreenshotTests.kt diff --git a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ButtonScreenshotTests.kt b/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ButtonScreenshotTests.kt similarity index 100% rename from core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ButtonScreenshotTests.kt rename to core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ButtonScreenshotTests.kt diff --git a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/FilterChipScreenshotTests.kt b/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/FilterChipScreenshotTests.kt similarity index 100% rename from core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/FilterChipScreenshotTests.kt rename to core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/FilterChipScreenshotTests.kt diff --git a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/IconButtonScreenshotTests.kt b/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/IconButtonScreenshotTests.kt similarity index 100% rename from core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/IconButtonScreenshotTests.kt rename to core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/IconButtonScreenshotTests.kt diff --git a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt b/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt similarity index 100% rename from core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt rename to core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt diff --git a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt b/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt similarity index 100% rename from core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt rename to core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt diff --git a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TabsScreenshotTests.kt b/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TabsScreenshotTests.kt similarity index 100% rename from core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TabsScreenshotTests.kt rename to core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TabsScreenshotTests.kt diff --git a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt b/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt similarity index 100% rename from core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt rename to core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt diff --git a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt b/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt similarity index 100% rename from core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt rename to core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt diff --git a/core/designsystem/src/test/screenshots/Background/Background_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Background/Background_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Background/Background_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Background/Background_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Background/Background_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Background/Background_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Background/Background_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Background/Background_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Background/Background_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Background/Background_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Background/Background_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Background/Background_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Background/Background_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Background/Background_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Background/Background_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Background/Background_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Background/GradientBackground_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Background/GradientBackground_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Background/GradientBackground_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Background/GradientBackground_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/Button_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Button/Button_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/Button_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/Button_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/Button_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Button/Button_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/Button_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/Button_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/Button_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Button/Button_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/Button_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/Button_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/Button_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Button/Button_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/Button_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/Button_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/Button_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Button/Button_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/Button_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/Button_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/Button_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Button/Button_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/Button_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/Button_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_fontScale2.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_fontScale2.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChip_fontScale2.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_fontScale2.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_1000.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_1000.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_1000.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_1000.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_115.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_115.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_115.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_115.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_20.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_20.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_20.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_20.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_724.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_724.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_724.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_724.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_fontScale2.png b/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_fontScale2.png similarity index 100% rename from core/designsystem/src/test/screenshots/Navigation/Navigation_fontScale2.png rename to core/designsystem/src/commonTest/screenshots/Navigation/Navigation_fontScale2.png diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Tabs/Tabs_fontScale2.png b/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_fontScale2.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tabs/Tabs_fontScale2.png rename to core/designsystem/src/commonTest/screenshots/Tabs/Tabs_fontScale2.png diff --git a/core/designsystem/src/test/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Tag/Tag_fontScale2.png b/core/designsystem/src/commonTest/screenshots/Tag/Tag_fontScale2.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tag/Tag_fontScale2.png rename to core/designsystem/src/commonTest/screenshots/Tag/Tag_fontScale2.png diff --git a/core/designsystem/src/test/screenshots/Tag/Tag_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Tag/Tag_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tag/Tag_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Tag/Tag_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/Tag/Tag_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/Tag/Tag_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tag/Tag_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/Tag/Tag_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_fontScale2.png b/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_fontScale2.png similarity index 100% rename from core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_fontScale2.png rename to core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_fontScale2.png diff --git a/core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png b/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png rename to core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png b/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/test/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png rename to core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts index 02729ceff..2b7083286 100644 --- a/core/testing/build.gradle.kts +++ b/core/testing/build.gradle.kts @@ -14,7 +14,8 @@ * limitations under the License. */ plugins { - alias(libs.plugins.nowinandroid.android.library) + alias(libs.plugins.nowinandroid.kmp.library) + alias(libs.plugins.nowinandroid.kotlin.inject) alias(libs.plugins.nowinandroid.android.library.compose) alias(libs.plugins.nowinandroid.android.hilt) } @@ -23,20 +24,25 @@ android { namespace = "com.google.samples.apps.nowinandroid.core.testing" } -dependencies { - api(kotlin("test")) - api(libs.androidx.compose.ui.test) - api(projects.core.analytics) - api(projects.core.data) - api(projects.core.model) - api(projects.core.notifications) +kotlin { + sourceSets { + commonMain.dependencies { + api(kotlin("test")) +// api(libs.androidx.compose.ui.test) + api(projects.core.analytics) + api(projects.core.data) + api(projects.core.model) + api(projects.core.notifications) + implementation(libs.kotlinx.coroutines.test) + implementation(libs.kotlinx.datetime) + implementation(projects.core.common) + implementation(projects.core.designsystem) + } - debugApi(libs.androidx.compose.ui.testManifest) - - implementation(libs.androidx.test.rules) - implementation(libs.hilt.android.testing) - implementation(libs.kotlinx.coroutines.test) - implementation(libs.kotlinx.datetime) - implementation(projects.core.common) - implementation(projects.core.designsystem) + androidMain.dependencies { + api(libs.androidx.compose.ui.testManifest) + implementation(libs.androidx.test.rules) + implementation(libs.hilt.android.testing) + } + } } diff --git a/core/testing/src/main/AndroidManifest.xml b/core/testing/src/androidMain/AndroidManifest.xml similarity index 100% rename from core/testing/src/main/AndroidManifest.xml rename to core/testing/src/androidMain/AndroidManifest.xml diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/rules/GrantPostNotificationsPermissionRule.kt b/core/testing/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/rules/GrantPostNotificationsPermissionRule.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/rules/GrantPostNotificationsPermissionRule.kt rename to core/testing/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/rules/GrantPostNotificationsPermissionRule.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/NiaTestRunner.kt b/core/testing/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/NiaTestRunner.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/NiaTestRunner.kt rename to core/testing/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/NiaTestRunner.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/FollowableTopicTestData.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/FollowableTopicTestData.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/FollowableTopicTestData.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/FollowableTopicTestData.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/TopicsTestData.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/TopicsTestData.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/TopicsTestData.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/TopicsTestData.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/notifications/TestNotifier.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/notifications/TestNotifier.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/notifications/TestNotifier.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/notifications/TestNotifier.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestRecentSearchRepository.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestRecentSearchRepository.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestRecentSearchRepository.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestRecentSearchRepository.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestSearchContentsRepository.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestSearchContentsRepository.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestSearchContentsRepository.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestSearchContentsRepository.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestAnalyticsHelper.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestAnalyticsHelper.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestAnalyticsHelper.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestAnalyticsHelper.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestNetworkMonitor.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestNetworkMonitor.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestNetworkMonitor.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestNetworkMonitor.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestSyncManager.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestSyncManager.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestSyncManager.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestSyncManager.kt diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestTimeZoneMonitor.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestTimeZoneMonitor.kt similarity index 100% rename from core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestTimeZoneMonitor.kt rename to core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/TestTimeZoneMonitor.kt diff --git a/gradle.properties b/gradle.properties index 82b326eab..87ec125b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -41,4 +41,7 @@ android.defaults.buildfeatures.resvalues=false android.defaults.buildfeatures.shaders=false # Suppress: The following Kotlin/Native targets cannot be built on this machine and are disabled -kotlin.native.ignoreDisabledTargets=true \ No newline at end of file +kotlin.native.ignoreDisabledTargets=true + +# Suppress: ERROR: Compose targets '[macos]' are experimental and may have bugs! +org.jetbrains.compose.experimental.macos.enabled=true