-
-
Notifications
You must be signed in to change notification settings - Fork 418
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #942 from mikepenz/develop
dev -> main
- Loading branch information
Showing
20 changed files
with
3,187 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| ## Usage | ||
|
|
||
| ### Generate Dependency Information | ||
|
|
||
| ```bash | ||
| ./gradlew app-wasm:exportLibraryDefinitions -PaboutLibraries.exportPath=src/wasmJsMain/resources/ | ||
| ``` | ||
|
|
||
| ### Run Wasm app | ||
|
|
||
| ``` | ||
| ./gradlew :app-wasm:wasmJsRun | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig | ||
|
|
||
| plugins { | ||
| kotlin("multiplatform") | ||
| id("org.jetbrains.compose") | ||
| id("com.mikepenz.aboutlibraries.plugin") | ||
| } | ||
|
|
||
| // val copyWasmResources = tasks.create("copyWasmResourcesWorkaround", Copy::class.java) { | ||
| // from(project(":shared").file("src/commonMain/resources")) | ||
| // into("build/processedResources/wasm/main") | ||
| // } | ||
| // | ||
| // afterEvaluate { | ||
| // project.tasks.getByName("wasmProcessResources").finalizedBy(copyWasmResources) | ||
| // } | ||
|
|
||
| kotlin { | ||
| wasmJs { | ||
| moduleName = "aboutlibraries" | ||
| browser { | ||
| commonWebpackConfig { | ||
| devServer = (devServer ?: KotlinWebpackConfig.DevServer()).copy( | ||
| open = mapOf( | ||
| "app" to mapOf( | ||
| "name" to "google chrome canary", | ||
| "arguments" to listOf("--js-flags=--experimental-wasm-gc ") | ||
| ) | ||
| ), | ||
| static = (devServer?.static ?: mutableListOf()).apply { | ||
| add(project.rootDir.path) | ||
| add(project.rootDir.path + "/common/") | ||
| add(project.rootDir.path + "/nonAndroidMain/") | ||
| add(project.rootDir.path + "/web/") | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
| binaries.executable() | ||
| } | ||
|
|
||
| sourceSets { | ||
| val wasmJsMain by getting { | ||
| dependencies { | ||
| implementation(compose.runtime) | ||
| implementation(compose.ui) | ||
| implementation(compose.foundation) | ||
| implementation(compose.material) | ||
| @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) | ||
| implementation(compose.components.resources) | ||
|
|
||
| implementation(project(":aboutlibraries-core")) | ||
| implementation(project(":aboutlibraries-compose")) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| compose.experimental { | ||
| web.application {} | ||
| } | ||
|
|
||
| compose { | ||
| kotlinCompilerPlugin.set(libs.versions.composeCompilerJb.get()) | ||
| // kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlinCore.get()}") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import androidx.compose.ui.graphics.Color | ||
|
|
||
| val Green = Color(0xff09B3AF) | ||
| val GreenDark = Color(0xff008380) | ||
| val GreenLight = Color(0x5de6e1) | ||
|
|
||
| val Red200 = Color(0xfff297a2) | ||
| val Red800 = Color(0xffd00036) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.material.Scaffold | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.material.TopAppBar | ||
| import androidx.compose.runtime.produceState | ||
| import androidx.compose.ui.ExperimentalComposeUiApi | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.window.CanvasBasedWindow | ||
| import com.mikepenz.aboutlibraries.Libs | ||
| import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer | ||
| import com.mikepenz.aboutlibraries.ui.compose.util.StableLibs | ||
| import com.mikepenz.aboutlibraries.ui.compose.util.stable | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.withContext | ||
| import org.jetbrains.compose.resources.ExperimentalResourceApi | ||
| import org.jetbrains.compose.resources.resource | ||
|
|
||
| @OptIn(ExperimentalComposeUiApi::class, ExperimentalResourceApi::class) | ||
| fun main() { | ||
| CanvasBasedWindow("AboutLibraries", canvasElementId = "aboutLibsCanvas") { | ||
| SampleTheme { | ||
| Scaffold( | ||
| topBar = { TopAppBar(title = { Text("AboutLibraries Compose Desktop Sample") }) } | ||
| ) { | ||
| val libraries = produceState<StableLibs?>(null) { | ||
| value = withContext(Dispatchers.Default) { | ||
| Libs.Builder() | ||
| .withJson(resource("aboutlibraries.json").readBytes().decodeToString()) | ||
| .build().stable | ||
| } | ||
| } | ||
|
|
||
| LibrariesContainer( | ||
| libraries.value, | ||
| Modifier.fillMaxSize() | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import androidx.compose.foundation.isSystemInDarkTheme | ||
| import androidx.compose.material.MaterialTheme | ||
| import androidx.compose.material.darkColors | ||
| import androidx.compose.material.lightColors | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.graphics.Color | ||
|
|
||
| private val DarkColorPalette = darkColors( | ||
| primary = Green, | ||
| primaryVariant = GreenDark, | ||
| onPrimary = Color.White, | ||
| secondary = Green, | ||
| onSecondary = Color.White, | ||
| error = Red200 | ||
| ) | ||
|
|
||
| private val LightColorPalette = lightColors( | ||
| primary = Green, | ||
| primaryVariant = GreenDark, | ||
| onPrimary = Color.White, | ||
| secondary = Green, | ||
| secondaryVariant = GreenDark, | ||
| onSecondary = Color.White, | ||
| error = Red800 | ||
| ) | ||
|
|
||
| @Composable | ||
| fun SampleTheme( | ||
| darkTheme: Boolean = isSystemInDarkTheme(), | ||
| content: @Composable() () -> Unit, | ||
| ) { | ||
| val colors = if (darkTheme) { | ||
| DarkColorPalette | ||
| } else { | ||
| LightColorPalette | ||
| } | ||
|
|
||
| MaterialTheme( | ||
| colors = colors, | ||
| content = content | ||
| ) | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.