-
-
Notifications
You must be signed in to change notification settings - Fork 3
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 #80 from teogor/feature/compose-demo-module
Update Demo Module to Use Jetpack Compose
- Loading branch information
Showing
44 changed files
with
2,900 additions
and
157 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| /* | ||
| * Copyright 2024 Teogor (Teodor Grigor) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| import org.jetbrains.compose.desktop.application.dsl.TargetFormat | ||
| import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi | ||
| import org.jetbrains.kotlin.gradle.dsl.JvmTarget | ||
| import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl | ||
| import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig | ||
|
|
||
| plugins { | ||
| alias(libs.plugins.jetbrains.kotlin.multiplatform) | ||
| alias(libs.plugins.android.application) | ||
| alias(libs.plugins.jetbrains.compose) | ||
| alias(libs.plugins.jetbrains.compose.compiler) | ||
| } | ||
|
|
||
| kotlin { | ||
| @OptIn(ExperimentalWasmDsl::class) | ||
| wasmJs { | ||
| moduleName = "composeApp" | ||
| browser { | ||
| val projectDirPath = project.projectDir.path | ||
| commonWebpackConfig { | ||
| outputFileName = "composeApp.js" | ||
| devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply { | ||
| static = (static ?: mutableListOf()).apply { | ||
| // Serve sources to debug inside browser | ||
| add(projectDirPath) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| binaries.executable() | ||
| } | ||
|
|
||
| androidTarget { | ||
| @OptIn(ExperimentalKotlinGradlePluginApi::class) | ||
| compilerOptions { | ||
| jvmTarget.set(JvmTarget.JVM_11) | ||
| } | ||
| } | ||
|
|
||
| jvm("desktop") | ||
|
|
||
| listOf( | ||
| iosX64(), | ||
| iosArm64(), | ||
| iosSimulatorArm64(), | ||
| ).forEach { iosTarget -> | ||
| iosTarget.binaries.framework { | ||
| baseName = "ComposeApp" | ||
| isStatic = true | ||
| } | ||
| } | ||
|
|
||
| sourceSets { | ||
| val desktopMain by getting | ||
|
|
||
| androidMain.dependencies { | ||
| implementation(compose.preview) | ||
|
|
||
| implementation(libs.androidx.activity.compose) | ||
| } | ||
| commonMain.dependencies { | ||
| implementation(compose.runtime) | ||
| implementation(compose.foundation) | ||
| implementation(compose.material3) | ||
| implementation(compose.ui) | ||
| implementation(compose.components.resources) | ||
| implementation(compose.components.uiToolingPreview) | ||
|
|
||
| implementation(libs.teogor.paletteon.core) | ||
|
|
||
| implementation(libs.androidx.lifecycle.viewmodel) | ||
| implementation(libs.androidx.lifecycle.runtime.compose) | ||
| implementation(libs.androidx.lifecycle.viewmodel.compose) | ||
|
|
||
| implementation(libs.jetbrains.kotlinx.coroutines.core) | ||
|
|
||
| implementation(projects.sudoklifyCore) | ||
| implementation(projects.sudoklifyPresets) | ||
| implementation(projects.sudoklifySolver) | ||
| } | ||
| desktopMain.dependencies { | ||
| implementation(compose.desktop.currentOs) | ||
|
|
||
| implementation(libs.jetbrains.kotlinx.coroutines.swing) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| android { | ||
| namespace = "dev.teogor.sudoklify.multiplatform" | ||
| compileSdk = libs.versions.android.compileSdk.get().toInt() | ||
|
|
||
| sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") | ||
| sourceSets["main"].res.srcDirs("src/androidMain/res") | ||
| sourceSets["main"].resources.srcDirs("src/commonMain/resources") | ||
|
|
||
| defaultConfig { | ||
| applicationId = "dev.teogor.sudoklify.multiplatform" | ||
| minSdk = libs.versions.android.minSdk.get().toInt() | ||
| targetSdk = libs.versions.android.targetSdk.get().toInt() | ||
| versionCode = 1 | ||
| versionName = "1.0" | ||
| } | ||
| packaging { | ||
| resources { | ||
| excludes += "/META-INF/{AL2.0,LGPL2.1}" | ||
| } | ||
| } | ||
| buildTypes { | ||
| getByName("release") { | ||
| isMinifyEnabled = false | ||
| } | ||
| } | ||
| compileOptions { | ||
| sourceCompatibility = JavaVersion.VERSION_11 | ||
| targetCompatibility = JavaVersion.VERSION_11 | ||
| } | ||
| buildFeatures { | ||
| compose = true | ||
| } | ||
| dependencies { | ||
| debugImplementation(compose.uiTooling) | ||
| } | ||
| } | ||
|
|
||
| compose.desktop { | ||
| application { | ||
| mainClass = "dev.teogor.sudoklify.multiplatform.MainKt" | ||
|
|
||
| nativeDistributions { | ||
| targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) | ||
| packageName = "dev.teogor.sudoklify.multiplatform" | ||
| packageVersion = "1.0.0" | ||
| } | ||
| } | ||
| } |
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,37 @@ | ||
| <?xml version="1.0" encoding="utf-8"?><!-- | ||
| Copyright 2024 Teogor (Teodor Grigor) | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||
|
|
||
| <application | ||
| android:allowBackup="true" | ||
| android:icon="@mipmap/ic_launcher" | ||
| android:label="@string/app_name" | ||
| android:roundIcon="@mipmap/ic_launcher_round" | ||
| android:supportsRtl="true" | ||
| android:theme="@android:style/Theme.Material.Light.NoActionBar"> | ||
| <activity | ||
| android:exported="true" | ||
| android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mnc|colorMode|density|fontScale|fontWeightAdjustment|keyboard|layoutDirection|locale|mcc|navigation|smallestScreenSize|touchscreen|uiMode" | ||
| android:name=".MainActivity"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN"/> | ||
|
|
||
| <category android:name="android.intent.category.LAUNCHER"/> | ||
| </intent-filter> | ||
| </activity> | ||
| </application> | ||
|
|
||
| </manifest> |
39 changes: 39 additions & 0 deletions
39
demo/composeApp/src/androidMain/kotlin/dev/teogor/sudoklify/multiplatform/MainActivity.kt
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,39 @@ | ||
| /* | ||
| * Copyright 2024 Teogor (Teodor Grigor) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package dev.teogor.sudoklify.multiplatform | ||
|
|
||
| import android.os.Bundle | ||
| import androidx.activity.ComponentActivity | ||
| import androidx.activity.compose.setContent | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
|
|
||
| class MainActivity : ComponentActivity() { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| setContent { | ||
| App() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun AppAndroidPreview() { | ||
| App() | ||
| } |
46 changes: 46 additions & 0 deletions
46
demo/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml
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,46 @@ | ||
| <?xml version="1.0" encoding="utf-8"?><!-- | ||
| Copyright 2024 Teogor (Teodor Grigor) | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:aapt="http://schemas.android.com/aapt" | ||
| android:width="108dp" | ||
| android:height="108dp" | ||
| android:viewportWidth="108" | ||
| android:viewportHeight="108"> | ||
| <path | ||
| android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z"> | ||
| <aapt:attr name="android:fillColor"> | ||
| <gradient | ||
| android:endX="85.84757" | ||
| android:endY="92.4963" | ||
| android:startX="42.9492" | ||
| android:startY="49.59793" | ||
| android:type="linear"> | ||
| <item | ||
| android:color="#44000000" | ||
| android:offset="0.0"/> | ||
| <item | ||
| android:color="#00000000" | ||
| android:offset="1.0"/> | ||
| </gradient> | ||
| </aapt:attr> | ||
| </path> | ||
| <path | ||
| android:fillColor="#FFFFFF" | ||
| android:fillType="nonZero" | ||
| android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z" | ||
| android:strokeWidth="1" | ||
| android:strokeColor="#00000000"/> | ||
| </vector> |
Oops, something went wrong.