Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

split modules #2

Merged
merged 4 commits into from
Feb 22, 2024
Merged

split modules #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03248ab
create ui for theme
makeevrserg Feb 22, 2024
71e9abf
remove unused dependencies
makeevrserg Feb 22, 2024
3d9bb17
create info module
makeevrserg Feb 22, 2024
0cbfa69
up version 1.1.0
makeevrserg Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ modules/features/splash/ui/build
modules/features/splash/impl/build
modules/features/theme/build
modules/features/theme/impl/build
modules/features/theme/ui/build
modules/features/info/ui/build
modules/features/ui/build

# Services
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ makeevrserg.android.kotlinCompilerExtensionVersion=1.5.3
# Project
makeevrserg.project.name=ApplicationTemplate
makeevrserg.project.group=com.makeevrserg.applicationtemplate
makeevrserg.project.version.string=1.0.1
makeevrserg.project.version.string=1.1.0
makeevrserg.project.version.code=11
makeevrserg.project.description=Template for KMP applcation
makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
Expand Down
1 change: 1 addition & 0 deletions instances/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ dependencies {
// Local
implementation(projects.modules.features.root.impl)
implementation(projects.modules.features.root.ui)
implementation(projects.modules.features.theme.ui)
implementation(projects.modules.services.coreUi)
implementation(projects.modules.services.coreResources)
}
41 changes: 41 additions & 0 deletions modules/features/info/ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
@file:Suppress("UnusedPrivateMember")

import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo

plugins {
id("org.jetbrains.compose")
id("com.android.library")
kotlin("multiplatform")
id("ru.astrainteractive.gradleplugin.java.core")
id("ru.astrainteractive.gradleplugin.android.core")
id("ru.astrainteractive.gradleplugin.android.compose")
}

kotlin {
android()
sourceSets {
val commonMain by getting {
dependencies {
// Compose MPP
implementation(compose.foundation)
implementation(compose.ui)
implementation(compose.runtime)
implementation(compose.uiTooling)
implementation(compose.preview)
implementation(compose.material)
implementation(compose.material3)
implementation(compose.materialIconsExtended)
// Moko
implementation(libs.moko.resources.core)
// Local
implementation(projects.modules.services.coreResources)
implementation(projects.modules.services.coreUi)
implementation(projects.modules.services.buildKonfig)
}
}
}
}

android {
namespace = "${requireProjectInfo.group}.features.info.ui"
}
0 ...es/info/linkbrowser/AndroidLinkBrowser.kt → ...es/info/linkbrowser/AndroidLinkBrowser.kt
View file
Open in desktop
File renamed without changes.
0 .../info/ui/components/ComposeLinkBrowser.kt → .../info/ui/components/ComposeLinkBrowser.kt
View file
Open in desktop
File renamed without changes.
0 .../features/info/linkbrowser/LinkBrowser.kt → .../features/info/linkbrowser/LinkBrowser.kt
View file
Open in desktop
File renamed without changes.
0 ...ate/mobile/features/info/ui/InfoScreen.kt → ...ate/mobile/features/info/ui/InfoScreen.kt
View file
Open in desktop
File renamed without changes.
0 ...nfo/ui/components/BottomSheetIndicator.kt → ...nfo/ui/components/BottomSheetIndicator.kt
View file
Open in desktop
File renamed without changes.
0 .../info/ui/components/ComposeLinkBrowser.kt → .../info/ui/components/ComposeLinkBrowser.kt
View file
Open in desktop
File renamed without changes.
0 ...features/info/ui/components/LinkWidget.kt → ...features/info/ui/components/LinkWidget.kt
View file
Open in desktop
File renamed without changes.
0 .../features/info/ui/data/InfoScreenLinks.kt → .../features/info/ui/data/InfoScreenLinks.kt
View file
Open in desktop
File renamed without changes.
0 ...obile/features/info/ui/model/LinkModel.kt → ...obile/features/info/ui/model/LinkModel.kt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions modules/features/root/ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ kotlin {
implementation(projects.modules.features.splash.impl)
implementation(projects.modules.features.splash.ui)
implementation(projects.modules.features.root.impl)
implementation(projects.modules.features.info.ui)
}
}
val androidMain by getting {
Expand Down
40 changes: 40 additions & 0 deletions modules/features/theme/ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
@file:Suppress("UnusedPrivateMember")

import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo

plugins {
id("org.jetbrains.compose")
id("com.android.library")
kotlin("multiplatform")
id("ru.astrainteractive.gradleplugin.java.core")
id("ru.astrainteractive.gradleplugin.android.core")
id("ru.astrainteractive.gradleplugin.android.compose")
}

kotlin {
androidTarget()
targetHierarchy.default()
sourceSets {
val commonMain by getting {
dependencies {
// Compose MPP
implementation(compose.foundation)
implementation(compose.ui)
implementation(compose.runtime)
// Local
implementation(projects.modules.services.coreUi)
implementation(projects.modules.features.theme.impl)
}
}
val androidMain by getting {
dependencies {
// Accompanist
implementation(libs.google.accompanist.systemuicontroller)
}
}
}
}

android {
namespace = "${requireProjectInfo.group}.features.theme.ui"
}
2 changes: 1 addition & 1 deletion ...features/ui/components/TransparentBars.kt → ...tures/theme/components/TransparentBars.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.makeevrserg.applicationtemplate.mobile.features.ui.components
package com.makeevrserg.applicationtemplate.mobile.features.theme.components

import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
Expand Down
2 changes: 1 addition & 1 deletion ...features/ui/components/TransparentBars.kt → ...tures/theme/components/TransparentBars.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.makeevrserg.applicationtemplate.mobile.features.ui.components
package com.makeevrserg.applicationtemplate.mobile.features.theme.components

import androidx.compose.runtime.Composable

Expand Down
2 changes: 1 addition & 1 deletion ...ile/features/theme/ui/ApplicationTheme.kt → ...ile/features/theme/ui/ApplicationTheme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import com.makeevrserg.applicationtemplate.mobile.core.ui.theme.AdaptThemeFade
import com.makeevrserg.applicationtemplate.mobile.core.ui.theme.ComposeTheme
import com.makeevrserg.applicationtemplate.mobile.features.theme.components.TransparentBars
import com.makeevrserg.applicationtemplate.mobile.features.theme.data.model.Theme
import com.makeevrserg.applicationtemplate.mobile.features.theme.presentation.PreviewThemeSwitcherComponent
import com.makeevrserg.applicationtemplate.mobile.features.theme.presentation.ThemeSwitcherComponent
import com.makeevrserg.applicationtemplate.mobile.features.ui.components.TransparentBars

@Composable
fun ApplicationTheme(
Expand Down
7 changes: 6 additions & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,14 @@ include(":modules:services:core-resources")
include(":modules:services:core-ui")
include(":modules:services:core")
include(":modules:services:build-konfig")
// Feature
// Feature-root
include(":modules:features:root:impl")
include(":modules:features:root:ui")
// Feature-splash
include(":modules:features:splash:impl")
include(":modules:features:splash:ui")
// Feature-theme
include(":modules:features:theme:impl")
include(":modules:features:theme:ui")
// Feature-info
include(":modules:features:info:ui")
Loading