Merge pull request #3 from raheemadamboev/1.0.5

1.0.5

Author: raheemadamboev

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android)
     alias(libs.plugins.kotlin)
@@ -25,8 +27,12 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
+    kotlin {
+        target {
+            compilerOptions {
+                jvmTarget = JvmTarget.JVM_17
+            }
+        }
     }
 
     buildFeatures {
@@ -44,6 +50,7 @@ dependencies {
 
     // timer flow
     implementation(projects.timerFlow)
+//    implementation("com.github.raheemadamboev:timer-flow:1.0.5")
 
     // compose
     implementation(platform(libs.compose))

app/src/main/java/xyz/teamgravity/timerflowdemo/MainActivity.kt

@@ -7,12 +7,14 @@ import androidx.activity.enableEdgeToEdge
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.material3.LinearProgressIndicator
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProgressIndicatorDefaults
-import androidx.compose.material3.Surface
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -31,10 +33,9 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             TimerFlowDemoTheme {
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
-                ) {
+                Scaffold(
+                    contentWindowInsets = WindowInsets.safeDrawing
+                ) { padding ->
                     val timer = remember {
                         Timer().apply {
                             timerDuration = 6_000L
@@ -55,7 +56,9 @@ class MainActivity : ComponentActivity() {
                             space = 16.dp,
                             alignment = Alignment.CenterVertically
                         ),
-                        modifier = Modifier.fillMaxSize()
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(padding)
                     ) {
                         Text(
                             text = time.toString()

gradle/libs.versions.toml

@@ -1,18 +1,17 @@
 [versions]
 
-compose = "2025.05.01"
+compose = "2025.07.00"
 compose-activity = "1.10.1"
-compose-lifecycle = "2.9.0"
+compose-lifecycle = "2.9.2"
 core = "1.16.0"
 coroutines = "1.10.2"
 
-android = "8.10.1"
-kotlin = "2.1.21"
+android = "8.12.0"
+kotlin = "2.2.0"
 
 sdk-min = "21"
-sdk-compile = "35"
-sdk-target = "35"
-jvm-target = "17"
+sdk-compile = "36"
+sdk-target = "36"
 
 [libraries]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jun 02 01:45:20 UZT 2025
+#Sun Aug 03 14:50:31 UZT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

timer-flow/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.library)
     alias(libs.plugins.kotlin)
@@ -21,8 +23,12 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
+    kotlin {
+        target {
+            compilerOptions {
+                jvmTarget = JvmTarget.JVM_17
+            }
+        }
     }
 
     packaging {
@@ -51,7 +57,7 @@ publishing {
         register<MavenPublication>("release") {
             groupId = "com.github.raheemadamboev"
             artifactId = "timer-flow"
-            version = "1.0.4"
+            version = "1.0.5"
 
             afterEvaluate {
                 from(components["release"])

timer-flow/src/main/java/xyz/teamgravity/timer_flow/Timer.kt

@@ -139,7 +139,7 @@ class Timer {
     }
 
     ///////////////////////////////////////////////////////////////////////////
-    // MISC
+    // Misc
     ///////////////////////////////////////////////////////////////////////////
 
     enum class TimerState {