diff --git a/docs/Dataflow/Cash App Paging Library/usage.md b/docs/Dataflow/Cash App Paging Library/usage.md index cddb6e97..c6b0973a 100644 --- a/docs/Dataflow/Cash App Paging Library/usage.md +++ b/docs/Dataflow/Cash App Paging Library/usage.md @@ -15,7 +15,7 @@ The example is part of showcases provided when the feature is included into the ```kotlin class BasicPagingViewModel( - private val pagingSource: AppPagingSource = instance() + private val pagingSource: AppPagingSource = get() ) : BaseViewModel() { val itemsFlow by lazy { diff --git a/docs/Dataflow/Facade Analytics API/usage.md b/docs/Dataflow/Facade Analytics API/usage.md index 4a8f8a0b..c1341020 100644 --- a/docs/Dataflow/Facade Analytics API/usage.md +++ b/docs/Dataflow/Facade Analytics API/usage.md @@ -24,7 +24,7 @@ To start using, just inject any of them to your DI managed class. Recommended to ```kotlin class TemplateViewModel ( - private val analyticsSource: AnalyticsSource = instance() // AppAnalyticsSource + private val analyticsSource: AnalyticsSource = get() // AppAnalyticsSource ) : BaseViewModel() { fun onSomeAction() { diff --git a/docs/Dataflow/Facade Config API/usage.md b/docs/Dataflow/Facade Config API/usage.md index 82562e33..34c60d8d 100644 --- a/docs/Dataflow/Facade Config API/usage.md +++ b/docs/Dataflow/Facade Config API/usage.md @@ -34,7 +34,7 @@ class AppConfigSource : DelegateConfigSource() { } class TemplateViewModel ( - private val configSource: AppConfigSource = instance() // ConfigSource + private val configSource: AppConfigSource = get() // ConfigSource ) : BaseViewModel() { private val counter by lazy { AtomicInteger(configSource.getCounterInitialValue()) } diff --git a/docs/Dataflow/Ktor/overview.md b/docs/Dataflow/Ktor/overview.md index d3352489..287c6330 100644 --- a/docs/Dataflow/Ktor/overview.md +++ b/docs/Dataflow/Ktor/overview.md @@ -1,6 +1,6 @@ # About -This API provides access to the Ktor, the latter of which utilizes platform-specific API as its HTTP engine. This data source is pre-configured to facilitate both REST and WebSocket communications with the backend. +This API provides access to the Ktor client, which utilizes platform-specific API as its HTTP engine. This data source is pre-configured to facilitate both REST and WebSocket communications with the backend. # Links diff --git a/docs/Dataflow/Ktor/usage.md b/docs/Dataflow/Ktor/usage.md index bfe2cd85..f5816ede 100644 --- a/docs/Dataflow/Ktor/usage.md +++ b/docs/Dataflow/Ktor/usage.md @@ -14,7 +14,7 @@ To start using, just inject it to your DI managed class. ```kotlin class ApiSource( - private val httpSource: HttpSource = instance() + private val httpSource: HttpSource = get() ) { suspend fun getIp(): String { diff --git a/docs/Dataflow/Multiplatform Settings/usage.md b/docs/Dataflow/Multiplatform Settings/usage.md index bc252d3e..7f626729 100644 --- a/docs/Dataflow/Multiplatform Settings/usage.md +++ b/docs/Dataflow/Multiplatform Settings/usage.md @@ -28,7 +28,7 @@ To start using, just inject it to your DI managed class. ```kotlin class TemplateViewModel @Inject constructor( - private val keyValueSource: AppKeyValueSource = instance() // KeyValueSource + private val keyValueSource: AppKeyValueSource = get() // KeyValueSource ) : BaseViewModel() { override fun doBind() { launchAsync("init settings") { diff --git a/docs/Essentials/Jetpack Navigation/usage.md b/docs/Essentials/Jetpack Navigation/usage.md index 58b0d762..bee73795 100644 --- a/docs/Essentials/Jetpack Navigation/usage.md +++ b/docs/Essentials/Jetpack Navigation/usage.md @@ -3,7 +3,7 @@ ## Overview The integration comes with a simple API for easier usage of Jetpack Navigation. -The API is available under the package `shared.core.navigation`. +The API is available under the package `shared.presentation.navigation`. ## Create Destination @@ -33,7 +33,7 @@ object TemplateDestination : NavigationDestination() { ## Register Destination -All app destinations should be registered within an instance of the class `shared.core.navigation.NavigationState`. +All app destinations should be registered within an instance of the class `shared.presentation.navigation.NavigationState`. This instance is already pre-configured in dependency injection (DI) through the `app.di.state.ProvidesNavigationState` class. Simply place all your destinations within this instance. @@ -58,7 +58,7 @@ val ProvidesNavigationState = module { ## Navigate to Destination -Once the navigation is aware of the destinations, you can initiate navigation to them using the `onBack` and `onNext` methods available in the `shared.core.navigation.NavigationState` class. +Once the navigation is aware of the destinations, you can initiate navigation to them using the `onBack` and `onNext` methods available in the `shared.presentation.navigation.NavigationState` class. Simply inject `NavigationState` into your `ViewModel` or other dependency injection managed class, and navigate whenever necessary. ```kotlin diff --git a/docs/Essentials/Material 3/usage.md b/docs/Essentials/Material 3/usage.md index 3db91a4d..ded6f388 100644 --- a/docs/Essentials/Material 3/usage.md +++ b/docs/Essentials/Material 3/usage.md @@ -3,7 +3,7 @@ ## Overview - Component package: `app.ui.theme` -- State management: `shared.core.theme.ThemeState` +- State management: `shared.presentation.theme.ThemeState` - DI integration: `app.di.state.ProvidesThemeState` This state instance is utilized by `app.ui.theme.AppThemeProvider`, which is pre-defined at the app level to furnish themes for the entire application. diff --git a/docs/Platform/Android/usage.md b/docs/Platform/Android/usage.md new file mode 100644 index 00000000..b9c947ac --- /dev/null +++ b/docs/Platform/Android/usage.md @@ -0,0 +1,5 @@ +# Usage + +## Run + +https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-multiplatform-create-first-app.html#run-your-application-on-android diff --git a/docs/Platform/Desktop/usage.md b/docs/Platform/Desktop/usage.md new file mode 100644 index 00000000..2c767cab --- /dev/null +++ b/docs/Platform/Desktop/usage.md @@ -0,0 +1,7 @@ +# Usage + +## Run + +``` +./gradlew run +``` diff --git a/docs/Platform/Web/usage.md b/docs/Platform/Web/usage.md new file mode 100644 index 00000000..086836dc --- /dev/null +++ b/docs/Platform/Web/usage.md @@ -0,0 +1,7 @@ +# Usage + +## Run + +``` +./gradlew jsBrowserRun +``` diff --git a/docs/Platform/iOS/usage.md b/docs/Platform/iOS/usage.md new file mode 100644 index 00000000..bd62d0e2 --- /dev/null +++ b/docs/Platform/iOS/usage.md @@ -0,0 +1,5 @@ +# Usage + +## Run + +https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-multiplatform-create-first-app.html#run-your-application-on-ios diff --git a/docs/Testing/Kermit/usage.md b/docs/Testing/Kermit/usage.md index a49aa1c2..cf9e117c 100644 --- a/docs/Testing/Kermit/usage.md +++ b/docs/Testing/Kermit/usage.md @@ -2,7 +2,7 @@ ## Overview -Library is pre-configured in the `composeApp` module. +Library is pre-configured in the `app` module. ## Example diff --git a/docs/Testing/Napier/usage.md b/docs/Testing/Napier/usage.md index f0bc5b26..296431b2 100644 --- a/docs/Testing/Napier/usage.md +++ b/docs/Testing/Napier/usage.md @@ -2,7 +2,7 @@ ## Overview -Library is pre-configured in the `composeApp` module. +Library is pre-configured in the `app` module. ## Example diff --git a/docs/Userflow/Adaptive Navigation/usage.md b/docs/Userflow/Adaptive Navigation/usage.md index 6740c7c6..4af03ddb 100644 --- a/docs/Userflow/Adaptive Navigation/usage.md +++ b/docs/Userflow/Adaptive Navigation/usage.md @@ -2,11 +2,10 @@ ## Overview -- Component package: `app.userflow.navigation` +- Component package: `app.feature.navigation` - DI integration: `app.di.state.ProvidesNavigationBarState` -- State management: `app.userflow.navigation.NavigationBarState` -- Pre-configured destinations package: `app.userflow.navigation.samples` - +- State management: `app.feature.navigation.NavigationBarState` +- Pre-configured destinations package: `app.feature.navigation.samples` ## Configuration diff --git a/docs/Userflow/Bottom Navigation/usage.md b/docs/Userflow/Bottom Navigation/usage.md index 18043566..aee6b1dd 100644 --- a/docs/Userflow/Bottom Navigation/usage.md +++ b/docs/Userflow/Bottom Navigation/usage.md @@ -2,11 +2,10 @@ ## Overview -- Component package: `app.userflow.navigation` +- Component package: `app.feature.navigation` - DI integration: `app.di.state.ProvidesNavigationBarState` -- State management: `app.userflow.navigation.NavigationBarState` -- Pre-configured destinations package: `app.userflow.navigation.samples` - +- State management: `app.feature.navigation.NavigationBarState` +- Pre-configured destinations package: `app.feature.navigation.samples` ## Configuration diff --git a/docs/Userflow/Change Theme Screen/usage.md b/docs/Userflow/Change Theme Screen/usage.md index 1f4fd9e9..2b01189d 100644 --- a/docs/Userflow/Change Theme Screen/usage.md +++ b/docs/Userflow/Change Theme Screen/usage.md @@ -2,7 +2,7 @@ ## Overview -Component package: `app.userflow.theme.change` +Component package: `app.feature.theme.change` ## Example @@ -12,7 +12,7 @@ Invoke the `ChangeThemeDestination` destination from your **ViewModel** or **Vie ```kotlin class TemplateViewModel( - private val navigationState: NavigationState = instance() + private val navigationState: NavigationState = get() ) : BaseViewModel() { fun onChangeTheme() { @@ -28,7 +28,7 @@ Invoke the `ChangeThemeDialogDestination` destination from your **ViewModel** or ```kotlin class TemplateViewModel( - private val navigationState: NavigationState = instance() + private val navigationState: NavigationState = get() ) : BaseViewModel() { fun onChangeTheme() { diff --git a/docs/Userflow/Data Loader/usage.md b/docs/Userflow/Data Loader/usage.md index c1ce5688..d2205255 100644 --- a/docs/Userflow/Data Loader/usage.md +++ b/docs/Userflow/Data Loader/usage.md @@ -2,11 +2,11 @@ ## Overview -Component package: `app.userflow.loader.data` +Component package: `app.feature.loader.data` The component is pre-configured at the `app.AppScreen` level to monitor state changes of the `app.AppState` instance. -If you need to modify the behavior, including colors, texts, logic, etc., simply update the `app.userflow.loader.data.DataLoaderProvider` composable. +If you need to modify the behavior, including colors, texts, logic, etc., simply update the `app.feature.loader.data.DataLoaderProvider` composable. ## Example @@ -19,7 +19,7 @@ Simply inject the `app.AppState` instance into your **ViewModel** and call the ` ```kotlin class TemplateViewModel( - private val appState: AppState = instance() + private val appState: AppState = get() ) : BaseViewModel() { fun onActionWithLoader() { @@ -38,7 +38,7 @@ However, it is recommended to use it only at the **ViewModel** level. ```kotlin class DataRepository( - private val appState: AppState = instance() + private val appState: AppState = get() ) { fun performSomeAction() { @@ -57,4 +57,4 @@ class DataRepository( ### Usage without `app.AppState` -`app.userflow.loader.data.DataLoaderProvider` accepts any `StoreState` instance. As this is your code, feel free to use it as needed. +`app.feature.loader.data.DataLoaderProvider` accepts any `StoreState` instance. As this is your code, feel free to use it as needed. diff --git a/docs/Userflow/Dismissible Navigation/usage.md b/docs/Userflow/Dismissible Navigation/usage.md index 18043566..aee6b1dd 100644 --- a/docs/Userflow/Dismissible Navigation/usage.md +++ b/docs/Userflow/Dismissible Navigation/usage.md @@ -2,11 +2,10 @@ ## Overview -- Component package: `app.userflow.navigation` +- Component package: `app.feature.navigation` - DI integration: `app.di.state.ProvidesNavigationBarState` -- State management: `app.userflow.navigation.NavigationBarState` -- Pre-configured destinations package: `app.userflow.navigation.samples` - +- State management: `app.feature.navigation.NavigationBarState` +- Pre-configured destinations package: `app.feature.navigation.samples` ## Configuration diff --git a/docs/Userflow/Modal Navigation/usage.md b/docs/Userflow/Modal Navigation/usage.md index 18043566..aee6b1dd 100644 --- a/docs/Userflow/Modal Navigation/usage.md +++ b/docs/Userflow/Modal Navigation/usage.md @@ -2,11 +2,10 @@ ## Overview -- Component package: `app.userflow.navigation` +- Component package: `app.feature.navigation` - DI integration: `app.di.state.ProvidesNavigationBarState` -- State management: `app.userflow.navigation.NavigationBarState` -- Pre-configured destinations package: `app.userflow.navigation.samples` - +- State management: `app.feature.navigation.NavigationBarState` +- Pre-configured destinations package: `app.feature.navigation.samples` ## Configuration diff --git a/docs/Userflow/Permanent Navigation/usage.md b/docs/Userflow/Permanent Navigation/usage.md index 18043566..aee6b1dd 100644 --- a/docs/Userflow/Permanent Navigation/usage.md +++ b/docs/Userflow/Permanent Navigation/usage.md @@ -2,11 +2,10 @@ ## Overview -- Component package: `app.userflow.navigation` +- Component package: `app.feature.navigation` - DI integration: `app.di.state.ProvidesNavigationBarState` -- State management: `app.userflow.navigation.NavigationBarState` -- Pre-configured destinations package: `app.userflow.navigation.samples` - +- State management: `app.feature.navigation.NavigationBarState` +- Pre-configured destinations package: `app.feature.navigation.samples` ## Configuration diff --git a/docs/Userflow/Rail Navigation/usage.md b/docs/Userflow/Rail Navigation/usage.md index 18043566..aee6b1dd 100644 --- a/docs/Userflow/Rail Navigation/usage.md +++ b/docs/Userflow/Rail Navigation/usage.md @@ -2,11 +2,10 @@ ## Overview -- Component package: `app.userflow.navigation` +- Component package: `app.feature.navigation` - DI integration: `app.di.state.ProvidesNavigationBarState` -- State management: `app.userflow.navigation.NavigationBarState` -- Pre-configured destinations package: `app.userflow.navigation.samples` - +- State management: `app.feature.navigation.NavigationBarState` +- Pre-configured destinations package: `app.feature.navigation.samples` ## Configuration diff --git a/docs/Userflow/Save Theme API/usage.md b/docs/Userflow/Save Theme API/usage.md index ff4b3562..b11261c7 100644 --- a/docs/Userflow/Save Theme API/usage.md +++ b/docs/Userflow/Save Theme API/usage.md @@ -4,7 +4,7 @@ Component package: `app.ui.theme` -The current theme state is managed by an instance of `shared.core.theme.ThemeState`. This class provides a `configStore` property representing the currently selected theme configuration. +The current theme state is managed by an instance of `shared.presentation.theme.ThemeState`. This class provides a `configStore` property representing the currently selected theme configuration. The feature utilizes `AppThemeProvider` to control the value of this property: - Persist its state whenever it changes. @@ -16,7 +16,7 @@ Thus, whenever you update the current active application theme, it is automatica ```kotlin class ToggleThemeViewModel( - private val themeState: ThemeState = instance() + private val themeState: ThemeState = get() ) : BaseViewModel() { fun onSetLightTheme() { diff --git a/docs/Userflow/Toggle Theme Button/usage.md b/docs/Userflow/Toggle Theme Button/usage.md index 19a9ab48..dc144d8a 100644 --- a/docs/Userflow/Toggle Theme Button/usage.md +++ b/docs/Userflow/Toggle Theme Button/usage.md @@ -2,11 +2,11 @@ ## Overview -Component package: `app.userflow.theme.toggle` +Component package: `app.feature.theme.toggle` ## Example -Simply add the `ToggleThemeButton` composable from the `app.userflow.theme.toggle` package to your screen. +Simply add the `ToggleThemeButton` composable from the `app.feature.theme.toggle` package to your screen. ```kotlin @Composable diff --git a/processor/build.gradle b/processor/build.gradle index 4e4f7737..0a834869 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -1,4 +1,4 @@ apply from: "${project.rootDir}/gradle/kotlin/processor.gradle" group = 'com.kotlitecture.kotli' -version = '0.2.0' \ No newline at end of file +version = '0.2.1' \ No newline at end of file diff --git a/template/shared/design/src/androidMain/kotlin/shared/design/icon/appIconsProvider.kt b/template/shared/design/src/androidMain/kotlin/shared/design/icon/appIconsProvider.kt deleted file mode 100644 index bc264cd9..00000000 --- a/template/shared/design/src/androidMain/kotlin/shared/design/icon/appIconsProvider.kt +++ /dev/null @@ -1,29 +0,0 @@ -package shared.design.icon - -import androidx.compose.ui.res.painterResource -import shared.design.R - -actual fun appIconsProvider() = object : AppIconsProvider { - - override val info: AppIconModel - get() = PainterIcon { painterResource(R.drawable.ic_info) } - override val cancel: AppIconModel - get() = PainterIcon { painterResource(R.drawable.ic_cancel) } - override val arrowBack: AppIconModel - get() = PainterIcon { painterResource(R.drawable.ic_arrow_back) } - override val chevronRight: AppIconModel - get() = PainterIcon { painterResource(R.drawable.ic_chevron_right) } - override val lightMode: AppIconModel - get() = PainterIcon { painterResource(R.drawable.ic_light_mode) } - override val darkMode: AppIconModel - get() = PainterIcon { painterResource(R.drawable.ic_dark_mode) } - override val school: AppIconModel - get() = PainterIcon { painterResource(R.drawable.ic_school) } - override val coffee: AppIconModel - get() = PainterIcon { painterResource(R.drawable.ic_coffee) } - override val wineBar: AppIconModel - get() = PainterIcon { painterResource(R.drawable.ic_wine_bar) } - override val localDrink: AppIconModel - get() = PainterIcon { painterResource(R.drawable.ic_local_drink) } - -} \ No newline at end of file diff --git a/template/shared/design/src/commonMain/composeResources/drawable/ic_arrow_back.svg b/template/shared/design/src/commonMain/composeResources/drawable/ic_arrow_back.svg deleted file mode 100644 index 16aa6122..00000000 --- a/template/shared/design/src/commonMain/composeResources/drawable/ic_arrow_back.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/template/shared/design/src/androidMain/res/drawable/ic_arrow_back.xml b/template/shared/design/src/commonMain/composeResources/drawable/ic_arrow_back.xml similarity index 100% rename from template/shared/design/src/androidMain/res/drawable/ic_arrow_back.xml rename to template/shared/design/src/commonMain/composeResources/drawable/ic_arrow_back.xml diff --git a/template/shared/design/src/commonMain/composeResources/drawable/ic_cancel.svg b/template/shared/design/src/commonMain/composeResources/drawable/ic_cancel.svg deleted file mode 100644 index 12079c13..00000000 --- a/template/shared/design/src/commonMain/composeResources/drawable/ic_cancel.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/template/shared/design/src/androidMain/res/drawable/ic_cancel.xml b/template/shared/design/src/commonMain/composeResources/drawable/ic_cancel.xml similarity index 100% rename from template/shared/design/src/androidMain/res/drawable/ic_cancel.xml rename to template/shared/design/src/commonMain/composeResources/drawable/ic_cancel.xml diff --git a/template/shared/design/src/commonMain/composeResources/drawable/ic_chevron_right.svg b/template/shared/design/src/commonMain/composeResources/drawable/ic_chevron_right.svg deleted file mode 100644 index 0603448c..00000000 --- a/template/shared/design/src/commonMain/composeResources/drawable/ic_chevron_right.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/template/shared/design/src/androidMain/res/drawable/ic_chevron_right.xml b/template/shared/design/src/commonMain/composeResources/drawable/ic_chevron_right.xml similarity index 100% rename from template/shared/design/src/androidMain/res/drawable/ic_chevron_right.xml rename to template/shared/design/src/commonMain/composeResources/drawable/ic_chevron_right.xml diff --git a/template/shared/design/src/commonMain/composeResources/drawable/ic_coffee.svg b/template/shared/design/src/commonMain/composeResources/drawable/ic_coffee.svg deleted file mode 100644 index f7e0cd47..00000000 --- a/template/shared/design/src/commonMain/composeResources/drawable/ic_coffee.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/template/shared/design/src/androidMain/res/drawable/ic_coffee.xml b/template/shared/design/src/commonMain/composeResources/drawable/ic_coffee.xml similarity index 100% rename from template/shared/design/src/androidMain/res/drawable/ic_coffee.xml rename to template/shared/design/src/commonMain/composeResources/drawable/ic_coffee.xml diff --git a/template/shared/design/src/commonMain/composeResources/drawable/ic_dark_mode.svg b/template/shared/design/src/commonMain/composeResources/drawable/ic_dark_mode.svg deleted file mode 100644 index fd031166..00000000 --- a/template/shared/design/src/commonMain/composeResources/drawable/ic_dark_mode.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/template/shared/design/src/androidMain/res/drawable/ic_dark_mode.xml b/template/shared/design/src/commonMain/composeResources/drawable/ic_dark_mode.xml similarity index 100% rename from template/shared/design/src/androidMain/res/drawable/ic_dark_mode.xml rename to template/shared/design/src/commonMain/composeResources/drawable/ic_dark_mode.xml diff --git a/template/shared/design/src/commonMain/composeResources/drawable/ic_info.svg b/template/shared/design/src/commonMain/composeResources/drawable/ic_info.svg deleted file mode 100644 index 0d4efd19..00000000 --- a/template/shared/design/src/commonMain/composeResources/drawable/ic_info.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/template/shared/design/src/androidMain/res/drawable/ic_info.xml b/template/shared/design/src/commonMain/composeResources/drawable/ic_info.xml similarity index 100% rename from template/shared/design/src/androidMain/res/drawable/ic_info.xml rename to template/shared/design/src/commonMain/composeResources/drawable/ic_info.xml diff --git a/template/shared/design/src/commonMain/composeResources/drawable/ic_light_mode.svg b/template/shared/design/src/commonMain/composeResources/drawable/ic_light_mode.svg deleted file mode 100644 index 4210bd0a..00000000 --- a/template/shared/design/src/commonMain/composeResources/drawable/ic_light_mode.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/template/shared/design/src/androidMain/res/drawable/ic_light_mode.xml b/template/shared/design/src/commonMain/composeResources/drawable/ic_light_mode.xml similarity index 100% rename from template/shared/design/src/androidMain/res/drawable/ic_light_mode.xml rename to template/shared/design/src/commonMain/composeResources/drawable/ic_light_mode.xml diff --git a/template/shared/design/src/commonMain/composeResources/drawable/ic_local_drink.svg b/template/shared/design/src/commonMain/composeResources/drawable/ic_local_drink.svg deleted file mode 100644 index a17e94ef..00000000 --- a/template/shared/design/src/commonMain/composeResources/drawable/ic_local_drink.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/template/shared/design/src/androidMain/res/drawable/ic_local_drink.xml b/template/shared/design/src/commonMain/composeResources/drawable/ic_local_drink.xml similarity index 100% rename from template/shared/design/src/androidMain/res/drawable/ic_local_drink.xml rename to template/shared/design/src/commonMain/composeResources/drawable/ic_local_drink.xml diff --git a/template/shared/design/src/commonMain/composeResources/drawable/ic_school.svg b/template/shared/design/src/commonMain/composeResources/drawable/ic_school.svg deleted file mode 100644 index c5076efa..00000000 --- a/template/shared/design/src/commonMain/composeResources/drawable/ic_school.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/template/shared/design/src/androidMain/res/drawable/ic_school.xml b/template/shared/design/src/commonMain/composeResources/drawable/ic_school.xml similarity index 100% rename from template/shared/design/src/androidMain/res/drawable/ic_school.xml rename to template/shared/design/src/commonMain/composeResources/drawable/ic_school.xml diff --git a/template/shared/design/src/commonMain/composeResources/drawable/ic_wine_bar.svg b/template/shared/design/src/commonMain/composeResources/drawable/ic_wine_bar.svg deleted file mode 100644 index dc36224f..00000000 --- a/template/shared/design/src/commonMain/composeResources/drawable/ic_wine_bar.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/template/shared/design/src/androidMain/res/drawable/ic_wine_bar.xml b/template/shared/design/src/commonMain/composeResources/drawable/ic_wine_bar.xml similarity index 100% rename from template/shared/design/src/androidMain/res/drawable/ic_wine_bar.xml rename to template/shared/design/src/commonMain/composeResources/drawable/ic_wine_bar.xml diff --git a/template/shared/design/src/commonMain/kotlin/shared/design/icon/AppIcons.kt b/template/shared/design/src/commonMain/kotlin/shared/design/icon/AppIcons.kt index 3c8de9fd..ea95b083 100644 --- a/template/shared/design/src/commonMain/kotlin/shared/design/icon/AppIcons.kt +++ b/template/shared/design/src/commonMain/kotlin/shared/design/icon/AppIcons.kt @@ -1,5 +1,3 @@ package shared.design.icon -expect fun appIconsProvider(): AppIconsProvider - -val AppIcons by lazy { appIconsProvider() } \ No newline at end of file +val AppIcons = object : AppIconsProvider {} \ No newline at end of file diff --git a/template/shared/design/src/iosMain/kotlin/shared/design/icon/appIconsProvider.kt b/template/shared/design/src/iosMain/kotlin/shared/design/icon/appIconsProvider.kt deleted file mode 100644 index 70a9145e..00000000 --- a/template/shared/design/src/iosMain/kotlin/shared/design/icon/appIconsProvider.kt +++ /dev/null @@ -1,3 +0,0 @@ -package shared.design.icon - -actual fun appIconsProvider() = object : AppIconsProvider {} \ No newline at end of file diff --git a/template/shared/design/src/jsMain/kotlin/shared/design/icon/appIconsProvider.kt b/template/shared/design/src/jsMain/kotlin/shared/design/icon/appIconsProvider.kt deleted file mode 100644 index 70a9145e..00000000 --- a/template/shared/design/src/jsMain/kotlin/shared/design/icon/appIconsProvider.kt +++ /dev/null @@ -1,3 +0,0 @@ -package shared.design.icon - -actual fun appIconsProvider() = object : AppIconsProvider {} \ No newline at end of file diff --git a/template/shared/design/src/jvmMain/kotlin/shared/design/icon/appIconsProvider.kt b/template/shared/design/src/jvmMain/kotlin/shared/design/icon/appIconsProvider.kt deleted file mode 100644 index 70a9145e..00000000 --- a/template/shared/design/src/jvmMain/kotlin/shared/design/icon/appIconsProvider.kt +++ /dev/null @@ -1,3 +0,0 @@ -package shared.design.icon - -actual fun appIconsProvider() = object : AppIconsProvider {} \ No newline at end of file