commit 3d642622f2310d1b1fda6d69049d58606baa2dbd Author: Nikola Petrov Date: Tue Nov 25 14:20:32 2025 +0100 init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml new file mode 100644 index 0000000..4a53bee --- /dev/null +++ b/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..97f0a8e --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..74dd639 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..f4c980c --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,61 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) +} + +android { + namespace = "com.petrovv.gogameclock" + compileSdk { + version = release(36) + } + + defaultConfig { + applicationId = "com.petrovv.gogameclock" + minSdk = 24 + targetSdk = 36 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = "11" + } + buildFeatures { + compose = true + } +} + +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.compose.ui) + implementation(libs.androidx.compose.ui.graphics) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.androidx.compose.material3) + implementation(libs.androidx.navigation.compose) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + debugImplementation(libs.androidx.compose.ui.tooling) + debugImplementation(libs.androidx.compose.ui.test.manifest) +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/petrovv/gogameclock/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/petrovv/gogameclock/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..6cf469a --- /dev/null +++ b/app/src/androidTest/java/com/petrovv/gogameclock/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.petrovv.gogameclock + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.petrovv.gogameclock", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..70c265b --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/petrovv/gogameclock/AbsoluteTiming.kt b/app/src/main/java/com/petrovv/gogameclock/AbsoluteTiming.kt new file mode 100644 index 0000000..6b8feaa --- /dev/null +++ b/app/src/main/java/com/petrovv/gogameclock/AbsoluteTiming.kt @@ -0,0 +1,52 @@ +package com.petrovv.gogameclock + +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.graphics.Color + +class AbsoluteTiming(initialTime: Long = 1200) : IClock { + val byoyomiTime : Long = 5 * 1000 + + override var timedOut by mutableStateOf(false) + val timer = Timer(initialTime) { + timedOut = true + } + + override fun start() { + timer.start() + } + + override fun stop() { + timer.stop() + } + + override fun updateMoviesAndStop() { + if(!timer.isRunning()) return + timer.stop() + } + + override fun reset() { + timer.reset() + timedOut = false + } + + override fun isRunning(): Boolean { + return timer.isRunning() + } + + override fun update() { + timer.update() + } + + override fun color(): Color { + if(timedOut){ return Colors.loss} + if(!timer.isRunning()) return Colors.stopped + if(timer.timeMillis < byoyomiTime) return Colors.byoyomi + return Colors.running + } + + override fun display(): String { + return timer.toString() + } +} diff --git a/app/src/main/java/com/petrovv/gogameclock/CanadianTiming.kt b/app/src/main/java/com/petrovv/gogameclock/CanadianTiming.kt new file mode 100644 index 0000000..2e32ec2 --- /dev/null +++ b/app/src/main/java/com/petrovv/gogameclock/CanadianTiming.kt @@ -0,0 +1,76 @@ +package com.petrovv.gogameclock + +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.graphics.Color + +class CanadianTiming( + private val initialTime: Long = 1200, + private val byoyomiTime : Long = 600, + private val maxByoyomiMoves: Long = 25 +) : IClock { + var mainTime by mutableStateOf(true) + var byoyomi by mutableStateOf(false) + var byoyomiC : Long = 0 + override var timedOut by mutableStateOf(false) + val timer: Timer = Timer(initialTime) { + if(mainTime){ + byoyomi = true + mainTime = false + timer.reset(byoyomiTime) + timer.start() + return@Timer + } + + timedOut = true + } + + override fun start() { + timer.start() + } + + override fun stop() { + timer.stop() + } + + override fun updateMoviesAndStop() { + if(!timer.isRunning()) return + timer.stop() + if(byoyomi){ + byoyomiC += 1 + if(byoyomiC == maxByoyomiMoves){ + timer.reset() + byoyomiC = 0 + } + } + } + + override fun reset() { + timer.reset(initialTime) + timedOut = false + byoyomiC = 0 + mainTime = true + byoyomi = false + } + + override fun isRunning(): Boolean { + return timer.isRunning() + } + + override fun update() { + timer.update() + } + + override fun color(): Color { + if(timedOut){ return Colors.loss} + if(!timer.isRunning()) return Colors.stopped + if(byoyomi) return Colors.byoyomi + return Colors.running + } + + override fun display(): String { + val timerS = timer.toString() + return "%s\n%02d".format(timerS, maxByoyomiMoves - byoyomiC) + } +} diff --git a/app/src/main/java/com/petrovv/gogameclock/Colors.kt b/app/src/main/java/com/petrovv/gogameclock/Colors.kt new file mode 100644 index 0000000..5d69707 --- /dev/null +++ b/app/src/main/java/com/petrovv/gogameclock/Colors.kt @@ -0,0 +1,11 @@ +package com.petrovv.gogameclock + +import androidx.compose.ui.graphics.Color + +object Colors { + val stopped = Color.Gray + val running = Color.Green + val byoyomi = Color.hsv(35f, 1f, 1f) + val loss = Color.Red + val win = Color.Green +} \ No newline at end of file diff --git a/app/src/main/java/com/petrovv/gogameclock/FischerTiming.kt b/app/src/main/java/com/petrovv/gogameclock/FischerTiming.kt new file mode 100644 index 0000000..7872216 --- /dev/null +++ b/app/src/main/java/com/petrovv/gogameclock/FischerTiming.kt @@ -0,0 +1,57 @@ +package com.petrovv.gogameclock + +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.graphics.Color + +class FischerTiming( + initialTime: Long = 600, + private val fischerIncrement: Long = 10 +) : IClock { + + val fischerIncrementMillis: Long = fischerIncrement * 1000 + override var timedOut by mutableStateOf(false) + val timer = Timer(initialTime) { + timedOut = true + } + + override fun start() { + timer.start() + } + + override fun stop() { + timer.stop() + } + + override fun updateMoviesAndStop() { + if(!timer.isRunning()) return + timer.stop() + timer.addTime(fischerIncrement) + } + + override fun reset() { + timer.reset() + timedOut = false + } + + override fun isRunning(): Boolean { + return timer.isRunning() + } + + override fun update() { + timer.update() + } + + override fun color(): Color { + if(timedOut){ return Colors.loss} + if(!timer.isRunning()) return Colors.stopped + if(timer.timeMillis < fischerIncrementMillis) return Colors.byoyomi + return Colors.running + } + + override fun display(): String { + val timerS = timer.toString() + return "%s\n+%02d".format(timerS, fischerIncrement) + } +} diff --git a/app/src/main/java/com/petrovv/gogameclock/IClock.kt b/app/src/main/java/com/petrovv/gogameclock/IClock.kt new file mode 100644 index 0000000..a0ff957 --- /dev/null +++ b/app/src/main/java/com/petrovv/gogameclock/IClock.kt @@ -0,0 +1,17 @@ +package com.petrovv.gogameclock +import androidx.compose.ui.graphics.Color + +interface IClock { + fun start() + fun stop() + fun reset() + fun isRunning(): Boolean + fun update() + fun display(): String + fun updateMoviesAndStop() + val timedOut: Boolean + fun color(): Color + +} + + diff --git a/app/src/main/java/com/petrovv/gogameclock/JapanTiming.kt b/app/src/main/java/com/petrovv/gogameclock/JapanTiming.kt new file mode 100644 index 0000000..594772a --- /dev/null +++ b/app/src/main/java/com/petrovv/gogameclock/JapanTiming.kt @@ -0,0 +1,79 @@ +package com.petrovv.gogameclock + +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.graphics.Color + +class JapanTiming( + private val initialTime: Long = 1200, + byoyomiTime : Long = 30, + private val maxByoyomi: Long = 5 +) : IClock { + + var mainTime by mutableStateOf(true) + var byoyomi by mutableStateOf(false) + var byoyomiC = maxByoyomi + override var timedOut by mutableStateOf(false) + val timer: Timer = Timer(initialTime) { + if(mainTime){ + byoyomi = true + mainTime = false + } + + if (byoyomi) { + timer.reset(byoyomiTime) + timer.start() + byoyomiC -= 1 + if(byoyomiC == 0L){ + byoyomi = false + } + return@Timer + } + timedOut = true + } + + override fun start() { + timer.start() + } + + override fun stop() { + timer.stop() + } + + override fun updateMoviesAndStop() { + if(!timer.isRunning()) return + timer.stop() + if(byoyomi){ + timer.reset() + } + } + + override fun reset() { + timer.reset(initialTime) + timedOut = false + byoyomiC = maxByoyomi + mainTime = true + byoyomi = false + } + + override fun isRunning(): Boolean { + return timer.isRunning() + } + + override fun update() { + timer.update() + } + + override fun color(): Color { + if(timedOut){ return Colors.loss} + if(!timer.isRunning()) return Colors.stopped + if(byoyomiC < maxByoyomi) return Colors.byoyomi + return Colors.running + } + + override fun display(): String { + val timerS = timer.toString() + return "%s\n%02d".format(timerS, byoyomiC) + } +} diff --git a/app/src/main/java/com/petrovv/gogameclock/MainActivity.kt b/app/src/main/java/com/petrovv/gogameclock/MainActivity.kt new file mode 100644 index 0000000..be3a55d --- /dev/null +++ b/app/src/main/java/com/petrovv/gogameclock/MainActivity.kt @@ -0,0 +1,168 @@ +package com.petrovv.gogameclock + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.material3.Button +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.navigation.NavController +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import kotlinx.coroutines.delay + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + var player1Clock : IClock = remember { CanadianTiming() } + var player2Clock : IClock = remember { CanadianTiming() } + + val navController = rememberNavController() + NavHost(navController = navController, startDestination = "clock") { + composable("clock") { + Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> + ChessClock( + navController = navController, + modifier = Modifier.padding(innerPadding), + player1Clock = player1Clock, + player2Clock = player2Clock, + ) + } + } + composable("settings") { + SettingsScreen( + onTimingChange = { clock1, clock2 -> + player1Clock = clock1 + player2Clock = clock2 + navController.popBackStack() + } + ) + } + } + } + } +} + +@Composable +fun ChessClock( + navController: NavController, + modifier: Modifier = Modifier, + player1Clock : IClock, + player2Clock : IClock, +) { + LaunchedEffect(Unit) { + while (true) { + delay(50) // for UI update + player1Clock.update() + player2Clock.update() + } + } + + fun player1() { + if(player1Clock.timedOut) return + player1Clock.updateMoviesAndStop() + player2Clock.start() + } + + fun player2() { + if(player2Clock.timedOut) return + player2Clock.updateMoviesAndStop() + player1Clock.start() + } + + Column( + modifier = modifier.fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + + PlayerClock( + time = player1Clock.display(), + color = player1Clock.color(), + onSwitch = ::player1, + rotation = 180f, + modifier = Modifier.weight(1f) + ) + Spacer(modifier = Modifier.height(64.dp)) + Row(horizontalArrangement = Arrangement.Center) { + Button(onClick = { + player1Clock.stop() + player2Clock.stop() + }) { + Text(text = "Stop") + } + Spacer(modifier = Modifier.width(16.dp)) + Button(onClick = { + player1Clock.reset() + player2Clock.reset() + }) { + Text(text = "Reset") + } + Spacer(modifier = Modifier.width(16.dp)) + Button(onClick = { + navController.navigate("settings") + player1Clock.stop() + player2Clock.stop() + }) { + Text(text = "Settings") + } + } + Spacer(modifier = Modifier.height(64.dp)) + PlayerClock( + time = player2Clock.display(), + color = player2Clock.color(), + onSwitch = ::player2, + modifier = Modifier.weight(1f) + ) + } +} + +@Composable +fun PlayerClock( + time: String, + color: Color, + onSwitch: () -> Unit, + modifier: Modifier = Modifier, + rotation: Float = 0f +) { + Box( + modifier = modifier + .fillMaxSize() + .graphicsLayer(rotationZ = rotation) + .background(color) + .clickable( + interactionSource = remember { MutableInteractionSource() }, + indication = null, + onClick = onSwitch + ) + .padding(16.dp), + contentAlignment = Alignment.Center + ) { + Text(text = time, fontSize = 96.sp) + } +} diff --git a/app/src/main/java/com/petrovv/gogameclock/SettingsScreen.kt b/app/src/main/java/com/petrovv/gogameclock/SettingsScreen.kt new file mode 100644 index 0000000..b42468b --- /dev/null +++ b/app/src/main/java/com/petrovv/gogameclock/SettingsScreen.kt @@ -0,0 +1,162 @@ +package com.petrovv.gogameclock + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.selection.selectable +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.Button +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp + +enum class TimingOption(val displayName: String) { + Absolute("Absolute Timing"), + Fischer("Fischer Timing"), + Canadian("Canadian Timing"), + Japan("Japan Timing"), +} + +@Composable +fun SettingsScreen( + modifier: Modifier = Modifier, + onTimingChange: (IClock, IClock) -> Unit +) { + var t1 by remember { mutableStateOf("1200") } + var t2 by remember { mutableStateOf("60") } + var t3 by remember { mutableStateOf("25") } + val timingOptions = remember { TimingOption.entries } + var selectedTiming by remember { mutableStateOf(TimingOption.Absolute) } + + Column( + modifier = modifier.fillMaxSize(), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text(text = "Settings") + + Spacer(modifier = Modifier.height(16.dp)) + + TextField( + value = t1, + onValueChange = { t1 = it }, + label = { Text("Main time (s)") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + ) + + Column { + timingOptions.forEach { timingType -> + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .selectable( + selected = (timingType == selectedTiming), + onClick = { selectedTiming = timingType } + ) + .padding(horizontal = 16.dp) + ) { + RadioButton( + selected = (timingType == selectedTiming), + onClick = { selectedTiming = timingType } + ) + Text( + text = timingType.displayName, + modifier = Modifier.padding(start = 16.dp) + ) + } + } + } + + var text1 = "" + var text2 = "" + var show1 = false + var show2 = false + + when (selectedTiming) { + TimingOption.Absolute -> {} + TimingOption.Fischer -> { + text1 = "Increment (s)" + show1 = true + } + TimingOption.Canadian -> { + text1 = "byo-yomi time (s)" + text2 = "byo-yomi stones" + show1 = true + show2 = true + } + TimingOption.Japan -> { + text1 = "byo-yomi time (s)" + text2 = "byo-yomi periods" + show1 = true + show2 = true + } + } + + if (show1) { + Spacer(modifier = Modifier.height(8.dp)) + TextField( + value = t2, + onValueChange = { t2 = it }, + label = { Text(text1) }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number) + ) + } + + + + if (show2) { + Spacer(modifier = Modifier.height(8.dp)) + TextField( + value = t3, + onValueChange = { t3 = it }, + label = { Text(text2) }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number) + ) + } + + Spacer(modifier = Modifier.height(16.dp)) + + Button(onClick = { + val v1 = t1.toLongOrNull() ?: 25 + val v2 = t2.toLongOrNull() ?: 25 + val v3 = t3.toLongOrNull() ?: 25 + + when (selectedTiming) { + TimingOption.Absolute -> onTimingChange(AbsoluteTiming(v1), AbsoluteTiming(v1)) + TimingOption.Fischer -> { + onTimingChange( + FischerTiming(v1, v2), + FischerTiming(v1, v2) + ) + } + TimingOption.Canadian -> { + onTimingChange( + CanadianTiming(v1, v2, v3), + CanadianTiming(v1, v2, v3) + ) + } + TimingOption.Japan -> { + onTimingChange( + JapanTiming(v1, v2, v3), + JapanTiming(v1, v2, v3) + ) + } + } + }) { + Text(text = "Start Game") + } + } +} diff --git a/app/src/main/java/com/petrovv/gogameclock/Timer.kt b/app/src/main/java/com/petrovv/gogameclock/Timer.kt new file mode 100644 index 0000000..91df2ab --- /dev/null +++ b/app/src/main/java/com/petrovv/gogameclock/Timer.kt @@ -0,0 +1,67 @@ +package com.petrovv.gogameclock + +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableLongStateOf +import androidx.compose.runtime.setValue + +class Timer(initialTime: Long = 60, private val onTimeOut: () -> Unit = {}) { + private var initialTimeMs: Long = initialTime * 1000 + var timeMillis by mutableLongStateOf(initialTimeMs) + private var running = false + private var startTime = 0L + private var timeAtStart = 0L + + fun start() { + if (!running && timeMillis > 0) { + running = true + startTime = System.currentTimeMillis() + timeAtStart = timeMillis + } + } + + fun stop() { + if (running) { + update() + running = false + } + } + + fun addTime(time: Long) { + if (running) { + update() + } + timeMillis += time * 1000 + } + + fun reset(time: Long = 0) { + if(time != 0L){ + initialTimeMs = time * 1000 + } + timeMillis = initialTimeMs + running = false + } + + fun isRunning(): Boolean { + return running + } + + fun update() { + if (running) { + val elapsed = System.currentTimeMillis() - startTime + timeMillis = (timeAtStart - elapsed).coerceAtLeast(0L) + if (timeMillis == 0L) { + running = false + onTimeOut() + } + } + } + + override fun toString() : String { + val seconds = timeMillis / 1000 + val minutes = seconds / 60 + val remainingSeconds = seconds % 60 + return "%02d:%02d".format(minutes, remainingSeconds) + } + + +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..5cf327f --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + GoGameClock + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..2b3722f --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +