Browse Source
COMPOSE-357 - Merged non UI examples visual-effects, falling-balls and minesweeper into one graphics2d - Removed deprecated function calls `kotlin.system.getTimeNanos()` - Little bit simplifyed code - Used Material3 Co-authored-by: Igor Demin <igordmn@users.noreply.github.com>pull/3798/head
dima.avdeev
1 year ago
committed by
GitHub
159 changed files with 642 additions and 3429 deletions
@ -1,21 +0,0 @@ |
|||||||
# Falling Balls game |
|
||||||
|
|
||||||
Game can run on Android, iOS, desktop or in a browser. |
|
||||||
|
|
||||||
## Setting up your development environment |
|
||||||
|
|
||||||
To setup the environment, please consult these [instructions](https://github.com/JetBrains/compose-multiplatform-template#setting-up-your-development-environment). |
|
||||||
|
|
||||||
## How to run |
|
||||||
|
|
||||||
Choose a run configuration for an appropriate target in Android Studio and run it. |
|
||||||
|
|
||||||
 |
|
||||||
|
|
||||||
## Run on desktop via Gradle |
|
||||||
|
|
||||||
`./gradlew desktopApp:run` |
|
||||||
|
|
||||||
## Run native on MacOS |
|
||||||
Choose **shared[macosX64]** or **shared[macosArm64]** configuration in IDE and run it. |
|
||||||
|
|
||||||
@ -1,3 +0,0 @@ |
|||||||
<resources> |
|
||||||
<string name="app_name">Falling Balls</string> |
|
||||||
</resources> |
|
||||||
@ -1,19 +0,0 @@ |
|||||||
/* |
|
||||||
* Copyright 2020-2021 JetBrains s.r.o. and respective authors and developers. |
|
||||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. |
|
||||||
*/ |
|
||||||
|
|
||||||
import androidx.compose.ui.ExperimentalComposeUiApi |
|
||||||
import androidx.compose.ui.unit.DpSize |
|
||||||
import androidx.compose.ui.unit.dp |
|
||||||
import androidx.compose.ui.window.WindowState |
|
||||||
import androidx.compose.ui.window.singleWindowApplication |
|
||||||
|
|
||||||
@OptIn(ExperimentalComposeUiApi::class) |
|
||||||
fun main() = |
|
||||||
singleWindowApplication( |
|
||||||
title = "Falling Balls", |
|
||||||
state = WindowState(size = DpSize(800.dp, 800.dp)) |
|
||||||
) { |
|
||||||
MainView() |
|
||||||
} |
|
||||||
@ -1,3 +0,0 @@ |
|||||||
TEAM_ID= |
|
||||||
BUNDLE_ID=org.jetbrains.FallingBalls |
|
||||||
APP_NAME=FallingBalls |
|
||||||
@ -1,15 +0,0 @@ |
|||||||
/* |
|
||||||
* Copyright 2020-2021 JetBrains s.r.o. and respective authors and developers. |
|
||||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. |
|
||||||
*/ |
|
||||||
|
|
||||||
import androidx.compose.ui.window.Window |
|
||||||
import org.jetbrains.skiko.wasm.onWasmReady |
|
||||||
|
|
||||||
fun main() { |
|
||||||
onWasmReady { |
|
||||||
Window("Falling Balls") { |
|
||||||
MainView() |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,32 +0,0 @@ |
|||||||
<!-- |
|
||||||
~ Copyright 2021 The Android Open Source Project |
|
||||||
~ |
|
||||||
~ 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. |
|
||||||
--> |
|
||||||
|
|
||||||
<!DOCTYPE html> |
|
||||||
<html lang="en"> |
|
||||||
<head> |
|
||||||
<meta charset="UTF-8"> |
|
||||||
<title>compose multiplatform web demo</title> |
|
||||||
<script src="skiko.js"> </script> |
|
||||||
<link type="text/css" rel="stylesheet" href="styles.css" /> |
|
||||||
</head> |
|
||||||
<body> |
|
||||||
<h1>compose multiplatform web demo</h1> |
|
||||||
<div> |
|
||||||
<canvas id="ComposeTarget" width="800" height="600"></canvas> |
|
||||||
</div> |
|
||||||
<script src="jsApp.js"> </script> |
|
||||||
</body> |
|
||||||
</html> |
|
||||||
@ -1,32 +0,0 @@ |
|||||||
pluginManagement { |
|
||||||
repositories { |
|
||||||
gradlePluginPortal() |
|
||||||
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") |
|
||||||
google() |
|
||||||
} |
|
||||||
|
|
||||||
plugins { |
|
||||||
val kotlinVersion = extra["kotlin.version"] as String |
|
||||||
val agpVersion = extra["agp.version"] as String |
|
||||||
val composeVersion = extra["compose.version"] as String |
|
||||||
|
|
||||||
kotlin("jvm").version(kotlinVersion) |
|
||||||
kotlin("multiplatform").version(kotlinVersion) |
|
||||||
kotlin("android").version(kotlinVersion) |
|
||||||
id("com.android.base").version(agpVersion) |
|
||||||
id("com.android.application").version(agpVersion) |
|
||||||
id("com.android.library").version(agpVersion) |
|
||||||
id("org.jetbrains.compose").version(composeVersion) |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
plugins { |
|
||||||
id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") |
|
||||||
} |
|
||||||
|
|
||||||
rootProject.name = "falling-balls-mpp" |
|
||||||
|
|
||||||
include(":androidApp") |
|
||||||
include(":shared") |
|
||||||
include(":desktopApp") |
|
||||||
include(":jsApp") |
|
||||||
@ -1,125 +0,0 @@ |
|||||||
@file:Suppress("OPT_IN_IS_NOT_ENABLED") |
|
||||||
|
|
||||||
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler |
|
||||||
|
|
||||||
|
|
||||||
plugins { |
|
||||||
kotlin("multiplatform") |
|
||||||
id("com.android.library") |
|
||||||
id("org.jetbrains.compose") |
|
||||||
} |
|
||||||
|
|
||||||
version = "1.0-SNAPSHOT" |
|
||||||
|
|
||||||
kotlin { |
|
||||||
androidTarget() |
|
||||||
|
|
||||||
jvm("desktop") |
|
||||||
|
|
||||||
js(IR) { |
|
||||||
browser() |
|
||||||
} |
|
||||||
|
|
||||||
macosX64 { |
|
||||||
binaries { |
|
||||||
executable { |
|
||||||
entryPoint = "main" |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
macosArm64 { |
|
||||||
binaries { |
|
||||||
executable { |
|
||||||
entryPoint = "main" |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
listOf( |
|
||||||
iosX64(), |
|
||||||
iosArm64(), |
|
||||||
iosSimulatorArm64() |
|
||||||
).forEach { iosTarget -> |
|
||||||
iosTarget.binaries.framework { |
|
||||||
baseName = "shared" |
|
||||||
isStatic = true |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
val enableKjsWorkaround = project.properties["workaround.kotlin.js.kt60852"] == "true" |
|
||||||
|
|
||||||
fun KotlinDependencyHandler.addCommonDependencies() { |
|
||||||
implementation(compose.ui) |
|
||||||
implementation(compose.runtime) |
|
||||||
implementation(compose.foundation) |
|
||||||
implementation(compose.material) |
|
||||||
@OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) |
|
||||||
implementation(compose.components.resources) |
|
||||||
} |
|
||||||
|
|
||||||
sourceSets { |
|
||||||
val commonMain by getting { |
|
||||||
dependencies { |
|
||||||
if (!enableKjsWorkaround) { |
|
||||||
addCommonDependencies() |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
val androidMain by getting { |
|
||||||
dependencies { |
|
||||||
api("androidx.activity:activity-compose:1.7.2") |
|
||||||
api("androidx.appcompat:appcompat:1.6.1") |
|
||||||
api("androidx.core:core-ktx:1.10.1") |
|
||||||
} |
|
||||||
} |
|
||||||
val iosMain by creating { |
|
||||||
dependsOn(commonMain) |
|
||||||
} |
|
||||||
val iosX64Main by getting { |
|
||||||
dependsOn(iosMain) |
|
||||||
} |
|
||||||
val iosArm64Main by getting { |
|
||||||
dependsOn(iosMain) |
|
||||||
} |
|
||||||
val iosSimulatorArm64Main by getting { |
|
||||||
dependsOn(iosMain) |
|
||||||
} |
|
||||||
val desktopMain by getting { |
|
||||||
dependencies { |
|
||||||
implementation(compose.desktop.common) |
|
||||||
} |
|
||||||
} |
|
||||||
val macosMain by creating { |
|
||||||
dependsOn(commonMain) |
|
||||||
} |
|
||||||
val macosArm64Main by getting { |
|
||||||
dependsOn(macosMain) |
|
||||||
} |
|
||||||
val jsMain by getting { |
|
||||||
dependencies { |
|
||||||
if (enableKjsWorkaround) { |
|
||||||
addCommonDependencies() |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
android { |
|
||||||
compileSdk = 34 |
|
||||||
namespace = "org.jetbrains.fallingballs" |
|
||||||
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") |
|
||||||
sourceSets["main"].res.srcDirs("src/androidMain/res") |
|
||||||
sourceSets["main"].resources.srcDirs("src/commonMain/resources") |
|
||||||
|
|
||||||
defaultConfig { |
|
||||||
minSdk = 26 |
|
||||||
} |
|
||||||
compileOptions { |
|
||||||
sourceCompatibility = JavaVersion.VERSION_17 |
|
||||||
targetCompatibility = JavaVersion.VERSION_17 |
|
||||||
} |
|
||||||
kotlin { |
|
||||||
jvmToolchain(17) |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,12 +0,0 @@ |
|||||||
import androidx.compose.runtime.Composable |
|
||||||
import androidx.compose.runtime.remember |
|
||||||
|
|
||||||
object AndroidTime : Time { |
|
||||||
override fun now(): Long = System.nanoTime() |
|
||||||
} |
|
||||||
|
|
||||||
@Composable |
|
||||||
fun MainView() { |
|
||||||
val game = remember { Game(AndroidTime) } |
|
||||||
FallingBalls(game) |
|
||||||
} |
|
||||||
@ -1,24 +0,0 @@ |
|||||||
/* |
|
||||||
* Copyright 2020-2021 JetBrains s.r.o. and respective authors and developers. |
|
||||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. |
|
||||||
*/ |
|
||||||
|
|
||||||
import androidx.compose.desktop.ui.tooling.preview.Preview |
|
||||||
import androidx.compose.runtime.Composable |
|
||||||
import androidx.compose.runtime.remember |
|
||||||
|
|
||||||
object JvmTime : Time { |
|
||||||
override fun now(): Long = System.nanoTime() |
|
||||||
} |
|
||||||
|
|
||||||
@Composable |
|
||||||
fun MainView() { |
|
||||||
val game = remember { Game(JvmTime) } |
|
||||||
FallingBalls(game) |
|
||||||
} |
|
||||||
|
|
||||||
@Preview |
|
||||||
@Composable |
|
||||||
fun GamePreview() { |
|
||||||
MainView() |
|
||||||
} |
|
||||||
@ -1,19 +0,0 @@ |
|||||||
/* |
|
||||||
* Copyright 2020-2021 JetBrains s.r.o. and respective authors and developers. |
|
||||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. |
|
||||||
*/ |
|
||||||
|
|
||||||
|
|
||||||
import androidx.compose.runtime.remember |
|
||||||
import androidx.compose.ui.window.ComposeUIViewController |
|
||||||
import platform.UIKit.UIViewController |
|
||||||
|
|
||||||
object IosTime : Time { |
|
||||||
override fun now(): Long = kotlin.system.getTimeNanos() |
|
||||||
} |
|
||||||
|
|
||||||
fun MainViewController() : UIViewController = ComposeUIViewController { |
|
||||||
val game = remember { Game(IosTime) } |
|
||||||
FallingBalls(game) |
|
||||||
} |
|
||||||
|
|
||||||
@ -1,65 +0,0 @@ |
|||||||
/* |
|
||||||
* Copyright 2020-2021 JetBrains s.r.o. and respective authors and developers. |
|
||||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. |
|
||||||
*/ |
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.* |
|
||||||
import androidx.compose.material.RadioButton |
|
||||||
import androidx.compose.material.Text |
|
||||||
import androidx.compose.runtime.Composable |
|
||||||
import androidx.compose.runtime.MutableState |
|
||||||
import androidx.compose.runtime.mutableStateOf |
|
||||||
import androidx.compose.runtime.remember |
|
||||||
import androidx.compose.ui.Alignment |
|
||||||
import androidx.compose.ui.Modifier |
|
||||||
import androidx.compose.ui.unit.dp |
|
||||||
import androidx.compose.ui.unit.sp |
|
||||||
import bouncingBalls.BouncingBallsApp |
|
||||||
|
|
||||||
object JsTime : Time { |
|
||||||
override fun now(): Long = kotlinx.browser.window.performance.now().toLong() |
|
||||||
} |
|
||||||
|
|
||||||
@Composable |
|
||||||
fun MainView() { |
|
||||||
val selectedExample = remember { mutableStateOf(Examples.FallingBalls) } |
|
||||||
|
|
||||||
Column(modifier = Modifier.fillMaxSize()) { |
|
||||||
ExamplesChooser(selectedExample) |
|
||||||
Spacer(modifier = Modifier.height(24.dp)) |
|
||||||
|
|
||||||
when (selectedExample.value) { |
|
||||||
Examples.FallingBalls -> { |
|
||||||
val game = remember { Game(JsTime) } |
|
||||||
FallingBalls(game) |
|
||||||
} |
|
||||||
Examples.BouncingBalls -> { |
|
||||||
BouncingBallsApp(10) |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
@Composable |
|
||||||
private fun ExamplesChooser(selected: MutableState<Examples>) { |
|
||||||
Column { |
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) { |
|
||||||
Text("Choose an example: ", fontSize = 16.sp) |
|
||||||
|
|
||||||
Examples.values().forEach { |
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) { |
|
||||||
RadioButton(selected = selected.value == it, onClick = { |
|
||||||
selected.value = it |
|
||||||
}) |
|
||||||
Text(it.name) |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
private enum class Examples { |
|
||||||
FallingBalls, |
|
||||||
BouncingBalls |
|
||||||
} |
|
||||||
|
|
||||||
@ -1,23 +0,0 @@ |
|||||||
/* |
|
||||||
* Copyright 2020-2021 JetBrains s.r.o. and respective authors and developers. |
|
||||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. |
|
||||||
*/ |
|
||||||
|
|
||||||
import androidx.compose.ui.window.Window |
|
||||||
import androidx.compose.runtime.remember |
|
||||||
import androidx.compose.ui.unit.dp |
|
||||||
import platform.AppKit.NSApp |
|
||||||
import platform.AppKit.NSApplication |
|
||||||
|
|
||||||
object MacosTime : Time { |
|
||||||
override fun now(): Long = kotlin.system.getTimeNanos() |
|
||||||
} |
|
||||||
|
|
||||||
fun main() { |
|
||||||
NSApplication.sharedApplication() |
|
||||||
Window("Falling Balls") { |
|
||||||
val game = remember { Game(MacosTime) } |
|
||||||
FallingBalls(game) |
|
||||||
} |
|
||||||
NSApp?.run() |
|
||||||
} |
|
||||||
@ -0,0 +1,24 @@ |
|||||||
|
# Graphics2D |
||||||
|
|
||||||
|
Example can run on Android, iOS, desktop or in a browser. |
||||||
|
|
||||||
|
## Setting up your development environment |
||||||
|
|
||||||
|
To setup the environment, please consult |
||||||
|
these [instructions](https://github.com/JetBrains/compose-multiplatform-template#setting-up-your-development-environment). |
||||||
|
|
||||||
|
## How to run |
||||||
|
|
||||||
|
Choose a run configuration for an appropriate target in Android Studio and run it. |
||||||
|
|
||||||
|
 |
||||||
|
|
||||||
|
## Run on desktop via Gradle |
||||||
|
|
||||||
|
`./gradlew desktopApp:run` |
||||||
|
|
||||||
|
## Run experimental native on MacOS |
||||||
|
|
||||||
|
`./gradlew runDebugExecutableMacosX64` (Works on Intel processors) |
||||||
|
`./gradlew runDebugExecutableMacosArm64` (Works on Arm processors) |
||||||
|
|
||||||
@ -1,4 +1,4 @@ |
|||||||
package org.jetbrains.fallingballs |
package org.jetbrains.graphics2d |
||||||
|
|
||||||
import MainView |
import MainView |
||||||
import android.os.Bundle |
import android.os.Bundle |
||||||
@ -0,0 +1,3 @@ |
|||||||
|
<resources> |
||||||
|
<string name="app_name">Graphics2D</string> |
||||||
|
</resources> |
||||||
|
Before Width: | Height: | Size: 213 KiB After Width: | Height: | Size: 213 KiB |
@ -0,0 +1,30 @@ |
|||||||
|
import androidx.compose.ui.unit.DpSize |
||||||
|
import androidx.compose.ui.unit.coerceIn |
||||||
|
import androidx.compose.ui.unit.dp |
||||||
|
import androidx.compose.ui.window.Window |
||||||
|
import androidx.compose.ui.window.application |
||||||
|
import androidx.compose.ui.window.rememberWindowState |
||||||
|
|
||||||
|
|
||||||
|
private val INIT_SIZE = DpSize(800.dp, 800.dp) |
||||||
|
|
||||||
|
fun main() = |
||||||
|
application { |
||||||
|
val windowState = rememberWindowState(width = 800.dp, height = 800.dp) |
||||||
|
|
||||||
|
Window( |
||||||
|
onCloseRequest = ::exitApplication, |
||||||
|
resizable = false, |
||||||
|
title = "Graphics2D", |
||||||
|
state = windowState, |
||||||
|
) { |
||||||
|
Graphics2D( |
||||||
|
requestWindowSize = { w, h -> |
||||||
|
windowState.size = windowState.size.copy( |
||||||
|
width = w.coerceIn(INIT_SIZE.width, Float.MAX_VALUE.dp), |
||||||
|
height = h.coerceIn(INIT_SIZE.height, Float.MAX_VALUE.dp) |
||||||
|
) |
||||||
|
} |
||||||
|
) |
||||||
|
} |
||||||
|
} |
||||||
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 64 KiB |
@ -0,0 +1,3 @@ |
|||||||
|
TEAM_ID= |
||||||
|
BUNDLE_ID=org.jetbrains.Graphics2D |
||||||
|
APP_NAME=Graphics2D |
||||||
@ -0,0 +1,10 @@ |
|||||||
|
import androidx.compose.ui.window.Window |
||||||
|
import org.jetbrains.skiko.wasm.onWasmReady |
||||||
|
|
||||||
|
fun main() { |
||||||
|
onWasmReady { |
||||||
|
Window("Graphics2D") { |
||||||
|
MainView() |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
Before Width: | Height: | Size: 896 B After Width: | Height: | Size: 896 B |
|
Before Width: | Height: | Size: 780 B After Width: | Height: | Size: 780 B |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -0,0 +1,16 @@ |
|||||||
|
<!DOCTYPE html> |
||||||
|
<html lang="en"> |
||||||
|
<head> |
||||||
|
<meta charset="UTF-8"> |
||||||
|
<title>compose multiplatform web demo</title> |
||||||
|
<script src="skiko.js"> </script> |
||||||
|
<link type="text/css" rel="stylesheet" href="styles.css" /> |
||||||
|
</head> |
||||||
|
<body> |
||||||
|
<h1>compose multiplatform web demo</h1> |
||||||
|
<div> |
||||||
|
<canvas id="ComposeTarget" width="800" height="600"></canvas> |
||||||
|
</div> |
||||||
|
<script src="jsApp.js"> </script> |
||||||
|
</body> |
||||||
|
</html> |
||||||
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
@ -0,0 +1,6 @@ |
|||||||
|
import androidx.compose.runtime.Composable |
||||||
|
|
||||||
|
@Composable |
||||||
|
fun MainView() { |
||||||
|
Graphics2D() |
||||||
|
} |
||||||
@ -0,0 +1,3 @@ |
|||||||
|
package minesweeper |
||||||
|
|
||||||
|
actual fun hasRightClick() = false |
||||||
@ -1,4 +1,4 @@ |
|||||||
package org.jetbrains.compose.demo.visuals.platform |
package visualeffects |
||||||
|
|
||||||
import androidx.compose.ui.Modifier |
import androidx.compose.ui.Modifier |
||||||
|
|
||||||
@ -0,0 +1,110 @@ |
|||||||
|
import androidx.compose.foundation.clickable |
||||||
|
import androidx.compose.foundation.isSystemInDarkTheme |
||||||
|
import androidx.compose.foundation.layout.Box |
||||||
|
import androidx.compose.foundation.layout.padding |
||||||
|
import androidx.compose.foundation.lazy.LazyColumn |
||||||
|
import androidx.compose.foundation.lazy.items |
||||||
|
import androidx.compose.material.icons.Icons |
||||||
|
import androidx.compose.material.icons.filled.ArrowBack |
||||||
|
import androidx.compose.material3.Button |
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api |
||||||
|
import androidx.compose.material3.Icon |
||||||
|
import androidx.compose.material3.MaterialTheme |
||||||
|
import androidx.compose.material3.Scaffold |
||||||
|
import androidx.compose.material3.Text |
||||||
|
import androidx.compose.material3.TopAppBar |
||||||
|
import androidx.compose.material3.darkColorScheme |
||||||
|
import androidx.compose.material3.lightColorScheme |
||||||
|
import androidx.compose.runtime.Composable |
||||||
|
import androidx.compose.runtime.MutableState |
||||||
|
import androidx.compose.runtime.mutableStateOf |
||||||
|
import androidx.compose.runtime.remember |
||||||
|
import androidx.compose.ui.Modifier |
||||||
|
import androidx.compose.ui.unit.Dp |
||||||
|
import androidx.compose.ui.unit.dp |
||||||
|
import bouncingballs.BouncingBallsApp |
||||||
|
import fallingballs.FallingBalls |
||||||
|
import minesweeper.MineSweeper |
||||||
|
import visualeffects.NYContent |
||||||
|
import visualeffects.RotatingWords |
||||||
|
import visualeffects.WaveEffectGrid |
||||||
|
|
||||||
|
private val TOP_APP_BAR_HEIGHT = 100.dp |
||||||
|
private val EMPTY_WINDOW_RESIZER: (width: Dp, height: Dp) -> Unit = { w, h -> } |
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class) |
||||||
|
@Composable |
||||||
|
fun Graphics2D(requestWindowSize: ((width: Dp, height: Dp) -> Unit) = EMPTY_WINDOW_RESIZER) { |
||||||
|
val exampleState: MutableState<Example?> = remember { mutableStateOf(null) } |
||||||
|
val example = exampleState.value |
||||||
|
|
||||||
|
MaterialTheme( |
||||||
|
colorScheme = if (isSystemInDarkTheme()) darkColorScheme() else lightColorScheme() |
||||||
|
) { |
||||||
|
Scaffold( |
||||||
|
topBar = { |
||||||
|
TopAppBar( |
||||||
|
navigationIcon = { |
||||||
|
if (example != null) { |
||||||
|
Icon( |
||||||
|
imageVector = Icons.Default.ArrowBack, |
||||||
|
contentDescription = "Back", |
||||||
|
modifier = Modifier.clickable { |
||||||
|
exampleState.value = null |
||||||
|
} |
||||||
|
) |
||||||
|
} |
||||||
|
}, |
||||||
|
title = { |
||||||
|
Text(example?.name ?: "Choose example") |
||||||
|
} |
||||||
|
) |
||||||
|
} |
||||||
|
) { |
||||||
|
Box(Modifier.padding(it)) { |
||||||
|
if (example == null) { |
||||||
|
LazyColumn(Modifier.padding(horizontal = 16.dp)) { |
||||||
|
items(examples) { |
||||||
|
Button(onClick = { |
||||||
|
exampleState.value = it |
||||||
|
}) { |
||||||
|
Text(it.name) |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
} else { |
||||||
|
example.content { w, h -> |
||||||
|
requestWindowSize(w, h + TOP_APP_BAR_HEIGHT) |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
private class Example( |
||||||
|
val name: String, |
||||||
|
val content: @Composable (requestWindowSize: ((width: Dp, height: Dp) -> Unit)) -> Unit |
||||||
|
) |
||||||
|
|
||||||
|
private val examples: List<Example> = listOf( |
||||||
|
Example("FallingBalls") { |
||||||
|
FallingBalls() |
||||||
|
}, |
||||||
|
Example("BouncingBalls") { |
||||||
|
BouncingBallsApp() |
||||||
|
}, |
||||||
|
Example("MineSweeper") { |
||||||
|
MineSweeper(it) |
||||||
|
}, |
||||||
|
Example("RotatingWords") { |
||||||
|
RotatingWords() |
||||||
|
}, |
||||||
|
Example("WaveEffectGrid") { |
||||||
|
WaveEffectGrid() |
||||||
|
}, |
||||||
|
Example("Happy New Year!") { |
||||||
|
NYContent() |
||||||
|
}, |
||||||
|
) |
||||||
@ -1,7 +1,4 @@ |
|||||||
/* |
package fallingballs |
||||||
* Copyright 2020-2021 JetBrains s.r.o. and respective authors and developers. |
|
||||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. |
|
||||||
*/ |
|
||||||
|
|
||||||
import androidx.compose.foundation.background |
import androidx.compose.foundation.background |
||||||
import androidx.compose.foundation.clickable |
import androidx.compose.foundation.clickable |
||||||
@ -1,3 +1,5 @@ |
|||||||
|
package minesweeper |
||||||
|
|
||||||
import androidx.compose.foundation.background |
import androidx.compose.foundation.background |
||||||
import androidx.compose.foundation.border |
import androidx.compose.foundation.border |
||||||
import androidx.compose.foundation.layout.Box |
import androidx.compose.foundation.layout.Box |
||||||
@ -1,36 +1,50 @@ |
|||||||
|
package minesweeper |
||||||
|
|
||||||
import androidx.compose.runtime.getValue |
import androidx.compose.runtime.getValue |
||||||
import androidx.compose.runtime.mutableStateOf |
import androidx.compose.runtime.mutableStateOf |
||||||
import androidx.compose.runtime.setValue |
import androidx.compose.runtime.setValue |
||||||
import kotlin.random.Random |
import kotlin.random.Random |
||||||
|
|
||||||
class GameController(private val options: GameSettings, private val onWin: (() -> Unit)? = null, private val onLose: (() -> Unit)? = null) { |
class GameController( |
||||||
|
private val options: GameSettings, |
||||||
|
private val onWin: (() -> Unit)? = null, |
||||||
|
private val onLose: (() -> Unit)? = null |
||||||
|
) { |
||||||
/** Number of rows in current board */ |
/** Number of rows in current board */ |
||||||
val rows: Int |
val rows: Int |
||||||
get() = options.rows |
get() = options.rows |
||||||
|
|
||||||
/** Number of columns in current board */ |
/** Number of columns in current board */ |
||||||
val columns: Int |
val columns: Int |
||||||
get() = options.columns |
get() = options.columns |
||||||
|
|
||||||
/** Number of bombs in current board */ |
/** Number of bombs in current board */ |
||||||
val bombs: Int |
val bombs: Int |
||||||
get() = options.mines |
get() = options.mines |
||||||
|
|
||||||
/** True if current game has started, false if game is finished or until first cell is opened or flagged */ |
/** True if current game has started, false if game is finished or until first cell is opened or flagged */ |
||||||
var running by mutableStateOf(false) |
var running by mutableStateOf(false) |
||||||
private set |
private set |
||||||
|
|
||||||
/** True if game is ended (win or lose) */ |
/** True if game is ended (win or lose) */ |
||||||
var finished by mutableStateOf(false) |
var finished by mutableStateOf(false) |
||||||
private set |
private set |
||||||
|
|
||||||
/** Total number of flags set on cells, used for calculation of number of remaining bombs */ |
/** Total number of flags set on cells, used for calculation of number of remaining bombs */ |
||||||
var flagsSet by mutableStateOf(0) |
var flagsSet by mutableStateOf(0) |
||||||
private set |
private set |
||||||
|
|
||||||
/** Number of remaining cells */ |
/** Number of remaining cells */ |
||||||
var cellsToOpen by mutableStateOf(options.rows * options.columns - options.mines) |
var cellsToOpen by mutableStateOf(options.rows * options.columns - options.mines) |
||||||
private set |
private set |
||||||
|
|
||||||
/** Game timer, increments every second while game is running */ |
/** Game timer, increments every second while game is running */ |
||||||
var seconds by mutableStateOf(0) |
var seconds by mutableStateOf(0) |
||||||
private set |
private set |
||||||
|
|
||||||
/** Global monotonic time, updated with [onTimeTick] */ |
/** Global monotonic time, updated with [onTimeTick] */ |
||||||
private var time = 0L |
private var time = 0L |
||||||
|
|
||||||
/** The time when user starts the game by opening or flagging any cell */ |
/** The time when user starts the game by opening or flagging any cell */ |
||||||
private var startTime = 0L |
private var startTime = 0L |
||||||
|
|
||||||
@ -1,3 +1,5 @@ |
|||||||
|
package minesweeper |
||||||
|
|
||||||
import androidx.compose.foundation.ExperimentalFoundationApi |
import androidx.compose.foundation.ExperimentalFoundationApi |
||||||
import androidx.compose.foundation.combinedClickable |
import androidx.compose.foundation.combinedClickable |
||||||
import androidx.compose.runtime.Composable |
import androidx.compose.runtime.Composable |
||||||
@ -1,11 +1,13 @@ |
|||||||
@file:Suppress("FunctionName") |
@file:Suppress("FunctionName") |
||||||
|
|
||||||
|
package minesweeper |
||||||
|
|
||||||
import androidx.compose.foundation.Image |
import androidx.compose.foundation.Image |
||||||
import androidx.compose.foundation.background |
import androidx.compose.foundation.background |
||||||
import androidx.compose.foundation.border |
import androidx.compose.foundation.border |
||||||
import androidx.compose.foundation.clickable |
import androidx.compose.foundation.clickable |
||||||
import androidx.compose.foundation.layout.* |
import androidx.compose.foundation.layout.* |
||||||
import androidx.compose.material.Text |
import androidx.compose.material3.Text |
||||||
import androidx.compose.runtime.Composable |
import androidx.compose.runtime.Composable |
||||||
import androidx.compose.ui.Alignment |
import androidx.compose.ui.Alignment |
||||||
import androidx.compose.ui.Modifier |
import androidx.compose.ui.Modifier |
||||||
|
Before Width: | Height: | Size: 896 B After Width: | Height: | Size: 896 B |
|
Before Width: | Height: | Size: 780 B After Width: | Height: | Size: 780 B |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -0,0 +1,36 @@ |
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android" |
||||||
|
android:width="600dp" |
||||||
|
android:height="600dp" |
||||||
|
android:viewportWidth="600" |
||||||
|
android:viewportHeight="600"> |
||||||
|
<path |
||||||
|
android:pathData="M301.21,418.53C300.97,418.54 300.73,418.56 300.49,418.56C297.09,418.59 293.74,417.72 290.79,416.05L222.6,377.54C220.63,376.43 219,374.82 217.85,372.88C216.7,370.94 216.09,368.73 216.07,366.47L216.07,288.16C216.06,287.32 216.09,286.49 216.17,285.67C216.38,283.54 216.91,281.5 217.71,279.6L199.29,268.27L177.74,256.19C175.72,260.43 174.73,265.23 174.78,270.22L174.79,387.05C174.85,393.89 178.57,400.2 184.53,403.56L286.26,461.02C290.67,463.51 295.66,464.8 300.73,464.76C300.91,464.76 301.09,464.74 301.27,464.74C301.24,449.84 301.22,439.23 301.22,439.23L301.21,418.53Z" |
||||||
|
android:fillColor="#041619" |
||||||
|
android:fillType="nonZero"/> |
||||||
|
<path |
||||||
|
android:pathData="M409.45,242.91L312.64,188.23C303.64,183.15 292.58,183.26 283.68,188.51L187.92,245C183.31,247.73 179.93,251.62 177.75,256.17L177.74,256.19L199.29,268.27L217.71,279.6C217.83,279.32 217.92,279.02 218.05,278.74C218.24,278.36 218.43,277.98 218.64,277.62C219.06,276.88 219.52,276.18 220.04,275.51C221.37,273.8 223.01,272.35 224.87,271.25L289.06,233.39C290.42,232.59 291.87,231.96 293.39,231.51C295.53,230.87 297.77,230.6 300,230.72C302.98,230.88 305.88,231.73 308.47,233.2L373.37,269.85C375.54,271.08 377.49,272.68 379.13,274.57C379.68,275.19 380.18,275.85 380.65,276.53C380.86,276.84 381.05,277.15 381.24,277.47L397.79,266.39L420.34,252.93L420.31,252.88C417.55,248.8 413.77,245.35 409.45,242.91Z" |
||||||
|
android:fillColor="#37BF6E" |
||||||
|
android:fillType="nonZero"/> |
||||||
|
<path |
||||||
|
android:pathData="M381.24,277.47C381.51,277.92 381.77,278.38 382.01,278.84C382.21,279.24 382.39,279.65 382.57,280.06C382.91,280.88 383.19,281.73 383.41,282.59C383.74,283.88 383.92,285.21 383.93,286.57L383.93,361.1C383.96,363.95 383.35,366.77 382.16,369.36C381.93,369.86 381.69,370.35 381.42,370.83C379.75,373.79 377.32,376.27 374.39,378L310.2,415.87C307.47,417.48 304.38,418.39 301.21,418.53L301.22,439.23C301.22,439.23 301.24,449.84 301.27,464.74C306.1,464.61 310.91,463.3 315.21,460.75L410.98,404.25C419.88,399 425.31,389.37 425.22,379.03L425.22,267.85C425.17,262.48 423.34,257.34 420.34,252.93L397.79,266.39L381.24,277.47Z" |
||||||
|
android:fillColor="#3870B2" |
||||||
|
android:fillType="nonZero"/> |
||||||
|
<path |
||||||
|
android:pathData="M177.75,256.17C179.93,251.62 183.31,247.73 187.92,245L283.68,188.51C292.58,183.26 303.64,183.15 312.64,188.23L409.45,242.91C413.77,245.35 417.55,248.8 420.31,252.88L420.34,252.93L498.59,206.19C494.03,199.46 487.79,193.78 480.67,189.75L320.86,99.49C306.01,91.1 287.75,91.27 273.07,99.95L114.99,193.2C107.39,197.69 101.81,204.11 98.21,211.63L177.74,256.19L177.75,256.17ZM301.27,464.74C301.09,464.74 300.91,464.76 300.73,464.76C295.66,464.8 290.67,463.51 286.26,461.02L184.53,403.56C178.57,400.2 174.85,393.89 174.79,387.05L174.78,270.22C174.73,265.23 175.72,260.43 177.74,256.19L98.21,211.63C94.86,218.63 93.23,226.58 93.31,234.82L93.31,427.67C93.42,438.97 99.54,449.37 109.4,454.92L277.31,549.77C284.6,553.88 292.84,556.01 301.2,555.94L301.2,555.8C301.39,543.78 301.33,495.26 301.27,464.74Z" |
||||||
|
android:strokeWidth="10" |
||||||
|
android:fillColor="#00000000" |
||||||
|
android:strokeColor="#083042" |
||||||
|
android:fillType="nonZero"/> |
||||||
|
<path |
||||||
|
android:pathData="M498.59,206.19L420.34,252.93C423.34,257.34 425.17,262.48 425.22,267.85L425.22,379.03C425.31,389.37 419.88,399 410.98,404.25L315.21,460.75C310.91,463.3 306.1,464.61 301.27,464.74C301.33,495.26 301.39,543.78 301.2,555.8L301.2,555.94C309.48,555.87 317.74,553.68 325.11,549.32L483.18,456.06C497.87,447.39 506.85,431.49 506.69,414.43L506.69,230.91C506.6,222.02 503.57,213.5 498.59,206.19Z" |
||||||
|
android:strokeWidth="10" |
||||||
|
android:fillColor="#00000000" |
||||||
|
android:strokeColor="#083042" |
||||||
|
android:fillType="nonZero"/> |
||||||
|
<path |
||||||
|
android:pathData="M301.2,555.94C292.84,556.01 284.6,553.88 277.31,549.76L109.4,454.92C99.54,449.37 93.42,438.97 93.31,427.67L93.31,234.82C93.23,226.58 94.86,218.63 98.21,211.63C101.81,204.11 107.39,197.69 114.99,193.2L273.07,99.95C287.75,91.27 306.01,91.1 320.86,99.49L480.67,189.75C487.79,193.78 494.03,199.46 498.59,206.19C503.57,213.5 506.6,222.02 506.69,230.91L506.69,414.43C506.85,431.49 497.87,447.39 483.18,456.06L325.11,549.32C317.74,553.68 309.48,555.87 301.2,555.94Z" |
||||||
|
android:strokeWidth="10" |
||||||
|
android:fillColor="#00000000" |
||||||
|
android:strokeColor="#083042" |
||||||
|
android:fillType="nonZero"/> |
||||||
|
</vector> |
||||||
@ -1,3 +1,5 @@ |
|||||||
|
package minesweeper |
||||||
|
|
||||||
import kotlin.test.* |
import kotlin.test.* |
||||||
|
|
||||||
class GameControllerTest { |
class GameControllerTest { |
||||||
@ -0,0 +1,3 @@ |
|||||||
|
package minesweeper |
||||||
|
|
||||||
|
actual fun hasRightClick() = true |
||||||
@ -1,4 +1,4 @@ |
|||||||
package org.jetbrains.compose.demo.visuals.platform |
package visualeffects |
||||||
|
|
||||||
import androidx.compose.ui.ExperimentalComposeUiApi |
import androidx.compose.ui.ExperimentalComposeUiApi |
||||||
import androidx.compose.ui.Modifier |
import androidx.compose.ui.Modifier |
||||||
@ -0,0 +1,6 @@ |
|||||||
|
import androidx.compose.ui.window.ComposeUIViewController |
||||||
|
import platform.UIKit.UIViewController |
||||||
|
|
||||||
|
fun MainViewController(): UIViewController = ComposeUIViewController { |
||||||
|
Graphics2D() |
||||||
|
} |
||||||
@ -0,0 +1,3 @@ |
|||||||
|
package minesweeper |
||||||
|
|
||||||
|
actual fun hasRightClick() = false |
||||||
@ -1,4 +1,4 @@ |
|||||||
package org.jetbrains.compose.demo.visuals.platform |
package visualeffects |
||||||
|
|
||||||
import androidx.compose.ui.Modifier |
import androidx.compose.ui.Modifier |
||||||
|
|
||||||
@ -0,0 +1,6 @@ |
|||||||
|
import androidx.compose.runtime.Composable |
||||||
|
|
||||||
|
@Composable |
||||||
|
fun MainView() { |
||||||
|
Graphics2D() |
||||||
|
} |
||||||
@ -0,0 +1,3 @@ |
|||||||
|
package minesweeper |
||||||
|
|
||||||
|
actual fun hasRightClick() = false |
||||||
@ -0,0 +1,26 @@ |
|||||||
|
package visualeffects |
||||||
|
|
||||||
|
import androidx.compose.ui.ExperimentalComposeUiApi |
||||||
|
import androidx.compose.ui.Modifier |
||||||
|
import androidx.compose.ui.input.pointer.PointerEventType |
||||||
|
import androidx.compose.ui.input.pointer.onPointerEvent |
||||||
|
|
||||||
|
@OptIn(ExperimentalComposeUiApi::class) |
||||||
|
actual fun Modifier.onPointerEvent( |
||||||
|
eventKind: PointerEventKind, |
||||||
|
onEvent: Position.() -> Unit |
||||||
|
): Modifier { |
||||||
|
|
||||||
|
val eventType: PointerEventType = when (eventKind) { |
||||||
|
PointerEventKind.Move -> PointerEventType.Move |
||||||
|
PointerEventKind.In -> PointerEventType.Enter |
||||||
|
PointerEventKind.Out -> PointerEventType.Exit |
||||||
|
} |
||||||
|
|
||||||
|
return this.onPointerEvent(eventType) { |
||||||
|
Position( |
||||||
|
it.changes.first().position.x.toInt(), |
||||||
|
it.changes.first().position.y.toInt() |
||||||
|
).onEvent() |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,11 @@ |
|||||||
|
import androidx.compose.ui.window.Window |
||||||
|
import platform.AppKit.NSApp |
||||||
|
import platform.AppKit.NSApplication |
||||||
|
|
||||||
|
fun main() { |
||||||
|
NSApplication.sharedApplication() |
||||||
|
Window("Graphics2D") { |
||||||
|
Graphics2D() |
||||||
|
} |
||||||
|
NSApp?.run() |
||||||
|
} |
||||||
@ -0,0 +1,3 @@ |
|||||||
|
package minesweeper |
||||||
|
|
||||||
|
actual fun hasRightClick() = false |
||||||
@ -0,0 +1,27 @@ |
|||||||
|
package visualeffects |
||||||
|
|
||||||
|
import androidx.compose.ui.ExperimentalComposeUiApi |
||||||
|
import androidx.compose.ui.Modifier |
||||||
|
import androidx.compose.ui.input.pointer.PointerEventType |
||||||
|
import androidx.compose.ui.input.pointer.onPointerEvent |
||||||
|
|
||||||
|
|
||||||
|
@OptIn(ExperimentalComposeUiApi::class) |
||||||
|
actual fun Modifier.onPointerEvent( |
||||||
|
eventKind: PointerEventKind, |
||||||
|
onEvent: Position.() -> Unit |
||||||
|
): Modifier { |
||||||
|
|
||||||
|
val eventType: PointerEventType = when (eventKind) { |
||||||
|
PointerEventKind.Move -> PointerEventType.Move |
||||||
|
PointerEventKind.In -> PointerEventType.Enter |
||||||
|
PointerEventKind.Out -> PointerEventType.Exit |
||||||
|
} |
||||||
|
|
||||||
|
return this.onPointerEvent(eventType) { |
||||||
|
Position( |
||||||
|
it.changes.first().position.x.toInt(), |
||||||
|
it.changes.first().position.y.toInt() |
||||||
|
).onEvent() |
||||||
|
} |
||||||
|
} |
||||||
@ -1,7 +0,0 @@ |
|||||||
local.properties |
|
||||||
iosApp/Podfile.lock |
|
||||||
iosApp/Pods/* |
|
||||||
iosApp/iosApp.xcworkspace/* |
|
||||||
iosApp/iosApp.xcodeproj/* |
|
||||||
!iosApp/iosApp.xcodeproj/project.pbxproj |
|
||||||
shared/shared.podspec |
|
||||||
@ -1,28 +0,0 @@ |
|||||||
<component name="ProjectRunConfigurationManager"> |
|
||||||
<configuration default="false" name="desktopApp" type="GradleRunConfiguration" factoryName="Gradle"> |
|
||||||
<ExternalSystemSettings> |
|
||||||
<option name="env"> |
|
||||||
<map> |
|
||||||
<entry key="DEVELOPER_DIR" value="/Applications/Xcode.app/Contents/Developer" /> |
|
||||||
</map> |
|
||||||
</option> |
|
||||||
<option name="executionName" /> |
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" /> |
|
||||||
<option name="externalSystemIdString" value="GRADLE" /> |
|
||||||
<option name="scriptParameters" value="" /> |
|
||||||
<option name="taskDescriptions"> |
|
||||||
<list /> |
|
||||||
</option> |
|
||||||
<option name="taskNames"> |
|
||||||
<list> |
|
||||||
<option value="desktopApp:run" /> |
|
||||||
</list> |
|
||||||
</option> |
|
||||||
<option name="vmOptions" /> |
|
||||||
</ExternalSystemSettings> |
|
||||||
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> |
|
||||||
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> |
|
||||||
<DebugAllEnabled>false</DebugAllEnabled> |
|
||||||
<method v="2" /> |
|
||||||
</configuration> |
|
||||||
</component> |
|
||||||
@ -1,25 +0,0 @@ |
|||||||
# Minesweeper |
|
||||||
|
|
||||||
A simple game powered by Compose Multiplatform. |
|
||||||
|
|
||||||
Game can run on Android, iOS, desktop or in a browser. |
|
||||||
|
|
||||||
## Setting up your development environment |
|
||||||
|
|
||||||
To setup the environment, please consult these [instructions](https://github.com/JetBrains/compose-multiplatform-template#setting-up-your-development-environment). |
|
||||||
|
|
||||||
## How to run |
|
||||||
|
|
||||||
Choose a run configuration for an appropriate target in Android Studio and run it. |
|
||||||
|
|
||||||
 |
|
||||||
|
|
||||||
## Run on desktop via Gradle |
|
||||||
|
|
||||||
`./gradlew desktopApp:run` |
|
||||||
|
|
||||||
## Run native on MacOS |
|
||||||
`./gradlew runDebugExecutableMacosX64` (Works on Intel processors) |
|
||||||
|
|
||||||
## Credits |
|
||||||
<div>Icons made by <a href="https://www.flaticon.com/authors/creaticca-creative-agency" title="Creaticca Creative Agency">Creaticca Creative Agency</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a></div> |
|
||||||
@ -1,35 +0,0 @@ |
|||||||
plugins { |
|
||||||
kotlin("multiplatform") |
|
||||||
id("com.android.application") |
|
||||||
id("org.jetbrains.compose") |
|
||||||
} |
|
||||||
|
|
||||||
kotlin { |
|
||||||
androidTarget() |
|
||||||
sourceSets { |
|
||||||
val androidMain by getting { |
|
||||||
dependencies { |
|
||||||
implementation(project(":shared")) |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
android { |
|
||||||
compileSdk = 34 |
|
||||||
namespace = "org.jetbrains.minesweeper" |
|
||||||
defaultConfig { |
|
||||||
applicationId = "org.jetbrains.ComposeMinesweeper" |
|
||||||
minSdk = 26 |
|
||||||
targetSdk = 34 |
|
||||||
versionCode = 1 |
|
||||||
versionName = "1.0" |
|
||||||
} |
|
||||||
compileOptions { |
|
||||||
sourceCompatibility = JavaVersion.VERSION_17 |
|
||||||
targetCompatibility = JavaVersion.VERSION_17 |
|
||||||
} |
|
||||||
kotlin { |
|
||||||
jvmToolchain(17) |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,21 +0,0 @@ |
|||||||
<?xml version="1.0" encoding="utf-8"?> |
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> |
|
||||||
|
|
||||||
<application |
|
||||||
android:allowBackup="true" |
|
||||||
android:label="@string/app_name" |
|
||||||
android:supportsRtl="true" |
|
||||||
android:theme="@style/Theme.AppCompat.Light.NoActionBar"> |
|
||||||
<activity |
|
||||||
android:exported="true" |
|
||||||
android:name="MainActivity" |
|
||||||
android:label="@string/app_name"> |
|
||||||
<intent-filter> |
|
||||||
<action android:name="android.intent.action.MAIN" /> |
|
||||||
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" /> |
|
||||||
</intent-filter> |
|
||||||
</activity> |
|
||||||
</application> |
|
||||||
|
|
||||||
</manifest> |
|
||||||
@ -1,15 +0,0 @@ |
|||||||
package org.jetbrains.minesweeper |
|
||||||
|
|
||||||
import android.os.Bundle |
|
||||||
import androidx.activity.compose.setContent |
|
||||||
import androidx.appcompat.app.AppCompatActivity |
|
||||||
import MainView |
|
||||||
|
|
||||||
class MainActivity : AppCompatActivity() { |
|
||||||
override fun onCreate(savedInstanceState: Bundle?) { |
|
||||||
super.onCreate(savedInstanceState) |
|
||||||
setContent { |
|
||||||
MainView() |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,3 +0,0 @@ |
|||||||
<resources> |
|
||||||
<string name="app_name">Minesweeper</string> |
|
||||||
</resources> |
|
||||||
@ -1,18 +0,0 @@ |
|||||||
plugins { |
|
||||||
// this is necessary to avoid the plugins to be loaded multiple times |
|
||||||
// in each subproject's classloader |
|
||||||
kotlin("jvm") apply false |
|
||||||
kotlin("multiplatform") apply false |
|
||||||
kotlin("android") apply false |
|
||||||
id("com.android.application") apply false |
|
||||||
id("com.android.library") apply false |
|
||||||
id("org.jetbrains.compose") apply false |
|
||||||
} |
|
||||||
|
|
||||||
allprojects { |
|
||||||
repositories { |
|
||||||
google() |
|
||||||
mavenCentral() |
|
||||||
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,35 +0,0 @@ |
|||||||
import org.jetbrains.compose.desktop.application.dsl.TargetFormat |
|
||||||
|
|
||||||
plugins { |
|
||||||
kotlin("multiplatform") |
|
||||||
id("org.jetbrains.compose") |
|
||||||
} |
|
||||||
|
|
||||||
kotlin { |
|
||||||
jvm {} |
|
||||||
sourceSets { |
|
||||||
val jvmMain by getting { |
|
||||||
dependencies { |
|
||||||
implementation(compose.desktop.currentOs) |
|
||||||
implementation(project(":shared")) |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
compose.desktop { |
|
||||||
application { |
|
||||||
mainClass = "MainKt" |
|
||||||
nativeDistributions { |
|
||||||
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) |
|
||||||
packageName = "Minesweeper" |
|
||||||
packageVersion = "1.0.0" |
|
||||||
|
|
||||||
windows { |
|
||||||
menuGroup = "Compose Examples" |
|
||||||
// see https://wixtoolset.org/documentation/manual/v3/howtos/general/generate_guids.html |
|
||||||
upgradeUuid = "2bf169f9-d851-49f0-b3a1-308966d473ca" |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,22 +0,0 @@ |
|||||||
/* |
|
||||||
* Copyright 2020-2021 JetBrains s.r.o. and respective authors and developers. |
|
||||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. |
|
||||||
*/ |
|
||||||
|
|
||||||
import androidx.compose.ui.ExperimentalComposeUiApi |
|
||||||
import androidx.compose.ui.res.painterResource |
|
||||||
import androidx.compose.ui.window.* |
|
||||||
|
|
||||||
fun main() = application { |
|
||||||
val windowState = rememberWindowState() |
|
||||||
|
|
||||||
Window( |
|
||||||
onCloseRequest = ::exitApplication, |
|
||||||
resizable = false, |
|
||||||
title = "Minesweeper", |
|
||||||
icon = painterResource("assets/mine.png"), |
|
||||||
state = windowState |
|
||||||
) { |
|
||||||
MainView(windowState) |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,19 +0,0 @@ |
|||||||
kotlin.code.style=official |
|
||||||
xcodeproj=./iosApp |
|
||||||
android.useAndroidX=true |
|
||||||
org.gradle.jvmargs=-Xmx3g |
|
||||||
org.jetbrains.compose.experimental.jscanvas.enabled=true |
|
||||||
org.jetbrains.compose.experimental.macos.enabled=true |
|
||||||
org.jetbrains.compose.experimental.uikit.enabled=true |
|
||||||
kotlin.native.useEmbeddableCompilerJar=true |
|
||||||
kotlin.mpp.androidSourceSetLayoutVersion=2 |
|
||||||
# Enable kotlin/native experimental memory model |
|
||||||
kotlin.native.binary.memoryModel=experimental |
|
||||||
kotlin.version=1.9.10 |
|
||||||
agp.version=8.0.2 |
|
||||||
compose.version=1.5.2 |
|
||||||
|
|
||||||
# TODO: remove when switching to 1.9.10. See: https://youtrack.jetbrains.com/issue/KT-60852 |
|
||||||
# usage: ./gradlew :jsApp:jsBrowserRun -Pworkaround.kotlin.js.kt60852=true |
|
||||||
# setting it to `true` breaks other targets (see shared/build.gradle.kts), so it should be used to run the web app only. |
|
||||||
workaround.kotlin.js.kt60852=false |
|
||||||
Binary file not shown.
@ -1,5 +0,0 @@ |
|||||||
distributionBase=GRADLE_USER_HOME |
|
||||||
distributionPath=wrapper/dists |
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip |
|
||||||
zipStoreBase=GRADLE_USER_HOME |
|
||||||
zipStorePath=wrapper/dists |
|
||||||
@ -1,240 +0,0 @@ |
|||||||
#!/bin/sh |
|
||||||
|
|
||||||
# |
|
||||||
# Copyright © 2015-2021 the original authors. |
|
||||||
# |
|
||||||
# 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. |
|
||||||
# |
|
||||||
|
|
||||||
############################################################################## |
|
||||||
# |
|
||||||
# Gradle start up script for POSIX generated by Gradle. |
|
||||||
# |
|
||||||
# Important for running: |
|
||||||
# |
|
||||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is |
|
||||||
# noncompliant, but you have some other compliant shell such as ksh or |
|
||||||
# bash, then to run this script, type that shell name before the whole |
|
||||||
# command line, like: |
|
||||||
# |
|
||||||
# ksh Gradle |
|
||||||
# |
|
||||||
# Busybox and similar reduced shells will NOT work, because this script |
|
||||||
# requires all of these POSIX shell features: |
|
||||||
# * functions; |
|
||||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», |
|
||||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»; |
|
||||||
# * compound commands having a testable exit status, especially «case»; |
|
||||||
# * various built-in commands including «command», «set», and «ulimit». |
|
||||||
# |
|
||||||
# Important for patching: |
|
||||||
# |
|
||||||
# (2) This script targets any POSIX shell, so it avoids extensions provided |
|
||||||
# by Bash, Ksh, etc; in particular arrays are avoided. |
|
||||||
# |
|
||||||
# The "traditional" practice of packing multiple parameters into a |
|
||||||
# space-separated string is a well documented source of bugs and security |
|
||||||
# problems, so this is (mostly) avoided, by progressively accumulating |
|
||||||
# options in "$@", and eventually passing that to Java. |
|
||||||
# |
|
||||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, |
|
||||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; |
|
||||||
# see the in-line comments for details. |
|
||||||
# |
|
||||||
# There are tweaks for specific operating systems such as AIX, CygWin, |
|
||||||
# Darwin, MinGW, and NonStop. |
|
||||||
# |
|
||||||
# (3) This script is generated from the Groovy template |
|
||||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt |
|
||||||
# within the Gradle project. |
|
||||||
# |
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/. |
|
||||||
# |
|
||||||
############################################################################## |
|
||||||
|
|
||||||
# Attempt to set APP_HOME |
|
||||||
|
|
||||||
# Resolve links: $0 may be a link |
|
||||||
app_path=$0 |
|
||||||
|
|
||||||
# Need this for daisy-chained symlinks. |
|
||||||
while |
|
||||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path |
|
||||||
[ -h "$app_path" ] |
|
||||||
do |
|
||||||
ls=$( ls -ld "$app_path" ) |
|
||||||
link=${ls#*' -> '} |
|
||||||
case $link in #( |
|
||||||
/*) app_path=$link ;; #( |
|
||||||
*) app_path=$APP_HOME$link ;; |
|
||||||
esac |
|
||||||
done |
|
||||||
|
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit |
|
||||||
|
|
||||||
APP_NAME="Gradle" |
|
||||||
APP_BASE_NAME=${0##*/} |
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. |
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' |
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value. |
|
||||||
MAX_FD=maximum |
|
||||||
|
|
||||||
warn () { |
|
||||||
echo "$*" |
|
||||||
} >&2 |
|
||||||
|
|
||||||
die () { |
|
||||||
echo |
|
||||||
echo "$*" |
|
||||||
echo |
|
||||||
exit 1 |
|
||||||
} >&2 |
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false'). |
|
||||||
cygwin=false |
|
||||||
msys=false |
|
||||||
darwin=false |
|
||||||
nonstop=false |
|
||||||
case "$( uname )" in #( |
|
||||||
CYGWIN* ) cygwin=true ;; #( |
|
||||||
Darwin* ) darwin=true ;; #( |
|
||||||
MSYS* | MINGW* ) msys=true ;; #( |
|
||||||
NONSTOP* ) nonstop=true ;; |
|
||||||
esac |
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar |
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM. |
|
||||||
if [ -n "$JAVA_HOME" ] ; then |
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then |
|
||||||
# IBM's JDK on AIX uses strange locations for the executables |
|
||||||
JAVACMD=$JAVA_HOME/jre/sh/java |
|
||||||
else |
|
||||||
JAVACMD=$JAVA_HOME/bin/java |
|
||||||
fi |
|
||||||
if [ ! -x "$JAVACMD" ] ; then |
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME |
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the |
|
||||||
location of your Java installation." |
|
||||||
fi |
|
||||||
else |
|
||||||
JAVACMD=java |
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. |
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the |
|
||||||
location of your Java installation." |
|
||||||
fi |
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can. |
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then |
|
||||||
case $MAX_FD in #( |
|
||||||
max*) |
|
||||||
MAX_FD=$( ulimit -H -n ) || |
|
||||||
warn "Could not query maximum file descriptor limit" |
|
||||||
esac |
|
||||||
case $MAX_FD in #( |
|
||||||
'' | soft) :;; #( |
|
||||||
*) |
|
||||||
ulimit -n "$MAX_FD" || |
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD" |
|
||||||
esac |
|
||||||
fi |
|
||||||
|
|
||||||
# Collect all arguments for the java command, stacking in reverse order: |
|
||||||
# * args from the command line |
|
||||||
# * the main class name |
|
||||||
# * -classpath |
|
||||||
# * -D...appname settings |
|
||||||
# * --module-path (only if needed) |
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. |
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java |
|
||||||
if "$cygwin" || "$msys" ; then |
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) |
|
||||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) |
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" ) |
|
||||||
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh |
|
||||||
for arg do |
|
||||||
if |
|
||||||
case $arg in #( |
|
||||||
-*) false ;; # don't mess with options #( |
|
||||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath |
|
||||||
[ -e "$t" ] ;; #( |
|
||||||
*) false ;; |
|
||||||
esac |
|
||||||
then |
|
||||||
arg=$( cygpath --path --ignore --mixed "$arg" ) |
|
||||||
fi |
|
||||||
# Roll the args list around exactly as many times as the number of |
|
||||||
# args, so each arg winds up back in the position where it started, but |
|
||||||
# possibly modified. |
|
||||||
# |
|
||||||
# NB: a `for` loop captures its iteration list before it begins, so |
|
||||||
# changing the positional parameters here affects neither the number of |
|
||||||
# iterations, nor the values presented in `arg`. |
|
||||||
shift # remove old arg |
|
||||||
set -- "$@" "$arg" # push replacement arg |
|
||||||
done |
|
||||||
fi |
|
||||||
|
|
||||||
# Collect all arguments for the java command; |
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of |
|
||||||
# shell script including quotes and variable substitutions, so put them in |
|
||||||
# double quotes to make sure that they get re-expanded; and |
|
||||||
# * put everything else in single quotes, so that it's not re-expanded. |
|
||||||
|
|
||||||
set -- \ |
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \ |
|
||||||
-classpath "$CLASSPATH" \ |
|
||||||
org.gradle.wrapper.GradleWrapperMain \ |
|
||||||
"$@" |
|
||||||
|
|
||||||
# Stop when "xargs" is not available. |
|
||||||
if ! command -v xargs >/dev/null 2>&1 |
|
||||||
then |
|
||||||
die "xargs is not available" |
|
||||||
fi |
|
||||||
|
|
||||||
# Use "xargs" to parse quoted args. |
|
||||||
# |
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed. |
|
||||||
# |
|
||||||
# In Bash we could simply go: |
|
||||||
# |
|
||||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) && |
|
||||||
# set -- "${ARGS[@]}" "$@" |
|
||||||
# |
|
||||||
# but POSIX shell has neither arrays nor command substitution, so instead we |
|
||||||
# post-process each arg (as a line of input to sed) to backslash-escape any |
|
||||||
# character that might be a shell metacharacter, then use eval to reverse |
|
||||||
# that process (while maintaining the separation between arguments), and wrap |
|
||||||
# the whole thing up as a single "set" statement. |
|
||||||
# |
|
||||||
# This will of course break if any of these variables contains a newline or |
|
||||||
# an unmatched quote. |
|
||||||
# |
|
||||||
|
|
||||||
eval "set -- $( |
|
||||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | |
|
||||||
xargs -n1 | |
|
||||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | |
|
||||||
tr '\n' ' ' |
|
||||||
)" '"$@"' |
|
||||||
|
|
||||||
exec "$JAVACMD" "$@" |
|
||||||
@ -1,91 +0,0 @@ |
|||||||
@rem |
|
||||||
@rem Copyright 2015 the original author or authors. |
|
||||||
@rem |
|
||||||
@rem Licensed under the Apache License, Version 2.0 (the "License"); |
|
||||||
@rem you may not use this file except in compliance with the License. |
|
||||||
@rem You may obtain a copy of the License at |
|
||||||
@rem |
|
||||||
@rem https://www.apache.org/licenses/LICENSE-2.0 |
|
||||||
@rem |
|
||||||
@rem Unless required by applicable law or agreed to in writing, software |
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS, |
|
||||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
||||||
@rem See the License for the specific language governing permissions and |
|
||||||
@rem limitations under the License. |
|
||||||
@rem |
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off |
|
||||||
@rem ########################################################################## |
|
||||||
@rem |
|
||||||
@rem Gradle startup script for Windows |
|
||||||
@rem |
|
||||||
@rem ########################################################################## |
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell |
|
||||||
if "%OS%"=="Windows_NT" setlocal |
|
||||||
|
|
||||||
set DIRNAME=%~dp0 |
|
||||||
if "%DIRNAME%"=="" set DIRNAME=. |
|
||||||
set APP_BASE_NAME=%~n0 |
|
||||||
set APP_HOME=%DIRNAME% |
|
||||||
|
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter. |
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi |
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. |
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" |
|
||||||
|
|
||||||
@rem Find java.exe |
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome |
|
||||||
|
|
||||||
set JAVA_EXE=java.exe |
|
||||||
%JAVA_EXE% -version >NUL 2>&1 |
|
||||||
if %ERRORLEVEL% equ 0 goto execute |
|
||||||
|
|
||||||
echo. |
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. |
|
||||||
echo. |
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the |
|
||||||
echo location of your Java installation. |
|
||||||
|
|
||||||
goto fail |
|
||||||
|
|
||||||
:findJavaFromJavaHome |
|
||||||
set JAVA_HOME=%JAVA_HOME:"=% |
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe |
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute |
|
||||||
|
|
||||||
echo. |
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% |
|
||||||
echo. |
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the |
|
||||||
echo location of your Java installation. |
|
||||||
|
|
||||||
goto fail |
|
||||||
|
|
||||||
:execute |
|
||||||
@rem Setup the command line |
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar |
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle |
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* |
|
||||||
|
|
||||||
:end |
|
||||||
@rem End local scope for the variables with windows NT shell |
|
||||||
if %ERRORLEVEL% equ 0 goto mainEnd |
|
||||||
|
|
||||||
:fail |
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of |
|
||||||
rem the _cmd.exe /c_ return code! |
|
||||||
set EXIT_CODE=%ERRORLEVEL% |
|
||||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1 |
|
||||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% |
|
||||||
exit /b %EXIT_CODE% |
|
||||||
|
|
||||||
:mainEnd |
|
||||||
if "%OS%"=="Windows_NT" endlocal |
|
||||||
|
|
||||||
:omega |
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue