diff --git a/AGENTS.md b/AGENTS.md index 514202f..87d4048 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -137,6 +137,22 @@ Do not flip it on without addressing those. ## Conventions +- When generating or mirroring Swift/iOS code into Android, stay as close to + the Swift original as possible: preserve naming, capitalization, visible text, + layout, styling, behavior and structure. Use the closest platform equivalent + where a direct translation is unavailable; avoid unrelated redesigns or + Android-specific changes unless requested. In particular, use `OGS blue` + (not `OGS Blue`) for the Android project name and app labels, matching iOS. + +- Android Compose typography: prefer named `MaterialTheme.typography` styles + over explicit numeric `fontSize` values. Use `headlineLarge` for Blue's title + as the counterpart to SwiftUI's `.largeTitle`, on both overlaid text layers. + +- Android Kotlin imports: use wildcard imports (`package.*`) when importing + multiple declarations from the same package, including newly generated imports. + Keep single imports and aliases explicit where needed to avoid name conflicts. + Wildcards do not include subpackages; import those separately. + - `game/ver-mac/.build/`, `build/`, `.DS_Store`, Xcode/Gradle artifacts are git-ignored. - Prefer editing files in `components/` (the real files); the `src/` entries are diff --git a/components/blue/android/blue.kt b/components/blue/android/blue.kt new file mode 100644 index 0000000..810349e --- /dev/null +++ b/components/blue/android/blue.kt @@ -0,0 +1,14 @@ +package org.opengamestudio + +object BlueComponent { + val ctrl = DialectController(BlueContext()) + + init { + blueRegisterEffects(ctrl) + blueRegisterShoulds(ctrl) + } + + fun setup() { + blueSet(F.didSetup, true) + } +} diff --git a/components/blue/android/view/BlueView.kt b/components/blue/android/view/BlueView.kt new file mode 100644 index 0000000..1cb0288 --- /dev/null +++ b/components/blue/android/view/BlueView.kt @@ -0,0 +1,31 @@ +package org.opengamestudio + +import androidx.compose.foundation.layout.* +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.ui.* +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp + +@Composable +fun BlueView() { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(16.dp), + modifier = Modifier.padding(40.dp) + ) { + Box(contentAlignment = Alignment.Center) { + Text( + text = "Blue", + style = MaterialTheme.typography.headlineLarge, + color = Color.White, + modifier = Modifier.offset(x = 1.dp, y = 1.dp) + ) + Text( + text = "Blue", + style = MaterialTheme.typography.headlineLarge, + color = Color.Black + ) + } + } +} diff --git a/components/other/other.kt b/components/other/other.kt new file mode 100644 index 0000000..b042469 --- /dev/null +++ b/components/other/other.kt @@ -0,0 +1,16 @@ +package org.opengamestudio + +fun otherPrintStderr(txt: String) { + System.err.println(txt) +} + +fun otherSetupConsoleLogging( + ctrl: DialectController, + prefix: String +) { + ctrl.registerCallback { c -> + val value = c.fieldAny(c.recentField) + val line = "ИГР $prefix k/v: '${c.recentField}'/'$value'" + otherPrintStderr(line) + } +} diff --git a/ogs-blue/ver-android/app/build.gradle.kts b/ogs-blue/ver-android/app/build.gradle.kts new file mode 100644 index 0000000..b5b36a9 --- /dev/null +++ b/ogs-blue/ver-android/app/build.gradle.kts @@ -0,0 +1,50 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget.* + +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) +} + +android { + namespace = "org.opengamestudio" + compileSdk = 35 + + buildFeatures { + compose = true + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { + applicationId = "org.opengamestudio.blue" + minSdk = 23 + targetSdk = 35 + versionCode = 1 + versionName = "0.0.1" + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) +} + +kotlin { + compilerOptions { + jvmTarget = JVM_1_8 + } + sourceSets { + val main by getting { + dependencies { + } + } + } +} diff --git a/ogs-blue/ver-android/app/src/main/AndroidManifest.xml b/ogs-blue/ver-android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..f9fc193 --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/AndroidManifest.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + diff --git a/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/ActivityDelegate.kt b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/ActivityDelegate.kt new file mode 100644 index 0000000..e42e000 --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/ActivityDelegate.kt @@ -0,0 +1,13 @@ +package org.opengamestudio + +object ActivityDelegate { + val blue = BlueComponent + + init() { + otherSetupConsoleLogging(blue.ctrl, "Blue") + } + + fun setup() { + blue.setup() + } +} diff --git a/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/MainActivity.kt b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/MainActivity.kt new file mode 100644 index 0000000..459b34b --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/MainActivity.kt @@ -0,0 +1,36 @@ +package org.opengamestudio + +import android.graphics.Color +import android.os.Bundle +import androidx.activity.* +import androidx.activity.compose.setContent +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.ui.* +import androidx.compose.ui.graphics.Color as ComposeColor +import org.opengamestudio.ui.theme.MyApplicationTheme + +class MainActivity: ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + ActivityDelegate.setup() + + enableEdgeToEdge( + navigationBarStyle = SystemBarStyle.dark(Color.TRANSPARENT), + statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT) + ) + setContent { + MyApplicationTheme { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier + .fillMaxSize() + .background(ComposeColor.White) + ) { + BlueView() + } + } + } + } +} diff --git a/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/blue/blue.kt b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/blue/blue.kt new file mode 120000 index 0000000..c009432 --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/blue/blue.kt @@ -0,0 +1 @@ +../../../../../../../../../components/blue/android/blue.kt \ No newline at end of file diff --git a/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/blue/view/BlueView.kt b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/blue/view/BlueView.kt new file mode 120000 index 0000000..6eaed85 --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/blue/view/BlueView.kt @@ -0,0 +1 @@ +../../../../../../../../../../components/blue/android/view/BlueView.kt \ No newline at end of file diff --git a/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/dialect.kt b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/dialect.kt new file mode 100644 index 0000000..340637f --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/dialect.kt @@ -0,0 +1,209 @@ +package org.opengamestudio + + +val DIALECT_CONTEXT_RECENT_FIELD_NONE = "none" + +interface DialectContext { + /** + * Name of the field that has just been changed + * + * Allows should-functions (reducers) to react only to + * relevant changes and ignore other changes of DialectContext + */ + var recentField: String + + /** + * Get field's value by its name + */ + fun field(name: String): T + /** + * Erase type + * + * Used by DialectController to assign recent field's value + */ + fun fieldAny(name: String): Any { + return field(name) + } + /** + * Create a copy of the DialectContext derivative + * + * Used by DialectController to treat all derived contexts as DialectContext + */ + fun selfCopy(): DialectContext + /** + * Set field's value by its name + */ + fun setField(name: String, value: Any?) +} + + +class DialectController( + var context: DialectContext +) { + internal var callbacks = mutableListOf<(c: DialectContext) -> Unit>() + internal var functions = mutableListOf<(c: DialectContext) -> DialectContext>() + var isProcessingQueue = false + internal var queue = mutableListOf() + + fun executeFunctions() { + val c = queue.removeAt(0) + // Keep SSOT: Only allow single field change per should-function + context.recentField = c.recentField + context.setField(c.recentField, c.fieldAny(c.recentField)) + + for (f in functions) { + val ctx = f(context.selfCopy()) + if (ctx.recentField != DIALECT_CONTEXT_RECENT_FIELD_NONE) { + queue.add(ctx) + } + } + + reportContext() + } + + fun processQueue() { + // Prevent recursion. + if (isProcessingQueue) { + return + } + + isProcessingQueue = true + + while (queue.size > 0) { + executeFunctions() + } + + isProcessingQueue = false + } + + fun registerCallback(cb: (c: DialectContext) -> Unit) { + callbacks.add(cb) + } + + fun registerFieldCallback( + fieldName: String, + cb: (DialectContext) -> Unit + ) { + callbacks.add({ c -> + if (c.recentField == fieldName) { + cb(c) + } + }) + } + + fun registerFunction(f: (DialectContext) -> DialectContext) { + functions.add(f) + } + + fun reportContext() { + for (cb in callbacks) { + cb(context) + } + } + + fun set(fieldName: String, value: Any) { + var c = context.selfCopy() + c.setField(fieldName, value) + c.recentField = fieldName + queue.add(c) + processQueue() + } +} + + +// Register several oneliner callbacks to a controller +@Suppress("UNCHECKED_CAST") +fun registerOneliners( + ctrl: DialectController, + items: Array +) { + val halfCount = items.size / 2 + for (i in 0.. Unit + ctrl.registerFieldCallback(field, callback) + } +} + +// Context field names for static type check +object F { + const val didLaunch = "didLaunch" + const val didSetup = "didSetup" + +} + +@Suppress("UNCHECKED_CAST") +data class BlueContext( + var didLaunch: Boolean = false, + var didSetup: Boolean = false, + + override var recentField: String = "" +) : DialectContext { + override fun field(name: String): T { + if (name == "didLaunch") { + return didLaunch as T + } + else if (name == "didSetup") { + return didSetup as T + } + + return "" as T + } + + override fun selfCopy(): DialectContext { + return this.copy() + } + + override fun setField( + name: String, + value: Any? + ) { + if (name == "didLaunch") { + didLaunch = value as Boolean + } + else if (name == "didSetup") { + didSetup = value as Boolean + } + + } +} + +fun blueSet( + key: String, + value: Any +) { + BlueComponent.ctrl.set(key, value) +} + +fun blueShouldResetDidLaunch(c: BlueContext): BlueContext { + val c = c + + // 1. Only once during the first setup + if ( +c.recentField == F.didSetup && +c.didLaunch == false + ) { +c.didLaunch = true + c.recentField = F.didLaunch + return c + } + + c.recentField = DIALECT_CONTEXT_RECENT_FIELD_NONE + return c +} + +fun blueRegisterShoulds(ctrl: DialectController) { + listOf( + ::blueShouldResetDidLaunch, + + ).forEach { f -> + ctrl.registerFunction { c -> f(c as BlueContext) } + } +} + +fun blueRegisterEffects(ctrl: DialectController) { + registerOneliners(ctrl, arrayOf( + F.didLaunch, { c: BlueContext -> print("Blue launched") }, + + )) +} diff --git a/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/other/other.kt b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/other/other.kt new file mode 120000 index 0000000..b2a5b02 --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/other/other.kt @@ -0,0 +1 @@ +../../../../../../../../../components/other/other.kt \ No newline at end of file diff --git a/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/ui/theme/Color.kt b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/ui/theme/Color.kt new file mode 100644 index 0000000..4908667 --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package org.opengamestudio.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) diff --git a/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/ui/theme/Theme.kt b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/ui/theme/Theme.kt new file mode 100644 index 0000000..dcb42e6 --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/ui/theme/Theme.kt @@ -0,0 +1,39 @@ +package org.opengamestudio.ui.theme + +import android.os.Build +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 +) + +@Composable +fun MyApplicationTheme( + darkTheme: Boolean = false, + dynamicColor: Boolean = false, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> + if (darkTheme) dynamicDarkColorScheme(LocalContext.current) + else dynamicLightColorScheme(LocalContext.current) + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} diff --git a/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/ui/theme/Type.kt b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/ui/theme/Type.kt new file mode 100644 index 0000000..51498b7 --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/kotlin/org/opengamestudio/ui/theme/Type.kt @@ -0,0 +1,16 @@ +package org.opengamestudio.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.* +import androidx.compose.ui.unit.sp + +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) +) diff --git a/ogs-blue/ver-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/ogs-blue/ver-android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..796acab Binary files /dev/null and b/ogs-blue/ver-android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/ogs-blue/ver-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/ogs-blue/ver-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..796acab Binary files /dev/null and b/ogs-blue/ver-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/ogs-blue/ver-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/ogs-blue/ver-android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..ca90df9 Binary files /dev/null and b/ogs-blue/ver-android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/ogs-blue/ver-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/ogs-blue/ver-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..ca90df9 Binary files /dev/null and b/ogs-blue/ver-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/ogs-blue/ver-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/ogs-blue/ver-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..50e0e8f Binary files /dev/null and b/ogs-blue/ver-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/ogs-blue/ver-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/ogs-blue/ver-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..50e0e8f Binary files /dev/null and b/ogs-blue/ver-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/ogs-blue/ver-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ogs-blue/ver-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..bbea74a Binary files /dev/null and b/ogs-blue/ver-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/ogs-blue/ver-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/ogs-blue/ver-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..bbea74a Binary files /dev/null and b/ogs-blue/ver-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/ogs-blue/ver-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/ogs-blue/ver-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..9c69972 Binary files /dev/null and b/ogs-blue/ver-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/ogs-blue/ver-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/ogs-blue/ver-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..9c69972 Binary files /dev/null and b/ogs-blue/ver-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/ogs-blue/ver-android/app/src/main/res/values/colors.xml b/ogs-blue/ver-android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..045e125 --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/res/values/colors.xml @@ -0,0 +1,3 @@ + + + diff --git a/ogs-blue/ver-android/app/src/main/res/values/strings.xml b/ogs-blue/ver-android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..4550039 --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + OGS blue + diff --git a/ogs-blue/ver-android/app/src/main/res/values/themes.xml b/ogs-blue/ver-android/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..86809cb --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/res/values/themes.xml @@ -0,0 +1,6 @@ + + + + diff --git a/ogs-blue/ver-android/app/src/main/res/xml/backup_rules.xml b/ogs-blue/ver-android/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..a608293 --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,3 @@ + + + diff --git a/ogs-blue/ver-android/app/src/main/res/xml/data_extraction_rules.xml b/ogs-blue/ver-android/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..798f19b --- /dev/null +++ b/ogs-blue/ver-android/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/ogs-blue/ver-android/build.gradle.kts b/ogs-blue/ver-android/build.gradle.kts new file mode 100644 index 0000000..81f6a88 --- /dev/null +++ b/ogs-blue/ver-android/build.gradle.kts @@ -0,0 +1,6 @@ +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.compose) apply false +} diff --git a/ogs-blue/ver-android/dialect.yml b/ogs-blue/ver-android/dialect.yml new file mode 100644 index 0000000..5cac467 --- /dev/null +++ b/ogs-blue/ver-android/dialect.yml @@ -0,0 +1,26 @@ +version: 4 + +output: + .build/dialect.swift: + type: swift + app/src/main/kotlin/org/opengamestudio/dialect.kt: + type: kotlin + +BlueContext: + type: context + fields: + didLaunch: Bool + didSetup: Bool + +BlueComponent: + type: component + oneliners: + - didLaunch: print("Blue launched") + shoulds: + didLaunch: + 1. Only once during the first setup: + if: + c.recentField == F.didSetup && + c.didLaunch == false + then: + c.didLaunch = true diff --git a/ogs-blue/ver-android/gradle.properties b/ogs-blue/ver-android/gradle.properties new file mode 100644 index 0000000..4c028f0 --- /dev/null +++ b/ogs-blue/ver-android/gradle.properties @@ -0,0 +1,8 @@ +# Use Compose for Android +android.useAndroidX=true +# Verbose build log +org.gradle.console=verbose +# Cache artifacts +org.gradle.caching=true +# JVM heap for Gradle and daemon +org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g diff --git a/ogs-blue/ver-android/gradle/libs.versions.toml b/ogs-blue/ver-android/gradle/libs.versions.toml new file mode 100644 index 0000000..90493ef --- /dev/null +++ b/ogs-blue/ver-android/gradle/libs.versions.toml @@ -0,0 +1,24 @@ +[versions] +activityCompose = "1.9.3" +agp = "8.7.3" +composeBom = "2024.12.01" +coreKtx = "1.15.0" +kotlin = "2.1.0" +lifecycleRuntimeKtx = "2.8.7" + +[libraries] +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +android-library = { id = "com.android.library", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/ogs-blue/ver-android/gradle/wrapper/gradle-wrapper.jar b/ogs-blue/ver-android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/ogs-blue/ver-android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/ogs-blue/ver-android/gradle/wrapper/gradle-wrapper.properties b/ogs-blue/ver-android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..37f78a6 --- /dev/null +++ b/ogs-blue/ver-android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/ogs-blue/ver-android/gradlew b/ogs-blue/ver-android/gradlew new file mode 100755 index 0000000..f3b75f3 --- /dev/null +++ b/ogs-blue/ver-android/gradlew @@ -0,0 +1,251 @@ +#!/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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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/HEAD/platforms/jvm/plugins-application/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + 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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +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" "$@" diff --git a/ogs-blue/ver-android/settings.gradle.kts b/ogs-blue/ver-android/settings.gradle.kts new file mode 100644 index 0000000..5d1e030 --- /dev/null +++ b/ogs-blue/ver-android/settings.gradle.kts @@ -0,0 +1,23 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "OGS blue" +include("app")