diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
deleted file mode 100644
index afdc61c..0000000
--- a/.github/workflows/android_build.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Android Build
-
-on: [pull_request, push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout the code
-        uses: actions/checkout@v2
-
-      - name: Set Up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-
-      - name: Run Tests
-        run: ./gradlew test
-
-      - name: Build the app
-        run: ./gradlew build
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..fa56880
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,45 @@
+name: Build & Test
+
+on:
+  push:
+    branches: [main, master, develop]
+  pull_request:
+    branches: [main, master, develop]
+
+jobs:
+  build:
+    name: Build & Test
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: ${{ github.ref != 'refs/heads/main' }}
+
+      # Runs commonTest + androidHostTest for core module
+      - name: Run Core Module Tests
+        run: ./gradlew :core:testAndroidHostTest
+
+      # Runs commonTest + Android unit tests for app module
+      - name: Run App Module Tests
+        run: ./gradlew :app:testDebugUnitTest
+
+      - name: Build Debug APK
+        run: ./gradlew :app:assembleDebug
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: debug-apk
+          path: app/build/outputs/apk/debug/*.apk
+          retention-days: 7
\ No newline at end of file
diff --git a/.idea/ChatHistory_schema_v4.xml b/.idea/ChatHistory_schema_v4.xml
new file mode 100644
index 0000000..7880fd1
--- /dev/null
+++ b/.idea/ChatHistory_schema_v4.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChatHistoryStateV2">
+    <option name="chatSessions" value="{&quot;5c513e45-7e9a-4981-936d-d4642076b0a6&quot;:{&quot;id&quot;:&quot;5c513e45-7e9a-4981-936d-d4642076b0a6&quot;,&quot;name&quot;:&quot;Production crash: IllegalArgumentException — NavDisplay backstack cannot be empty&quot;,&quot;timestamp&quot;:1767149954740,&quot;messages&quot;:[{&quot;role&quot;:&quot;user&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;text&quot;,&quot;text&quot;:&quot;I\u0027m having this crash in production:\nException java.lang.IllegalArgumentException: NavDisplay backstack cannot be empty\n  at androidx.navigation3.ui.NavDisplayKt__NavDisplayKt.NavDisplay (NavDisplay.kt:287)\n  at androidx.navigation3.ui.NavDisplayKt.NavDisplay (Unknown Source:1)\n  at androidx.navigation3.ui.NavDisplayKt__NavDisplayKt.NavDisplay$lambda$4$NavDisplayKt__NavDisplayKt (Unknown Source:38)\n  at androidx.navigation3.ui.NavDisplayKt__NavDisplayKt.$r8$lambda$P9Mf3Do1t4N-_9P4T8PgpKaFFzE (Unknown Source)\n  at androidx.navigation3.ui.NavDisplayKt__NavDisplayKt$$ExternalSyntheticLambda3.invoke (D8$$SyntheticClass)\n  at androidx.compose.runtime.RecomposeScopeImpl.compose (RecomposeScopeImpl.kt:201)\n  at androidx.compose.runtime.ComposerImpl.recomposeToGroupEnd (ComposerImpl.kt:1690)\n  at androidx.compose.runtime.ComposerImpl.skipCurrentGroup (ComposerImpl.kt:2026)\n  at androidx.compose.runtime.ComposerImpl.doCompose-aFTiNEg (ComposerImpl.kt:2659)\n  at androidx.compose.runtime.ComposerImpl.recompose-aFTiNEg$runtime (ComposerImpl.kt:2583)\n  at androidx.compose.runtime.CompositionImpl.recompose (Composition.kt:1080)\n  at androidx.compose.runtime.Recomposer.performRecompose (Recomposer.kt:1406)\n  at androidx.compose.runtime.Recomposer.access$performRecompose (Recomposer.kt:159)\n  at androidx.compose.runtime.Recomposer$runRecomposeAndApplyChanges$2.invokeSuspend$lambda$2 (Recomposer.kt:638)\n  at androidx.compose.runtime.Recomposer$runRecomposeAndApplyChanges$2.$r8$lambda$sdKIQuFT6MpOW8QdHT9yWSawFoM (Unknown Source)\n  at androidx.compose.runtime.Recomposer$runRecomposeAndApplyChanges$2$$ExternalSyntheticLambda0.invoke (D8$$SyntheticClass)\n  at androidx.compose.ui.platform.AndroidUiFrameClock$withFrameNanos$2$callback$1.doFrame (AndroidUiFrameClock.android.kt:39)\n  at androidx.compose.ui.platform.AndroidUiDispatcher.performFrameDispatch (AndroidUiDispatcher.android.kt:108)\n  at androidx.compose.ui.platform.AndroidUiDispatcher.access$performFrameDispatch (AndroidUiDispatcher.android.kt:41)\n  at androidx.compose.ui.platform.AndroidUiDispatcher$dispatchCallback$1.doFrame (AndroidUiDispatcher.android.kt:69)\n  at android.view.Choreographer$CallbackRecord.run (Choreographer.java:1506)\n  at android.view.Choreographer$CallbackRecord.run (Choreographer.java:1517)\n  at android.view.Choreographer.doCallbacks (Choreographer.java:1085)\n  at android.view.Choreographer.doFrame (Choreographer.java:971)\n  at android.view.Choreographer$FrameDisplayEventReceiver.run (Choreographer.java:1491)\n  at android.os.Handler.handleCallback (Handler.java:958)\n  at android.os.Handler.dispatchMessage (Handler.java:99)\n  at android.os.Looper.loopOnce (Looper.java:243)\n  at android.os.Looper.loop (Looper.java:338)\n  at android.app.ActivityThread.main (ActivityThread.java:8524)\n  at java.lang.reflect.Method.invoke\n  at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run (RuntimeInit.java:602)\n  at com.android.internal.os.ZygoteInit.main (ZygoteInit.java:1064)\n\nany ideas what the issue could be?&quot;}],&quot;context&quot;:[{&quot;file_path&quot;:&quot;app/build.gradle.kts&quot;,&quot;code_text&quot;:&quot;import org.jetbrains.kotlin.gradle.dsl.JvmTarget\n\nplugins {\n    alias(libs.plugins.android.gradle)\n    alias(libs.plugins.serialization)\n    alias(libs.plugins.google.services)\n    alias(libs.plugins.crashlytics.gradle)\n    alias(libs.plugins.ksp)\n    alias(libs.plugins.compose.compiler)\n    alias(libs.plugins.composeMultiplatform)\n    alias(libs.plugins.kotlinMultiplatform)\n    alias(libs.plugins.androidx.room)\n}\n\nksp {\n    arg(\&quot;lyricist.generateStringsProperty\&quot;, \&quot;true\&quot;)\n}\n\n// Room KMP configuration\nroom {\n    schemaDirectory(\&quot;$projectDir/schemas\&quot;)\n}\n\nkotlin {\n    androidTarget {\n        compilerOptions {\n            jvmTarget.set(JvmTarget.JVM_17)\n            allWarningsAsErrors \u003d false\n            freeCompilerArgs \u003d listOf(\&quot;-Xopt-in\u003dkotlin.RequiresOptIn\&quot;, \&quot;-Xopt-in\u003dkotlin.Experimental\&quot;)\n        }\n    }\n\n    listOf(\n        iosArm64(),\n        iosSimulatorArm64()\n    ).forEach { iosTarget -\u003e\n        iosTarget.binaries.framework {\n            baseName \u003d \&quot;app\&quot;\n            isStatic \u003d true\n        }\n    }\n    \n    // Swift Export configuration for AlarmKit integration\n    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)\n    swiftExport {\n        // Module name for Swift imports\n        moduleName \u003d \&quot;MathAlarmShared\&quot;\n        \n        // Flatten package structure for cleaner Swift code\n        flattenPackage \u003d \&quot;com.timilehinaregbesola.mathalarm.alarm\&quot;\n        \n        // Compiler configuration\n        configure {\n            freeCompilerArgs.add(\&quot;-Xexpect-actual-classes\&quot;)\n        }\n    }\n\n    sourceSets {\n        androidMain.dependencies {\n            implementation(compose.preview)\n            implementation(libs.androidx.activity.compose)\n            implementation(libs.androidx.sqlite.driver.android)\n            implementation(project.dependencies.platform(libs.firebase.bom))\n            implementation(libs.firebase.analytics)\n            implementation(libs.firebase.crashlytics)\n            implementation(libs.firebase.messaging)\n\n            implementation(libs.androidx.core.splashscreen)\n            implementation(libs.android.material)\n        }\n        commonMain {\n            kotlin.srcDir(\&quot;build/generated/ksp/metadata/commonMain/kotlin\&quot;)\n            dependencies {\n                implementation(project(\&quot;:core\&quot;))\n                implementation(libs.runtime)\n                implementation(libs.foundation)\n                implementation(libs.material3)\n                implementation(libs.ui)\n                implementation(libs.components.resources)\n                implementation(libs.ui.tooling.preview)\n\n                val koinBom \u003d project.dependencies.platform(libs.koin.bom)\n                implementation(koinBom)\n                implementation(libs.koin.core)\n                implementation(libs.koin.compose)\n                implementation(libs.koin.compose.viewmodel)\n\n                implementation(libs.kermit)\n                implementation(libs.kermit.crashlytics)\n\n                implementation(libs.kotlinx.serialization)\n                implementation(libs.lyricist)\n\n                implementation(libs.jetbrains.navigation3.ui)\n                implementation(libs.jetbrains.lifecycle.viewmodel.navigation3)\n                implementation(libs.kotlinx.datetime)\n                implementation(libs.multiplatform.settings.no.arg)\n                \n                implementation(libs.androidx.room.runtime)\n                implementation(libs.androidx.sqlite.driver.bundled)\n\n                implementation(libs.compottie.lite)\n            }\n        }\n        \n        // iOS dependencies\n        val iosMain by creating {\n            dependsOn(commonMain.get())\n            dependencies {\n                implementation(libs.androidx.sqlite.driver.bundled)\n            }\n        }\n        val iosArm64Main by getting { dependsOn(iosMain) }\n        val iosSimulatorArm64Main by getting { dependsOn(iosMain) }\n        \n        commonTest.dependencies {\n            implementation(libs.kotlin.test)\n            implementation(libs.coroutines.test)\n            implementation(libs.turbine)\n            implementation(libs.kotest.assertions)\n        }\n    }\n}\n\nandroid {\n    namespace \u003d \&quot;com.timilehinaregbesola.mathalarm\&quot;\n    defaultConfig {\n        applicationId \u003d \&quot;com.timilehinaregbesola.mathalarm\&quot;\n        versionCode \u003d 21\n        versionName \u003d \&quot;2.3.2\&quot;\n        minSdk \u003d libs.versions.android.min.sdk.get().toInt()\n        targetSdk \u003d libs.versions.android.target.sdk.get().toInt()\n        compileSdk \u003d libs.versions.android.compile.sdk.get().toInt()\n        testInstrumentationRunner \u003d \&quot;androidx.test.runner.AndroidJUnitRunner\&quot;\n    }\n    buildTypes {\n        getByName(\&quot;release\&quot;) {\n            isMinifyEnabled \u003d false\n            proguardFiles(\&quot;proguard-android-optimize.txt\&quot;, \&quot;proguard-rules.pro\&quot;)\n            signingConfig \u003d signingConfigs.getByName(\&quot;debug\&quot;)\n        }\n\n        getByName(\&quot;debug\&quot;) {\n            applicationIdSuffix \u003d \&quot;.debug\&quot;\n        }\n    }\n\n    compileOptions {\n        sourceCompatibility \u003d JavaVersion.VERSION_17\n        targetCompatibility \u003d JavaVersion.VERSION_17\n    }\n\n    lint {\n        disable +\u003d setOf(\&quot;LogNotTimber\&quot;, \&quot;StringFormatInTimber\&quot;, \&quot;ThrowableNotAtBeginning\&quot;, \&quot;BinaryOperationInTimber\&quot;, \&quot;TimberArgCount\&quot;, \&quot;TimberArgTypes\&quot;, \&quot;TimberTagLength\&quot;, \&quot;TimberExceptionLogging\&quot;)\n    }\n\n    buildFeatures {\n        compose \u003d true\n        buildConfig \u003d true\n    }\n\n    packagingOptions {\n        resources.excludes.apply {\n            add(\&quot;META-INF/DEPENDENCIES\&quot;)\n            add(\&quot;META-INF/LICENSE\&quot;)\n            add(\&quot;META-INF/LICENSE.txt\&quot;)\n            add(\&quot;META-INF/license.txt\&quot;)\n            add(\&quot;META-INF/NOTICE\&quot;)\n            add(\&quot;META-INF/NOTICE.txt\&quot;)\n            add(\&quot;META-INF/notice.txt\&quot;)\n            add(\&quot;META-INF/AL2.0\&quot;)\n        }\n    }\n\n    testOptions {\n        unitTests.isReturnDefaultValues \u003d true\n    }\n}\n\ndependencies {\n    implementation(fileTree(mapOf(\&quot;dir\&quot; to \&quot;libs\&quot;, \&quot;include\&quot; to listOf(\&quot;*.jar\&quot;))))\n\n    testImplementation(libs.junit)\n    testImplementation(libs.coroutines.test)\n    androidTestImplementation(libs.androidx.test.ext.junit)\n    androidTestImplementation(libs.androidx.test.espresso.core)\n    testImplementation(libs.mockk)\n\n    // Room KMP - compiler for each platform\n    add(\&quot;kspAndroid\&quot;, libs.androidx.room.compiler)\n    add(\&quot;kspIosArm64\&quot;, libs.androidx.room.compiler)\n    add(\&quot;kspIosSimulatorArm64\&quot;, libs.androidx.room.compiler)\n    androidTestImplementation(libs.androidx.compose.ui.test)\n\n    add(\&quot;kspCommonMainMetadata\&quot;, libs.lyricist.processor)\n}\n\nafterEvaluate {\n    // Make all compilation tasks depend on KSP common metadata\n    tasks.withType\u003corg.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask\u003c*\u003e\u003e().configureEach {\n        if (name !\u003d \&quot;kspCommonMainKotlinMetadata\&quot;) {\n            dependsOn(\&quot;kspCommonMainKotlinMetadata\&quot;)\n        }\n    }\n}\n\n// Ensure all KSP tasks run after common metadata KSP\ntasks.matching { it.name.startsWith(\&quot;ksp\&quot;) \u0026\u0026 it.name !\u003d \&quot;kspCommonMainKotlinMetadata\&quot; }.configureEach {\n    dependsOn(tasks.named(\&quot;kspCommonMainKotlinMetadata\&quot;))\n}\n&quot;,&quot;ranges&quot;:[],&quot;type&quot;:&quot;current_file&quot;},{&quot;file_path&quot;:&quot;README.md&quot;,&quot;code_text&quot;:&quot;![](media/math_alarm_github.png)\n# Math Alarm :alarm_clock:\n\n![Android Build](https://github.com/t-regbs/MathAlarm/workflows/Android%20Build/badge.svg) ![My twitter](https://img.shields.io/twitter/url?style\u003dsocial\u0026url\u003dhttps%3A%2F%2Ftwitter.com%2Ftimiaregbs) ![Shield](https://img.shields.io/badge/contributions-welcome-brightgreen) [![Made in Nigeria](https://img.shields.io/badge/made%20in-nigeria-008751.svg?style\u003dflat-square)](https://github.com/acekyd/made-in-nigeria)\n\nA **Kotlin Multiplatform** alarm app for Android and iOS where you solve math problems of varying difficulty to dismiss the alarm. Built with Compose Multiplatform, Clean Architecture, and modern KMP libraries.\n\n\u003ca href\u003d\u0027https://play.google.com/store/apps/details?id\u003dcom.timilehinaregbesola.mathalarm\u0027\u003e\u003cimg alt\u003d\u0027Get it on Google Play\u0027 src\u003d\u0027https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png\u0027 width\u003d\&quot;280\&quot;/\u003e\u003c/a\u003e\n\n## Architecture\n\nThe project follows **Clean Architecture** with the **MVVM** pattern:\n\n- **`:app`** - Main application module containing UI, navigation, and platform-specific implementations\n- **`:core`** - Shared domain logic and business rules\n\n## Technologies Used\n\n### Kotlin Multiplatform\n* [Kotlin Multiplatform](https://kotlinlang.org/docs/multiplatform.html) - Share code between Android and iOS\n* [Compose Multiplatform](https://www.jetbrains.com/lp/compose-multiplatform/) - Declarative UI framework for both platforms\n\n### UI \u0026 Navigation\n* [Material 3](https://m3.material.io/) - Modern Material Design components\n* [Navigation 3](https://developer.android.com/guide/navigation) - Jetpack Navigation for Compose Multiplatform\n* [Compottie](https://github.com/alexzhirkevich/compottie) - Lottie animations for Compose Multiplatform\n\n### Data \u0026 Storage\n* [Room KMP](https://developer.android.com/kotlin/multiplatform/room) - Multiplatform database with SQLite\n* [Multiplatform Settings](https://github.com/russhwolf/multiplatform-settings) - Key-value storage across platforms\n* [Kotlinx Serialization](https://github.com/Kotlin/kotlinx.serialization) - JSON serialization\n\n### Dependency Injection\n* [Koin](https://insert-koin.io/) - Lightweight dependency injection framework for KMP\n\n### Async \u0026 Reactive\n* [Coroutines](https://kotlinlang.org/docs/coroutines-overview.html) - Asynchronous programming\n* [Kotlinx DateTime](https://github.com/Kotlin/kotlinx-datetime) - Multiplatform date/time library\n\n### Logging \u0026 Analytics (Android)\n* [Kermit](https://github.com/touchlab/Kermit) - Multiplatform logging library\n* [Firebase Analytics](https://firebase.google.com/docs/analytics) - App analytics\n* [Firebase Crashlytics](https://firebase.google.com/docs/crashlytics) - Crash reporting\n\n### Localization\n* [Lyricist](https://github.com/adrielcafe/lyricist) - Type-safe string localization for Compose\n\n### Testing\n* [Kotlin Test](https://kotlinlang.org/api/latest/kotlin.test/) - Multiplatform testing\n* [Turbine](https://github.com/cashapp/turbine) - Flow testing\n* [Kotest](https://kotest.io/) - Assertions library\n* [MockK](https://mockk.io/) - Mocking library (Android)\n\n## Installation\n\nMath Alarm requires a minimum API level of **26** (Android 8.0+).\n\n```bash\n# Clone the repository\ngit clone https://github.com/t-regbs/MathAlarm.git\n\n# Open in Android Studio or IntelliJ IDEA\n```\n\n### Building for iOS\nThe iOS app is located in the `iosApp/` directory. Open the Xcode project to build and run on iOS devices/simulators.\n\n## Contribution\nAll contributions are welcome. Simply make a PR!\n\n## LICENSE\n```\nMIT License\n\nCopyright (c) 2025 Timilehin Aregbesola\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \&quot;Software\&quot;), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \&quot;AS IS\&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n```\n&quot;,&quot;timestamp&quot;:1766967455826,&quot;ranges&quot;:[],&quot;type&quot;:&quot;recent_file&quot;},{&quot;mode&quot;:&quot;Write&quot;,&quot;plan_file_path&quot;:&quot;/Users/timilehin/.firebender/projects/Users-timilehin-AndroidStudioProjects-MathAlarm/plans/plan-b86201.md&quot;,&quot;ranges&quot;:[],&quot;type&quot;:&quot;query_metadata&quot;}]},{&quot;role&quot;:&quot;assistant&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;thinking&quot;,&quot;thinking&quot;:&quot;The user is experiencing a crash with the error \&quot;NavDisplay backstack cannot be empty\&quot;. This is related to Navigation 3 in Jetpack Compose. The issue is that somewhere in the code, the navigation backstack is becoming empty, which is not allowed.\n\nLet me look at the codebase to understand how navigation is set up and find where this issue might be occurring.&quot;,&quot;signature&quot;:&quot;Eo8ECkYICxgCKkDfs65IskHkSPKQs4nNDFSQiYCHHJa29+r2UE4Y0YoY2OwH1kIVjixBztavTxLMlw5uKNsjG4pGI7LtarjDSK9YEgzjK2Yb6hZ0r7hKzXIaDDmFs98hNB+mbGkpTCIwh/GnujP8GIMiefgPZHVXN19HeRI/ppNFqT2aMV1Gay5If9K6Acu7ZiXygXp43F7WKvYCNX4ODVcsbS7Hx4AZVA4lMuHJUx8qpBsMQzgOwNhe2EMUoGsMwY3T7Bn3OhTsAXOOjhwMk4ugN60mpwcA+QFOhlY+TrOHTUuXPxxGJPpzSfkzRZfIGwniqyL5Bf/fMmpNJsF+DcjLylw9Xm2YBhnN/8MwBQm8znjEX6eTu28ok4MNbytiiTc9JPsy5unFGbz70I6LXNCgXuS2TSOBuvvOHTtukS95CLNwTbO+RiRNmLW/rzoiEgIaBJmpQ3gKpkHKdyk0nI7RZw2LTUMuElB5+JhkDOXIokz55ofjxzKnv0ssfCX5P8/R3qr4ka0sPxe4IJ7mclk/5AfkI5yFisEQZwU1vFf0K/MTZbdCUxDnTEleCczk6Y0SxhihMFggGl/Y34bUj0ZOgZYWWSkygrJtUywqOTWAuO2O7UBp0Lyq7sdSPE9CdqFqMMyGxr5GRtQ5U2t4CvcpMWboJzsfLibp7CnOoY64MT4BOaiVlfAAzNJFntrzFDgYAQ\u003d\u003d&quot;},{&quot;type&quot;:&quot;text&quot;,&quot;text&quot;:&quot;Looking at this crash, the issue is that your Navigation 3 backstack is becoming empty at some point. Let me explore your codebase to find where navigation is set up and identify the root cause.&quot;}],&quot;tool_calls&quot;:[{&quot;id&quot;:&quot;toolu_01LzeDHfD3j6tUFrcJYZRDWi&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;grep&quot;,&quot;arguments&quot;:&quot;{\&quot;pattern\&quot;: \&quot;NavDisplay|backStack|BackStack\&quot;, \&quot;glob\&quot;: \&quot;*.kt\&quot;}&quot;}},{&quot;id&quot;:&quot;toolu_01Y34kjSQ8HAJDrLhvfUyTCt&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;list_dir&quot;,&quot;arguments&quot;:&quot;{\&quot;target_directory\&quot;: \&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/main/java\&quot;}&quot;}}]},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;grep&quot;,&quot;tool_call_id&quot;:&quot;toolu_01LzeDHfD3j6tUFrcJYZRDWi&quot;,&quot;content&quot;:&quot;app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/utils/UiEvent.kt:6:    object PopBackStack : UiEvent()\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt:53:import androidx.navigation3.runtime.NavBackStack\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt:105:    backStack: NavBackStack\u003cNavKey\u003e,\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt:147:                    backStack.removeLastOrNull()\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt:212:                    backStack.removeLastOrNull()\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:20:import androidx.navigation3.runtime.rememberNavBackStack\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:22:import androidx.navigation3.ui.NavDisplay\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:61:    val backStack \u003d rememberNavBackStack(config, AlarmList)\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:71:            backStack.add(AlarmMath(it, false))\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:75:    NavDisplay(\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:77:        backStack \u003d backStack,\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:78:        onBack \u003d { backStack.removeLastOrNull() },\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:113:                    backstack \u003d backStack,\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:123:                    backstack \u003d backStack,\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:132:                    backStack \u003d backStack,\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:141:                    onBackPress \u003d { backStack.removeLastOrNull() },\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmlist/components/AlarmListScreen.kt:33:import androidx.navigation3.runtime.NavBackStack\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmlist/components/AlarmListScreen.kt:68:    backstack: NavBackStack\u003cNavKey\u003e,\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/components/AlarmBottomSheet.kt:44:import androidx.navigation3.runtime.NavBackStack\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/components/AlarmBottomSheet.kt:106:    backstack: NavBackStack\u003cNavKey\u003e,\n[Showing results with pagination \u003d limit: 100, offset: 0]&quot;},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;list_dir&quot;,&quot;tool_call_id&quot;:&quot;toolu_01Y34kjSQ8HAJDrLhvfUyTCt&quot;,&quot;content&quot;:&quot;Error listing directory /Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/main/java: Could not find file \u0027/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/main/java\u0027 in project&quot;},{&quot;role&quot;:&quot;assistant&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;thinking&quot;,&quot;thinking&quot;:&quot;Let me look at the NavGraph.kt file since that\u0027s where NavDisplay is used and where the backstack is managed. The crash happens when the backstack is empty, so I need to check how the backstack is being modified.&quot;,&quot;signature&quot;:&quot;Ev0CCkYICxgCKkC/evau4SRdYbbptZA3dVfmXw1p9zJREIaI4LZ5ABtmIM0KD5Z9EskqLRvlxhd5WCYjx1Kp0Tmnz2Ph4IspqN0xEgwss0usOe20D7k+ml4aDJcEAeVu1HpVuBj0QiIw/vZqCqx8SxPLGwtnwBTrgQvukM4YxShOn/es2QyI2Ag63J1LqDQbkecloh/wvhv1KuQBWUAcGfrNTSgnrJgHbquBcXd0QXotH9jJSyxuUkBKmfJ2qRXkMcAPaSu8LsRFLaBKFlZqZRnKfxOESsah2Yag6D2oGg8EeOZj5UoYb9+hKj8E7BI38IvZqlNHWFRsiikenaUrKwDVIak+OAuyc+J70QwU3XLO+3QM5e2SJORqCyZtNRW5y40DRc/j/sdkdXYGL1Vkg3z2U6AEAL5P+k8MaeMokx6D0KC+bMtW4qBmtn25eBlTD7iyocvYtfP+2FN4ioHaSldhHfDa7C851+LPv8nT6fT+UjLud+sZ7Z6YQWvNf5kWGAE\u003d&quot;}],&quot;tool_calls&quot;:[{&quot;id&quot;:&quot;toolu_01U8jhtdgAb7o332Tq9rH5Mx&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;read_file&quot;,&quot;arguments&quot;:&quot;{\&quot;target_file\&quot;: \&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt\&quot;}&quot;}},{&quot;id&quot;:&quot;toolu_01FTpGwLC3KMvGbDsoXUHkEz&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;read_file&quot;,&quot;arguments&quot;:&quot;{\&quot;target_file\&quot;: \&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt\&quot;}&quot;}}]},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;read&quot;,&quot;tool_call_id&quot;:&quot;toolu_01U8jhtdgAb7o332Tq9rH5Mx&quot;,&quot;content&quot;:&quot;  1|package com.timilehinaregbesola.mathalarm.navigation\n  2|\n  3|import androidx.compose.animation.ExperimentalAnimationApi\n  4|import androidx.compose.animation.core.tween\n  5|import androidx.compose.animation.slideInHorizontally\n  6|import androidx.compose.animation.slideOutHorizontally\n  7|import androidx.compose.animation.togetherWith\n  8|import androidx.compose.foundation.ExperimentalFoundationApi\n  9|import androidx.compose.foundation.background\n 10|import androidx.compose.material3.ExperimentalMaterial3Api\n 11|import androidx.compose.material3.MaterialTheme\n 12|import androidx.compose.runtime.Composable\n 13|import androidx.compose.runtime.LaunchedEffect\n 14|import androidx.compose.runtime.remember\n 15|import androidx.compose.ui.ExperimentalComposeUiApi\n 16|import androidx.compose.ui.Modifier\n 17|import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator\n 18|import androidx.navigation3.runtime.NavKey\n 19|import androidx.navigation3.runtime.entryProvider\n 20|import androidx.navigation3.runtime.rememberNavBackStack\n 21|import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator\n 22|import androidx.navigation3.ui.NavDisplay\n 23|import androidx.savedstate.serialization.SavedStateConfiguration\n 24|import com.timilehinaregbesola.mathalarm.framework.database.AlarmEntity\n 25|import com.timilehinaregbesola.mathalarm.navigation.NavGraph.ANIM_TRANSITION_DURATION\n 26|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.components.ListDisplayScreen\n 27|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen\n 28|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet\n 29|import com.timilehinaregbesola.mathalarm.presentation.appsettings.AlarmPreferencesImpl\n 30|import com.timilehinaregbesola.mathalarm.presentation.appsettings.components.AppSettingsScreen\n 31|import com.timilehinaregbesola.mathalarm.presentation.appsettings.shouldUseDarkColors\n 32|import com.timilehinaregbesola.mathalarm.utils.Destinations.AlarmList\n 33|import com.timilehinaregbesola.mathalarm.utils.Destinations.AlarmMath\n 34|import com.timilehinaregbesola.mathalarm.utils.Destinations.AppSettings\n 35|import com.timilehinaregbesola.mathalarm.utils.Destinations.SettingsSheet\n 36|import kotlinx.coroutines.InternalCoroutinesApi\n 37|import kotlinx.serialization.json.Json\n 38|import kotlinx.serialization.modules.SerializersModule\n 39|import kotlinx.serialization.modules.polymorphic\n 40|\n 41|@ExperimentalAnimationApi\n 42|@InternalCoroutinesApi\n 43|@ExperimentalComposeUiApi\n 44|@ExperimentalMaterial3Api\n 45|@ExperimentalFoundationApi\n 46|@Composable\n 47|fun NavGraph(\n 48|    preferences: AlarmPreferencesImpl,\n 49|    deeplinkInfo: String?\n 50|) {\n 51|    val config \u003d SavedStateConfiguration {\n 52|        serializersModule \u003d SerializersModule {\n 53|            polymorphic(NavKey::class) {\n 54|                subclass(AlarmList::class, AlarmList.serializer())\n 55|                subclass(AppSettings::class, AppSettings.serializer())\n 56|                subclass(AlarmMath::class, AlarmMath.serializer())\n 57|                subclass(SettingsSheet::class, SettingsSheet.serializer())\n 58|            }\n 59|        }\n 60|    }\n 61|    val backStack \u003d rememberNavBackStack(config, AlarmList)\n 62|    val bottomSheetStrategy \u003d remember {\n 63|        BottomSheetSceneStrategy\u003cNavKey\u003e()\n 64|    }\n 65|\n 66|    // Navigate to MathScreen when deeplinkInfo changes (e.g., from notification tap)\n 67|    LaunchedEffect(deeplinkInfo) {\n 68|        println(\&quot;NavGraph: LaunchedEffect triggered with deeplinkInfo \u003d $deeplinkInfo\&quot;)\n 69|        deeplinkInfo?.let {\n 70|            println(\&quot;NavGraph: Navigating to AlarmMath\&quot;)\n 71|            backStack.add(AlarmMath(it, false))\n 72|        }\n 73|    }\n 74|\n 75|    NavDisplay(\n 76|        modifier \u003d Modifier.background(color \u003d MaterialTheme.colorScheme.background),\n 77|        backStack \u003d backStack,\n 78|        onBack \u003d { backStack.removeLastOrNull() },\n 79|        sceneStrategy \u003d bottomSheetStrategy,\n 80|        entryDecorators \u003d listOf(\n 81|//            rememberSceneSetupNavEntryDecorator(),\n 82|//            rememberSavedStateNavEntryDecorator(),\n 83|            rememberSaveableStateHolderNavEntryDecorator(),\n 84|            rememberViewModelStoreNavEntryDecorator()\n 85|        ),\n 86|        transitionSpec \u003d {\n 87|            slideInHorizontally(\n 88|                animationSpec \u003d tween(ANIM_TRANSITION_DURATION),\n 89|                initialOffsetX \u003d { -it }) togetherWith\n 90|                    slideOutHorizontally(\n 91|                        animationSpec \u003d tween(ANIM_TRANSITION_DURATION),\n 92|                        targetOffsetX \u003d { -it })\n 93|        },\n 94|        popTransitionSpec \u003d {\n 95|            slideInHorizontally(\n 96|                animationSpec \u003d tween(ANIM_TRANSITION_DURATION),\n 97|                initialOffsetX \u003d { it }) togetherWith\n 98|                    slideOutHorizontally(\n 99|                        animationSpec \u003d tween(ANIM_TRANSITION_DURATION),\n100|                        targetOffsetX \u003d { it })\n101|        },\n102|        predictivePopTransitionSpec \u003d {\n103|            slideInHorizontally(\n104|                animationSpec \u003d tween(ANIM_TRANSITION_DURATION),\n105|                initialOffsetX \u003d { it }) togetherWith\n106|                    slideOutHorizontally(\n107|                        animationSpec \u003d tween(ANIM_TRANSITION_DURATION),\n108|                        targetOffsetX \u003d { it })\n109|        },\n110|        entryProvider \u003d entryProvider {\n111|            entry\u003cAlarmList\u003e {\n112|                ListDisplayScreen(\n113|                    backstack \u003d backStack,\n114|                    darkTheme \u003d preferences.shouldUseDarkColors(),\n115|                )\n116|            }\n117|\n118|            entry\u003cSettingsSheet\u003e(\n119|                metadata \u003d BottomSheetSceneStrategy.bottomSheet()\n120|            ) {\n121|                val alarmObject \u003d Json.decodeFromString\u003cAlarmEntity\u003e(it.settingsAlarm)\n122|                AlarmBottomSheet(\n123|                    backstack \u003d backStack,\n124|                    darkTheme \u003d preferences.shouldUseDarkColors(),\n125|                    alarm \u003d alarmObject\n126|                )\n127|            }\n128|\n129|            entry\u003cAlarmMath\u003e {\n130|                val alarmObject \u003d Json.decodeFromString\u003cAlarmEntity\u003e(it.alarmJson)\n131|                MathScreen(\n132|                    backStack \u003d backStack,\n133|                    alarm \u003d alarmObject,\n134|                    darkTheme \u003d preferences.shouldUseDarkColors(),\n135|                    fromSheet \u003d it.fromSheet\n136|                )\n137|            }\n138|\n139|            entry\u003cAppSettings\u003e {\n140|                AppSettingsScreen(\n141|                    onBackPress \u003d { backStack.removeLastOrNull() },\n142|                    pref \u003d preferences\n143|                )\n144|            }\n145|\n146|        }\n147|    )\n148|}\n149|\n150|private object NavGraph {\n151|    val ANIM_TRANSITION_DURATION \u003d 700\n152|}\n153|&quot;},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;read&quot;,&quot;tool_call_id&quot;:&quot;toolu_01FTpGwLC3KMvGbDsoXUHkEz&quot;,&quot;content&quot;:&quot;  1|package com.timilehinaregbesola.mathalarm.presentation.alarmmath.components\n  2|\n  3|import androidx.compose.animation.core.animateFloatAsState\n  4|import androidx.compose.foundation.layout.Arrangement.Center\n  5|import androidx.compose.foundation.layout.Arrangement.SpaceBetween\n  6|import androidx.compose.foundation.layout.Column\n  7|import androidx.compose.foundation.layout.IntrinsicSize\n  8|import androidx.compose.foundation.layout.Row\n  9|import androidx.compose.foundation.layout.Spacer\n 10|import androidx.compose.foundation.layout.fillMaxHeight\n 11|import androidx.compose.foundation.layout.fillMaxSize\n 12|import androidx.compose.foundation.layout.fillMaxWidth\n 13|import androidx.compose.foundation.layout.height\n 14|import androidx.compose.foundation.layout.padding\n 15|import androidx.compose.foundation.shape.CornerSize\n 16|import androidx.compose.foundation.shape.RoundedCornerShape\n 17|import androidx.compose.foundation.text.KeyboardActions\n 18|import androidx.compose.foundation.text.KeyboardOptions\n 19|import androidx.compose.material3.Button\n 20|import androidx.compose.material3.ButtonDefaults\n 21|import androidx.compose.material3.ExperimentalMaterial3Api\n 22|import androidx.compose.material3.LinearProgressIndicator\n 23|import androidx.compose.material3.MaterialTheme\n 24|import androidx.compose.material3.ProgressIndicatorDefaults.ProgressAnimationSpec\n 25|import androidx.compose.material3.Scaffold\n 26|import androidx.compose.material3.SnackbarHostState\n 27|import androidx.compose.material3.Surface\n 28|import androidx.compose.material3.Text\n 29|import androidx.compose.material3.TextField\n 30|import androidx.compose.material3.TextFieldDefaults\n 31|import androidx.compose.runtime.Composable\n 32|import androidx.compose.runtime.DisposableEffect\n 33|import androidx.compose.runtime.LaunchedEffect\n 34|import androidx.compose.runtime.collectAsState\n 35|import androidx.compose.runtime.getValue\n 36|import androidx.compose.runtime.mutableFloatStateOf\n 37|import androidx.compose.runtime.mutableStateOf\n 38|import androidx.compose.runtime.remember\n 39|import androidx.compose.ui.Alignment.Companion.CenterVertically\n 40|import androidx.compose.ui.ExperimentalComposeUiApi\n 41|import androidx.compose.ui.Modifier\n 42|import androidx.compose.ui.graphics.Color.Companion.DarkGray\n 43|import androidx.compose.ui.graphics.Color.Companion.Transparent\n 44|import androidx.compose.ui.graphics.Color.Companion.White\n 45|import androidx.compose.ui.platform.LocalSoftwareKeyboardController\n 46|import androidx.compose.ui.text.TextStyle\n 47|import androidx.compose.ui.text.font.FontWeight.Companion.Bold\n 48|import androidx.compose.ui.text.input.ImeAction.Companion.Done\n 49|import androidx.compose.ui.text.input.KeyboardType.Companion.Number\n 50|import androidx.compose.ui.text.style.TextAlign\n 51|import androidx.compose.ui.unit.dp\n 52|import androidx.compose.ui.unit.sp\n 53|import androidx.navigation3.runtime.NavBackStack\n 54|import androidx.navigation3.runtime.NavKey\n 55|import cafe.adriel.lyricist.strings\n 56|import co.touchlab.kermit.Logger\n 57|import com.timilehinaregbesola.mathalarm.domain.model.Alarm\n 58|import com.timilehinaregbesola.mathalarm.framework.database.AlarmEntity\n 59|import com.timilehinaregbesola.mathalarm.framework.database.AlarmMapper\n 60|import com.timilehinaregbesola.mathalarm.platform.PlatformVibrator\n 61|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.components.AlarmSnack\n 62|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.AlarmMathViewModel\n 63|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.MathScreenEvent\n 64|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.MathScreenEvent.EnteredAnswer\n 65|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.MathScreenEvent.OnClearClick\n 66|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.MathScreenEvent.OnEnterClick\n 67|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.MathScreenEvent.OnSnoozeClick\n 68|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.ToneState.Countdown\n 69|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.buildQuestionString\n 70|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.ANSWER_FIELD_CORNER_SIZE\n 71|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.ANSWER_FIELD_FONT_SIZE\n 72|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.ANSWER_FIELD_HEIGHT\n 73|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.ANSWER_FIELD_HORIZONTAL_PADDING\n 74|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.BUTTON_SECTION_HEIGHT\n 75|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.BUTTON_SECTION_HORIZONTAL_PADDING\n 76|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.CLEAR_FONT_SIZE\n 77|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.DEFAULT_VIBRATION_PATTERN\n 78|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.ENTER_FONT_SIZE\n 79|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.INITIAL_INDICATOR_PROGRESS\n 80|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.MAX_ANSWER_CHARS\n 81|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.PROGRESS_INDICATOR_HEIGHT\n 82|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.PROGRESS_LABEL\n 83|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.QUESTION_FONT_SIZE\n 84|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.REPEAT_INDEFINITELY\n 85|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.components.MathScreen.SNOOZE_FONT_SIZE\n 86|import com.timilehinaregbesola.mathalarm.presentation.alarmmath.generateMathProblem\n 87|import com.timilehinaregbesola.mathalarm.presentation.ui.MathAlarmTheme\n 88|import com.timilehinaregbesola.mathalarm.presentation.ui.clearButtonColor\n 89|import com.timilehinaregbesola.mathalarm.presentation.ui.enterButtonColor\n 90|import com.timilehinaregbesola.mathalarm.presentation.ui.indicatorColor\n 91|import com.timilehinaregbesola.mathalarm.presentation.ui.shapes\n 92|import com.timilehinaregbesola.mathalarm.presentation.ui.snoozeButtonColor\n 93|import com.timilehinaregbesola.mathalarm.presentation.ui.spacing\n 94|import com.timilehinaregbesola.mathalarm.presentation.ui.unSelectedDay\n 95|import kotlinx.coroutines.InternalCoroutinesApi\n 96|import kotlinx.coroutines.flow.collectLatest\n 97|import androidx.compose.ui.tooling.preview.Preview\n 98|import org.koin.compose.viewmodel.koinViewModel\n 99|\n100|@ExperimentalMaterial3Api\n101|@InternalCoroutinesApi\n102|@ExperimentalComposeUiApi\n103|@Composable\n104|fun MathScreen(\n105|    backStack: NavBackStack\u003cNavKey\u003e,\n106|    alarm: AlarmEntity,\n107|    viewModel: AlarmMathViewModel \u003d koinViewModel(),\n108|    darkTheme: Boolean,\n109|    fromSheet: Boolean \u003d false\n110|) {\n111|    var vibrator: PlatformVibrator? \u003d null\n112|    val problem \u003d remember { generateMathProblem(alarm.difficulty) }\n113|    val question \u003d remember { mutableStateOf(buildQuestionString(problem)) }\n114|    val snackbarHostState \u003d remember {\n115|        SnackbarHostState()\n116|    }\n117|    val keyboardController \u003d LocalSoftwareKeyboardController.current\n118|    val toneState by viewModel.state.collectAsState()\n119|    val progress by remember(viewModel.currentPosition) {\n120|        mutableFloatStateOf(\n121|            if (toneState is Countdown) {\n122|                val state \u003d toneState as Countdown\n123|                state.seconds / state.total.toFloat()\n124|            } else {\n125|                INITIAL_INDICATOR_PROGRESS\n126|            }\n127|        )\n128|    }\n129|    val animatedProgress by animateFloatAsState(\n130|        targetValue \u003d progress,\n131|        animationSpec \u003d ProgressAnimationSpec,\n132|        label \u003d PROGRESS_LABEL\n133|    )\n134|\n135|    LaunchedEffect(key1 \u003d true) {\n136|        viewModel.eventFlow.collectLatest { event -\u003e\n137|            when (event) {\n138|                is AlarmMathViewModel.UiEvent.ShowSnackbar -\u003e {\n139|                    snackbarHostState.showSnackbar(\n140|                        message \u003d event.message,\n141|                    )\n142|                }\n143|                is AlarmMathViewModel.UiEvent.CompleteAndClose -\u003e {\n144|                    if (!alarm.repeat) {\n145|                        viewModel.completeAlarm(AlarmMapper().mapToDomainModel(alarm))\n146|                    }\n147|                    backStack.removeLastOrNull()\n148|                }\n149|                is AlarmMathViewModel.UiEvent.StopVibrateAndHideKeyboard -\u003e {\n150|                    vibrator?.cancel()\n151|                    vibrator \u003d null\n152|                    keyboardController?.hide()\n153|                }\n154|            }\n155|        }\n156|    }\n157|\n158|    DisposableEffect(true) {\n159|        if (alarm.vibrate) {\n160|            vibrator \u003d PlatformVibrator()\n161|            vibrator?.startWaveform(DEFAULT_VIBRATION_PATTERN, REPEAT_INDEFINITELY)\n162|        }\n163|        if (alarm.alarmTone.isNotEmpty()) {\n164|            if (fromSheet) {\n165|                try {\n166|                    viewModel.startAlarmWith(alarm.alarmTone)\n167|                    viewModel.startTimer()\n168|                } catch (_: Throwable) {\n169|                }\n170|            }\n171|        } else {\n172|            Logger.d(\&quot;Tone not available\&quot;)\n173|            viewModel.onEvent(MathScreenEvent.OnToneError(\&quot;Tone not available\&quot;))\n174|        }\n175|        onDispose {\n176|            vibrator?.cancel()\n177|            vibrator \u003d null\n178|        }\n179|    }\n180|\n181|    MathScreenContent(\n182|        snackbarHostState \u003d snackbarHostState,\n183|        question \u003d question.value,\n184|        animatedProgress \u003d animatedProgress,\n185|        inputField \u003d {\n186|            MathInputField(\n187|                value \u003d viewModel.answerText.value,\n188|                darkTheme \u003d darkTheme,\n189|                onDonePressed \u003d {\n190|                    viewModel.onEvent(OnEnterClick(problem))\n191|                },\n192|                onValueChange \u003d { newVal -\u003e\n193|                    if (newVal.length \u003c\u003d MAX_ANSWER_CHARS) {\n194|                        viewModel.onEvent(\n195|                            EnteredAnswer(newVal.filter { it.isDigit() }),\n196|                        )\n197|                    }\n198|                }\n199|            )\n200|        },\n201|        buttonSection \u003d {\n202|            ButtonSection(\n203|                alarm \u003d alarm,\n204|                onEnterClick \u003d {\n205|                    viewModel.onEvent(OnEnterClick(problem))\n206|                },\n207|                onClearClick \u003d {\n208|                    viewModel.onEvent(OnClearClick)\n209|                },\n210|                onSnoozeClick \u003d {\n211|                    viewModel.onEvent(OnSnoozeClick(alarm.alarmId))\n212|                    backStack.removeLastOrNull()\n213|                }\n214|            )\n215|        }\n216|    )\n217|}\n218|\n219|@ExperimentalMaterial3Api\n220|@Composable\n221|private fun MathScreenContent(\n222|    snackbarHostState: SnackbarHostState,\n223|    question: String,\n224|    animatedProgress: Float,\n225|    inputField: @Composable () -\u003e Unit,\n226|    buttonSection: @Composable () -\u003e Unit\n227|) {\n228|    Scaffold(\n229|        snackbarHost \u003d { AlarmSnack(state \u003d snackbarHostState) },\n230|    ) { padding -\u003e\n231|        with(MaterialTheme) {\n232|            Surface(\n233|                Modifier\n234|                    .fillMaxSize()\n235|                    .padding(padding)\n236|                    .padding(vertical \u003d spacing.extraMedium),\n237|            ) {\n238|                Column {\n239|                    Spacer(modifier \u003d Modifier.height(spacing.extraMedium))\n240|                    LinearProgressIndicator(\n241|                        progress \u003d { animatedProgress },\n242|                        modifier \u003d Modifier\n243|                            .fillMaxWidth()\n244|                            .height(PROGRESS_INDICATOR_HEIGHT)\n245|                            .padding(horizontal \u003d spacing.extraMedium),\n246|                        color \u003d indicatorColor,\n247|                    )\n248|                    Spacer(modifier \u003d Modifier.height(spacing.large))\n249|                    Row(\n250|                        modifier \u003d Modifier.fillMaxWidth(),\n251|                        horizontalArrangement \u003d Center,\n252|                    ) {\n253|                        Text(\n254|                            text \u003d question,\n255|                            fontSize \u003d QUESTION_FONT_SIZE,\n256|                            fontWeight \u003d Bold,\n257|                        )\n258|                    }\n259|                    Spacer(modifier \u003d Modifier.height(spacing.medium))\n260|                    inputField()\n261|                    Spacer(modifier \u003d Modifier.height(spacing.medium))\n262|                    buttonSection()\n263|                }\n264|            }\n265|        }\n266|    }\n267|}\n268|\n269|@ExperimentalMaterial3Api\n270|@Composable\n271|private fun MathInputField(\n272|    value: String,\n273|    darkTheme: Boolean,\n274|    onDonePressed: () -\u003e Unit,\n275|    onValueChange: (String) -\u003e Unit,\n276|) {\n277|    TextField(\n278|        modifier \u003d Modifier\n279|            .fillMaxWidth()\n280|            .height(ANSWER_FIELD_HEIGHT)\n281|            .padding(horizontal \u003d ANSWER_FIELD_HORIZONTAL_PADDING),\n282|        value \u003d value,\n283|        onValueChange \u003d onValueChange,\n284|        singleLine \u003d true,\n285|        placeholder \u003d {\n286|            Row(\n287|                modifier \u003d Modifier.fillMaxWidth(),\n288|                horizontalArrangement \u003d Center,\n289|                verticalAlignment \u003d CenterVertically,\n290|            ) {\n291|                Text(text \u003d \&quot;\u003d\&quot;, fontSize \u003d ANSWER_FIELD_FONT_SIZE)\n292|            }\n293|        },\n294|        keyboardOptions \u003d KeyboardOptions(\n295|            keyboardType \u003d Number,\n296|            imeAction \u003d Done,\n297|        ),\n298|        keyboardActions \u003d KeyboardActions(\n299|            onDone \u003d {\n300|                onDonePressed()\n301|            },\n302|        ),\n303|        textStyle \u003d TextStyle(\n304|            color \u003d MaterialTheme.colorScheme.onSurface,\n305|            fontSize \u003d ANSWER_FIELD_FONT_SIZE,\n306|            textAlign \u003d TextAlign.Center,\n307|        ),\n308|        colors \u003d TextFieldDefaults.colors(\n309|            unfocusedContainerColor \u003d if (darkTheme) DarkGray else unSelectedDay,\n310|            focusedContainerColor \u003d if (darkTheme) DarkGray else unSelectedDay,\n311|            focusedIndicatorColor \u003d Transparent,\n312|            unfocusedIndicatorColor \u003d Transparent,\n313|            disabledIndicatorColor \u003d Transparent,\n314|            cursorColor \u003d MaterialTheme.colorScheme.onSurface\n315|        ),\n316|        shape \u003d shapes.medium.copy(CornerSize(ANSWER_FIELD_CORNER_SIZE)),\n317|    )\n318|}\n319|\n320|@Composable\n321|private fun ButtonSection(\n322|    alarm: AlarmEntity,\n323|    onClearClick: () -\u003e Unit,\n324|    onSnoozeClick: () -\u003e Unit,\n325|    onEnterClick: () -\u003e Unit\n326|) {\n327|    Row(\n328|        modifier \u003d Modifier\n329|            .fillMaxWidth()\n330|            .height(IntrinsicSize.Max)\n331|            .padding(horizontal \u003d BUTTON_SECTION_HORIZONTAL_PADDING),\n332|        horizontalArrangement \u003d SpaceBetween,\n333|    ) {\n334|        Column(\n335|            modifier \u003d Modifier\n336|                .padding(end \u003d 8.dp)\n337|                .weight(1f)\n338|                .height(BUTTON_SECTION_HEIGHT),\n339|            verticalArrangement \u003d SpaceBetween,\n340|        ) {\n341|            Button(\n342|                modifier \u003d Modifier.fillMaxWidth(),\n343|                onClick \u003d {\n344|                    onClearClick()\n345|                },\n346|                colors \u003d ButtonDefaults.buttonColors(\n347|                    containerColor \u003d clearButtonColor,\n348|                    contentColor \u003d White,\n349|                ),\n350|            ) {\n351|                Text(text \u003d strings.clear.uppercase(), fontSize \u003d CLEAR_FONT_SIZE)\n352|            }\n353|            Button(\n354|                modifier \u003d Modifier.fillMaxWidth(),\n355|                enabled \u003d alarm.snooze !\u003d 0,\n356|                onClick \u003d {\n357|                    onSnoozeClick()\n358|                },\n359|                colors \u003d ButtonDefaults.buttonColors(\n360|                    containerColor \u003d snoozeButtonColor,\n361|                    contentColor \u003d White,\n362|                ),\n363|            ) {\n364|                Text(text \u003d strings.snooze.uppercase(), fontSize \u003d SNOOZE_FONT_SIZE)\n365|            }\n366|        }\n367|        Button(\n368|            modifier \u003d Modifier\n369|                .weight(1f)\n370|                .fillMaxHeight(),\n371|            onClick \u003d {\n372|                onEnterClick()\n373|            },\n374|            shape \u003d RoundedCornerShape(8.dp),\n375|            colors \u003d ButtonDefaults.buttonColors(\n376|                containerColor \u003d enterButtonColor,\n377|                contentColor \u003d White,\n378|            ),\n379|        ) {\n380|            Text(text \u003d strings.enter.uppercase(), fontSize \u003d ENTER_FONT_SIZE)\n381|        }\n382|    }\n383|}\n384|\n385|@ExperimentalComposeUiApi\n386|@InternalCoroutinesApi\n387|@ExperimentalMaterial3Api\n388|@Preview\n389|@Composable\n390|fun MathPreview() {\n391|    MathAlarmTheme(darkTheme \u003d true) {\n392|        MathScreenContent(\n393|            snackbarHostState \u003d SnackbarHostState(),\n394|            question \u003d \&quot;1 + 1\&quot;,\n395|            animatedProgress \u003d INITIAL_INDICATOR_PROGRESS,\n396|            inputField \u003d {\n397|                MathInputField(\n398|                    value \u003d \&quot;\&quot;,\n399|                    darkTheme \u003d true,\n400|                    onDonePressed \u003d { },\n401|                    onValueChange \u003d { }\n402|                )\n403|            },\n404|            buttonSection \u003d {\n405|                ButtonSection(\n406|                    alarm \u003d AlarmMapper().mapFromDomainModel(Alarm()),\n407|                    onClearClick \u003d { },\n408|                    onSnoozeClick \u003d { },\n409|                    onEnterClick \u003d { }\n410|                )\n411|            }\n412|        )\n413|    }\n414|}\n415|\n416|private object MathScreen {\n417|    val DEFAULT_VIBRATION_PATTERN \u003d longArrayOf(0, 1000, 3000)\n418|    const val SETTINGS_ID \u003d 1143682591\n419|    const val TEST_ALARM_KEY \u003d \&quot;testAlarm\&quot;\n420|    const val FROM_SHEET_KEY \u003d \&quot;fromSheet\&quot;\n421|    const val INITIAL_INDICATOR_PROGRESS \u003d 0.1f\n422|    const val MAX_ANSWER_CHARS \u003d 8\n423|    const val PROGRESS_LABEL \u003d \&quot;ProgressBar\&quot;\n424|    const val REPEAT_INDEFINITELY \u003d 0\n425|    val PROGRESS_INDICATOR_HEIGHT \u003d 10.dp\n426|    val QUESTION_FONT_SIZE \u003d 70.sp\n427|    val ANSWER_FIELD_HORIZONTAL_PADDING \u003d 56.dp\n428|    val ANSWER_FIELD_HEIGHT \u003d 90.dp\n429|    val ANSWER_FIELD_CORNER_SIZE \u003d 24.dp\n430|    val ANSWER_FIELD_FONT_SIZE \u003d 30.sp\n431|    val BUTTON_SECTION_HORIZONTAL_PADDING \u003d 56.dp\n432|    val BUTTON_SECTION_HEIGHT \u003d 120.dp\n433|    val ENTER_FONT_SIZE \u003d 19.sp\n434|    val SNOOZE_FONT_SIZE \u003d 19.sp\n435|    val CLEAR_FONT_SIZE \u003d 19.sp\n436|}\n437|&quot;},{&quot;role&quot;:&quot;assistant&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;thinking&quot;,&quot;thinking&quot;:&quot;Now I see the issue. Looking at the code:\n\n1. In `NavGraph.kt`, the backstack starts with `AlarmList` as the initial entry (line 61)\n2. But there are multiple places where `backStack.removeLastOrNull()` is called:\n   - Line 78: `onBack \u003d { backStack.removeLastOrNull() }` - the general back handler\n   - Line 141: `onBackPress \u003d { backStack.removeLastOrNull() }` in AppSettings\n\n3. In `MathScreen.kt`:\n   - Line 147: `backStack.removeLastOrNull()` in `CompleteAndClose` event\n   - Line 212: `backStack.removeLastOrNull()` in `onSnoozeClick`\n\nThe problem is that the backstack can become empty if:\n1. The user is on `AlarmMath` screen (backstack has `AlarmList`, `AlarmMath`)\n2. The user\u0027s answer completes or snoozes the alarm\n3. `removeLastOrNull()` is called, removing `AlarmMath`\n4. If somehow the `AlarmList` also gets removed (e.g., through a back gesture or double removal), the backstack becomes empty\n\nHowever, looking more carefully at the deeplinking scenario:\n- Line 67-72 in NavGraph: When a deeplink is received, it adds `AlarmMath` to the backstack\n- But if the backstack starts empty somehow (not from normal app launch), adding just `AlarmMath` wouldn\u0027t help\n\nWait, looking at line 61: `val backStack \u003d rememberNavBackStack(config, AlarmList)` - this should always initialize with `AlarmList`.\n\nThe issue might be:\n1. When the app is launched via deeplink/notification, the backstack gets initialized\n2. The MathScreen is shown\n3. When snoozing or completing, `removeLastOrNull()` is called\n\n\n4. If somehow this happens when only `AlarmMath` is in the backstack (AlarmList was somehow removed), it crashes\n\nThe predictive back handler on line 78 could trigger this issue. If the user swipes back while on AlarmList, it would attempt to remove AlarmList (the only item), potentially leaving the backstack empty.\n\nI need to investigate how to prevent the backstack from becoming empty during navigation, ensuring a stable navigation state across different app launch scenarios.&quot;,&quot;signature&quot;:&quot;EqoRCkYICxgCKkBOLx9MhbuXR4T7WFIAu6brAX2ctG9FU13YVRxyW8o8KTJ3/qtAccUPDRYE+V1ZV6k9BvsD1wTgqjDu05AIBb4fEgyTlNeBMe8nxg9P/kUaDBINNYaiEuDSEdd1XyIwU9JQ6GQhgBk1tFaW9UXMoZN3FKY5o6RSUkdGEKYfzgEe7OShfXSZgQZwbUYyDtHtKpEQw+dsQQiYRGrsWCKo4ywvMv4ziYpieZSKjhMv04TzYNtD5/2APi5UZ3aIRM8Nu/ULBoWzCp6oxREI7zAWrAUJYLEiU/L672AUe+mNiVZd94BKFgki9CIiQ4sgLEOYojettRhvNGTeqh5vLP4yYh6od3Vz0/DQIor/knjK2qV1Cuu0Uvina0Z/zWZqKKRiCycE6lmg572EC56HqHzC6hhzt1MacLUQJFes9ceGAmxBMdRVc8llhWc/fnq9v+0zJSmdsS2o7xP6aExxRqYz/3ezg8DrYJnrz+WP5aRtkluOPh9boLb5hJZsmuqNUnIcj9pFmjFn/OcNuIT6t5a8uJ+jdY5hzPXzzi+iEHczhdFXllLeAnqJIToz9dZCKQbNAtlk4lTaix2HUxPIyHfVk2GtIzRI83mF2avj5ZUsuy+jkqeADdFRUraZxKkXTZJVNTMEmdQaEJ696QGAE8lXBDvAEc+08qWI7VagT0eTmqwGUgnZHtEEr5LokyWzHotQph42nZMwKszIxKoBg9cjhTD1MfX+Tsi6nUmPQBzQxfrihzSK/czkXc+evpbb+Xz+qIjK5sG72jKcDka2AtDjaYJg+XBL15wBE+ZIjHi+5S5b7IXMtTvbHxMTMaNUopcw3IjV7tFjtL70GUDZXu26WDPMJkXEUi5fpIR0aTkhZFGCl65lZ7Lo7d4gs4R+uloK/IdtUP15xL2rlwk84cHy/xY+EOpZc7B8le6nC9CA7CGRM4P7te6VEGdshbjbADbmjrxlqd6obzMk+t4/7R5hiMae9OtYY4WbhyXurLybo+L4Dn4PfG0ScBmdaflMIi1Trgktp5LLU5xYcIvbvGSe+HYya5IdNx5Ci9hqW5dODCMZztp9e+1LRuS3X2ii2UDVXKN8eFDo8KCAV8jAJWqZazbX9cAUXfrI863Fg7yUhZdEwONIU4anrbK7fh8zDubWYcCT6q2q7KcNdrS2BKB1EvMX40sXJ4T585B4+2PTnPJzPEbe+S/l6UvbmWZiHVnm/lCV1uXfToua0Q1unDR+GThAF4fy8CrhopQX/QwQ0S79fvAu8SXyA/cmLPZeIy9d1klgGDcfIBNvDXIPT+58gkRSRR08lSi6Rta4ffutGSx4Kylt4irj6uBMTvmdZaaCNo9p1IVJeZ9dQx4poXE4nuNmU5ssfGTWDOiAciGGtmMtyuuMG2cEiwV7DGj63LhNY0Z/fALLp2hghkDSsRMhuVwomA/zzola1Z/xkqAioCQgBqk/Cb8nQPFvHv7lr2vLRMHnx/oNop/K1lr8yxfqUZGdjUGtfU9Hl1cti4quqoNkA51mzUeGEsMaSkOeHZXV0telhdLi00a3Q5HbX+0BXb2fc+oGNPjeEJFcNXyqkuwhtH0JlaSl5gRDQ6jmCTgQaUXonMZGhURHVTs+Kwa7GRDAwxQBF6Z6TzZno1sXqSEqLhATHHTzHF31TZBC8XlJzo9GeYex47tOVHz3sOWLldPHUILSkfBzLBV9kp3uWOtPXKU0uZEqjr/tnYpdCW2wHR1r3eL2qPivmA/DWXvpzRK1fmcu7FTwqBscPb4pfQvSl/rsjswrzM7NPxH06GrkXM8b5AFp8g9VSRVAbVjEqIcu+kS068pY+NdSXRTSTPylerx5uLVjQNhC+G2b0UQyMGgw2bp5bOW+cJt3XAdL1jl9vtkF79fp1daTpdCAZr6LJFz6IeZ9AwxdFncMB8i1a2plLHwrvtd9Ut1dS24kQ83qc2ICwbKdvXdBLQvkg0OzOpCnmyz6ikcB9bilQTI5UHFob8b5ahhWql8J7XyvfSz6ZEKrz+1iD/DAEThkUE1UOUXOm2LGY7AUmPi6HgOu0TwjtRORRrTSUJJ5QatIKSmWTKP5QOquYw7LNbmQZBefQLf8KOBdekIwFsGE3qF6YdCoGWmRNbzJ4cBRof6dSjUx5GuTB76neSodQU+iTl+A+t9NiEhU0WpR8fZUmiuVYPF8qJBOSK82E2Fnb+NoiNAtiSkNByyN17+Gt6nsP3QzWbYLgJWd+eUbM3soN+dPxkJXzCFxT3LH2oBxcbTUrofmBMjwBwSaToLmYNvPDP7CvypHhRgPrULVUaBtlSb+7PD+qEqEqCWzWpgMlKJ4CoHMAagu4gh7N/WCpxxBNKhEcTwKc2HlWIKTepvhNBwCWZjMzWNPSRkqdzeEaeRmenYF4As7jP7/w02uvotJNX+N1ED2hZtVB/bGltsl60zcbwQdvHE9C8RfXo8J9ILgRHawHXFfWljx2n1/cUhd9n/JQYJ9J7D1XDsT7o6AlTKnaa7MXCyOnKzDxMHrg+pERA+u15o5NJ2vysb1rfx20WD7kaBOdFm9CPSAVVD6HH/cvW0/men0kfbnzX4M5jTEHU7XJ9C9eT35BO3hp/+9FXLFmKiSzcR79Rxfy+RUiSLlPLEUu6Zso5iOHD6jj3oh5C82y/hd4BM7N2KXqZk2/47lb2K+UTTtkZUAykg116TvAtHfe5m2ETkduL4MGNyFAJGmjZZCwh1An17/cLfsTINas693foSlkCYdVfKYNHCG3Ng0V96BZ9q8MZkLde3Fb6Rc9E33PKYd66QHfAETQbdCJucx0hiG0TWC1G0vol8L2hDZjJeFg2BbtszQd75CqTGRgX3F+FPQeN9+jvP15SceqBsY6gjd0zx++eKVfhEV7JpAOPKxt8+VXkSw6TRkg65LCNvlAiMBdLC5OWgiaSYAeZZxVDVceMo0IADiMl++bSM/MhgB&quot;},{&quot;type&quot;:&quot;text&quot;,&quot;text&quot;:&quot;I found the issue. The problem is that **`removeLastOrNull()` can remove the last item from the backstack**, leaving it empty. There are several places this can happen:\n\n1. **In `NavGraph.kt` line 78**: The `onBack` handler calls `backStack.removeLastOrNull()` unconditionally\n2. **In `MathScreen.kt` lines 147 and 212**: `removeLastOrNull()` is called when completing or snoozing an alarm\n\nIf the app is launched directly to the `AlarmMath` screen (via deeplink/notification), and then the user completes or snoozes the alarm, it removes `AlarmMath`. If the backstack only contained that single entry (e.g., race condition during initialization), the backstack becomes empty causing the crash.\n\nLet me check how the deeplink navigation works and fix this:&quot;}],&quot;tool_calls&quot;:[{&quot;id&quot;:&quot;toolu_0145CNbyWyT6YHkkwyyMWr5P&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;grep&quot;,&quot;arguments&quot;:&quot;{\&quot;pattern\&quot;: \&quot;deeplinkInfo|deeplink\&quot;, \&quot;glob\&quot;: \&quot;*.kt\&quot;}&quot;}}]},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;grep&quot;,&quot;tool_call_id&quot;:&quot;toolu_0145CNbyWyT6YHkkwyyMWr5P&quot;,&quot;content&quot;:&quot;app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/MainActivity.kt:45:        deeplinkInfo \u003d intent.extractAlarmJson()\n--\napp/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/MainActivity.kt:53:                    NavGraph(preferences, deeplinkInfo)\n--\napp/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/MainActivity.kt:77:        var deeplinkInfo by mutableStateOf\u003cString?\u003e(null)\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:49:    deeplinkInfo: String?\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:66:    // Navigate to MathScreen when deeplinkInfo changes (e.g., from notification tap)\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:67:    LaunchedEffect(deeplinkInfo) {\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:68:        println(\&quot;NavGraph: LaunchedEffect triggered with deeplinkInfo \u003d $deeplinkInfo\&quot;)\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:69:        deeplinkInfo?.let {\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationHandler.kt:17: * Singleton to hold the deeplink information when a notification is tapped\n--\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationHandler.kt:21:    private val _deeplinkInfo \u003d MutableStateFlow\u003cString?\u003e(null)\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationHandler.kt:22:    val deeplinkInfo: StateFlow\u003cString?\u003e \u003d _deeplinkInfo.asStateFlow()\n--\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationHandler.kt:26:        println(\&quot;NotificationDeeplinkHolder: Setting deeplink \u003d $alarmJson\&quot;)\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationHandler.kt:27:        _deeplinkInfo.value \u003d alarmJson\n--\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationHandler.kt:33:        _deeplinkInfo.value \u003d json\n--\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationHandler.kt:37:        println(\&quot;NotificationDeeplinkHolder: Clearing deeplink\&quot;)\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationHandler.kt:38:        _deeplinkInfo.value \u003d null\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/MainViewController.kt:53:        // Observe deeplink info from notification taps\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/MainViewController.kt:54:        val deeplinkInfo by NotificationDeeplinkHolder.deeplinkInfo.collectAsState()\n--\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/MainViewController.kt:57:        println(\&quot;MainViewController: deeplinkInfo \u003d $deeplinkInfo\&quot;)\n--\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/MainViewController.kt:59:        // Clear the deeplink after it\u0027s been consumed to prevent re-navigation\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/MainViewController.kt:60:        androidx.compose.runtime.LaunchedEffect(deeplinkInfo) {\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/MainViewController.kt:61:            if (deeplinkInfo !\u003d null) {\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/MainViewController.kt:62:                println(\&quot;MainViewController: LaunchedEffect triggered with deeplinkInfo\&quot;)\n--\napp/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/MainViewController.kt:71:                NavGraph(preferences, deeplinkInfo)\n[Showing results with pagination \u003d limit: 100, offset: 0]&quot;},{&quot;role&quot;:&quot;assistant&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;thinking&quot;,&quot;thinking&quot;:&quot;Now I understand the issue better. The fix needs to ensure that when we call `removeLastOrNull()`, we don\u0027t end up with an empty backstack. In Navigation 3, the backstack should never be empty.\n\nThe solution is to guard the `removeLastOrNull()` calls to check if there\u0027s more than one item in the backstack. If we\u0027re at the root and try to go back, we should either:\n1. Not remove the item (keep the app at root)\n2. Finish the activity instead\n\nLet me fix this in the NavGraph.kt:&quot;,&quot;signature&quot;:&quot;EoUFCkYICxgCKkAC2Cl44v8znPeok1egoF1S/L6S5EqXQ02Blm0zXOq/CD1qGFUVimJWr5QXzXVwWVsNInD+wwSsESceDdNmxGmhEgxr4/vwtp41YlKvOvUaDB+gUJ/wF0nfp59FKyIwYTE/34d4AXn2WUVG9GHEfe/sNObUN2fZCCFnKkGTt0gsBGXijSgfkGKjdqamDKTVKuwD7bFrQ9f1ylKAmWDLPvZvilWHbJGUkYL3VrGWG5cZyefrNjVsutUQH4Zh54Ivle+CMYRsF7wThmRmLV8m93WDKrzOICumO8HuCsGkHlXiNBKR+1SvqdHUrC0B3crK7EzssEAYtGsbRUIpBgWQvGpnXlM+KNzKRsiXJFLdxGPEu0ZSdMqxpLyCEe7aMxCOIE28ReMTLn5RHnSLfeDwQNuxccrXn5qdmCp3MUYMTavmFtlzp5kHeK0kOvsUCSluIVPjVa/ZCOH+HkpeUwtPKto8+l1toHTmJbZT14PBEeFJbKHUnxPSi/D0CSGKAS2evuuD4qREbwizjy7TgKL+C13HJXwRgyFeB3BycwciNYz/W+OCK9ycWsgyShouwm7l1kr3Bmi5ooiSBHQ71UihZbuKRLT16hO6xKg45kwxVTnVjNouU/P+u/qZsSIvQtOanrAcgJSggYj0SbwoT4XbhEQxS11CVhOxTmJaIMq/xKP3yaIWLwpT/3aZ5oeiQvz5Jhq7uGy/oil9Dlqn58me6LBosJ84+NEF6yU3oenihxFu7l/anS05qGTFNinRor6pMUlf0nnYD1HimqkheOwWZ/Qjf7Ln/9FyyAFzY5bNfh9wSo5w0ec0xhwbPKYe2YW72ewRhuVBYxMII5fL1njDGAE\u003d&quot;},{&quot;type&quot;:&quot;text&quot;,&quot;text&quot;:&quot;Now I understand the issue. The fix is to **guard the `removeLastOrNull()` calls** to prevent the backstack from becoming empty. In Navigation 3, the backstack must always have at least one entry.&quot;}],&quot;tool_calls&quot;:[{&quot;id&quot;:&quot;toolu_01ANEEgxDFoJ9gjnwwQKbexn&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;edit&quot;,&quot;arguments&quot;:&quot;{\&quot;file_path\&quot;: \&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt\&quot;, \&quot;old_string\&quot;: \&quot;    NavDisplay(\\n        modifier \u003d Modifier.background(color \u003d MaterialTheme.colorScheme.background),\\n        backStack \u003d backStack,\\n        onBack \u003d { backStack.removeLastOrNull() },\&quot;, \&quot;new_string\&quot;: \&quot;    NavDisplay(\\n        modifier \u003d Modifier.background(color \u003d MaterialTheme.colorScheme.background),\\n        backStack \u003d backStack,\\n        onBack \u003d { if (backStack.size \u003e 1) backStack.removeLastOrNull() },\&quot;}&quot;}}]},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;edit&quot;,&quot;tool_call_id&quot;:&quot;toolu_01ANEEgxDFoJ9gjnwwQKbexn&quot;,&quot;content&quot;:&quot;The file /Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt has been updated.\n\nWhen you\u0027re done with your current set of changes to this file, you should call the read_lints tool with the specific file path and fix any newly introduced errors.&quot;},{&quot;role&quot;:&quot;assistant&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;thinking&quot;,&quot;thinking&quot;:&quot;Now let me also fix the `removeLastOrNull()` call in the AppSettings screen, and in the MathScreen. The MathScreen is more complex because it needs to handle the case where the user completes an alarm or snoozes - in those cases, we should remove the MathScreen and go back to AlarmList, but we need to make sure we don\u0027t empty the backstack.&quot;,&quot;signature&quot;:&quot;Ev8DCkYICxgCKkB2CqhhVFNo+YqfkhmRu0ExMpKurlqHCH93ZKlCDF3ZK68Hxcuj89VkinFHeUpp04ooIZK9qp3HrkcB/TjPV1VaEgwF2u70D5SFI/33Sg4aDBUI2yDnZkRK7dABJCIwC6Ak/T1FlJwyV3t7RnZXs1ahgG9L/skByeYNZ7LJ06PM/0gtyTanqvS0N3bdLqe1KuYC5wkzsScitGFCZPrg7m+/TxgJZ3A0x64IHzXpgxDK5dve5X4/0GiFSRYe0BBB/WemjU4OJM0d4QZo0TWWQVQUvFwCYiPPlP4Uunja5NWhhrDS2UAGPvO4VTBSe1i6dwsXSPKushUlzTOgEc0hWVLXoaZ5Zkl07RY2qpFHezLivV9KIEZBOBZSgovaoQsT6F+K8qDAi5EWS1tPIXrZlYJgx4v6HZKQJKy7N35a5mTrGJHQak8jD1dgoC5hGhP6SKS5EO01GvHrh+g5/EDPcd4Ts/XiILpWcrkOqvNVG1MMBox6dnftNVv4c4VE8YcYxDuQCD+qY7lSCrXlrl6/7q5YhJzzwCLI2s82N6Yf+r6cJwHJ0soaOJeO4WbJmBapeii7JwDzmw7+kzaO2sGuflIUIBu2wNSCieMEJR71pnPBP1PH+jYw/fxXq/yyOPW1tzwThDmEIapbas7UJCmVcHX1csR4XLAzlBgB&quot;},{&quot;type&quot;:&quot;text&quot;,&quot;text&quot;:&quot;Now let me also fix the `AppSettings` back handler:&quot;}],&quot;tool_calls&quot;:[{&quot;id&quot;:&quot;toolu_01WhAQnzrUkh4vPytAAoNA3L&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;edit&quot;,&quot;arguments&quot;:&quot;{\&quot;file_path\&quot;: \&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt\&quot;, \&quot;old_string\&quot;: \&quot;            entry\u003cAppSettings\u003e {\\n                AppSettingsScreen(\\n                    onBackPress \u003d { backStack.removeLastOrNull() },\\n                    pref \u003d preferences\\n                )\\n            }\&quot;, \&quot;new_string\&quot;: \&quot;            entry\u003cAppSettings\u003e {\\n                AppSettingsScreen(\\n                    onBackPress \u003d { if (backStack.size \u003e 1) backStack.removeLastOrNull() },\\n                    pref \u003d preferences\\n                )\\n            }\&quot;}&quot;}}]},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;edit&quot;,&quot;tool_call_id&quot;:&quot;toolu_01WhAQnzrUkh4vPytAAoNA3L&quot;,&quot;content&quot;:&quot;The file /Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt has been updated.\n\nWhen you\u0027re done with your current set of changes to this file, you should call the read_lints tool with the specific file path and fix any newly introduced errors.&quot;},{&quot;role&quot;:&quot;assistant&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;thinking&quot;,&quot;thinking&quot;:&quot;Now I need to fix the MathScreen. Looking at the code, there are two places where `removeLastOrNull()` is called:\n1. Line 147: In the `CompleteAndClose` event handler\n2. Line 212: In the `onSnoozeClick` callbackThe fix for MathScreen is trickier because it receives the backStack as a parameter. Let me update those calls as well.&quot;,&quot;signature&quot;:&quot;EvIDCkYICxgCKkCTEKIgB02y35ELKjnLec1IgsWsr+o/2WrkdB17qi4Y/VrVArdsg97ILSwEAbpb5/aqVs77ESI4j1aueYcFL1n7Egwj8p6F6TxP9cfqUS8aDB054JEa+m1HB0G6iiIwRZ8kmKegaaXKWalJehyUw+/y83qQ6pl85AY4i5WoEEB0Fhy2+YD/3ZzWXgslXye+KtkCUw063S+vBFJ8BPXkdHD/38riv/0vWD/1imYk1eG9Ll4WXbj2nG4BMUt8ZGU31+D3MVSvI6uUXOVVF5CrPwv3hC9nt0HLmIxrHgYlkJrfQXnHTLhw/svZZSGh/+/Apx8mTF8cXCWAZfKvKd+lmbmCMKjqzbZcc6/qVnTOD3dbU0YVeYakkgBSE0iLPr9F9TKnvvEMwfIjBlJa6VXId0bwxek9MrX61xwwQFqF7FA9srMboG/HHqeMnU514YS9UBUIvw+Q4vqselgvG8SAXe2Jn7QZ9sJhvHOjM+Hw100ECelAKAK5MxforjjpLEXe5VhchWVcP0LAY/aTC45WtatbhjPYD9rjtQ0wYrdNylw6jkw6TeTjcAEcX24lH3R8mykZDdYLJ8xif+r1KfBSzXQ5JYWLXvwDxq1byx7ymmDPWMgajHTI5kC5BpdyNUuNoOpunnuOtH/HFJ3KGAE\u003d&quot;},{&quot;type&quot;:&quot;text&quot;,&quot;text&quot;:&quot;Now let me fix the `MathScreen.kt` where the backstack can also be emptied:&quot;}],&quot;tool_calls&quot;:[{&quot;id&quot;:&quot;toolu_01Prqi79itQR2uArsdAQLCez&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;edit&quot;,&quot;arguments&quot;:&quot;{\&quot;file_path\&quot;: \&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt\&quot;, \&quot;old_string\&quot;: \&quot;                is AlarmMathViewModel.UiEvent.CompleteAndClose -\u003e {\\n                    if (!alarm.repeat) {\\n                        viewModel.completeAlarm(AlarmMapper().mapToDomainModel(alarm))\\n                    }\\n                    backStack.removeLastOrNull()\\n                }\&quot;, \&quot;new_string\&quot;: \&quot;                is AlarmMathViewModel.UiEvent.CompleteAndClose -\u003e {\\n                    if (!alarm.repeat) {\\n                        viewModel.completeAlarm(AlarmMapper().mapToDomainModel(alarm))\\n                    }\\n                    if (backStack.size \u003e 1) backStack.removeLastOrNull()\\n                }\&quot;}&quot;}}]},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;edit&quot;,&quot;tool_call_id&quot;:&quot;toolu_01Prqi79itQR2uArsdAQLCez&quot;,&quot;content&quot;:&quot;The file /Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt has been updated.\n\nWhen you\u0027re done with your current set of changes to this file, you should call the read_lints tool with the specific file path and fix any newly introduced errors.&quot;},{&quot;role&quot;:&quot;assistant&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;thinking&quot;,&quot;thinking&quot;:&quot;Now let me fix the snooze click handler as well.&quot;,&quot;signature&quot;:&quot;EtgBCkYICxgCKkCbpsji71jASHJ/wapxRFYIRfyRLWevUPVBcgGlP3qZ0jUwQgkFX144Uhk0QI2y3w0YorZfOUvIG59NMxgYCmjQEgylkGid1fhTxlsK/OEaDPrcGo1+jrJGZzDPsyIwZt8s9F4VaTSAdF2SwADq0h0mCgHN4rdW1FxYlKcNv4/HlTu5AS999+IOWp2XgzKrKkDeJkV7YbXyPS9VnTepweKVYt1FYa4K8w+4+G1pe2tAAPEOKhy86uX+xn24ECvhi1FLS5FsHwP8qH27GV0D+yv+GAE\u003d&quot;}],&quot;tool_calls&quot;:[{&quot;id&quot;:&quot;toolu_01MagH2YjSESmiJ6eB1taM5h&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;edit&quot;,&quot;arguments&quot;:&quot;{\&quot;file_path\&quot;: \&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt\&quot;, \&quot;old_string\&quot;: \&quot;                onSnoozeClick \u003d {\\n                    viewModel.onEvent(OnSnoozeClick(alarm.alarmId))\\n                    backStack.removeLastOrNull()\\n                }\&quot;, \&quot;new_string\&quot;: \&quot;                onSnoozeClick \u003d {\\n                    viewModel.onEvent(OnSnoozeClick(alarm.alarmId))\\n                    if (backStack.size \u003e 1) backStack.removeLastOrNull()\\n                }\&quot;}&quot;}}]},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;edit&quot;,&quot;tool_call_id&quot;:&quot;toolu_01MagH2YjSESmiJ6eB1taM5h&quot;,&quot;content&quot;:&quot;The file /Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt has been updated.\n\nWhen you\u0027re done with your current set of changes to this file, you should call the read_lints tool with the specific file path and fix any newly introduced errors.&quot;},{&quot;role&quot;:&quot;assistant&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;thinking&quot;,&quot;thinking&quot;:&quot;Let me also check if there are any other places where `removeLastOrNull()` is called on the backstack. I saw in the initial grep that there are also calls in `AlarmListScreen.kt` and `AlarmBottomSheet.kt`.&quot;,&quot;signature&quot;:&quot;EvYCCkYICxgCKkAkAr8mx/DUBsrADQe47FdBzIcytGlI9mivMt2dKjrSbmwldpy/JO8DhrHEZKFthSiTRFILyKChe87u0qaAX8kqEgwM/iKKjpIx53+vtmUaDDzCnfr7WgOj6dvCNyIwH8ZjjyQMWZWnxDLift3d2PwFpUtINhQw5R60ATmt2KgTORhvFgUAp1Sfj/M6Jg7GKt0BGEATWcoomYq5bIGavcJB3yehvDIiQl5kifthPCyuOdqMXnCuOUtYEotpWj61NTJvezkcwk6wfRj3bnBAhorCHeIz4V75vpNUx1cZcDnkn78XaG4+HHzf5bDxcMFQ6T8jZMHzFUQrw2YmDKq227fjqO4mnqKR9x2VBInwUQZNkgF0FSH/vv3r3ZM3g4lqFsXZUPSQUQuYsP2nULNrjSOHcht0XkkI8ckDXyXoUOxWwFkwJuJOs3Xl03HiTBhk689g+108j8a6mFdrCd3kRMGop0peCdkOdkI94RrMdxEYAQ\u003d\u003d&quot;},{&quot;type&quot;:&quot;text&quot;,&quot;text&quot;:&quot;Let me check for any other places where the backstack is being manipulated:&quot;}],&quot;tool_calls&quot;:[{&quot;id&quot;:&quot;toolu_01VnYeS8JQxDD8NDB4MtWuAE&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;read_file&quot;,&quot;arguments&quot;:&quot;{\&quot;target_file\&quot;: \&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmlist/components/AlarmListScreen.kt\&quot;}&quot;}},{&quot;id&quot;:&quot;toolu_019LL4a4LdEmUzZc5YnneCfW&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;read_file&quot;,&quot;arguments&quot;:&quot;{\&quot;target_file\&quot;: \&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/components/AlarmBottomSheet.kt\&quot;}&quot;}}]},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;read&quot;,&quot;tool_call_id&quot;:&quot;toolu_01VnYeS8JQxDD8NDB4MtWuAE&quot;,&quot;content&quot;:&quot;  1|package com.timilehinaregbesola.mathalarm.presentation.alarmlist.components\n  2|\n  3|import androidx.compose.animation.ExperimentalAnimationApi\n  4|import androidx.compose.foundation.ExperimentalFoundationApi\n  5|import androidx.compose.foundation.background\n  6|import androidx.compose.foundation.layout.Box\n  7|import androidx.compose.foundation.layout.fillMaxSize\n  8|import androidx.compose.foundation.layout.padding\n  9|import androidx.compose.foundation.layout.safeContentPadding\n 10|import androidx.compose.foundation.layout.size\n 11|import androidx.compose.foundation.lazy.LazyColumn\n 12|import androidx.compose.foundation.lazy.items\n 13|import androidx.compose.material3.ExperimentalMaterial3Api\n 14|import androidx.compose.material3.Scaffold\n 15|import androidx.compose.material3.SnackbarDuration\n 16|import androidx.compose.material3.SnackbarHostState\n 17|import androidx.compose.material3.SnackbarResult.ActionPerformed\n 18|import androidx.compose.material3.Surface\n 19|import androidx.compose.runtime.Composable\n 20|import androidx.compose.runtime.LaunchedEffect\n 21|import androidx.compose.runtime.collectAsState\n 22|import androidx.compose.runtime.getValue\n 23|import androidx.compose.runtime.mutableStateOf\n 24|import androidx.compose.runtime.remember\n 25|import androidx.compose.runtime.setValue\n 26|import androidx.compose.ui.Alignment.Companion.BottomEnd\n 27|import androidx.compose.ui.Alignment.Companion.Center\n 28|import androidx.compose.ui.Alignment.Companion.CenterHorizontally\n 29|import androidx.compose.ui.Alignment.Companion.TopStart\n 30|import androidx.compose.ui.Modifier\n 31|import androidx.compose.ui.graphics.Color.Companion.LightGray\n 32|import androidx.compose.ui.unit.dp\n 33|import androidx.navigation3.runtime.NavBackStack\n 34|import androidx.navigation3.runtime.NavKey\n 35|import cafe.adriel.lyricist.strings\n 36|import com.timilehinaregbesola.mathalarm.domain.model.Alarm\n 37|import com.timilehinaregbesola.mathalarm.framework.database.AlarmMapper\n 38|import com.timilehinaregbesola.mathalarm.platform.requestExactAlarmPermission\n 39|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.AlarmListEvent.OnAddAlarmClick\n 40|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.AlarmListEvent.OnClearAlarmsClick\n 41|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.AlarmListEvent.OnClearEmptyAlarmsClick\n 42|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.AlarmListEvent.OnDeleteAlarmClick\n 43|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.AlarmListEvent.OnEditAlarmClick\n 44|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.AlarmListEvent.OnUndoDeleteClick\n 45|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.AlarmListViewModel\n 46|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.components.AlarmListScreen.LIST_ALARM_BACKGROUND_ALPHA\n 47|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.components.AlarmListScreen.LOADER_SIZE\n 48|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.components.AlarmListScreen.LOADING_SHIMMER_IMAGE_HEIGHT\n 49|import com.timilehinaregbesola.mathalarm.presentation.ui.MathAlarmTheme\n 50|import com.timilehinaregbesola.mathalarm.utils.Destinations.AppSettings\n 51|import com.timilehinaregbesola.mathalarm.utils.Destinations.SettingsSheet\n 52|import com.timilehinaregbesola.mathalarm.utils.UiEvent.Navigate\n 53|import com.timilehinaregbesola.mathalarm.utils.UiEvent.ShowSnackbar\n 54|import com.timilehinaregbesola.mathalarm.utils.getTimeLeft\n 55|import kotlinx.serialization.json.Json\n 56|import mathalarm.app.generated.resources.Res\n 57|import mathalarm.app.generated.resources.fab_icon\n 58|import org.jetbrains.compose.resources.painterResource\n 59|import androidx.compose.ui.tooling.preview.Preview\n 60|import org.koin.compose.viewmodel.koinViewModel\n 61|\n 62|@ExperimentalAnimationApi\n 63|@ExperimentalFoundationApi\n 64|@ExperimentalMaterial3Api\n 65|@Composable\n 66|fun ListDisplayScreen(\n 67|    viewModel: AlarmListViewModel \u003d koinViewModel(),\n 68|    backstack: NavBackStack\u003cNavKey\u003e,\n 69|    darkTheme: Boolean,\n 70|) {\n 71|    val alarms by viewModel.alarms.collectAsState(null)\n 72|    val alarmPermission \u003d viewModel.permission\n 73|    var deleteAllAlarmsDialog by remember { mutableStateOf(false) }\n 74|    val snackbarHoststate \u003d remember {\n 75|        SnackbarHostState()\n 76|    }\n 77|    var showPermissionDialog by remember { mutableStateOf(false) }\n 78|    var isLoading by remember { mutableStateOf(false) }\n 79|\n 80|    LaunchedEffect(key1 \u003d true) {\n 81|        viewModel.uiEvent.collect { event -\u003e\n 82|            when (event) {\n 83|                is ShowSnackbar -\u003e {\n 84|                    val result \u003d snackbarHoststate.showSnackbar(\n 85|                        message \u003d event.message,\n 86|                        actionLabel \u003d event.action,\n 87|                        withDismissAction \u003d true,\n 88|                        duration \u003d SnackbarDuration.Short\n 89|                    )\n 90|                    if (result \u003d\u003d ActionPerformed) {\n 91|                        viewModel.onEvent(OnUndoDeleteClick)\n 92|                    }\n 93|                }\n 94|\n 95|                is Navigate -\u003e {\n 96|                    val alarmJson \u003d Json.encodeToString(AlarmMapper().mapFromDomainModel(event.alarm))\n 97|                    backstack.add(SettingsSheet(alarmJson))\n 98|                    isLoading \u003d false\n 99|                }\n100|\n101|                else -\u003e Unit\n102|            }\n103|        }\n104|    }\n105|\n106|    if (alarms \u003d\u003d null) {\n107|        ListLoadingShimmer(imageHeight \u003d LOADING_SHIMMER_IMAGE_HEIGHT, isDark \u003d darkTheme)\n108|    }\n109|    alarms?.let { alarmList -\u003e\n110|        Scaffold(\n111|            topBar \u003d {\n112|                ListTopAppBar(\n113|                    openDialog \u003d {\n114|                        if (alarmList.isNotEmpty()) {\n115|                            deleteAllAlarmsDialog \u003d true\n116|                        } else {\n117|                            viewModel.onEvent(OnClearEmptyAlarmsClick)\n118|                        }\n119|                    },\n120|                    onSettingsClick \u003d {\n121|                        backstack.add(AppSettings)\n122|                    },\n123|                )\n124|            },\n125|            snackbarHost \u003d { AlarmSnack(state \u003d snackbarHoststate) },\n126|        ) { padding -\u003e\n127|            AlarmPermissionDialog(\n128|                isDialogOpen \u003d showPermissionDialog,\n129|                onCloseDialog \u003d { showPermissionDialog \u003d false },\n130|            )\n131|            ClearDialog(\n132|                openDialog \u003d deleteAllAlarmsDialog,\n133|                onClear \u003d { viewModel.onEvent(OnClearAlarmsClick) },\n134|                onCloseDialog \u003d { deleteAllAlarmsDialog \u003d false },\n135|            )\n136|            if (alarmList.isEmpty()) {\n137|                AlarmEmptyScreen(\n138|                    modifier \u003d Modifier.padding(padding),\n139|                    onClickFab \u003d {\n140|                        viewModel.onEvent(OnAddAlarmClick)\n141|                    },\n142|                    darkTheme \u003d darkTheme,\n143|                )\n144|            } else {\n145|                Box(\n146|                    modifier \u003d Modifier\n147|                        .safeContentPadding()\n148|                        .fillMaxSize()\n149|                        .background(\n150|                            color \u003d LightGray.copy(alpha \u003d LIST_ALARM_BACKGROUND_ALPHA),\n151|                        ),\n152|                    contentAlignment \u003d TopStart,\n153|                ) {\n154|                    val alarmSetText \u003d strings.alarmSet\n155|                    AlarmListContent(\n156|                        alarmList \u003d alarmList,\n157|                        darkTheme \u003d darkTheme,\n158|                        onEditAlarm \u003d {\n159|                            isLoading \u003d true\n160|                            checkPermissionAndPerformAction(\n161|                                value \u003d alarmPermission.hasExactAlarmPermission(),\n162|                                action \u003d { viewModel.onEvent(OnEditAlarmClick(it)) },\n163|                                onPermissionAbsent \u003d { showPermissionDialog \u003d true },\n164|                            )\n165|                        },\n166|                        onUpdateAlarm \u003d {\n167|                            checkPermissionAndPerformAction(\n168|                                value \u003d alarmPermission.hasExactAlarmPermission(),\n169|                                action \u003d { viewModel.onUpdate(it) },\n170|                                onPermissionAbsent \u003d { showPermissionDialog \u003d true },\n171|                            )\n172|                        },\n173|                        onDeleteAlarm \u003d {\n174|                            viewModel.onEvent(OnDeleteAlarmClick(it))\n175|                        },\n176|                        onCancelAlarm \u003d viewModel::cancelAlarm,\n177|                        onScheduleAlarm \u003d { curAlarm: Alarm, b: Boolean -\u003e\n178|                            checkPermissionAndPerformAction(\n179|                                value \u003d alarmPermission.hasExactAlarmPermission(),\n180|                                action \u003d {\n181|                                    viewModel.scheduleAlarm(\n182|                                        alarm \u003d curAlarm,\n183|                                        reschedule \u003d b,\n184|                                        message \u003d \&quot;$alarmSetText ${curAlarm.getTimeLeft()}\&quot;,\n185|                                    )\n186|                                },\n187|                                onPermissionAbsent \u003d { showPermissionDialog \u003d true },\n188|                            )\n189|                        }\n190|                    )\n191|                    val fabImage \u003d painterResource(Res.drawable.fab_icon)\n192|                    AddAlarmFab(\n193|                        modifier \u003d Modifier.align(BottomEnd),\n194|                        fabImage \u003d fabImage,\n195|                        onClick \u003d {\n196|                            isLoading \u003d true\n197|                            checkPermissionAndPerformAction(\n198|                                value \u003d alarmPermission.hasExactAlarmPermission(),\n199|                                action \u003d { viewModel.onEvent(OnAddAlarmClick) },\n200|                                onPermissionAbsent \u003d { showPermissionDialog \u003d true },\n201|                            )\n202|                        },\n203|                    )\n204|                    if (isLoading) {\n205|                        Loader(\n206|                            modifier \u003d Modifier\n207|                                .size(LOADER_SIZE)\n208|                                .align(Center),\n209|                        )\n210|                    }\n211|                }\n212|            }\n213|        }\n214|    }\n215|}\n216|\n217|@OptIn(\n218|    ExperimentalFoundationApi::class,\n219|    ExperimentalAnimationApi::class,\n220|    ExperimentalMaterial3Api::class,\n221|)\n222|@Composable\n223|private fun AlarmListContent(\n224|    alarmList: List\u003cAlarm\u003e,\n225|    darkTheme: Boolean,\n226|    onEditAlarm: (Alarm) -\u003e Unit,\n227|    onUpdateAlarm: (Alarm) -\u003e Unit,\n228|    onDeleteAlarm: (Alarm) -\u003e Unit,\n229|    onCancelAlarm: (Alarm) -\u003e Unit,\n230|    onScheduleAlarm: (Alarm, Boolean) -\u003e Unit,\n231|) {\n232|    Surface(\n233|        modifier \u003d Modifier\n234|            .fillMaxSize(),\n235|    ) {\n236|        LazyColumn(\n237|            horizontalAlignment \u003d CenterHorizontally,\n238|        ) {\n239|            stickyHeader(\n240|                key \u003d \&quot;sticky_header\&quot;\n241|            ) {\n242|                ListHeader(\n243|                    enabled \u003d alarmList.any { it.isOn },\n244|                    alarmList \u003d alarmList,\n245|                    isDark \u003d darkTheme\n246|                )\n247|            }\n248|            items(\n249|                items \u003d alarmList,\n250|                key \u003d { alarm -\u003e alarm.alarmId },\n251|            ) { alarm -\u003e\n252|                AlarmItem(\n253|                    alarm \u003d alarm,\n254|                    onEditAlarm \u003d {\n255|                        onEditAlarm(alarm)\n256|                    },\n257|                    onUpdateAlarm \u003d onUpdateAlarm,\n258|                    onDeleteAlarm \u003d onDeleteAlarm,\n259|                    onCancelAlarm \u003d onCancelAlarm,\n260|                    onScheduleAlarm \u003d onScheduleAlarm,\n261|                    darkTheme \u003d darkTheme,\n262|                )\n263|            }\n264|        }\n265|    }\n266|}\n267|\n268|private fun checkPermissionAndPerformAction(\n269|    value: Boolean,\n270|    action: () -\u003e Unit,\n271|    onPermissionAbsent: () -\u003e Unit\n272|) {\n273|    if (value) {\n274|        action()\n275|    } else {\n276|        onPermissionAbsent()\n277|    }\n278|}\n279|\n280|@Composable\n281|private fun AlarmPermissionDialog(\n282|    isDialogOpen: Boolean,\n283|    onCloseDialog: () -\u003e Unit,\n284|) {\n285|    val arguments \u003d DialogArguments(\n286|        title \u003d strings.alarms,\n287|        text \u003d strings.taskAlarmPermissionDialogText,\n288|        confirmText \u003d strings.taskAlarmPermissionDialogConfirm,\n289|        dismissText \u003d strings.taskAlarmPermissionDialogCancel,\n290|        onConfirmAction \u003d {\n291|            requestExactAlarmPermission()\n292|            onCloseDialog()\n293|        },\n294|    )\n295|    MathAlarmDialog(\n296|        arguments \u003d arguments,\n297|        isDialogOpen \u003d isDialogOpen,\n298|        onDismissRequest \u003d onCloseDialog,\n299|    )\n300|}\n301|\n302|@Preview\n303|@Composable\n304|private fun AlarmListScreenPreview() {\n305|    MathAlarmTheme {\n306|        AlarmListContent(\n307|            alarmList \u003d listOf(Alarm(), Alarm(alarmId \u003d 1L)),\n308|            darkTheme \u003d false,\n309|            onEditAlarm \u003d {},\n310|            onUpdateAlarm \u003d {},\n311|            onDeleteAlarm \u003d {},\n312|            onCancelAlarm \u003d {}\n313|        ) { _, _ -\u003e }\n314|    }\n315|}\n316|\n317|private object AlarmListScreen {\n318|    const val LIST_ALARM_BACKGROUND_ALPHA \u003d 0.1f\n319|    val LOADING_SHIMMER_IMAGE_HEIGHT \u003d 180.dp\n320|    val LOADER_SIZE \u003d 50.dp\n321|}\n322|&quot;},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;read&quot;,&quot;tool_call_id&quot;:&quot;toolu_019LL4a4LdEmUzZc5YnneCfW&quot;,&quot;content&quot;:&quot;  1|package com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components\n  2|\n  3|import androidx.compose.foundation.clickable\n  4|import androidx.compose.foundation.gestures.Orientation.Vertical\n  5|import androidx.compose.foundation.gestures.scrollable\n  6|import androidx.compose.foundation.layout.Arrangement\n  7|import androidx.compose.foundation.layout.Arrangement.SpaceBetween\n  8|import androidx.compose.foundation.layout.Box\n  9|import androidx.compose.foundation.layout.Column\n 10|import androidx.compose.foundation.layout.Row\n 11|import androidx.compose.foundation.layout.Spacer\n 12|import androidx.compose.foundation.layout.fillMaxSize\n 13|import androidx.compose.foundation.layout.fillMaxWidth\n 14|import androidx.compose.foundation.layout.height\n 15|import androidx.compose.foundation.layout.padding\n 16|import androidx.compose.foundation.rememberScrollState\n 17|import androidx.compose.foundation.shape.CornerSize\n 18|import androidx.compose.material3.Button\n 19|import androidx.compose.material3.ButtonDefaults.buttonColors\n 20|import androidx.compose.material3.Card\n 21|import androidx.compose.material3.CardDefaults\n 22|import androidx.compose.material3.ExperimentalMaterial3Api\n 23|import androidx.compose.material3.HorizontalDivider\n 24|import androidx.compose.material3.Icon\n 25|import androidx.compose.material3.MaterialTheme\n 26|import androidx.compose.material3.Surface\n 27|import androidx.compose.material3.Text\n 28|import androidx.compose.material3.rememberBottomSheetScaffoldState\n 29|import androidx.compose.material3.rememberTimePickerState\n 30|import androidx.compose.runtime.Composable\n 31|import androidx.compose.runtime.LaunchedEffect\n 32|import androidx.compose.runtime.getValue\n 33|import androidx.compose.runtime.mutableStateOf\n 34|import androidx.compose.runtime.remember\n 35|import androidx.compose.runtime.setValue\n 36|import androidx.compose.ui.Alignment.Companion.CenterVertically\n 37|import androidx.compose.ui.Modifier\n 38|import androidx.compose.ui.graphics.Color.Companion.Black\n 39|import androidx.compose.ui.text.font.FontWeight.Companion.Bold\n 40|import androidx.compose.ui.text.input.TextFieldValue\n 41|import androidx.compose.ui.text.style.TextAlign.Companion.Center\n 42|import androidx.compose.ui.unit.dp\n 43|import androidx.compose.ui.unit.sp\n 44|import androidx.navigation3.runtime.NavBackStack\n 45|import androidx.navigation3.runtime.NavKey\n 46|import cafe.adriel.lyricist.strings\n 47|import co.touchlab.kermit.Logger\n 48|import com.timilehinaregbesola.mathalarm.framework.database.AlarmEntity\n 49|import com.timilehinaregbesola.mathalarm.framework.database.AlarmMapper\n 50|import com.timilehinaregbesola.mathalarm.platform.areNotificationsEnabled\n 51|import com.timilehinaregbesola.mathalarm.platform.checkRingtonePermissions\n 52|import com.timilehinaregbesola.mathalarm.platform.getRingtoneTitle\n 53|import com.timilehinaregbesola.mathalarm.platform.openNotificationSettings\n 54|import com.timilehinaregbesola.mathalarm.platform.rememberNotificationPermissionHandler\n 55|import com.timilehinaregbesola.mathalarm.platform.rememberRingtonePickerLauncher\n 56|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.components.DialogArguments\n 57|import com.timilehinaregbesola.mathalarm.presentation.alarmlist.components.MathAlarmDialog\n 58|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.AddEditAlarmEvent\n 59|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.AddEditAlarmEvent.EnteredTitle\n 60|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.AddEditAlarmEvent.OnDifficultyChange\n 61|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.AddEditAlarmEvent.OnSaveTodoClick\n 62|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.AddEditAlarmEvent.OnTestClick\n 63|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.AddEditAlarmEvent.OnToneChange\n 64|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.AddEditAlarmEvent.OnToneError\n 65|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.AddEditAlarmEvent.ToggleDayChooser\n 66|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.AddEditAlarmEvent.ToggleRepeat\n 67|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.AddEditAlarmEvent.ToggleVibrate\n 68|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.AlarmSettingsViewModel\n 69|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.TimeState\n 70|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.ALARM_DAYS_TOP_PADDING\n 71|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.DIFFICULTY_ICON_END_PADDING\n 72|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.DIFFICULTY_SECTION_HORIZONTAL_PADDING\n 73|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.DIFFICULTY_SECTION_TOP_PADDING\n 74|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.DIVIDER_THICKNESS\n 75|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.MIDDLE_CONTROL_SECTION_TOP_PADDING\n 76|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.NO_ELEVATION\n 77|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.SAVE_BUTTON_FONT_SIZE\n 78|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.SAVE_BUTTON_TOP_PADDING\n 79|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.TEST_BUTTON_FONT_SIZE\n 80|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.TIME_CARD_CORNER_SIZE\n 81|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.TIME_CARD_HEIGHT\n 82|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.TIME_TEXT_FONT_SIZE\n 83|import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components.AlarmBottomSheet.TIME_TEXT_PADDING\n 84|import com.timilehinaregbesola.mathalarm.presentation.ui.MathAlarmTheme\n 85|import com.timilehinaregbesola.mathalarm.presentation.ui.darkPrimaryLight\n 86|import com.timilehinaregbesola.mathalarm.presentation.ui.spacing\n 87|import com.timilehinaregbesola.mathalarm.presentation.ui.unSelectedDay\n 88|import com.timilehinaregbesola.mathalarm.utils.Destinations.AlarmMath\n 89|import kotlinx.coroutines.Dispatchers\n 90|import kotlinx.coroutines.flow.collectLatest\n 91|import kotlinx.coroutines.launch\n 92|import kotlinx.coroutines.withContext\n 93|import kotlinx.datetime.LocalTime\n 94|import kotlinx.datetime.format\n 95|import kotlinx.datetime.format.char\n 96|import kotlinx.serialization.json.Json\n 97|import androidx.compose.ui.tooling.preview.Preview\n 98|import com.timilehinaregbesola.mathalarm.presentation.ui.icon.EmojiSymbols\n 99|import com.timilehinaregbesola.mathalarm.presentation.ui.icon.Notifications\n100|import org.koin.compose.viewmodel.koinViewModel\n101|\n102|@OptIn(ExperimentalMaterial3Api::class)\n103|@Composable\n104|fun AlarmBottomSheet(\n105|    viewModel: AlarmSettingsViewModel \u003d koinViewModel(),\n106|    backstack: NavBackStack\u003cNavKey\u003e,\n107|    darkTheme: Boolean,\n108|    alarm: AlarmEntity,\n109|) {\n110|    LaunchedEffect(Unit) {\n111|        viewModel.setAlarm(AlarmMapper().mapToDomainModel(alarm))\n112|    }\n113|    val scaffoldState \u003d rememberBottomSheetScaffoldState()\n114|    var showTimePickerDialog by remember { mutableStateOf(false) }\n115|    var showConfirmationDialog by remember { mutableStateOf(false) }\n116|    var showPermRequiredDialog by remember { mutableStateOf(false) }\n117|\n118|    val toneText \u003d remember { mutableStateOf\u003cString?\u003e(null) }\n119|\n120|    // Capture string values for use in non-composable callbacks\n121|    val alertTitle \u003d strings.alert\n122|    val storagePermissionTextFn \u003d strings.permissionsExternalStorageText\n123|\n124|    // Use platform-abstracted ringtone picker\n125|    val pickToneLauncher \u003d rememberRingtonePickerLauncher { selectedTone -\u003e\n126|        selectedTone?.let { alert -\u003e\n127|            checkRingtonePermissions(\n128|                tones \u003d listOf(alert),\n129|                unplayableDialogTitle \u003d alertTitle,\n130|                unplayableDialogMessage \u003d storagePermissionTextFn,\n131|            )\n132|            viewModel.onEvent(OnToneChange(alert))\n133|            toneText.value \u003d getRingtoneTitle(alert)\n134|        }\n135|    }\n136|\n137|    // Use platform-abstracted notification permission handler\n138|    val requestNotificationPermission \u003d rememberNotificationPermissionHandler { granted -\u003e\n139|        if (granted) {\n140|            if (areNotificationsEnabled()) {\n141|                viewModel.onEvent(OnSaveTodoClick)\n142|            } else {\n143|                showConfirmationDialog \u003d true\n144|            }\n145|        } else {\n146|            showPermRequiredDialog \u003d true\n147|        }\n148|    }\n149|\n150|    LaunchedEffect(true) {\n151|        viewModel.eventFlow.collectLatest { event -\u003e\n152|            when (event) {\n153|                is AlarmSettingsViewModel.UiEvent.ShowSnackbar -\u003e {\n154|                    scaffoldState.snackbarHostState.showSnackbar(\n155|                        message \u003d event.message,\n156|                    )\n157|                }\n158|                is AlarmSettingsViewModel.UiEvent.SaveAlarm -\u003e {\n159|                    backstack.removeLastOrNull()\n160|                }\n161|                is AlarmSettingsViewModel.UiEvent.TestAlarm -\u003e {\n162|                    launch(Dispatchers.Default) {\n163|                        val alarmEntity \u003d AlarmMapper().mapFromDomainModel(event.alarm)\n164|                        val json \u003d Json.encodeToString(alarmEntity)\n165|                        withContext(Dispatchers.Main) {\n166|                            backstack.add(AlarmMath(alarmJson \u003d json, fromSheet \u003d true))\n167|                        }\n168|                    }\n169|                }\n170|            }\n171|        }\n172|    }\n173|    AlarmBottomSheetContent(\n174|        topSection \u003d {\n175|            TopSection(\n176|                selectedDays \u003d viewModel.dayChooser.value,\n177|                darkTheme \u003d darkTheme,\n178|                currentTime \u003d viewModel.alarmTime.value.formattedTime,\n179|                onTimeCardClick \u003d { showTimePickerDialog \u003d true },\n180|                onSelectedDaysChanged \u003d {\n181|                    viewModel.onEvent(ToggleDayChooser(it))\n182|                }\n183|            )\n184|        },\n185|        bottomSection \u003d {\n186|            val noPickerText \u003d strings.noRingtonePicker\n187|            val defaultToneText \u003d strings.defaultAlarmTone\n188|            BottomSettingsSection(\n189|                repeatWeekly \u003d viewModel.repeatWeekly.value,\n190|                vibrate \u003d viewModel.vibrate.value,\n191|                difficulty \u003d viewModel.difficulty.value,\n192|                onRepeatToggle \u003d {\n193|                    viewModel.onEvent(ToggleRepeat(it))\n194|                },\n195|                onVibrateToggle \u003d {\n196|                    viewModel.onEvent(ToggleVibrate(it))\n197|                },\n198|                onToneClick \u003d {\n199|                    try {\n200|                        pickToneLauncher.launch(viewModel.tone.value.ifEmpty { null })\n201|                    } catch (e: Exception) {\n202|                        Logger.e(\&quot;error launching tone picker\&quot;, e)\n203|                        viewModel.onEvent(\n204|                            OnToneError(message \u003d noPickerText)\n205|                        )\n206|                    }\n207|                },\n208|                onDifficultyChange \u003d {\n209|                    viewModel.onEvent(OnDifficultyChange(it))\n210|                },\n211|                labelTextField \u003d {\n212|                    LabelTextField(\n213|                        text \u003d viewModel.alarmTitle.value,\n214|                        onValueChange \u003d { newValue -\u003e\n215|                            viewModel.onEvent(EnteredTitle(newValue))\n216|                        },\n217|                        label \u003d { Text(strings.alarmTitle) },\n218|                        placeholder \u003d { Text(strings.goodDay) },\n219|                    )\n220|                },\n221|                currentTone \u003d when {\n222|                    toneText.value !\u003d null -\u003e {\n223|                        toneText.value!!\n224|                    }\n225|\n226|                    viewModel.tone.value \u003d\u003d \&quot;\&quot; -\u003e {\n227|                        defaultToneText\n228|                    }\n229|\n230|                    else -\u003e {\n231|                        getRingtoneTitle(viewModel.tone.value)\n232|                    }\n233|                }\n234|            )\n235|        },\n236|        buttonSection \u003d {\n237|            SheetActionButtons(\n238|                onTestClick \u003d {\n239|                    viewModel.onEvent(OnTestClick)\n240|                },\n241|                onSaveClick \u003d {\n242|                    requestNotificationPermission()\n243|                }\n244|            )\n245|        },\n246|        dialogSection \u003d {\n247|            with(viewModel.alarmTime.value) {\n248|                if (showTimePickerDialog) {\n249|                    TimePickerDialog(\n250|                        timeState \u003d rememberTimePickerState(\n251|                            initialHour \u003d hour,\n252|                            initialMinute \u003d minute\n253|                        ),\n254|                        darkTheme \u003d darkTheme,\n255|                        onCancel \u003d {\n256|                            showTimePickerDialog \u003d false\n257|                        },\n258|                        onConfirm \u003d { newTime -\u003e\n259|                            val tf \u003d LocalTime.Format {\n260|                                amPmHour()\n261|                                char(\u0027:\u0027)\n262|                                minute()\n263|                                char(\u0027 \u0027)\n264|                                amPmMarker(\&quot;AM\&quot;, \&quot;PM\&quot;)\n265|                            }\n266|                            viewModel.onEvent(\n267|                                AddEditAlarmEvent.ChangeTime(\n268|                                    TimeState(\n269|                                        hour \u003d newTime.hour,\n270|                                        minute \u003d newTime.minute,\n271|                                        formattedTime \u003d newTime.format(tf)\n272|                                    ),\n273|                                ),\n274|                            )\n275|                            showTimePickerDialog \u003d false\n276|                        }\n277|                    )\n278|                }\n279|            }\n280|            MathAlarmDialog(\n281|                arguments \u003d DialogArguments(\n282|                    title \u003d strings.alert,\n283|                    text \u003d strings.disabledNotificationMessageExtended,\n284|                    confirmText \u003d strings.ok,\n285|                    dismissText \u003d null,\n286|                    onConfirmAction \u003d {\n287|                        viewModel.onEvent(OnSaveTodoClick)\n288|                        showConfirmationDialog \u003d false\n289|                    }\n290|                ),\n291|                isDialogOpen \u003d showConfirmationDialog,\n292|                onDismissRequest \u003d { showConfirmationDialog \u003d false }\n293|            )\n294|            MathAlarmDialog(\n295|                arguments \u003d DialogArguments(\n296|                    title \u003d strings.alert,\n297|                    text \u003d strings.notificationPermissionDialogMessage,\n298|                    confirmText \u003d strings.grantPermission,\n299|                    dismissText \u003d strings.cancel,\n300|                    onConfirmAction \u003d {\n301|                        openNotificationSettings()\n302|                        showPermRequiredDialog \u003d false\n303|                    }\n304|                ),\n305|                isDialogOpen \u003d showPermRequiredDialog,\n306|                onDismissRequest \u003d { showPermRequiredDialog \u003d false }\n307|            )\n308|        }\n309|    )\n310|}\n311|\n312|@Composable\n313|private fun AlarmBottomSheetContent(\n314|    topSection: @Composable () -\u003e Unit,\n315|    bottomSection: @Composable () -\u003e Unit,\n316|    buttonSection: @Composable () -\u003e Unit,\n317|    dialogSection: @Composable () -\u003e Unit\n318|) {\n319|    with(MaterialTheme) {\n320|        Surface {\n321|            Box {\n322|                Column(\n323|                    Modifier\n324|                        .fillMaxWidth()\n325|                        .padding(spacing.extraMedium)\n326|                        .scrollable(rememberScrollState(), Vertical),\n327|                ) {\n328|                    topSection()\n329|                    HorizontalDivider(\n330|                        modifier \u003d Modifier.padding(\n331|                            top \u003d spacing.medium,\n332|                            start \u003d spacing.medium,\n333|                            end \u003d spacing.medium,\n334|                        ),\n335|                        thickness \u003d DIVIDER_THICKNESS,\n336|                        color \u003d unSelectedDay\n337|                    )\n338|                    bottomSection()\n339|                    buttonSection()\n340|                }\n341|                dialogSection()\n342|            }\n343|        }\n344|    }\n345|}\n346|\n347|@Composable\n348|fun TopSection(\n349|    selectedDays: String,\n350|    currentTime: String,\n351|    darkTheme: Boolean,\n352|    onTimeCardClick: () -\u003e Unit,\n353|    onSelectedDaysChanged: (String) -\u003e Unit\n354|) {\n355|    Card(\n356|        modifier \u003d Modifier\n357|            .fillMaxWidth()\n358|            .height(TIME_CARD_HEIGHT)\n359|            .padding(horizontal \u003d MaterialTheme.spacing.medium),\n360|        colors \u003d CardDefaults.cardColors(\n361|            containerColor \u003d if (darkTheme) darkPrimaryLight else unSelectedDay\n362|        ),\n363|        elevation \u003d CardDefaults.cardElevation(defaultElevation \u003d NO_ELEVATION),\n364|        shape \u003d MaterialTheme.shapes.medium.copy(CornerSize(TIME_CARD_CORNER_SIZE)),\n365|    ) {\n366|        Row(\n367|            modifier \u003d Modifier\n368|                .fillMaxSize()\n369|                .clickable(\n370|                    onClick \u003d { onTimeCardClick() }\n371|                ),\n372|            verticalAlignment \u003d CenterVertically,\n373|            horizontalArrangement \u003d Arrangement.Center,\n374|        ) {\n375|            Text(\n376|                modifier \u003d Modifier\n377|                    .fillMaxWidth()\n378|                    .padding(TIME_TEXT_PADDING),\n379|                text \u003d currentTime,\n380|                fontSize \u003d TIME_TEXT_FONT_SIZE,\n381|                fontWeight \u003d Bold,\n382|                textAlign \u003d Center,\n383|            )\n384|        }\n385|    }\n386|    Spacer(modifier \u003d Modifier.height(ALARM_DAYS_TOP_PADDING))\n387|    AlarmDays(currentDays \u003d selectedDays) {\n388|        onSelectedDaysChanged(it)\n389|    }\n390|}\n391|\n392|@Composable\n393|private fun BottomSettingsSection(\n394|    repeatWeekly: Boolean,\n395|    vibrate: Boolean,\n396|    difficulty: Int,\n397|    onRepeatToggle: (Boolean) -\u003e Unit,\n398|    onVibrateToggle: (Boolean) -\u003e Unit,\n399|    onToneClick: () -\u003e Unit,\n400|    onDifficultyChange: (Int) -\u003e Unit,\n401|    labelTextField: @Composable () -\u003e Unit,\n402|    currentTone: String\n403|) {\n404|    Row(\n405|        modifier \u003d Modifier\n406|            .padding(\n407|                top \u003d MIDDLE_CONTROL_SECTION_TOP_PADDING,\n408|                start \u003d MaterialTheme.spacing.medium,\n409|                end \u003d MaterialTheme.spacing.medium,\n410|            )\n411|            .fillMaxWidth(),\n412|        horizontalArrangement \u003d SpaceBetween,\n413|    ) {\n414|        TextWithCheckbox(\n415|            text \u003d strings.repeatWeekly,\n416|            initialState \u003d repeatWeekly,\n417|        ) {\n418|            onRepeatToggle(it)\n419|        }\n420|        TextWithCheckbox(text \u003d strings.vibrate, initialState \u003d vibrate) {\n421|            onVibrateToggle(it)\n422|        }\n423|    }\n424|    labelTextField()\n425|    TextWithIcon(\n426|        modifier \u003d Modifier.padding(horizontal \u003d MaterialTheme.spacing.medium),\n427|        text \u003d currentTone,\n428|        image \u003d Notifications,\n429|        onClick \u003d {\n430|            onToneClick()\n431|        },\n432|    )\n433|    Row(\n434|        modifier \u003d Modifier\n435|            .padding(\n436|                top \u003d DIFFICULTY_SECTION_TOP_PADDING,\n437|                start \u003d DIFFICULTY_SECTION_HORIZONTAL_PADDING,\n438|                end \u003d DIFFICULTY_SECTION_HORIZONTAL_PADDING,\n439|            )\n440|            .fillMaxWidth(),\n441|    ) {\n442|        Icon(\n443|            modifier \u003d Modifier.padding(end \u003d DIFFICULTY_ICON_END_PADDING),\n444|            imageVector \u003d EmojiSymbols,\n445|            contentDescription \u003d null,\n446|        )\n447|        DifficultyChooser(difficulty) {\n448|            onDifficultyChange(it)\n449|        }\n450|    }\n451|}\n452|\n453|@Composable\n454|private fun SheetActionButtons(\n455|    onTestClick: () -\u003e Unit,\n456|    onSaveClick: () -\u003e Unit\n457|) {\n458|    Button(\n459|        modifier \u003d Modifier\n460|            .padding(top \u003d MaterialTheme.spacing.large)\n461|            .fillMaxWidth(),\n462|        onClick \u003d onTestClick,\n463|        colors \u003d buttonColors(\n464|            containerColor \u003d unSelectedDay,\n465|            contentColor \u003d Black,\n466|        ),\n467|    ) {\n468|        Text(\n469|            fontSize \u003d TEST_BUTTON_FONT_SIZE,\n470|            text \u003d strings.testAlarm.uppercase(),\n471|        )\n472|    }\n473|    Button(\n474|        modifier \u003d Modifier\n475|            .padding(top \u003d SAVE_BUTTON_TOP_PADDING)\n476|            .fillMaxWidth(),\n477|        onClick \u003d onSaveClick,\n478|        colors \u003d buttonColors(containerColor \u003d MaterialTheme.colorScheme.secondary),\n479|    ) {\n480|        Text(\n481|            fontSize \u003d SAVE_BUTTON_FONT_SIZE,\n482|            text \u003d strings.save.uppercase(),\n483|        )\n484|    }\n485|}\n486|\n487|@Preview\n488|@Composable\n489|private fun BottomSheetPreview() {\n490|    MathAlarmTheme(darkTheme \u003d true) {\n491|        Surface {\n492|            AlarmBottomSheetContent(\n493|                topSection \u003d {\n494|                    TopSection(\n495|                        selectedDays \u003d \&quot;TFFFFFF\&quot;,\n496|                        currentTime \u003d \&quot;12:00\&quot;,\n497|                        darkTheme \u003d true,\n498|                        onTimeCardClick \u003d {}\n499|                    ) {}\n500|                },\n501|                bottomSection \u003d {\n502|                    BottomSettingsSection(\n503|                        repeatWeekly \u003d true,\n504|                        vibrate \u003d true,\n505|                        difficulty \u003d 1,\n506|                        onRepeatToggle \u003d {},\n507|                        onVibrateToggle \u003d {},\n508|                        onToneClick \u003d {},\n509|                        onDifficultyChange \u003d {},\n510|                        labelTextField \u003d {\n511|                            LabelTextField(\n512|                                text \u003d TextFieldValue(),\n513|                            ) {}\n514|                        },\n515|                        currentTone \u003d \&quot;1000\&quot;,\n516|                    )\n517|                },\n518|                buttonSection \u003d {\n519|                    SheetActionButtons(\n520|                        onTestClick \u003d {},\n521|                        onSaveClick \u003d {}\n522|                    )\n523|                }) {}\n524|        }\n525|    }\n526|}\n527|\n528|private object AlarmBottomSheet {\n529|    const val FROM_SHEET_KEY \u003d \&quot;fromSheet\&quot;\n530|    const val URL_ENCODER \u003d \&quot;utf-8\&quot;\n531|    const val TIME_PATTERN \u003d \&quot;hh:mm a\&quot;\n532|    val TIME_CARD_HEIGHT \u003d 150.dp\n533|    val NO_ELEVATION \u003d 0.dp\n534|    val TIME_CARD_CORNER_SIZE \u003d 24.dp\n535|    val TIME_TEXT_PADDING \u003d 30.dp\n536|    val TIME_TEXT_FONT_SIZE \u003d 50.sp\n537|    val ALARM_DAYS_TOP_PADDING \u003d 12.dp\n538|    val DIVIDER_THICKNESS \u003d 10.dp\n539|    val MIDDLE_CONTROL_SECTION_TOP_PADDING \u003d 28.dp\n540|    val DIFFICULTY_SECTION_TOP_PADDING \u003d 30.dp\n541|    val DIFFICULTY_SECTION_HORIZONTAL_PADDING \u003d 26.dp\n542|    val DIFFICULTY_ICON_END_PADDING \u003d 14.dp\n543|    val TEST_BUTTON_FONT_SIZE \u003d 14.sp\n544|    val SAVE_BUTTON_FONT_SIZE \u003d 14.sp\n545|    val SAVE_BUTTON_TOP_PADDING \u003d 12.dp\n546|}\n547|&quot;},{&quot;role&quot;:&quot;assistant&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;thinking&quot;,&quot;thinking&quot;:&quot;I found another instance in `AlarmBottomSheet.kt` at line 159 where `backstack.removeLastOrNull()` is called when saving the alarm. I need to fix this one as well.&quot;,&quot;signature&quot;:&quot;EswCCkYICxgCKkCzpoki74eHW+OCZ2WkzhDtieKTa2nf47UZXUbggM5zzNQP/GHvvBz35xOnhToCG4RgL0GBxzDi+U4jrSSaAfuEEgzJdM6ptO2HNR16znQaDP93A9+BByqUxiKZqSIwdDeruUd0/HGLjq96bf3IU/6QrqrPIjv+c0H4cFWRW6rqRU2pP+Ral1SRuoUoMoEnKrMBhq/cAXEAJRF+Qah365KMww5IXtQd8oUyKd9vpii5PGNOiMY6QcKf2mclO7zG/oT3eMNGtJfe7ePMrEz3XI/TH9Wj6IZi04Mq3g81kEwl+BSNmW2WAxXu3+BGjTrt1VSiqWJmdWW4561b5bws6sDvRdfi9AkGyLoNP4IaTU2IJ+RcmKaWfp2cc/C2WGXFAtQXBa+f+VI2O/O+Bu8NyTKXx7ZF/ynay4BLCuQzRoyM6mlxiPkYAQ\u003d\u003d&quot;},{&quot;type&quot;:&quot;text&quot;,&quot;text&quot;:&quot;Found another instance in `AlarmBottomSheet.kt`. Let me fix that too:&quot;}],&quot;tool_calls&quot;:[{&quot;id&quot;:&quot;toolu_01VeTXybtFYAtwJ9gg7sdUfH&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;edit&quot;,&quot;arguments&quot;:&quot;{\&quot;file_path\&quot;: \&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/components/AlarmBottomSheet.kt\&quot;, \&quot;old_string\&quot;: \&quot;                is AlarmSettingsViewModel.UiEvent.SaveAlarm -\u003e {\\n                    backstack.removeLastOrNull()\\n                }\&quot;, \&quot;new_string\&quot;: \&quot;                is AlarmSettingsViewModel.UiEvent.SaveAlarm -\u003e {\\n                    if (backstack.size \u003e 1) backstack.removeLastOrNull()\\n                }\&quot;}&quot;}}]},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;edit&quot;,&quot;tool_call_id&quot;:&quot;toolu_01VeTXybtFYAtwJ9gg7sdUfH&quot;,&quot;content&quot;:&quot;The file /Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/components/AlarmBottomSheet.kt has been updated.\n\nWhen you\u0027re done with your current set of changes to this file, you should call the read_lints tool with the specific file path and fix any newly introduced errors.&quot;},{&quot;role&quot;:&quot;assistant&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;thinking&quot;,&quot;thinking&quot;:&quot;Let me now check for any lint errors in the files I modified to make sure the changes are valid.&quot;,&quot;signature&quot;:&quot;EogCCkYICxgCKkA0u4ZSjLCDXZWM3zFrbpi5JE3/0Ozz30P6SX4odgnDQWmnLOTZSk+YrDkskD3dkpVrhkf+ENOfb41WmSFEDU85EgxQpQYmgVRm1TJZvR0aDMFdG3wP5xB17M4VHSIw+XJdmJwLZbvuwl0CuDYCez7CswcwbJgyt8wSjW2gvFw7tQTsEpXYGeYDVjSjEkDdKnAln9o+Ps7O664djR4dC095uLu91ZBzB2aPY93oiY1wM6aRXeZGLF2FTQRvl0MuNcqj1ZMTNz20SDaBKQQ/2SShOXnUlfYD3qBMasJXZxEoUQP1/blqDJznaA1Sn8aJo5KxtUumpWNaNo9hDS2a1QZtGAE\u003d&quot;}],&quot;tool_calls&quot;:[{&quot;id&quot;:&quot;toolu_01SZWdh6s2pvkP6k1ahy6p3s&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;read_lints&quot;,&quot;arguments&quot;:&quot;{\&quot;paths\&quot;: [\&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt\&quot;,\&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt\&quot;,\&quot;/Users/timilehin/AndroidStudioProjects/MathAlarm/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/components/AlarmBottomSheet.kt\&quot;]}&quot;}}]},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;read_lints&quot;,&quot;tool_call_id&quot;:&quot;toolu_01SZWdh6s2pvkP6k1ahy6p3s&quot;,&quot;content&quot;:&quot;\u003clinter_errors\u003e\n## Linter Errors\n\nPath: app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt\nErrors:\n\nLine 3: Unresolved reference \u0027androidx\u0027.\nLine 4: Unresolved reference \u0027androidx\u0027.\nLine 5: Unresolved reference \u0027androidx\u0027.\nLine 6: Unresolved reference \u0027androidx\u0027.\nLine 7: Unresolved reference \u0027androidx\u0027.\nLine 8: Unresolved reference \u0027androidx\u0027.\nLine 9: Unresolved reference \u0027androidx\u0027.\nLine 10: Unresolved reference \u0027androidx\u0027.\nLine 11: Unresolved reference \u0027androidx\u0027.\nLine 12: Unresolved reference \u0027androidx\u0027.\nLine 13: Unresolved reference \u0027androidx\u0027.\nLine 14: Unresolved reference \u0027androidx\u0027.\nLine 15: Unresolved reference \u0027androidx\u0027.\nLine 16: Unresolved reference \u0027androidx\u0027.\nLine 17: Unresolved reference \u0027androidx\u0027.\nLine 18: Unresolved reference \u0027androidx\u0027.\nLine 19: Unresolved reference \u0027androidx\u0027.\nLine 20: Unresolved reference \u0027androidx\u0027.\nLine 21: Unresolved reference \u0027androidx\u0027.\nLine 22: Unresolved reference \u0027androidx\u0027.\nLine 23: Unresolved reference \u0027androidx\u0027.\nLine 36: Unresolved reference \u0027kotlinx\u0027.\nLine 37: Unresolved reference \u0027kotlinx\u0027.\nLine 38: Unresolved reference \u0027kotlinx\u0027.\nLine 39: Unresolved reference \u0027kotlinx\u0027.\nLine 41: Unresolved reference \u0027ExperimentalAnimationApi\u0027.\nLine 42: Unresolved reference \u0027InternalCoroutinesApi\u0027.\nLine 43: Unresolved reference \u0027ExperimentalComposeUiApi\u0027.\nLine 44: Unresolved reference \u0027ExperimentalMaterial3Api\u0027.\nLine 45: Unresolved reference \u0027ExperimentalFoundationApi\u0027.\nLine 46: Unresolved reference \u0027Composable\u0027.\nLine 51: Unresolved reference \u0027SavedStateConfiguration\u0027.\nLine 52: Unresolved reference \u0027serializersModule\u0027.\nLine 52: Unresolved reference \u0027SerializersModule\u0027.\nLine 53: Unresolved reference \u0027polymorphic\u0027.\nLine 53: Unresolved reference \u0027NavKey\u0027.\nLine 54: Unresolved reference \u0027subclass\u0027.\nLine 54: Unresolved reference \u0027serializer\u0027.\nLine 55: Unresolved reference \u0027subclass\u0027.\nLine 55: Unresolved reference \u0027serializer\u0027.\nLine 56: Unresolved reference \u0027subclass\u0027.\nLine 56: Unresolved reference \u0027serializer\u0027.\nLine 57: Unresolved reference \u0027subclass\u0027.\nLine 57: Unresolved reference \u0027serializer\u0027.\nLine 61: Unresolved reference \u0027rememberNavBackStack\u0027.\nLine 62: Unresolved reference \u0027remember\u0027.\nLine 63: Unresolved reference \u0027NavKey\u0027.\nLine 67: Unresolved reference \u0027LaunchedEffect\u0027.\nLine 68: Unresolved reference \u0027println\u0027.\nLine 69: Unresolved reference \u0027let\u0027.\nLine 70: Unresolved reference \u0027println\u0027.\nLine 71: Unresolved reference \u0027it\u0027.\nLine 75: Unresolved reference \u0027NavDisplay\u0027.\nLine 76: Unresolved reference \u0027Modifier\u0027.\nLine 76: Unresolved reference \u0027MaterialTheme\u0027.\nLine 80: Unresolved reference \u0027listOf\u0027.\nLine 83: Unresolved reference \u0027rememberSaveableStateHolderNavEntryDecorator\u0027.\nLine 84: Unresolved reference \u0027rememberViewModelStoreNavEntryDecorator\u0027.\nLine 87: Unresolved reference \u0027slideInHorizontally\u0027.\nLine 88: Unresolved reference \u0027tween\u0027.\nLine 89: Unresolved reference \u0027it\u0027.\nLine 90: Unresolved reference \u0027slideOutHorizontally\u0027.\nLine 91: Unresolved reference \u0027tween\u0027.\nLine 92: Unresolved reference \u0027it\u0027.\nLine 95: Unresolved reference \u0027slideInHorizontally\u0027.\nLine 96: Unresolved reference \u0027tween\u0027.\nLine 97: Unresolved reference \u0027it\u0027.\nLine 98: Unresolved reference \u0027slideOutHorizontally\u0027.\nLine 99: Unresolved reference \u0027tween\u0027.\nLine 100: Unresolved reference \u0027it\u0027.\nLine 103: Unresolved reference \u0027slideInHorizontally\u0027.\nLine 104: Unresolved reference \u0027tween\u0027.\nLine 105: Unresolved reference \u0027it\u0027.\nLine 106: Unresolved reference \u0027slideOutHorizontally\u0027.\nLine 107: Unresolved reference \u0027tween\u0027.\nLine 108: Unresolved reference \u0027it\u0027.\nLine 110: Unresolved reference \u0027entryProvider\u0027.\nLine 111: Unresolved reference \u0027entry\u0027.\nLine 118: Unresolved reference \u0027entry\u0027.\nLine 121: Unresolved reference \u0027Json\u0027.\nLine 121: Unresolved reference \u0027it\u0027.\nLine 129: Unresolved reference \u0027entry\u0027.\nLine 130: Unresolved reference \u0027Json\u0027.\nLine 130: Unresolved reference \u0027it\u0027.\nLine 135: Unresolved reference \u0027it\u0027.\nLine 139: Unresolved reference \u0027entry\u0027.\n\u003c/linter_errors\u003e\n\n\u003clinter_errors\u003e\n## Linter Errors\n\nPath: app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt\nErrors:\n\nLine 3: Unresolved reference \u0027androidx\u0027.\nLine 4: Unresolved reference \u0027androidx\u0027.\nLine 5: Unresolved reference \u0027androidx\u0027.\nLine 6: Unresolved reference \u0027androidx\u0027.\nLine 7: Unresolved reference \u0027androidx\u0027.\nLine 8: Unresolved reference \u0027androidx\u0027.\nLine 9: Unresolved reference \u0027androidx\u0027.\nLine 10: Unresolved reference \u0027androidx\u0027.\nLine 11: Unresolved reference \u0027androidx\u0027.\nLine 12: Unresolved reference \u0027androidx\u0027.\nLine 13: Unresolved reference \u0027androidx\u0027.\nLine 14: Unresolved reference \u0027androidx\u0027.\nLine 15: Unresolved reference \u0027androidx\u0027.\nLine 16: Unresolved reference \u0027androidx\u0027.\nLine 17: Unresolved reference \u0027androidx\u0027.\nLine 18: Unresolved reference \u0027androidx\u0027.\nLine 19: Unresolved reference \u0027androidx\u0027.\nLine 20: Unresolved reference \u0027androidx\u0027.\nLine 21: Unresolved reference \u0027androidx\u0027.\nLine 22: Unresolved reference \u0027androidx\u0027.\nLine 23: Unresolved reference \u0027androidx\u0027.\nLine 24: Unresolved reference \u0027androidx\u0027.\nLine 25: Unresolved reference \u0027androidx\u0027.\nLine 26: Unresolved reference \u0027androidx\u0027.\nLine 27: Unresolved reference \u0027androidx\u0027.\nLine 28: Unresolved reference \u0027androidx\u0027.\nLine 29: Unresolved reference \u0027androidx\u0027.\nLine 30: Unresolved reference \u0027androidx\u0027.\nLine 31: Unresolved reference \u0027androidx\u0027.\nLine 32: Unresolved reference \u0027androidx\u0027.\nLine 33: Unresolved reference \u0027androidx\u0027.\nLine 34: Unresolved reference \u0027androidx\u0027.\nLine 35: Unresolved reference \u0027androidx\u0027.\nLine 36: Unresolved reference \u0027androidx\u0027.\nLine 37: Unresolved reference \u0027androidx\u0027.\nLine 38: Unresolved reference \u0027androidx\u0027.\nLine 39: Unresolved reference \u0027androidx\u0027.\nLine 40: Unresolved reference \u0027androidx\u0027.\nLine 41: Unresolved reference \u0027androidx\u0027.\nLine 42: Unresolved reference \u0027androidx\u0027.\nLine 43: Unresolved reference \u0027androidx\u0027.\nLine 44: Unresolved reference \u0027androidx\u0027.\nLine 45: Unresolved reference \u0027androidx\u0027.\nLine 46: Unresolved reference \u0027androidx\u0027.\nLine 47: Unresolved reference \u0027androidx\u0027.\nLine 48: Unresolved reference \u0027androidx\u0027.\nLine 49: Unresolved reference \u0027androidx\u0027.\nLine 50: Unresolved reference \u0027androidx\u0027.\nLine 51: Unresolved reference \u0027androidx\u0027.\nLine 52: Unresolved reference \u0027androidx\u0027.\nLine 53: Unresolved reference \u0027androidx\u0027.\nLine 54: Unresolved reference \u0027androidx\u0027.\nLine 56: Unresolved reference \u0027co\u0027.\nLine 95: Unresolved reference \u0027kotlinx\u0027.\nLine 96: Unresolved reference \u0027kotlinx\u0027.\nLine 97: Unresolved reference \u0027androidx\u0027.\nLine 98: Unresolved reference \u0027org\u0027.\nLine 100: Unresolved reference \u0027ExperimentalMaterial3Api\u0027.\nLine 101: Unresolved reference \u0027InternalCoroutinesApi\u0027.\nLine 102: Unresolved reference \u0027ExperimentalComposeUiApi\u0027.\nLine 103: Unresolved reference \u0027Composable\u0027.\nLine 105: Unresolved reference \u0027NavBackStack\u0027.\nLine 105: Unresolved reference \u0027NavKey\u0027.\nLine 107: Unresolved reference \u0027koinViewModel\u0027.\nLine 112: Unresolved reference \u0027remember\u0027.\nLine 113: Unresolved reference \u0027remember\u0027.\nLine 113: Unresolved reference \u0027mutableStateOf\u0027.\nLine 114: Unresolved reference \u0027remember\u0027.\nLine 115: Unresolved reference \u0027SnackbarHostState\u0027.\nLine 117: Unresolved reference \u0027LocalSoftwareKeyboardController\u0027.\nLine 118: Unresolved reference \u0027collectAsState\u0027.\nLine 119: Unresolved reference \u0027remember\u0027.\nLine 120: Unresolved reference \u0027mutableFloatStateOf\u0027.\nLine 129: Unresolved reference \u0027animateFloatAsState\u0027.\nLine 131: Unresolved reference \u0027ProgressAnimationSpec\u0027.\nLine 135: Unresolved reference \u0027LaunchedEffect\u0027.\nLine 136: Cannot infer type for value parameter \u0027event\u0027. Specify it explicitly.\nLine 147: Unresolved reference \u0027size\u0027.\nLine 147: Unresolved reference \u0027removeLastOrNull\u0027.\nLine 158: Unresolved reference \u0027DisposableEffect\u0027.\nLine 163: Unresolved reference \u0027isNotEmpty\u0027.\nLine 172: Unresolved reference \u0027Logger\u0027.\nLine 175: Unresolved reference \u0027onDispose\u0027.\nLine 187: Unresolved reference \u0027value\u0027.\nLine 195: Unresolved reference \u0027filter\u0027.\nLine 195: Unresolved reference \u0027it\u0027.\nLine 212: Unresolved reference \u0027size\u0027.\nLine 212: Unresolved reference \u0027removeLastOrNull\u0027.\nLine 219: Unresolved reference \u0027ExperimentalMaterial3Api\u0027.\nLine 220: Unresolved reference \u0027Composable\u0027.\nLine 222: Unresolved reference \u0027SnackbarHostState\u0027.\nLine 225: Unresolved reference \u0027Composable\u0027.\nLine 226: Unresolved reference \u0027Composable\u0027.\nLine 228: Unresolved reference \u0027Scaffold\u0027.\nLine 230: Cannot infer type for value parameter \u0027padding\u0027. Specify it explicitly.\nLine 231: Unresolved reference \u0027with\u0027.\nLine 231: Unresolved reference \u0027MaterialTheme\u0027.\nLine 232: Unresolved reference \u0027Surface\u0027.\nLine 233: Unresolved reference \u0027Modifier\u0027.\nLine 236: Unresolved reference \u0027spacing\u0027.\nLine 238: Unresolved reference \u0027Column\u0027.\nLine 239: Unresolved reference \u0027Spacer\u0027.\nLine 239: Unresolved reference \u0027Modifier\u0027.\nLine 239: Unresolved reference \u0027spacing\u0027.\nLine 240: Unresolved reference \u0027LinearProgressIndicator\u0027.\nLine 242: Unresolved reference \u0027Modifier\u0027.\nLine 245: Unresolved reference \u0027spacing\u0027.\nLine 248: Unresolved reference \u0027Spacer\u0027.\nLine 248: Unresolved reference \u0027Modifier\u0027.\nLine 248: Unresolved reference \u0027spacing\u0027.\nLine 249: Unresolved reference \u0027Row\u0027.\nLine 250: Unresolved reference \u0027Modifier\u0027.\nLine 251: Unresolved reference \u0027Center\u0027.\nLine 253: Unresolved reference \u0027Text\u0027.\nLine 256: Unresolved reference \u0027Bold\u0027.\nLine 259: Unresolved reference \u0027Spacer\u0027.\nLine 259: Unresolved reference \u0027Modifier\u0027.\nLine 259: Unresolved reference \u0027spacing\u0027.\nLine 261: Unresolved reference \u0027Spacer\u0027.\nLine 261: Unresolved reference \u0027Modifier\u0027.\nLine 261: Unresolved reference \u0027spacing\u0027.\nLine 269: Unresolved reference \u0027ExperimentalMaterial3Api\u0027.\nLine 270: Unresolved reference \u0027Composable\u0027.\nLine 277: Unresolved reference \u0027TextField\u0027.\nLine 278: Unresolved reference \u0027Modifier\u0027.\nLine 286: Unresolved reference \u0027Row\u0027.\nLine 287: Unresolved reference \u0027Modifier\u0027.\nLine 288: Unresolved reference \u0027Center\u0027.\nLine 289: Unresolved reference \u0027CenterVertically\u0027.\nLine 291: Unresolved reference \u0027Text\u0027.\nLine 294: Unresolved reference \u0027KeyboardOptions\u0027.\nLine 295: Classifier \u0027class Number : Any\u0027 does not have a companion object, so it cannot be used as an expression.\nLine 296: Unresolved reference \u0027Done\u0027.\nLine 298: Unresolved reference \u0027KeyboardActions\u0027.\nLine 303: Unresolved reference \u0027TextStyle\u0027.\nLine 304: Unresolved reference \u0027MaterialTheme\u0027.\nLine 306: Unresolved reference \u0027TextAlign\u0027.\nLine 308: Unresolved reference \u0027TextFieldDefaults\u0027.\nLine 309: Unresolved reference \u0027DarkGray\u0027.\nLine 310: Unresolved reference \u0027DarkGray\u0027.\nLine 311: Unresolved reference \u0027Transparent\u0027.\nLine 312: Unresolved reference \u0027Transparent\u0027.\nLine 313: Unresolved reference \u0027Transparent\u0027.\nLine 314: Unresolved reference \u0027MaterialTheme\u0027.\nLine 316: Unresolved reference \u0027CornerSize\u0027.\nLine 320: Unresolved reference \u0027Composable\u0027.\nLine 327: Unresolved reference \u0027Row\u0027.\nLine 328: Unresolved reference \u0027Modifier\u0027.\nLine 330: Unresolved reference \u0027IntrinsicSize\u0027.\nLine 332: Unresolved reference \u0027SpaceBetween\u0027.\nLine 334: Unresolved reference \u0027Column\u0027.\nLine 335: Unresolved reference \u0027Modifier\u0027.\nLine 336: Unresolved reference \u0027dp\u0027.\nLine 339: Unresolved reference \u0027SpaceBetween\u0027.\nLine 341: Unresolved reference \u0027Button\u0027.\nLine 342: Unresolved reference \u0027Modifier\u0027.\nLine 346: Unresolved reference \u0027ButtonDefaults\u0027.\nLine 348: Unresolved reference \u0027White\u0027.\nLine 351: Unresolved reference \u0027Text\u0027.\nLine 351: Unresolved reference \u0027uppercase\u0027.\nLine 353: Unresolved reference \u0027Button\u0027.\nLine 354: Unresolved reference \u0027Modifier\u0027.\nLine 359: Unresolved reference \u0027ButtonDefaults\u0027.\nLine 361: Unresolved reference \u0027White\u0027.\nLine 364: Unresolved reference \u0027Text\u0027.\nLine 364: Unresolved reference \u0027uppercase\u0027.\nLine 367: Unresolved reference \u0027Button\u0027.\nLine 368: Unresolved reference \u0027Modifier\u0027.\nLine 374: Unresolved reference \u0027RoundedCornerShape\u0027.\nLine 374: Unresolved reference \u0027dp\u0027.\nLine 375: Unresolved reference \u0027ButtonDefaults\u0027.\nLine 377: Unresolved reference \u0027White\u0027.\nLine 380: Unresolved reference \u0027Text\u0027.\nLine 380: Unresolved reference \u0027uppercase\u0027.\nLine 385: Unresolved reference \u0027ExperimentalComposeUiApi\u0027.\nLine 386: Unresolved reference \u0027InternalCoroutinesApi\u0027.\nLine 387: Unresolved reference \u0027ExperimentalMaterial3Api\u0027.\nLine 388: Unresolved reference \u0027Preview\u0027.\nLine 389: Unresolved reference \u0027Composable\u0027.\nLine 393: Unresolved reference \u0027SnackbarHostState\u0027.\nLine 425: Unresolved reference \u0027dp\u0027.\nLine 426: Unresolved reference \u0027sp\u0027.\nLine 427: Unresolved reference \u0027dp\u0027.\nLine 428: Unresolved reference \u0027dp\u0027.\nLine 429: Unresolved reference \u0027dp\u0027.\nLine 430: Unresolved reference \u0027sp\u0027.\nLine 431: Unresolved reference \u0027dp\u0027.\nLine 432: Unresolved reference \u0027dp\u0027.\nLine 433: Unresolved reference \u0027sp\u0027.\nLine 434: Unresolved reference \u0027sp\u0027.\nLine 435: Unresolved reference \u0027sp\u0027.\n\u003c/linter_errors\u003e\n\n\u003clinter_errors\u003e\n## Linter Errors\n\nPath: app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/components/AlarmBottomSheet.kt\nErrors:\n\nLine 3: Unresolved reference \u0027androidx\u0027.\nLine 4: Unresolved reference \u0027androidx\u0027.\nLine 5: Unresolved reference \u0027androidx\u0027.\nLine 6: Unresolved reference \u0027androidx\u0027.\nLine 7: Unresolved reference \u0027androidx\u0027.\nLine 8: Unresolved reference \u0027androidx\u0027.\nLine 9: Unresolved reference \u0027androidx\u0027.\nLine 10: Unresolved reference \u0027androidx\u0027.\nLine 11: Unresolved reference \u0027androidx\u0027.\nLine 12: Unresolved reference \u0027androidx\u0027.\nLine 13: Unresolved reference \u0027androidx\u0027.\nLine 14: Unresolved reference \u0027androidx\u0027.\nLine 15: Unresolved reference \u0027androidx\u0027.\nLine 16: Unresolved reference \u0027androidx\u0027.\nLine 17: Unresolved reference \u0027androidx\u0027.\nLine 18: Unresolved reference \u0027androidx\u0027.\nLine 19: Unresolved reference \u0027androidx\u0027.\nLine 20: Unresolved reference \u0027androidx\u0027.\nLine 21: Unresolved reference \u0027androidx\u0027.\nLine 22: Unresolved reference \u0027androidx\u0027.\nLine 23: Unresolved reference \u0027androidx\u0027.\nLine 24: Unresolved reference \u0027androidx\u0027.\nLine 25: Unresolved reference \u0027androidx\u0027.\nLine 26: Unresolved reference \u0027androidx\u0027.\nLine 27: Unresolved reference \u0027androidx\u0027.\nLine 28: Unresolved reference \u0027androidx\u0027.\nLine 29: Unresolved reference \u0027androidx\u0027.\nLine 30: Unresolved reference \u0027androidx\u0027.\nLine 31: Unresolved reference \u0027androidx\u0027.\nLine 32: Unresolved reference \u0027androidx\u0027.\nLine 33: Unresolved reference \u0027androidx\u0027.\nLine 34: Unresolved reference \u0027androidx\u0027.\nLine 35: Unresolved reference \u0027androidx\u0027.\nLine 36: Unresolved reference \u0027androidx\u0027.\nLine 37: Unresolved reference \u0027androidx\u0027.\nLine 38: Unresolved reference \u0027androidx\u0027.\nLine 39: Unresolved reference \u0027androidx\u0027.\nLine 40: Unresolved reference \u0027androidx\u0027.\nLine 41: Unresolved reference \u0027androidx\u0027.\nLine 42: Unresolved reference \u0027androidx\u0027.\nLine 43: Unresolved reference \u0027androidx\u0027.\nLine 44: Unresolved reference \u0027androidx\u0027.\nLine 45: Unresolved reference \u0027androidx\u0027.\nLine 47: Unresolved reference \u0027co\u0027.\nLine 89: Unresolved reference \u0027kotlinx\u0027.\nLine 90: Unresolved reference \u0027kotlinx\u0027.\nLine 91: Unresolved reference \u0027kotlinx\u0027.\nLine 92: Unresolved reference \u0027kotlinx\u0027.\nLine 93: Unresolved reference \u0027kotlinx\u0027.\nLine 94: Unresolved reference \u0027kotlinx\u0027.\nLine 95: Unresolved reference \u0027kotlinx\u0027.\nLine 96: Unresolved reference \u0027kotlinx\u0027.\nLine 97: Unresolved reference \u0027androidx\u0027.\nLine 100: Unresolved reference \u0027org\u0027.\nLine 102: Unresolved reference \u0027ExperimentalMaterial3Api\u0027.\nLine 102: Annotation argument must be a compile-time constant.\nLine 103: Unresolved reference \u0027Composable\u0027.\nLine 105: Unresolved reference \u0027koinViewModel\u0027.\nLine 106: Unresolved reference \u0027NavBackStack\u0027.\nLine 106: Unresolved reference \u0027NavKey\u0027.\nLine 110: Unresolved reference \u0027LaunchedEffect\u0027.\nLine 113: Unresolved reference \u0027rememberBottomSheetScaffoldState\u0027.\nLine 114: Unresolved reference \u0027remember\u0027.\nLine 114: Unresolved reference \u0027mutableStateOf\u0027.\nLine 115: Unresolved reference \u0027remember\u0027.\nLine 115: Unresolved reference \u0027mutableStateOf\u0027.\nLine 116: Unresolved reference \u0027remember\u0027.\nLine 116: Unresolved reference \u0027mutableStateOf\u0027.\nLine 118: Unresolved reference \u0027remember\u0027.\nLine 118: Unresolved reference \u0027mutableStateOf\u0027.\nLine 126: Unresolved reference \u0027let\u0027.\nLine 126: Cannot infer type for value parameter \u0027alert\u0027. Specify it explicitly.\nLine 128: Unresolved reference \u0027listOf\u0027.\nLine 150: Unresolved reference \u0027LaunchedEffect\u0027.\nLine 151: Cannot infer type for value parameter \u0027event\u0027. Specify it explicitly.\nLine 159: Unresolved reference \u0027size\u0027.\nLine 159: Unresolved reference \u0027removeLastOrNull\u0027.\nLine 162: Unresolved reference \u0027launch\u0027.\nLine 162: Unresolved reference \u0027Dispatchers\u0027.\nLine 164: Unresolved reference \u0027Json\u0027.\nLine 165: Unresolved reference \u0027withContext\u0027.\nLine 165: Unresolved reference \u0027Dispatchers\u0027.\nLine 166: Unresolved reference \u0027add\u0027.\nLine 176: Unresolved reference \u0027value\u0027.\nLine 178: Unresolved reference \u0027value\u0027.\nLine 189: Unresolved reference \u0027value\u0027.\nLine 190: Unresolved reference \u0027value\u0027.\nLine 191: Unresolved reference \u0027value\u0027.\nLine 200: Unresolved reference \u0027value\u0027.\nLine 201: Unresolved reference \u0027Exception\u0027.\nLine 202: Unresolved reference \u0027Logger\u0027.\nLine 213: Unresolved reference \u0027value\u0027.\nLine 214: Unresolved reference \u0027TextFieldValue\u0027.\nLine 217: Unresolved reference \u0027Text\u0027.\nLine 218: Unresolved reference \u0027Text\u0027.\nLine 226: Unresolved reference \u0027value\u0027.\nLine 231: Unresolved reference \u0027value\u0027.\nLine 247: Unresolved reference \u0027with\u0027.\nLine 247: Unresolved reference \u0027value\u0027.\nLine 250: Unresolved reference \u0027rememberTimePickerState\u0027.\nLine 251: Unresolved reference \u0027hour\u0027.\nLine 252: Unresolved reference \u0027minute\u0027.\nLine 258: Unresolved reference \u0027LocalTime\u0027.\nLine 259: Unresolved reference \u0027LocalTime\u0027.\nLine 260: Unresolved reference \u0027amPmHour\u0027.\nLine 261: Unresolved reference \u0027char\u0027.\nLine 262: Unresolved reference \u0027minute\u0027.\nLine 263: Unresolved reference \u0027char\u0027.\nLine 264: Unresolved reference \u0027amPmMarker\u0027.\nLine 269: Unresolved reference \u0027hour\u0027.\nLine 270: Unresolved reference \u0027minute\u0027.\nLine 271: Unresolved reference \u0027format\u0027.\nLine 312: Unresolved reference \u0027Composable\u0027.\nLine 314: Unresolved reference \u0027Composable\u0027.\nLine 315: Unresolved reference \u0027Composable\u0027.\nLine 316: Unresolved reference \u0027Composable\u0027.\nLine 317: Unresolved reference \u0027Composable\u0027.\nLine 319: Unresolved reference \u0027with\u0027.\nLine 319: Unresolved reference \u0027MaterialTheme\u0027.\nLine 320: Unresolved reference \u0027Surface\u0027.\nLine 321: Unresolved reference \u0027Box\u0027.\nLine 322: Unresolved reference \u0027Column\u0027.\nLine 323: Unresolved reference \u0027Modifier\u0027.\nLine 325: Unresolved reference \u0027spacing\u0027.\nLine 326: Unresolved reference \u0027rememberScrollState\u0027.\nLine 326: Unresolved reference \u0027Vertical\u0027.\nLine 329: Unresolved reference \u0027HorizontalDivider\u0027.\nLine 330: Unresolved reference \u0027Modifier\u0027.\nLine 331: Unresolved reference \u0027spacing\u0027.\nLine 332: Unresolved reference \u0027spacing\u0027.\nLine 333: Unresolved reference \u0027spacing\u0027.\nLine 347: Unresolved reference \u0027Composable\u0027.\nLine 355: Unresolved reference \u0027Card\u0027.\nLine 356: Unresolved reference \u0027Modifier\u0027.\nLine 359: Unresolved reference \u0027MaterialTheme\u0027.\nLine 360: Unresolved reference \u0027CardDefaults\u0027.\nLine 363: Unresolved reference \u0027CardDefaults\u0027.\nLine 364: Unresolved reference \u0027MaterialTheme\u0027.\nLine 364: Unresolved reference \u0027CornerSize\u0027.\nLine 366: Unresolved reference \u0027Row\u0027.\nLine 367: Unresolved reference \u0027Modifier\u0027.\nLine 372: Unresolved reference \u0027CenterVertically\u0027.\nLine 373: Unresolved reference \u0027Arrangement\u0027.\nLine 375: Unresolved reference \u0027Text\u0027.\nLine 376: Unresolved reference \u0027Modifier\u0027.\nLine 381: Unresolved reference \u0027Bold\u0027.\nLine 382: Unresolved reference \u0027Center\u0027.\nLine 386: Unresolved reference \u0027Spacer\u0027.\nLine 386: Unresolved reference \u0027Modifier\u0027.\nLine 392: Unresolved reference \u0027Composable\u0027.\nLine 401: Unresolved reference \u0027Composable\u0027.\nLine 404: Unresolved reference \u0027Row\u0027.\nLine 405: Unresolved reference \u0027Modifier\u0027.\nLine 408: Unresolved reference \u0027MaterialTheme\u0027.\nLine 409: Unresolved reference \u0027MaterialTheme\u0027.\nLine 412: Unresolved reference \u0027SpaceBetween\u0027.\nLine 426: Unresolved reference \u0027Modifier\u0027.\nLine 426: Unresolved reference \u0027MaterialTheme\u0027.\nLine 433: Unresolved reference \u0027Row\u0027.\nLine 434: Unresolved reference \u0027Modifier\u0027.\nLine 442: Unresolved reference \u0027Icon\u0027.\nLine 443: Unresolved reference \u0027Modifier\u0027.\nLine 453: Unresolved reference \u0027Composable\u0027.\nLine 458: Unresolved reference \u0027Button\u0027.\nLine 459: Unresolved reference \u0027Modifier\u0027.\nLine 460: Unresolved reference \u0027MaterialTheme\u0027.\nLine 463: Unresolved reference \u0027buttonColors\u0027.\nLine 465: Unresolved reference \u0027Black\u0027.\nLine 468: Unresolved reference \u0027Text\u0027.\nLine 470: Unresolved reference \u0027uppercase\u0027.\nLine 473: Unresolved reference \u0027Button\u0027.\nLine 474: Unresolved reference \u0027Modifier\u0027.\nLine 478: Unresolved reference \u0027buttonColors\u0027.\nLine 478: Unresolved reference \u0027MaterialTheme\u0027.\nLine 480: Unresolved reference \u0027Text\u0027.\nLine 482: Unresolved reference \u0027uppercase\u0027.\nLine 487: Unresolved reference \u0027Preview\u0027.\nLine 488: Unresolved reference \u0027Composable\u0027.\nLine 491: Unresolved reference \u0027Surface\u0027.\nLine 512: Unresolved reference \u0027TextFieldValue\u0027.\nLine 513: Unresolved reference \u0027TextFieldValue\u0027.\nLine 532: Unresolved reference \u0027dp\u0027.\nLine 533: Unresolved reference \u0027dp\u0027.\nLine 534: Unresolved reference \u0027dp\u0027.\nLine 535: Unresolved reference \u0027dp\u0027.\nLine 536: Unresolved reference \u0027sp\u0027.\nLine 537: Unresolved reference \u0027dp\u0027.\nLine 538: Unresolved reference \u0027dp\u0027.\nLine 539: Unresolved reference \u0027dp\u0027.\nLine 540: Unresolved reference \u0027dp\u0027.\nLine 541: Unresolved reference \u0027dp\u0027.\nLine 542: Unresolved reference \u0027dp\u0027.\nLine 543: Unresolved reference \u0027sp\u0027.\nLine 544: Unresolved reference \u0027sp\u0027.\nLine 545: Unresolved reference \u0027dp\u0027.\n\u003c/linter_errors\u003e\n\n&quot;},{&quot;role&quot;:&quot;assistant&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;thinking&quot;,&quot;thinking&quot;:&quot;The lint errors are pre-existing issues related to the IDE not resolving the dependencies (Kotlin Multiplatform project structure issues). The errors are all \&quot;Unresolved reference\&quot; for standard libraries like androidx, kotlinx, etc. - these are not related to my changes.\n\nMy changes are logically correct - I\u0027m simply adding a guard check `if (backStack.size \u003e 1)` before calling `removeLastOrNull()` to prevent the backstack from becoming empty.\n\nLet me verify the changes I made are correct by reading the modified files.&quot;,&quot;signature&quot;:&quot;ErMFCkYICxgCKkCiyWxDpMTc8I0U3WR0/b408KCHC7rwcQkAkt1QDx4fx7SgLtkTTOF8CUkmdl+4lpYqNiP3qDi/NwxRnF+WDGVyEgyrNVwxpF9evh89fH8aDGDsXiSzmCh6zrErKSIwnOoXWPW2IbKxT3tWzb2UrmkmJ/jSqqejIKr7Ho2OLwM3PsaakdkMCiZqfte6CRgYKpoEtzriGkH7fkRkXD/dwkpyNzOhITnEAnIuWRcGIKGKdQD7OY59+0XuL7DBIjjYbAZSjFXksWqHjAz1WOg+1Ga1+Kj2tycfR7ad+PaFn1Jt8nhw0d1Qjl6WhgFe1TJ5iuYl7BpUCYea/SwFOiE2vuwRSfzk4Li1G3qtny2zTttRLy1TNW6vl+MBh4zlU/vGu4guJDojfesG7lERjP2ktHkJLDoAL23r0dhvZfOJjr8Oi9SiiUY1qjXP2C4FSAXSvB+n6GfzI8mDoxWOR3nlRrnHqXY61GLX4S5ZYKxVrbij4OUB5PCI2xodXNQZbeL2TxTwS0JU5XuFwGiHxLECu2mdEaL+ujbOgv+ijwFWHyOkbKDRVTdAPPCoFuign08Ds8wYpM8vO8uODPnGmml24H4Kv90/DkY9P3FYUfmDg2Gyq3snkXbKVSgQlhOsKxPGDyiUo9fCZCXwLLOMSgdUm06dyMtx2G6xpF+xqZOYVxvZ9mvr+iAYNlR83yHLfl1/ILk+RPwq+QR2g3lIozOEmdMs2HA2ttTKAirnUCxiF0oNRKDS9wlw2TBpq0lK8RVXn/s+mbD0TZrnXT0VABTnTKYwLRmrIqAuWEFklS/LcJf8UNFJvWhClmL7itOAYhjXypbvHJMHePVtga03KFgpEjAGzhE1DdKsvST3IOka/U7SPBTkOxblfIY9f9/RompIa8129Y5fvMLhSd64FhgB&quot;},{&quot;type&quot;:&quot;text&quot;,&quot;text&quot;:&quot;The lint errors are pre-existing issues related to IDE dependency resolution in this Kotlin Multiplatform project - not caused by my changes. Let me verify the fixes are in place:&quot;}],&quot;tool_calls&quot;:[{&quot;id&quot;:&quot;toolu_012AtvwEqq3UmsjNMKkLJi5k&quot;,&quot;type&quot;:&quot;function&quot;,&quot;function&quot;:{&quot;name&quot;:&quot;grep&quot;,&quot;arguments&quot;:&quot;{\&quot;pattern\&quot;: \&quot;backStack\\\\.removeLastOrNull|backstack\\\\.removeLastOrNull\&quot;, \&quot;glob\&quot;: \&quot;*.kt\&quot;}&quot;}}]},{&quot;role&quot;:&quot;tool&quot;,&quot;name&quot;:&quot;grep&quot;,&quot;tool_call_id&quot;:&quot;toolu_012AtvwEqq3UmsjNMKkLJi5k&quot;,&quot;content&quot;:&quot;app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt:147:                    if (backStack.size \u003e 1) backStack.removeLastOrNull()\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/components/MathScreen.kt:212:                    if (backStack.size \u003e 1) backStack.removeLastOrNull()\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:78:        onBack \u003d { if (backStack.size \u003e 1) backStack.removeLastOrNull() },\n--\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt:141:                    onBackPress \u003d { if (backStack.size \u003e 1) backStack.removeLastOrNull() },\napp/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/components/AlarmBottomSheet.kt:159:                    if (backstack.size \u003e 1) backstack.removeLastOrNull()\n[Showing results with pagination \u003d limit: 100, offset: 0]&quot;},{&quot;role&quot;:&quot;assistant&quot;,&quot;content&quot;:[{&quot;type&quot;:&quot;thinking&quot;,&quot;thinking&quot;:&quot;All the `removeLastOrNull()` calls now have a guard check `if (backStack.size \u003e 1)` to prevent the backstack from becoming empty. This should fix the crash.&quot;,&quot;signature&quot;:&quot;EsUCCkYICxgCKkDkL5DGtFPYiXeXSdjJbCSN5nHd+k1HSJlZAel5yfqgGTXhb/dDfu17WbfBbXF+Znaieg2n0cutPB1Ic94f+gAdEgwhLiy4yIcipKNG5b8aDC+fgdzx6RJau6oXZSIwI+RkHjt7qsNIsSDe3Y9cL+xQRg9ZNtAHYjMVr/vortb/eiIFzg+gyVaMUwx3iEHNKqwBjMTdk8Lz9L/JOwRw5aw9G4q9KCNtTLJElKsnn3bh41jZ0VB30Vh0v+Y1v7BpULoy/6vAoAgT6mc8cKHlgDnyZIewQGCN0OzeWAwlEP7DLMU4D5Ef5xLBJzO7lb6tTYP/bxyykHzlFIAyiPAvsR+T90hVJW9wZLok10keWZC3OOx1D/47uRpUPJ1NSD8Hm422RQie/5THaHovUxdtU6mHHXXVf7t3Qvq8lLUFgRgB&quot;},{&quot;type&quot;:&quot;text&quot;,&quot;text&quot;:&quot;All instances are now guarded. Let me provide a summary of the fix.\n\n---\n\n## Summary\n\nThe crash `NavDisplay backstack cannot be empty` was happening because **Navigation 3 requires the backstack to always have at least one entry**, but your code was calling `removeLastOrNull()` unconditionally, which could empty the backstack.\n\n### Root Cause\nThis typically happens when:\n1. The app is launched directly via deeplink/notification to the `AlarmMath` screen\n2. The user completes or snoozes the alarm (triggering `removeLastOrNull()`)\n3. Race conditions during initialization could result in only a single entry in the backstack\n\n### Fix Applied\nAdded guard checks to **all 5 locations** where `removeLastOrNull()` is called:\n\n- **`NavGraph.kt`**: `onBack` handler and `AppSettings` back press\n- **`MathScreen.kt`**: `CompleteAndClose` event and `onSnoozeClick`  \n- **`AlarmBottomSheet.kt`**: `SaveAlarm` event\n\nEach call now checks `if (backStack.size \u003e 1)` before removing, ensuring the root entry (`AlarmList`) is never removed.&quot;}]}]}}" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/artifacts/core.xml b/.idea/artifacts/core.xml
new file mode 100644
index 0000000..88ce0c8
--- /dev/null
+++ b/.idea/artifacts/core.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="core">
+    <output-path>$PROJECT_DIR$/core/build/libs</output-path>
+    <root id="archive" name="core.jar">
+      <element id="module-output" name="MathAlarm.core.androidMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/firebender/chat_history.db b/.idea/firebender/chat_history.db
new file mode 100644
index 0000000..09968d7
Binary files /dev/null and b/.idea/firebender/chat_history.db differ
diff --git a/.idea/firebender/chat_history.db-shm b/.idea/firebender/chat_history.db-shm
new file mode 100644
index 0000000..b5612b9
Binary files /dev/null and b/.idea/firebender/chat_history.db-shm differ
diff --git a/.idea/firebender/chat_history.db-wal b/.idea/firebender/chat_history.db-wal
new file mode 100644
index 0000000..e7a8bfd
Binary files /dev/null and b/.idea/firebender/chat_history.db-wal differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.annotation-annotation-1.9.1-commonMain-WmoUwA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.annotation-annotation-1.9.1-commonMain-WmoUwA.klib
new file mode 100644
index 0000000..a580fff
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.annotation-annotation-1.9.1-commonMain-WmoUwA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.annotation-annotation-1.9.1-nonJvmMain-WmoUwA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.annotation-annotation-1.9.1-nonJvmMain-WmoUwA.klib
new file mode 100644
index 0000000..9a6b924
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.annotation-annotation-1.9.1-nonJvmMain-WmoUwA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-commonMain-j7f1lg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-commonMain-j7f1lg.klib
new file mode 100644
index 0000000..b4bbb52
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-commonMain-j7f1lg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-darwinMain-1oCDtg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-darwinMain-1oCDtg.klib
new file mode 100644
index 0000000..9d7c42d
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-darwinMain-1oCDtg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-nativeMain-j7f1lg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-nativeMain-j7f1lg.klib
new file mode 100644
index 0000000..feac87a
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-nativeMain-j7f1lg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-nonJvmMain-j7f1lg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-nonJvmMain-j7f1lg.klib
new file mode 100644
index 0000000..7cfdd44
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-nonJvmMain-j7f1lg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-unixMain-j7f1lg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-unixMain-j7f1lg.klib
new file mode 100644
index 0000000..0fbe7dc
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.collection-collection-1.5.0-unixMain-j7f1lg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-commonMain-jL1lig.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-commonMain-jL1lig.klib
new file mode 100644
index 0000000..8a3f255
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-commonMain-jL1lig.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-darwinMain-LBH16w.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-darwinMain-LBH16w.klib
new file mode 100644
index 0000000..22c67e1
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-darwinMain-LBH16w.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-nativeMain-jL1lig.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-nativeMain-jL1lig.klib
new file mode 100644
index 0000000..d91958b
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-nativeMain-jL1lig.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-nonAndroidMain-jL1lig.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-nonAndroidMain-jL1lig.klib
new file mode 100644
index 0000000..7d2f402
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-nonAndroidMain-jL1lig.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-nonJvmMain-jL1lig.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-nonJvmMain-jL1lig.klib
new file mode 100644
index 0000000..5bafcc4
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-nonJvmMain-jL1lig.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-unixMain-jL1lig.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-unixMain-jL1lig.klib
new file mode 100644
index 0000000..cf168af
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-1.10.0-unixMain-jL1lig.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-annotation-1.10.0-commonMain-stVLwg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-annotation-1.10.0-commonMain-stVLwg.klib
new file mode 100644
index 0000000..f24c9db
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-annotation-1.10.0-commonMain-stVLwg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-retain-1.10.0-commonMain-gAgqGg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-retain-1.10.0-commonMain-gAgqGg.klib
new file mode 100644
index 0000000..9203d6f
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-retain-1.10.0-commonMain-gAgqGg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-retain-1.10.0-nonJvmMain-gAgqGg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-retain-1.10.0-nonJvmMain-gAgqGg.klib
new file mode 100644
index 0000000..423be95
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-retain-1.10.0-nonJvmMain-gAgqGg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-saveable-1.10.0-commonMain-2vxcdQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-saveable-1.10.0-commonMain-2vxcdQ.klib
new file mode 100644
index 0000000..97fe739
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.compose.runtime-runtime-saveable-1.10.0-commonMain-2vxcdQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-common-2.10.0-commonMain-ENdyRA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-common-2.10.0-commonMain-ENdyRA.klib
new file mode 100644
index 0000000..4caba4a
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-common-2.10.0-commonMain-ENdyRA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-common-2.10.0-nonJvmMain-ENdyRA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-common-2.10.0-nonJvmMain-ENdyRA.klib
new file mode 100644
index 0000000..401ac46
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-common-2.10.0-nonJvmMain-ENdyRA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-2.10.0-commonMain-MSpfvg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-2.10.0-commonMain-MSpfvg.klib
new file mode 100644
index 0000000..92a5aac
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-2.10.0-commonMain-MSpfvg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-2.10.0-nativeMain-MSpfvg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-2.10.0-nativeMain-MSpfvg.klib
new file mode 100644
index 0000000..3eac374
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-2.10.0-nativeMain-MSpfvg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-2.10.0-nonJvmMain-MSpfvg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-2.10.0-nonJvmMain-MSpfvg.klib
new file mode 100644
index 0000000..e96d244
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-2.10.0-nonJvmMain-MSpfvg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-compose-2.10.0-commonMain-UUsvAg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-compose-2.10.0-commonMain-UUsvAg.klib
new file mode 100644
index 0000000..51265b6
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-compose-2.10.0-commonMain-UUsvAg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-compose-2.10.0-nonAndroidMain-UUsvAg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-compose-2.10.0-nonAndroidMain-UUsvAg.klib
new file mode 100644
index 0000000..916ced1
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-runtime-compose-2.10.0-nonAndroidMain-UUsvAg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-commonMain-1eFh5A.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-commonMain-1eFh5A.klib
new file mode 100644
index 0000000..03c0b6d
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-commonMain-1eFh5A.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-darwinMain-DPL3kg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-darwinMain-DPL3kg.klib
new file mode 100644
index 0000000..2b1e298
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-darwinMain-DPL3kg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-nativeMain-1eFh5A.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-nativeMain-1eFh5A.klib
new file mode 100644
index 0000000..e30060b
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-nativeMain-1eFh5A.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-nonJvmMain-1eFh5A.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-nonJvmMain-1eFh5A.klib
new file mode 100644
index 0000000..e3493e8
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-nonJvmMain-1eFh5A.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-unixMain-1eFh5A.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-unixMain-1eFh5A.klib
new file mode 100644
index 0000000..9e0c384
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-2.10.0-unixMain-1eFh5A.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-savedstate-2.10.0-commonMain-bNK2hQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-savedstate-2.10.0-commonMain-bNK2hQ.klib
new file mode 100644
index 0000000..b90d172
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-savedstate-2.10.0-commonMain-bNK2hQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-savedstate-2.10.0-nativeMain-bNK2hQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-savedstate-2.10.0-nativeMain-bNK2hQ.klib
new file mode 100644
index 0000000..4c60494
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-savedstate-2.10.0-nativeMain-bNK2hQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-savedstate-2.10.0-nonAndroidMain-bNK2hQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-savedstate-2.10.0-nonAndroidMain-bNK2hQ.klib
new file mode 100644
index 0000000..28aa0c4
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.lifecycle-lifecycle-viewmodel-savedstate-2.10.0-nonAndroidMain-bNK2hQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigation3-navigation3-runtime-1.1.0-alpha01-commonMain-Ia37Wg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigation3-navigation3-runtime-1.1.0-alpha01-commonMain-Ia37Wg.klib
new file mode 100644
index 0000000..4a32b5a
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigation3-navigation3-runtime-1.1.0-alpha01-commonMain-Ia37Wg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigationevent-navigationevent-1.0.1-commonMain-CVCQsg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigationevent-navigationevent-1.0.1-commonMain-CVCQsg.klib
new file mode 100644
index 0000000..efd5910
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigationevent-navigationevent-1.0.1-commonMain-CVCQsg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigationevent-navigationevent-1.0.1-darwinMain-v-PyAQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigationevent-navigationevent-1.0.1-darwinMain-v-PyAQ.klib
new file mode 100644
index 0000000..621464c
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigationevent-navigationevent-1.0.1-darwinMain-v-PyAQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigationevent-navigationevent-1.0.1-nativeMain-CVCQsg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigationevent-navigationevent-1.0.1-nativeMain-CVCQsg.klib
new file mode 100644
index 0000000..f80260c
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigationevent-navigationevent-1.0.1-nativeMain-CVCQsg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigationevent-navigationevent-1.0.1-unixMain-CVCQsg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigationevent-navigationevent-1.0.1-unixMain-CVCQsg.klib
new file mode 100644
index 0000000..86cfa5e
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.navigationevent-navigationevent-1.0.1-unixMain-CVCQsg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-common-2.8.4-commonMain-FV9dPA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-common-2.8.4-commonMain-FV9dPA.klib
new file mode 100644
index 0000000..d1fa591
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-common-2.8.4-commonMain-FV9dPA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-common-2.8.4-nativeMain-FV9dPA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-common-2.8.4-nativeMain-FV9dPA.klib
new file mode 100644
index 0000000..622bac5
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-common-2.8.4-nativeMain-FV9dPA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-runtime-2.8.4-commonMain-oKhOvw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-runtime-2.8.4-commonMain-oKhOvw.klib
new file mode 100644
index 0000000..b97b17b
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-runtime-2.8.4-commonMain-oKhOvw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-runtime-2.8.4-jvmNativeMain-oKhOvw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-runtime-2.8.4-jvmNativeMain-oKhOvw.klib
new file mode 100644
index 0000000..0be6098
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-runtime-2.8.4-jvmNativeMain-oKhOvw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-runtime-2.8.4-nativeMain-oKhOvw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-runtime-2.8.4-nativeMain-oKhOvw.klib
new file mode 100644
index 0000000..32c6269
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.room-room-runtime-2.8.4-nativeMain-oKhOvw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-commonMain-JkDvJw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-commonMain-JkDvJw.klib
new file mode 100644
index 0000000..88b04f5
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-commonMain-JkDvJw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-darwinMain-PeDSBw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-darwinMain-PeDSBw.klib
new file mode 100644
index 0000000..42e7ec2
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-darwinMain-PeDSBw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-nativeMain-JkDvJw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-nativeMain-JkDvJw.klib
new file mode 100644
index 0000000..6daa445
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-nativeMain-JkDvJw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-nonAndroidMain-JkDvJw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-nonAndroidMain-JkDvJw.klib
new file mode 100644
index 0000000..d1a18db
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-nonAndroidMain-JkDvJw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-unixMain-JkDvJw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-unixMain-JkDvJw.klib
new file mode 100644
index 0000000..e197e3b
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-1.4.0-unixMain-JkDvJw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-compose-1.4.0-commonMain-YfHBdg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-compose-1.4.0-commonMain-YfHBdg.klib
new file mode 100644
index 0000000..f7218c1
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-compose-1.4.0-commonMain-YfHBdg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-compose-1.4.0-nonAndroidMain-YfHBdg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-compose-1.4.0-nonAndroidMain-YfHBdg.klib
new file mode 100644
index 0000000..33ae7b6
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.savedstate-savedstate-compose-1.4.0-nonAndroidMain-YfHBdg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-2.6.2-commonMain-Y3bhRQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-2.6.2-commonMain-Y3bhRQ.klib
new file mode 100644
index 0000000..964098d
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-2.6.2-commonMain-Y3bhRQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-2.6.2-nativeMain-Y3bhRQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-2.6.2-nativeMain-Y3bhRQ.klib
new file mode 100644
index 0000000..3260e06
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-2.6.2-nativeMain-Y3bhRQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-bundled-2.6.2-commonMain-dCYVRw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-bundled-2.6.2-commonMain-dCYVRw.klib
new file mode 100644
index 0000000..1f49c9a
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-bundled-2.6.2-commonMain-dCYVRw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-bundled-2.6.2-nativeMain-dCYVRw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-bundled-2.6.2-nativeMain-dCYVRw.klib
new file mode 100644
index 0000000..26ee413
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-bundled-2.6.2-nativeMain-dCYVRw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-framework-2.6.2-nativeMain-5Ubkcg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-framework-2.6.2-nativeMain-5Ubkcg.klib
new file mode 100644
index 0000000..a02f4cd
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/androidx.sqlite-sqlite-framework-2.6.2-nativeMain-5Ubkcg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/app.cash.turbine-turbine-1.2.1-commonMain-3FY4Jw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/app.cash.turbine-turbine-1.2.1-commonMain-3FY4Jw.klib
new file mode 100644
index 0000000..af8183b
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/app.cash.turbine-turbine-1.2.1-commonMain-3FY4Jw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/cafe.adriel.lyricist-lyricist-1.7.0-commonMain-E3zqSA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/cafe.adriel.lyricist-lyricist-1.7.0-commonMain-E3zqSA.klib
new file mode 100644
index 0000000..7c803ec
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/cafe.adriel.lyricist-lyricist-1.7.0-commonMain-E3zqSA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/cafe.adriel.lyricist-lyricist-core-1.7.0-commonMain-jbtC-Q.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/cafe.adriel.lyricist-lyricist-core-1.7.0-commonMain-jbtC-Q.klib
new file mode 100644
index 0000000..5797a4d
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/cafe.adriel.lyricist-lyricist-core-1.7.0-commonMain-jbtC-Q.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-2.0.8-commonMain-rUoOlA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-2.0.8-commonMain-rUoOlA.klib
new file mode 100644
index 0000000..0a07300
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-2.0.8-commonMain-rUoOlA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-2.0.8-nativeMain-rUoOlA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-2.0.8-nativeMain-rUoOlA.klib
new file mode 100644
index 0000000..b2199d3
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-2.0.8-nativeMain-rUoOlA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-core-2.0.8-appleMain-Mv5SxQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-core-2.0.8-appleMain-Mv5SxQ.klib
new file mode 100644
index 0000000..04946d4
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-core-2.0.8-appleMain-Mv5SxQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-core-2.0.8-commonMain-3AHZ4A.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-core-2.0.8-commonMain-3AHZ4A.klib
new file mode 100644
index 0000000..dc43258
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-core-2.0.8-commonMain-3AHZ4A.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-core-2.0.8-nativeMain-3AHZ4A.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-core-2.0.8-nativeMain-3AHZ4A.klib
new file mode 100644
index 0000000..0d7aae1
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-core-2.0.8-nativeMain-3AHZ4A.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-crashlytics-2.0.8-commonMain-zvpb6Q.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-crashlytics-2.0.8-commonMain-zvpb6Q.klib
new file mode 100644
index 0000000..df227a5
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-kermit-crashlytics-2.0.8-commonMain-zvpb6Q.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-2.1.0-appleMain-oa7GPg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-2.1.0-appleMain-oa7GPg.klib
new file mode 100644
index 0000000..fc7216e
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-2.1.0-appleMain-oa7GPg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-2.1.0-commonMain-t1ZQYw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-2.1.0-commonMain-t1ZQYw.klib
new file mode 100644
index 0000000..fab96b5
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-2.1.0-commonMain-t1ZQYw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-2.1.0-nativeMain-t1ZQYw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-2.1.0-nativeMain-t1ZQYw.klib
new file mode 100644
index 0000000..eb3f933
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrency-2.1.0-nativeMain-t1ZQYw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrent-collections-2.1.0-commonMain-jSCQOA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrent-collections-2.1.0-commonMain-jSCQOA.klib
new file mode 100644
index 0000000..3a38149
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-concurrent-collections-2.1.0-commonMain-jSCQOA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-strict-2.1.0-commonMain-dKdBGA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-strict-2.1.0-commonMain-dKdBGA.klib
new file mode 100644
index 0000000..01c5195
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-strict-2.1.0-commonMain-dKdBGA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-strict-2.1.0-nativeMain-dKdBGA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-strict-2.1.0-nativeMain-dKdBGA.klib
new file mode 100644
index 0000000..42afcd0
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab-stately-strict-2.1.0-nativeMain-dKdBGA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab.crashkios-core-0.8.5-commonMain-KN4_Hg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab.crashkios-core-0.8.5-commonMain-KN4_Hg.klib
new file mode 100644
index 0000000..4af1a12
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab.crashkios-core-0.8.5-commonMain-KN4_Hg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab.crashkios-core-0.8.5-darwinMain-FcyXVA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab.crashkios-core-0.8.5-darwinMain-FcyXVA.klib
new file mode 100644
index 0000000..264896e
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab.crashkios-core-0.8.5-darwinMain-FcyXVA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab.crashkios-crashlytics-0.8.5-commonMain-0LMh8A.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab.crashkios-crashlytics-0.8.5-commonMain-0LMh8A.klib
new file mode 100644
index 0000000..7e095ad
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab.crashkios-crashlytics-0.8.5-commonMain-0LMh8A.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab.crashkios-crashlytics-0.8.5-darwinMain-Pbfr_A.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab.crashkios-crashlytics-0.8.5-darwinMain-Pbfr_A.klib
new file mode 100644
index 0000000..0f4a971
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/co.touchlab.crashkios-crashlytics-0.8.5-darwinMain-Pbfr_A.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.rickclephas.kmp-nsexception-kt-core-0.1.10-commonMain-Z_lGpw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.rickclephas.kmp-nsexception-kt-core-0.1.10-commonMain-Z_lGpw.klib
new file mode 100644
index 0000000..44acfe6
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.rickclephas.kmp-nsexception-kt-core-0.1.10-commonMain-Z_lGpw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-1.3.0-apple64Main-YvI2jQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-1.3.0-apple64Main-YvI2jQ.klib
new file mode 100644
index 0000000..276e9fc
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-1.3.0-apple64Main-YvI2jQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-1.3.0-appleMain-YvI2jQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-1.3.0-appleMain-YvI2jQ.klib
new file mode 100644
index 0000000..8939240
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-1.3.0-appleMain-YvI2jQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-1.3.0-commonMain-oQmQdg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-1.3.0-commonMain-oQmQdg.klib
new file mode 100644
index 0000000..2f56da0
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-1.3.0-commonMain-oQmQdg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-no-arg-1.3.0-appleMain-ckY_5A.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-no-arg-1.3.0-appleMain-ckY_5A.klib
new file mode 100644
index 0000000..1326a79
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-no-arg-1.3.0-appleMain-ckY_5A.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-no-arg-1.3.0-commonMain-QEsy7A.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-no-arg-1.3.0-commonMain-QEsy7A.klib
new file mode 100644
index 0000000..81a635b
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.russhwolf-multiplatform-settings-no-arg-1.3.0-commonMain-QEsy7A.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-appleMain-oxtp1g.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-appleMain-oxtp1g.klib
new file mode 100644
index 0000000..f661264
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-appleMain-oxtp1g.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-commonMain-6b-baw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-commonMain-6b-baw.klib
new file mode 100644
index 0000000..797e70d
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-commonMain-6b-baw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-hashFunctions-6b-baw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-hashFunctions-6b-baw.klib
new file mode 100644
index 0000000..083bc76
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-hashFunctions-6b-baw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-nativeMain-6b-baw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-nativeMain-6b-baw.klib
new file mode 100644
index 0000000..cc7f6b9
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-nativeMain-6b-baw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-nonJsMain-6b-baw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-nonJsMain-6b-baw.klib
new file mode 100644
index 0000000..95c09c1
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-nonJsMain-6b-baw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-nonJvmMain-6b-baw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-nonJvmMain-6b-baw.klib
new file mode 100644
index 0000000..d958153
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-nonJvmMain-6b-baw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-systemFileSystemMain-6b-baw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-systemFileSystemMain-6b-baw.klib
new file mode 100644
index 0000000..292cdc0
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-systemFileSystemMain-6b-baw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-unixMain-6b-baw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-unixMain-6b-baw.klib
new file mode 100644
index 0000000..493225c
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-unixMain-6b-baw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-zlibMain-6b-baw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-zlibMain-6b-baw.klib
new file mode 100644
index 0000000..d0a6c95
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/com.squareup.okio-okio-3.15.0-zlibMain-6b-baw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-compottie-core-2.0.2-commonMain-lMMlqw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-compottie-core-2.0.2-commonMain-lMMlqw.klib
new file mode 100644
index 0000000..b1f7158
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-compottie-core-2.0.2-commonMain-lMMlqw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-compottie-core-2.0.2-jvmNativeMain-lMMlqw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-compottie-core-2.0.2-jvmNativeMain-lMMlqw.klib
new file mode 100644
index 0000000..1972880
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-compottie-core-2.0.2-jvmNativeMain-lMMlqw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-compottie-core-2.0.2-skikoMain-lMMlqw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-compottie-core-2.0.2-skikoMain-lMMlqw.klib
new file mode 100644
index 0000000..00b9ff2
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-compottie-core-2.0.2-skikoMain-lMMlqw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-compottie-lite-2.0.2-commonMain-f_1qIA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-compottie-lite-2.0.2-commonMain-f_1qIA.klib
new file mode 100644
index 0000000..881578c
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-compottie-lite-2.0.2-commonMain-f_1qIA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-keight-core-0.0.04-commonMain-aCo-QQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-keight-core-0.0.04-commonMain-aCo-QQ.klib
new file mode 100644
index 0000000..646e95e
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.github.alexzhirkevich-keight-core-0.0.04-commonMain-aCo-QQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-compose-4.1.1-commonMain-0NT22Q.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-compose-4.1.1-commonMain-0NT22Q.klib
new file mode 100644
index 0000000..24e8cd9
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-compose-4.1.1-commonMain-0NT22Q.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-compose-4.1.1-nativeMain-Txoobw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-compose-4.1.1-nativeMain-Txoobw.klib
new file mode 100644
index 0000000..5e757d4
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-compose-4.1.1-nativeMain-Txoobw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-compose-viewmodel-4.1.1-commonMain-0POyBw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-compose-viewmodel-4.1.1-commonMain-0POyBw.klib
new file mode 100644
index 0000000..d0d9631
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-compose-viewmodel-4.1.1-commonMain-0POyBw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-core-4.1.1-commonMain-hXs0VA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-core-4.1.1-commonMain-hXs0VA.klib
new file mode 100644
index 0000000..3eccdb3
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-core-4.1.1-commonMain-hXs0VA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-core-4.1.1-nativeMain-hXs0VA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-core-4.1.1-nativeMain-hXs0VA.klib
new file mode 100644
index 0000000..60cd907
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-core-4.1.1-nativeMain-hXs0VA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-core-viewmodel-4.1.1-commonMain-EFzrFQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-core-viewmodel-4.1.1-commonMain-EFzrFQ.klib
new file mode 100644
index 0000000..e59c384
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.insert-koin-koin-core-viewmodel-4.1.1-commonMain-EFzrFQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-assertions-core-6.0.7-commonMain-Gm0JHA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-assertions-core-6.0.7-commonMain-Gm0JHA.klib
new file mode 100644
index 0000000..3a16003
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-assertions-core-6.0.7-commonMain-Gm0JHA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-assertions-core-6.0.7-nonjvmMain-Gm0JHA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-assertions-core-6.0.7-nonjvmMain-Gm0JHA.klib
new file mode 100644
index 0000000..dabec71
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-assertions-core-6.0.7-nonjvmMain-Gm0JHA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-assertions-shared-6.0.7-commonMain-Jfng_w.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-assertions-shared-6.0.7-commonMain-Jfng_w.klib
new file mode 100644
index 0000000..ef70344
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-assertions-shared-6.0.7-commonMain-Jfng_w.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-assertions-shared-6.0.7-nonjvmMain-Jfng_w.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-assertions-shared-6.0.7-nonjvmMain-Jfng_w.klib
new file mode 100644
index 0000000..8363099
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-assertions-shared-6.0.7-nonjvmMain-Jfng_w.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-common-6.0.7-commonMain-BC0QFg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-common-6.0.7-commonMain-BC0QFg.klib
new file mode 100644
index 0000000..00351b5
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-common-6.0.7-commonMain-BC0QFg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-common-6.0.7-nativeMain-BC0QFg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-common-6.0.7-nativeMain-BC0QFg.klib
new file mode 100644
index 0000000..45af768
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-common-6.0.7-nativeMain-BC0QFg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-common-6.0.7-nonjvmMain-BC0QFg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-common-6.0.7-nonjvmMain-BC0QFg.klib
new file mode 100644
index 0000000..7e046da
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/io.kotest-kotest-common-6.0.7-nonjvmMain-BC0QFg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-common-2.10.0-alpha07-commonMain-F7wFOg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-common-2.10.0-alpha07-commonMain-F7wFOg.klib
new file mode 100644
index 0000000..03f48a6
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-common-2.10.0-alpha07-commonMain-F7wFOg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-runtime-2.10.0-alpha06-commonMain-sW-D8A.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-runtime-2.10.0-alpha06-commonMain-sW-D8A.klib
new file mode 100644
index 0000000..7acebb5
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-runtime-2.10.0-alpha06-commonMain-sW-D8A.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-runtime-compose-2.10.0-alpha06-commonMain-JomyRw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-runtime-compose-2.10.0-alpha06-commonMain-JomyRw.klib
new file mode 100644
index 0000000..71555b3
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-runtime-compose-2.10.0-alpha06-commonMain-JomyRw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-2.10.0-alpha07-commonMain-3MD3hQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-2.10.0-alpha07-commonMain-3MD3hQ.klib
new file mode 100644
index 0000000..7b4dbe5
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-2.10.0-alpha07-commonMain-3MD3hQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-compose-2.10.0-alpha07-commonMain-1J6zNw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-compose-2.10.0-alpha07-commonMain-1J6zNw.klib
new file mode 100644
index 0000000..0d25488
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-compose-2.10.0-alpha07-commonMain-1J6zNw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-compose-2.10.0-alpha07-nativeMain-P2UNFA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-compose-2.10.0-alpha07-nativeMain-P2UNFA.klib
new file mode 100644
index 0000000..7a9db05
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-compose-2.10.0-alpha07-nativeMain-P2UNFA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-compose-2.10.0-alpha07-nonAndroidMain-1J6zNw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-compose-2.10.0-alpha07-nonAndroidMain-1J6zNw.klib
new file mode 100644
index 0000000..def6201
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-compose-2.10.0-alpha07-nonAndroidMain-1J6zNw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-navigation3-2.10.0-alpha07-commonMain-lOMNYw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-navigation3-2.10.0-alpha07-commonMain-lOMNYw.klib
new file mode 100644
index 0000000..68a2438
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-navigation3-2.10.0-alpha07-commonMain-lOMNYw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-navigation3-2.10.0-alpha07-nonAndroidMain-lOMNYw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-navigation3-2.10.0-alpha07-nonAndroidMain-lOMNYw.klib
new file mode 100644
index 0000000..096f8f1
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-navigation3-2.10.0-alpha07-nonAndroidMain-lOMNYw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-savedstate-2.10.0-alpha07-commonMain-aoKHeg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-savedstate-2.10.0-alpha07-commonMain-aoKHeg.klib
new file mode 100644
index 0000000..440a11b
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.lifecycle-lifecycle-viewmodel-savedstate-2.10.0-alpha07-commonMain-aoKHeg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.navigation3-navigation3-ui-1.0.0-alpha06-commonMain-LvU4Gg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.navigation3-navigation3-ui-1.0.0-alpha06-commonMain-LvU4Gg.klib
new file mode 100644
index 0000000..263b9ab
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.navigation3-navigation3-ui-1.0.0-alpha06-commonMain-LvU4Gg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.navigation3-navigation3-ui-1.0.0-alpha06-uikitMain-ZuYz1Q.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.navigation3-navigation3-ui-1.0.0-alpha06-uikitMain-ZuYz1Q.klib
new file mode 100644
index 0000000..67d1236
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.navigation3-navigation3-ui-1.0.0-alpha06-uikitMain-ZuYz1Q.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.navigationevent-navigationevent-compose-1.0.0-rc01-commonMain-8XaMeA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.navigationevent-navigationevent-compose-1.0.0-rc01-commonMain-8XaMeA.klib
new file mode 100644
index 0000000..00bdec8
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.navigationevent-navigationevent-compose-1.0.0-rc01-commonMain-8XaMeA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.navigationevent-navigationevent-compose-1.0.0-rc01-nonAndroidMain-8XaMeA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.navigationevent-navigationevent-compose-1.0.0-rc01-nonAndroidMain-8XaMeA.klib
new file mode 100644
index 0000000..e756dd8
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.navigationevent-navigationevent-compose-1.0.0-rc01-nonAndroidMain-8XaMeA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.savedstate-savedstate-1.3.6-commonMain-Gx5ULw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.savedstate-savedstate-1.3.6-commonMain-Gx5ULw.klib
new file mode 100644
index 0000000..4bdf70f
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.savedstate-savedstate-1.3.6-commonMain-Gx5ULw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.savedstate-savedstate-compose-1.3.6-commonMain-Fw7d1w.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.savedstate-savedstate-compose-1.3.6-commonMain-Fw7d1w.klib
new file mode 100644
index 0000000..7dd18e3
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.androidx.savedstate-savedstate-compose-1.3.6-commonMain-Fw7d1w.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-1.10.0-rc02-commonMain-XCRBBA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-1.10.0-rc02-commonMain-XCRBBA.klib
new file mode 100644
index 0000000..368a0f6
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-1.10.0-rc02-commonMain-XCRBBA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-1.10.0-rc02-nonAndroidMain-XCRBBA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-1.10.0-rc02-nonAndroidMain-XCRBBA.klib
new file mode 100644
index 0000000..3526df8
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-1.10.0-rc02-nonAndroidMain-XCRBBA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-1.10.0-rc02-nonJvmMain-XCRBBA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-1.10.0-rc02-nonJvmMain-XCRBBA.klib
new file mode 100644
index 0000000..7d48cf6
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-1.10.0-rc02-nonJvmMain-XCRBBA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-core-1.10.0-rc02-commonMain-Y18Qzg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-core-1.10.0-rc02-commonMain-Y18Qzg.klib
new file mode 100644
index 0000000..2d6a00f
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-core-1.10.0-rc02-commonMain-Y18Qzg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-core-1.10.0-rc02-nonJvmMain-Y18Qzg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-core-1.10.0-rc02-nonJvmMain-Y18Qzg.klib
new file mode 100644
index 0000000..4699c8d
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.animation-animation-core-1.10.0-rc02-nonJvmMain-Y18Qzg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.annotation-internal-annotation-1.10.0-rc02-commonMain-jG1XTg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.annotation-internal-annotation-1.10.0-rc02-commonMain-jG1XTg.klib
new file mode 100644
index 0000000..280db72
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.annotation-internal-annotation-1.10.0-rc02-commonMain-jG1XTg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.collection-internal-collection-1.10.0-rc02-commonMain-PdmhIQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.collection-internal-collection-1.10.0-rc02-commonMain-PdmhIQ.klib
new file mode 100644
index 0000000..42e411a
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.collection-internal-collection-1.10.0-rc02-commonMain-PdmhIQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-blockingMain-OSNkTw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-blockingMain-OSNkTw.klib
new file mode 100644
index 0000000..f254840
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-blockingMain-OSNkTw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-commonMain-OSNkTw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-commonMain-OSNkTw.klib
new file mode 100644
index 0000000..424d4ae
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-commonMain-OSNkTw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-iosMain-_aNPIA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-iosMain-_aNPIA.klib
new file mode 100644
index 0000000..751b9a3
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-iosMain-_aNPIA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-nativeMain-_aNPIA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-nativeMain-_aNPIA.klib
new file mode 100644
index 0000000..fd1d139
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-nativeMain-_aNPIA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-skikoMain-OSNkTw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-skikoMain-OSNkTw.klib
new file mode 100644
index 0000000..266e902
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.components-components-resources-1.10.0-rc02-skikoMain-OSNkTw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-commonMain-buy1Tw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-commonMain-buy1Tw.klib
new file mode 100644
index 0000000..5c44f5c
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-commonMain-buy1Tw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-darwinMain-BSwZaQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-darwinMain-BSwZaQ.klib
new file mode 100644
index 0000000..b486799
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-darwinMain-BSwZaQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-nativeMain-BSwZaQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-nativeMain-BSwZaQ.klib
new file mode 100644
index 0000000..61dd533
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-nativeMain-BSwZaQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-nonJvmMain-buy1Tw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-nonJvmMain-buy1Tw.klib
new file mode 100644
index 0000000..c3b0dad
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-nonJvmMain-buy1Tw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-skikoMain-buy1Tw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-skikoMain-buy1Tw.klib
new file mode 100644
index 0000000..10fbf76
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-skikoMain-buy1Tw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-uikitMain-BSwZaQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-uikitMain-BSwZaQ.klib
new file mode 100644
index 0000000..e872a72
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-1.10.0-rc02-uikitMain-BSwZaQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-layout-1.10.0-rc02-commonMain-pSMAXg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-layout-1.10.0-rc02-commonMain-pSMAXg.klib
new file mode 100644
index 0000000..2a1e4ad
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-layout-1.10.0-rc02-commonMain-pSMAXg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-layout-1.10.0-rc02-nonJvmMain-pSMAXg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-layout-1.10.0-rc02-nonJvmMain-pSMAXg.klib
new file mode 100644
index 0000000..ac48842
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-layout-1.10.0-rc02-nonJvmMain-pSMAXg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-layout-1.10.0-rc02-skikoMain-pSMAXg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-layout-1.10.0-rc02-skikoMain-pSMAXg.klib
new file mode 100644
index 0000000..9c02de3
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.foundation-foundation-layout-1.10.0-rc02-skikoMain-pSMAXg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material-material-ripple-1.9.1-commonMain-tnX3iQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material-material-ripple-1.9.1-commonMain-tnX3iQ.klib
new file mode 100644
index 0000000..ada7df9
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material-material-ripple-1.9.1-commonMain-tnX3iQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material-material-ripple-1.9.1-nonAndroidMain-tnX3iQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material-material-ripple-1.9.1-nonAndroidMain-tnX3iQ.klib
new file mode 100644
index 0000000..9918195
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material-material-ripple-1.9.1-nonAndroidMain-tnX3iQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-commonMain-PrP0Cw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-commonMain-PrP0Cw.klib
new file mode 100644
index 0000000..9ba43d2
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-commonMain-PrP0Cw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-darwinMain-ZkaPNQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-darwinMain-ZkaPNQ.klib
new file mode 100644
index 0000000..e1db80f
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-darwinMain-ZkaPNQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-nativeMain-ZkaPNQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-nativeMain-ZkaPNQ.klib
new file mode 100644
index 0000000..7c4a4bf
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-nativeMain-ZkaPNQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-nonJvmMain-PrP0Cw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-nonJvmMain-PrP0Cw.klib
new file mode 100644
index 0000000..07f52ef
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-nonJvmMain-PrP0Cw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-skikoMain-PrP0Cw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-skikoMain-PrP0Cw.klib
new file mode 100644
index 0000000..cae7d47
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.material3-material3-1.9.0-skikoMain-PrP0Cw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.runtime-runtime-1.10.0-rc02-commonMain-y8wUOA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.runtime-runtime-1.10.0-rc02-commonMain-y8wUOA.klib
new file mode 100644
index 0000000..a593f06
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.runtime-runtime-1.10.0-rc02-commonMain-y8wUOA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.runtime-runtime-saveable-1.10.0-rc02-commonMain-uS-nIg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.runtime-runtime-saveable-1.10.0-rc02-commonMain-uS-nIg.klib
new file mode 100644
index 0000000..7be9555
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.runtime-runtime-saveable-1.10.0-rc02-commonMain-uS-nIg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-commonMain-Ikk6iA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-commonMain-Ikk6iA.klib
new file mode 100644
index 0000000..f6ffa69
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-commonMain-Ikk6iA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-nativeMain-NIMPcw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-nativeMain-NIMPcw.klib
new file mode 100644
index 0000000..ac4d84f
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-nativeMain-NIMPcw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-nonJvmMain-Ikk6iA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-nonJvmMain-Ikk6iA.klib
new file mode 100644
index 0000000..cc6dd80
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-nonJvmMain-Ikk6iA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-skikoMain-Ikk6iA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-skikoMain-Ikk6iA.klib
new file mode 100644
index 0000000..511f703
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-skikoMain-Ikk6iA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-uikitMain-NIMPcw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-uikitMain-NIMPcw.klib
new file mode 100644
index 0000000..f4e4008
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-1.10.0-rc02-uikitMain-NIMPcw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-backhandler-1.10.0-rc02-commonMain-CRGTfA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-backhandler-1.10.0-rc02-commonMain-CRGTfA.klib
new file mode 100644
index 0000000..0e97b7c
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-backhandler-1.10.0-rc02-commonMain-CRGTfA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-backhandler-1.10.0-rc02-jbMain-CRGTfA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-backhandler-1.10.0-rc02-jbMain-CRGTfA.klib
new file mode 100644
index 0000000..39e6459
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-backhandler-1.10.0-rc02-jbMain-CRGTfA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-geometry-1.10.0-rc02-commonMain-qqJ-Hg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-geometry-1.10.0-rc02-commonMain-qqJ-Hg.klib
new file mode 100644
index 0000000..572f423
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-geometry-1.10.0-rc02-commonMain-qqJ-Hg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-commonMain-DCwFSQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-commonMain-DCwFSQ.klib
new file mode 100644
index 0000000..57ffbba
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-commonMain-DCwFSQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-nativeMain-SQidgQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-nativeMain-SQidgQ.klib
new file mode 100644
index 0000000..b94deed
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-nativeMain-SQidgQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-nonJvmMain-DCwFSQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-nonJvmMain-DCwFSQ.klib
new file mode 100644
index 0000000..ea1c08f
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-nonJvmMain-DCwFSQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-skikoExcludingWebMain-DCwFSQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-skikoExcludingWebMain-DCwFSQ.klib
new file mode 100644
index 0000000..8b630bd
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-skikoExcludingWebMain-DCwFSQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-skikoMain-DCwFSQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-skikoMain-DCwFSQ.klib
new file mode 100644
index 0000000..4e34ac0
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-graphics-1.10.0-rc02-skikoMain-DCwFSQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-commonMain-kU2cPg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-commonMain-kU2cPg.klib
new file mode 100644
index 0000000..05e93f5
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-commonMain-kU2cPg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-darwinMain-PRSAaQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-darwinMain-PRSAaQ.klib
new file mode 100644
index 0000000..5674e9c
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-darwinMain-PRSAaQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-nativeMain-PRSAaQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-nativeMain-PRSAaQ.klib
new file mode 100644
index 0000000..dab9950
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-nativeMain-PRSAaQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-nonJvmMain-kU2cPg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-nonJvmMain-kU2cPg.klib
new file mode 100644
index 0000000..c791e1e
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-nonJvmMain-kU2cPg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-skikoMain-kU2cPg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-skikoMain-kU2cPg.klib
new file mode 100644
index 0000000..49daffa
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-skikoMain-kU2cPg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-uikitMain-PRSAaQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-uikitMain-PRSAaQ.klib
new file mode 100644
index 0000000..bee395d
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-text-1.10.0-rc02-uikitMain-PRSAaQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-tooling-preview-1.10.0-rc02-commonMain-8Expeg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-tooling-preview-1.10.0-rc02-commonMain-8Expeg.klib
new file mode 100644
index 0000000..03ae69f
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-tooling-preview-1.10.0-rc02-commonMain-8Expeg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-tooling-preview-1.10.0-rc02-nonJvmMain-8Expeg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-tooling-preview-1.10.0-rc02-nonJvmMain-8Expeg.klib
new file mode 100644
index 0000000..2b29a20
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-tooling-preview-1.10.0-rc02-nonJvmMain-8Expeg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-uikit-1.10.0-rc02-uikitMain-Q1SrDw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-uikit-1.10.0-rc02-uikitMain-Q1SrDw.klib
new file mode 100644
index 0000000..e41f926
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-uikit-1.10.0-rc02-uikitMain-Q1SrDw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-unit-1.10.0-rc02-commonMain-JGR4Tw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-unit-1.10.0-rc02-commonMain-JGR4Tw.klib
new file mode 100644
index 0000000..6106981
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-unit-1.10.0-rc02-commonMain-JGR4Tw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-unit-1.10.0-rc02-nonAndroidMain-JGR4Tw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-unit-1.10.0-rc02-nonAndroidMain-JGR4Tw.klib
new file mode 100644
index 0000000..787a5e7
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-unit-1.10.0-rc02-nonAndroidMain-JGR4Tw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-unit-1.10.0-rc02-nonJvmMain-JGR4Tw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-unit-1.10.0-rc02-nonJvmMain-JGR4Tw.klib
new file mode 100644
index 0000000..bb881b6
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-unit-1.10.0-rc02-nonJvmMain-JGR4Tw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-util-1.10.0-rc02-commonMain-WTwl9g.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-util-1.10.0-rc02-commonMain-WTwl9g.klib
new file mode 100644
index 0000000..218c7a3
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-util-1.10.0-rc02-commonMain-WTwl9g.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-util-1.10.0-rc02-nonJvmMain-WTwl9g.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-util-1.10.0-rc02-nonJvmMain-WTwl9g.klib
new file mode 100644
index 0000000..4ea2627
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-util-1.10.0-rc02-nonJvmMain-WTwl9g.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-util-1.10.0-rc02-uikitMain-sNYMHg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-util-1.10.0-rc02-uikitMain-sNYMHg.klib
new file mode 100644
index 0000000..822e00e
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.compose.ui-ui-util-1.10.0-rc02-uikitMain-sNYMHg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlin-kotlin-stdlib-2.3.0-commonMain-1ooqQQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlin-kotlin-stdlib-2.3.0-commonMain-1ooqQQ.klib
new file mode 100644
index 0000000..c0cccdf
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlin-kotlin-stdlib-2.3.0-commonMain-1ooqQQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlin-kotlin-test-2.2.0-annotationsCommonMain-4o4N4g.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlin-kotlin-test-2.2.0-annotationsCommonMain-4o4N4g.klib
new file mode 100644
index 0000000..e38964f
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlin-kotlin-test-2.2.0-annotationsCommonMain-4o4N4g.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlin-kotlin-test-2.2.0-assertionsCommonMain-4o4N4g.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlin-kotlin-test-2.2.0-assertionsCommonMain-4o4N4g.klib
new file mode 100644
index 0000000..82b8e68
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlin-kotlin-test-2.2.0-assertionsCommonMain-4o4N4g.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-commonMain-wFq7cg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-commonMain-wFq7cg.klib
new file mode 100644
index 0000000..2cc3cd8
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-commonMain-wFq7cg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-wFq7cg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-wFq7cg.klib
new file mode 100644
index 0000000..bed0f0d
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-wFq7cg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.27.0-commonMain-7K06eQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.27.0-commonMain-7K06eQ.klib
new file mode 100644
index 0000000..7940a04
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.27.0-commonMain-7K06eQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.27.0-nativeMain-7K06eQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.27.0-nativeMain-7K06eQ.klib
new file mode 100644
index 0000000..ca1adc5
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.27.0-nativeMain-7K06eQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.27.0-nativeUnixLikeMain-7K06eQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.27.0-nativeUnixLikeMain-7K06eQ.klib
new file mode 100644
index 0000000..0657f2b
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.27.0-nativeUnixLikeMain-7K06eQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.10.2-commonMain-wJOvIw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.10.2-commonMain-wJOvIw.klib
new file mode 100644
index 0000000..c50afea
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.10.2-commonMain-wJOvIw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.10.2-concurrentMain-wJOvIw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.10.2-concurrentMain-wJOvIw.klib
new file mode 100644
index 0000000..f3bdf1c
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.10.2-concurrentMain-wJOvIw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.10.2-nativeDarwinMain--jzUgA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.10.2-nativeDarwinMain--jzUgA.klib
new file mode 100644
index 0000000..295f171
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.10.2-nativeDarwinMain--jzUgA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.10.2-nativeMain-wJOvIw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.10.2-nativeMain-wJOvIw.klib
new file mode 100644
index 0000000..b2db0ee
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.10.2-nativeMain-wJOvIw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-test-1.10.2-commonMain-vXmODA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-test-1.10.2-commonMain-vXmODA.klib
new file mode 100644
index 0000000..308bdb0
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-test-1.10.2-commonMain-vXmODA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-test-1.10.2-nativeMain-vXmODA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-test-1.10.2-nativeMain-vXmODA.klib
new file mode 100644
index 0000000..69fa1e6
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-coroutines-test-1.10.2-nativeMain-vXmODA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-commonKotlinMain-uTxUqg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-commonKotlinMain-uTxUqg.klib
new file mode 100644
index 0000000..9f01ebc
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-commonKotlinMain-uTxUqg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-commonMain-uTxUqg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-commonMain-uTxUqg.klib
new file mode 100644
index 0000000..bc9c565
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-commonMain-uTxUqg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-darwinMain-HeEIcg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-darwinMain-HeEIcg.klib
new file mode 100644
index 0000000..82ded14
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-darwinMain-HeEIcg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-tzdbOnFilesystemMain-uTxUqg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-tzdbOnFilesystemMain-uTxUqg.klib
new file mode 100644
index 0000000..f4db381
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-tzdbOnFilesystemMain-uTxUqg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-tzfileMain-uTxUqg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-tzfileMain-uTxUqg.klib
new file mode 100644
index 0000000..b517675
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-datetime-0.7.1-tzfileMain-uTxUqg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-core-1.6.2-commonMain-0z2eOA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-core-1.6.2-commonMain-0z2eOA.klib
new file mode 100644
index 0000000..c4a8446
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-core-1.6.2-commonMain-0z2eOA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-core-1.6.2-nativeMain-0z2eOA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-core-1.6.2-nativeMain-0z2eOA.klib
new file mode 100644
index 0000000..68b2ea6
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-core-1.6.2-nativeMain-0z2eOA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-core-1.9.0-commonMain-DVGtaQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-core-1.9.0-commonMain-DVGtaQ.klib
new file mode 100644
index 0000000..951a26c
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-core-1.9.0-commonMain-DVGtaQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-core-1.9.0-nativeMain-DVGtaQ.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-core-1.9.0-nativeMain-DVGtaQ.klib
new file mode 100644
index 0000000..c77ed23
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-core-1.9.0-nativeMain-DVGtaQ.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-json-1.9.0-commonMain-_ulzXg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-json-1.9.0-commonMain-_ulzXg.klib
new file mode 100644
index 0000000..17e7b9f
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-json-1.9.0-commonMain-_ulzXg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-json-1.9.0-nativeMain-_ulzXg.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-json-1.9.0-nativeMain-_ulzXg.klib
new file mode 100644
index 0000000..ffbb93d
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.kotlinx-kotlinx-serialization-json-1.9.0-nativeMain-_ulzXg.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-commonMain-aAAseA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-commonMain-aAAseA.klib
new file mode 100644
index 0000000..ab89de3
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-commonMain-aAAseA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-darwinMain-TtyIcw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-darwinMain-TtyIcw.klib
new file mode 100644
index 0000000..9a555d5
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-darwinMain-TtyIcw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-iosMain-TtyIcw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-iosMain-TtyIcw.klib
new file mode 100644
index 0000000..8620cfa
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-iosMain-TtyIcw.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-nativeJsMain-aAAseA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-nativeJsMain-aAAseA.klib
new file mode 100644
index 0000000..4497fcd
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-nativeJsMain-aAAseA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-nativeMain-aAAseA.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-nativeMain-aAAseA.klib
new file mode 100644
index 0000000..115ac39
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-nativeMain-aAAseA.klib differ
diff --git a/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-uikitMain-TtyIcw.klib b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-uikitMain-TtyIcw.klib
new file mode 100644
index 0000000..ec4ca1e
Binary files /dev/null and b/.kotlin/metadata/kotlinTransformedMetadataLibraries/org.jetbrains.skiko-skiko-0.9.37.3-uikitMain-TtyIcw.klib differ
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e94453f..625450a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,4 +1,7 @@
+@file:OptIn(ExperimentalSwiftExportDsl::class)
+
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.swiftexport.ExperimentalSwiftExportDsl
 
 plugins {
     alias(libs.plugins.android.gradle)
@@ -174,6 +177,7 @@ android {
 
     testOptions {
         unitTests.isReturnDefaultValues = true
+        unitTests.isIncludeAndroidResources = true
     }
 }
 
@@ -182,6 +186,8 @@ dependencies {
 
     testImplementation(libs.junit)
     testImplementation(libs.coroutines.test)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.androidx.core)
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.androidx.test.espresso.core)
     testImplementation(libs.mockk)
diff --git a/app/src/androidMain/AndroidManifest.xml b/app/src/androidMain/AndroidManifest.xml
index 6110523..02183f5 100644
--- a/app/src/androidMain/AndroidManifest.xml
+++ b/app/src/androidMain/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
     <uses-permission android:name="android.permission.RECEIVE_LAUNCH_BROADCASTS"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -50,6 +51,10 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
+        <service
+            android:name=".notification.AlarmService"
+            android:exported="false"
+            android:foregroundServiceType="mediaPlayback" />
 <!--        <receiver android:name="com.timilehinaregbesola.mathalarm.RebootReceiver"-->
 <!--            android:exported="true">-->
 <!--            <intent-filter>-->
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/AlarmReceiver.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/AlarmReceiver.kt
index ef21413..cec22b1 100644
--- a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/AlarmReceiver.kt
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/AlarmReceiver.kt
@@ -8,10 +8,8 @@ import android.content.Context
 import android.content.Intent
 import android.os.PowerManager
 import co.touchlab.kermit.Logger
+import com.timilehinaregbesola.mathalarm.coroutines.AppCoroutineScope
 import com.timilehinaregbesola.mathalarm.framework.Usecases
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
@@ -19,9 +17,9 @@ import org.koin.core.component.inject
  * [BroadcastReceiver] to be notified by the [android.app.AlarmManager].
  */ 
 class AlarmReceiver : BroadcastReceiver(), KoinComponent {
-    val usecases: Usecases by inject()
+    private val usecases: Usecases by inject()
+    private val appScope: AppCoroutineScope by inject()
 
-    @OptIn(DelicateCoroutinesApi::class)
     override fun onReceive(context: Context, intent: Intent) {
         Logger.d("onReceive() - intent ${intent.action}")
 
@@ -33,21 +31,27 @@ class AlarmReceiver : BroadcastReceiver(), KoinComponent {
             )
             wakelock.acquire(3000)
         }
-        GlobalScope.launch {
+        
+        appScope.launch {
             handleIntent(intent)
         }
     }
 
-    private suspend fun handleIntent(intent: Intent?): Unit? {
-        return when (intent?.action) {
+    private suspend fun handleIntent(intent: Intent?) {
+        when (intent?.action) {
             ALARM_ACTION -> getAlarmId(intent)?.let { usecases.showAlarm(it) }
             COMPLETE_ACTION -> getAlarmId(intent)?.let { usecases.completeAlarm(it) }
             SNOOZE_ACTION -> getAlarmId(intent)?.let { usecases.snoozeAlarm(it) }
+            DISMISS_ACTION -> {
+                // User swiped away the notification - immediately re-show it
+                Logger.d("Notification dismissed by user, re-showing alarm")
+                getAlarmId(intent)?.let { usecases.showAlarm(it) }
+            }
             Intent.ACTION_BOOT_COMPLETED,
             "android.intent.action.QUICKBOOT_POWERON",
             "android.intent.action.MY_PACKAGE_REPLACED",
             AlarmManager.ACTION_SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED -> {
-                Logger.d("Reboot Reboot!!")
+                Logger.d("Rescheduling alarms after system event")
                 usecases.rescheduleFutureAlarms()
             }
             else -> {
@@ -68,5 +72,7 @@ class AlarmReceiver : BroadcastReceiver(), KoinComponent {
         const val COMPLETE_ACTION = "com.timilehinaregbesola.mathalarm.SET_COMPLETE"
 
         const val SNOOZE_ACTION = "com.timilehinaregbesola.mathalarm.SNOOZE"
+
+        const val DISMISS_ACTION = "com.timilehinaregbesola.mathalarm.NOTIFICATION_DISMISSED"
     }
 }
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/di/AppModule.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/di/AppModule.kt
index be55f45..bd489ba 100644
--- a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/di/AppModule.kt
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/di/AppModule.kt
@@ -16,6 +16,10 @@ import com.timilehinaregbesola.mathalarm.framework.app.permission.AlarmPermissio
 import com.timilehinaregbesola.mathalarm.framework.app.permission.AlarmPermissionImpl
 import com.timilehinaregbesola.mathalarm.framework.app.permission.AndroidVersion
 import com.timilehinaregbesola.mathalarm.framework.app.permission.AndroidVersionImpl
+import com.timilehinaregbesola.mathalarm.framework.app.permission.PermissionChecker
+import com.timilehinaregbesola.mathalarm.framework.app.permission.PermissionCheckerImpl
+import com.timilehinaregbesola.mathalarm.framework.app.permission.ScreenNavigator
+import com.timilehinaregbesola.mathalarm.framework.app.permission.ScreenNavigatorImpl
 import com.timilehinaregbesola.mathalarm.framework.database.AlarmDatabase
 import com.timilehinaregbesola.mathalarm.framework.database.MIGRATION_2_3
 import com.timilehinaregbesola.mathalarm.framework.database.MIGRATION_3_4
@@ -28,6 +32,7 @@ import com.timilehinaregbesola.mathalarm.interactors.PlayerWrapper
 import com.timilehinaregbesola.mathalarm.notification.AlarmNotificationScheduler
 import com.timilehinaregbesola.mathalarm.notification.MathAlarmNotification
 import com.timilehinaregbesola.mathalarm.notification.MathAlarmNotificationChannel
+import com.timilehinaregbesola.mathalarm.notification.PendingIntentIdGenerator
 import com.timilehinaregbesola.mathalarm.utils.getAlarmManager
 import kotlinx.coroutines.InternalCoroutinesApi
 import org.koin.android.ext.koin.androidApplication
@@ -59,6 +64,10 @@ val androidModule = module {
 
     single { get<AlarmDatabase>().alarmDatabaseDao }
 
+    single { PendingIntentIdGenerator() }
+
+    single { AlarmNotificationScheduler(androidContext(), getWith("AlarmNotificationScheduler"), get()) }
+
     // Android Alarm Interactor
     single<AlarmInteractor> { AlarmInteractorImpl(get(), getWith("AlarmInteractorImpl")) }
 
@@ -75,8 +84,6 @@ val androidModule = module {
 
     single { MathAlarmNotificationChannel(androidContext()) }
 
-    single { AlarmNotificationScheduler(androidContext(), getWith("AlarmNotificationScheduler")) }
-
     @OptIn(
         ExperimentalAnimationApi::class,
         InternalCoroutinesApi::class,
@@ -86,7 +93,7 @@ val androidModule = module {
     )
     single<NotificationInteractor> {
         NotificationInteractorImpl(
-            get(),
+            androidContext(),
             getWith("NotificationInteractorImpl")
         )
     }
@@ -94,11 +101,17 @@ val androidModule = module {
     // Android Audio Player
     single<AudioPlayer> { PlayerWrapper(androidContext(), getWith("PlayerWrapper")) }
 
-    // Android Version and Permission
+    // Permission abstractions
     single<AndroidVersion> { AndroidVersionImpl() }
+    single<ScreenNavigator> { ScreenNavigatorImpl(androidContext()) }
+    single<PermissionChecker> { PermissionCheckerImpl(androidContext().getAlarmManager()) }
 
     single<AlarmPermission> {
-        AlarmPermissionImpl(androidContext().getAlarmManager(), get())
+        AlarmPermissionImpl(
+            screenNavigator = get(),
+            permissionChecker = get(),
+            androidVersion = get()
+        )
     }
 
     // Platform Logger - Android-specific with Crashlytics integration
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermission.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermission.kt
index 0a967cc..82d65cf 100644
--- a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermission.kt
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermission.kt
@@ -1,11 +1,13 @@
 package com.timilehinaregbesola.mathalarm.framework.app.permission
 
-import android.annotation.SuppressLint
-import android.app.AlarmManager
 import android.os.Build
 
+/**
+ * Android implementation of [AlarmPermission] using abstracted dependencies.
+ */
 class AlarmPermissionImpl(
-    private val alarmManager: AlarmManager?,
+    private val screenNavigator: ScreenNavigator,
+    private val permissionChecker: PermissionChecker,
     private val androidVersion: AndroidVersion
 ) : AlarmPermission {
 
@@ -14,14 +16,19 @@ class AlarmPermissionImpl(
      *
      * @return `true` if the permission is granted, `false` otherwise
      */
-    @SuppressLint("NewApi")
     override fun hasExactAlarmPermission(): Boolean {
-        if (alarmManager == null) return false
-
         return if (androidVersion.currentVersion >= Build.VERSION_CODES.S) {
-            alarmManager.canScheduleExactAlarms()
+            permissionChecker.canScheduleExactAlarms()
         } else {
             true
         }
     }
+
+    override fun openExactAlarmPermissionScreen() {
+        screenNavigator.openExactAlarmPermissionScreen()
+    }
+
+    override fun openAppSettings() {
+        screenNavigator.openAppSettings()
+    }
 }
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/PermissionChecker.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/PermissionChecker.kt
new file mode 100644
index 0000000..c65c1c2
--- /dev/null
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/PermissionChecker.kt
@@ -0,0 +1,13 @@
+package com.timilehinaregbesola.mathalarm.framework.app.permission
+
+/**
+ * Abstraction for checking system permissions.
+ * Extracted for better testability.
+ */
+interface PermissionChecker {
+    /**
+     * Checks if the app can schedule exact alarms.
+     * @return true if exact alarms can be scheduled
+     */
+    fun canScheduleExactAlarms(): Boolean
+}
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/PermissionCheckerImpl.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/PermissionCheckerImpl.kt
new file mode 100644
index 0000000..5fc5d58
--- /dev/null
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/PermissionCheckerImpl.kt
@@ -0,0 +1,24 @@
+package com.timilehinaregbesola.mathalarm.framework.app.permission
+
+import android.annotation.SuppressLint
+import android.app.AlarmManager
+import android.os.Build
+
+/**
+ * Android implementation of [PermissionChecker].
+ */
+class PermissionCheckerImpl(
+    private val alarmManager: AlarmManager?
+) : PermissionChecker {
+
+    @SuppressLint("NewApi")
+    override fun canScheduleExactAlarms(): Boolean {
+        if (alarmManager == null) return false
+
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            alarmManager.canScheduleExactAlarms()
+        } else {
+            true
+        }
+    }
+}
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/ScreenNavigator.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/ScreenNavigator.kt
new file mode 100644
index 0000000..a272209
--- /dev/null
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/ScreenNavigator.kt
@@ -0,0 +1,17 @@
+package com.timilehinaregbesola.mathalarm.framework.app.permission
+
+/**
+ * Abstraction for navigating to system screens.
+ * Extracted for better testability.
+ */
+interface ScreenNavigator {
+    /**
+     * Opens the exact alarm permission screen (Android S+).
+     */
+    fun openExactAlarmPermissionScreen()
+
+    /**
+     * Opens the app settings screen.
+     */
+    fun openAppSettings()
+}
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/ScreenNavigatorImpl.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/ScreenNavigatorImpl.kt
new file mode 100644
index 0000000..945b362
--- /dev/null
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/ScreenNavigatorImpl.kt
@@ -0,0 +1,41 @@
+package com.timilehinaregbesola.mathalarm.framework.app.permission
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.provider.Settings
+import androidx.core.net.toUri
+
+/**
+ * Android implementation of [ScreenNavigator].
+ */
+class ScreenNavigatorImpl(
+    private val context: Context
+) : ScreenNavigator {
+
+    override fun openExactAlarmPermissionScreen() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            val intent = Intent(
+                Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM,
+                "package:${context.packageName}".toUri()
+            ).apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
+            context.startActivity(intent)
+        } else {
+            // On older versions, open app settings instead
+            openAppSettings()
+        }
+    }
+
+    override fun openAppSettings() {
+        val intent = Intent(
+            Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+            "package:${context.packageName}".toUri()
+        ).apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        context.startActivity(intent)
+    }
+}
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AlarmInteractorImpl.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AlarmInteractorImpl.kt
index 98b91dc..a8e6be0 100644
--- a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AlarmInteractorImpl.kt
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AlarmInteractorImpl.kt
@@ -3,26 +3,24 @@ package com.timilehinaregbesola.mathalarm.interactors
 import co.touchlab.kermit.Logger
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.notification.AlarmNotificationScheduler
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-import org.koin.core.parameter.parametersOf
 
 class AlarmInteractorImpl(
     private val alarmManager: AlarmNotificationScheduler,
     private val logger: Logger
-) :
-    AlarmInteractor, KoinComponent {
+) : AlarmInteractor {
 
-    override fun schedule(alarm: Alarm, reschedule: Boolean): Boolean {
-        logger.d("AlarmInteractorImpl.schedule called: alarmId=${alarm.alarmId}, time=${alarm.hour}:${alarm.minute}, repeat=${alarm.repeat}, repeatDays=${alarm.repeatDays}, reschedule=$reschedule")
-        val result = alarmManager.scheduleAlarm(alarm, reschedule)
-        logger.d("AlarmInteractorImpl.schedule result for alarmId=${alarm.alarmId}: $result")
-        return result
+    override fun schedule(alarm: Alarm, timeInMillis: Long) {
+        logger.d("AlarmInteractorImpl.schedule: alarmId=${alarm.alarmId}, timeInMillis=$timeInMillis")
+        alarmManager.scheduleAlarm(alarm, timeInMillis)
     }
 
     override fun cancel(alarm: Alarm) {
-        logger.d("AlarmInteractorImpl.cancel called: alarmId=${alarm.alarmId}, time=${alarm.hour}:${alarm.minute}, repeat=${alarm.repeat}, repeatDays=${alarm.repeatDays}")
+        logger.d("AlarmInteractorImpl.cancel: alarmId=${alarm.alarmId}")
         alarmManager.cancelAlarm(alarm)
-        logger.d("AlarmInteractorImpl.cancel completed for alarmId=${alarm.alarmId}")
+    }
+
+    override fun update(alarm: Alarm) {
+        logger.d("AlarmInteractorImpl.update: alarmId=${alarm.alarmId}")
+        alarmManager.updateAlarm(alarm)
     }
 }
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt
index 1eabd94..aa2309f 100644
--- a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt
@@ -10,6 +10,7 @@ actual interface AudioPlayer {
 
     actual val currentPosition: Int
     actual val duration: Int
+    actual val isPlaying: Boolean
 
     actual fun init()
     actual fun startAlarmAudio()
@@ -36,6 +37,8 @@ class PlayerWrapper(
         get() = player?.currentPosition?: 0
     override val duration: Int
         get() = player?.duration?: 0
+    override val isPlaying: Boolean
+        get() = player?.isPlaying == true
 
     override fun init() {
         player = MediaPlayer().apply {
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/NotificationInteractorImpl.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/NotificationInteractorImpl.kt
index 530d8de..a1a891a 100644
--- a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/NotificationInteractorImpl.kt
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/NotificationInteractorImpl.kt
@@ -1,12 +1,13 @@
 package com.timilehinaregbesola.mathalarm.interactors
 
+import android.content.Context
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.ExperimentalComposeUiApi
 import co.touchlab.kermit.Logger
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
-import com.timilehinaregbesola.mathalarm.notification.MathAlarmNotification
+import com.timilehinaregbesola.mathalarm.notification.AlarmService
 import kotlinx.coroutines.InternalCoroutinesApi
 
 @ExperimentalFoundationApi
@@ -15,21 +16,17 @@ import kotlinx.coroutines.InternalCoroutinesApi
 @InternalCoroutinesApi
 @ExperimentalAnimationApi
 internal class NotificationInteractorImpl(
-    private val alarmNotification: MathAlarmNotification,
+    private val context: Context,
     private val logger: Logger
 ) : NotificationInteractor {
 
     override fun show(alarm: Alarm) {
-        logger.d("show - alarmId = ${alarm.alarmId}")
-        if (alarm.repeat) {
-            alarmNotification.showRepeating(alarm)
-        } else {
-            alarmNotification.show(alarm)
-        }
+        logger.d("show - alarmId = ${alarm.alarmId}, starting AlarmService")
+        AlarmService.startAlarm(context, alarm)
     }
 
     override fun dismiss(notificationId: Long) {
-        logger.d("dismiss - alarmId = $notificationId")
-        alarmNotification.dismiss(notificationId)
+        logger.d("dismiss - alarmId = $notificationId, stopping AlarmService")
+        AlarmService.stopAlarm(context)
     }
 }
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/ActiveAlarmManager.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/ActiveAlarmManager.kt
new file mode 100644
index 0000000..e0a0328
--- /dev/null
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/ActiveAlarmManager.kt
@@ -0,0 +1,35 @@
+package com.timilehinaregbesola.mathalarm.notification
+
+/**
+ * Singleton to track the currently active alarm being displayed on the math screen.
+ * Used to re-show the alarm notification if the user force-closes the app without
+ * solving the math problem.
+ */
+object ActiveAlarmManager {
+    
+    /**
+     * The ID of the currently active alarm, or null if no alarm is active.
+     */
+    @Volatile
+    var activeAlarmId: Long? = null
+        private set
+    
+    /**
+     * Sets the active alarm when the math screen is displayed.
+     */
+    fun setActiveAlarm(alarmId: Long) {
+        activeAlarmId = alarmId
+    }
+    
+    /**
+     * Clears the active alarm when it's properly dismissed (solved or snoozed).
+     */
+    fun clearActiveAlarm() {
+        activeAlarmId = null
+    }
+    
+    /**
+     * Checks if there's an active alarm that wasn't properly dismissed.
+     */
+    fun hasActiveAlarm(): Boolean = activeAlarmId != null
+}
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/AlarmNotificationScheduler.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/AlarmNotificationScheduler.kt
index a120199..a143865 100644
--- a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/AlarmNotificationScheduler.kt
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/AlarmNotificationScheduler.kt
@@ -1,258 +1,100 @@
 package com.timilehinaregbesola.mathalarm.notification
 
-import android.annotation.SuppressLint
 import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_MUTABLE
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import co.touchlab.kermit.Logger
 import com.timilehinaregbesola.mathalarm.AlarmReceiver
 import com.timilehinaregbesola.mathalarm.AlarmReceiver.Companion.ALARM_ACTION
 import com.timilehinaregbesola.mathalarm.AlarmReceiver.Companion.EXTRA_TASK
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
-import com.timilehinaregbesola.mathalarm.utils.SAT
-import com.timilehinaregbesola.mathalarm.utils.SUN
 import com.timilehinaregbesola.mathalarm.utils.cancelAlarm
 import com.timilehinaregbesola.mathalarm.utils.fullDays
-import com.timilehinaregbesola.mathalarm.utils.initLocalDateTimeInSystemZone
 import com.timilehinaregbesola.mathalarm.utils.setExactAlarm
-import com.timilehinaregbesola.mathalarm.utils.toIndex
-import kotlinx.datetime.DatePeriod
-import kotlinx.datetime.LocalDate
-import kotlinx.datetime.LocalDateTime
-import kotlinx.datetime.LocalTime
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.plus
-import kotlinx.datetime.toInstant
-import kotlinx.datetime.toLocalDateTime
-import kotlin.time.Clock
-import kotlin.time.ExperimentalTime
-import kotlin.time.Instant
 
 /**
  * Alarm manager to schedule an event based on the time from a Alarm.
  */
-class AlarmNotificationScheduler(private val context: Context, private val logger: Logger) {
+class AlarmNotificationScheduler(
+    private val context: Context,
+    private val logger: Logger,
+    private val idGenerator: PendingIntentIdGenerator = PendingIntentIdGenerator()
+) {
 
     /**
-     * Schedules all the alarm of the object at once including repeating ones
+     * Schedules a single alarm notification at the specified time.
      *
-     * @param passedAlarm alarm to be scheduled
-     * @param reschedule whether alarm is repeating
+     * @param alarm the alarm to schedule
+     * @param timeInMillis the exact time to trigger the alarm
      */
-    @OptIn(ExperimentalTime::class)
-    @SuppressLint("UnspecifiedImmutableFlag")
-    fun scheduleAlarm(passedAlarm: Alarm, reschedule: Boolean): Boolean {
-        logger.d("Schedule alarm for id=${passedAlarm.alarmId}, time=${passedAlarm.hour}:${passedAlarm.minute}, repeat=${passedAlarm.repeat}, repeatDays=${passedAlarm.repeatDays}, reschedule=$reschedule")
-        val alarmIntent = Intent(context, AlarmReceiver::class.java).apply {
-            action = ALARM_ACTION
-            putExtra(EXTRA_TASK, passedAlarm.alarmId)
-        }
-        val alarmIntentList: MutableList<PendingIntent> = ArrayList()
-        val timeInstants: MutableList<Instant> = ArrayList()
-        val tz = TimeZone.currentSystemDefault()
-        var hasExistingAlarms = false
-
-        // If there is no day set, set the alarm on the closest possible date
-        if (passedAlarm.repeatDays == "FFFFFFF") {
-            logger.d("No repeat days set, determining closest possible date")
-            val dateTime = passedAlarm.initLocalDateTimeInSystemZone()
-            val instant = dateTime.toInstant(tz)
-            val nowInstant = Clock.System.now()
-            logger.d("Alarm datetime: $dateTime, instant: $instant, now: $nowInstant")
-
-            var dayOfTheWeek = dateTime.date.dayOfWeek.toIndex()
-            logger.d("Current day of week: $dayOfTheWeek")
-
-            if (instant > nowInstant) { // set it today
-                val sb = StringBuilder("FFFFFFF")
-                sb.setCharAt(dayOfTheWeek, 'T')
-                passedAlarm.repeatDays = sb.toString()
-                logger.d("Alarm time is in the future, setting for today. New repeatDays: ${passedAlarm.repeatDays}")
-            } else { // alarm time already passed for the day so set it tomorrow
-                val sb = StringBuilder("FFFFFFF")
-                if (dayOfTheWeek == SAT) { // if it is saturday
-                    dayOfTheWeek = SUN
-                } else {
-                    dayOfTheWeek++
-                }
-                sb.setCharAt(dayOfTheWeek, 'T')
-                passedAlarm.repeatDays = sb.toString()
-                logger.d("Alarm time already passed, setting for tomorrow (day $dayOfTheWeek). New repeatDays: ${passedAlarm.repeatDays}")
-            }
-        }
-
-        for (i in SUN..SAT) {
-            if (passedAlarm.repeatDays[i] == 'T') {
-                logger.d("Processing day $i (${fullDays[i]}) which is set to true")
-                val nowInstant = Clock.System.now()
-                val localNow = nowInstant.toLocalDateTime(tz)
-                val todayDate = localNow.date
-
-                val currentDay = todayDate.dayOfWeek.toIndex()
-
-                logger.d("Current day: $currentDay (${fullDays[currentDay]})")
-
-                val daysUntilAlarm: Int
-                val targetDate: LocalDate
-
-                val alarmTimeToday = passedAlarm.initLocalDateTimeInSystemZone()
-                val alarmInstantToday = alarmTimeToday.toInstant(tz)
-                logger.d("Alarm time today would be: $alarmTimeToday (${alarmInstantToday})")
-                logger.d("Current time is: $localNow (${nowInstant})")
-
-                val isPastToday = alarmInstantToday < nowInstant
-                logger.d("Is alarm time past for today? $isPastToday")
-
-                if (currentDay > i || (currentDay == i && isPastToday)) {
-                    // days left till end of week(sat) + the day of the week of the alarm
-                    // EX: alarm = i = tues = 2; current = wed = 3; end of week = sat = 6
-                    // end - current = 6 - 3 = 3 -> 3 days till saturday/end of week
-                    // end of week + 1 (to sunday) + day of week alarm is on = 3 + 1 + 2 = 6
-                    daysUntilAlarm = SAT - currentDay + 1 + i
-                    targetDate = todayDate.plus(DatePeriod(days = daysUntilAlarm))
-                    logger.d("Current day ($currentDay) > alarm day ($i) or same day but time passed, scheduling for next week")
-                    logger.d("Days until alarm: $daysUntilAlarm, target date: $targetDate")
-                } else {
-                    daysUntilAlarm = i - currentDay
-                    targetDate = todayDate.plus(DatePeriod(days = daysUntilAlarm))
-                    logger.d("Current day ($currentDay) <= alarm day ($i) and time not passed, scheduling for this week")
-                    logger.d("Days until alarm: $daysUntilAlarm, target date: $targetDate")
-                }
-
-                val targetDateTime = LocalDateTime(
-                    date = targetDate,
-                    time = LocalTime(passedAlarm.hour, passedAlarm.minute, 0)
-                )
-                val targetInstant = targetDateTime.toInstant(tz)
-
-                val stringId: StringBuilder = StringBuilder().append(passedAlarm.alarmId).append(i)
-                    .append(passedAlarm.hour).append(passedAlarm.minute)
-                val id = stringId.toString().split("-").joinToString("")
-                val intentId = id.toInt()
-                logger.d("Generated intent ID: $intentId for alarm ID: ${passedAlarm.alarmId}, day: $i, time: ${passedAlarm.hour}:${passedAlarm.minute}")
-
-                // Check if a previous alarm has been set
-                logger.d("Checking if a previous alarm with this ID already exists")
-                val isSet = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.getBroadcast(
-                        context,
-                        intentId,
-                        alarmIntent,
-                        PendingIntent.FLAG_NO_CREATE or FLAG_MUTABLE,
-                    )
-                } else {
-                    PendingIntent.getBroadcast(context, intentId, alarmIntent, PendingIntent.FLAG_NO_CREATE)
-                }
-
-                if (isSet != null) {
-                    logger.d("An alarm with ID $intentId already exists")
-                    hasExistingAlarms = true
-                    if (!reschedule) {
-                        logger.d("Not rescheduling because reschedule flag is false")
-                        // context.showToast(R.string.alarm_duplicate_toast_text)
-                    } else {
-                        // If reschedule is true, cancel the existing alarm and create a new one
-                        logger.d("Canceling existing alarm because reschedule flag is true")
-                        context.cancelAlarm(isSet)
-                        isSet.cancel()
-                    }
-                }
-
-                // If reschedule is true or no existing alarm was found, create a new one
-                if (isSet == null || reschedule) {
-                    logger.d("Proceeding to create new alarm")
-
-                    val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                        PendingIntent.getBroadcast(
-                            context,
-                            intentId,
-                            alarmIntent,
-                            PendingIntent.FLAG_CANCEL_CURRENT or FLAG_MUTABLE,
-                        )
-                    } else {
-                        PendingIntent.getBroadcast(
-                            context,
-                            intentId,
-                            alarmIntent,
-                            PendingIntent.FLAG_CANCEL_CURRENT,
-                        )
-                    }
-
-                    alarmIntentList.add(pendingIntent)
-                    timeInstants.add(targetInstant)
-                }
-            }
-        }
-
-        // Return true if we scheduled new alarms OR if there were existing alarms
-        if (alarmIntentList.isEmpty() && !hasExistingAlarms) {
-            logger.w("No alarms were scheduled and no existing alarms found")
-            return false
-        }
-
-        logger.d("Scheduling ${alarmIntentList.size} alarms")
-        for (i in alarmIntentList.indices) {
-            val pendingIntent = alarmIntentList[i]
-            val instant = timeInstants[i]
-            logger.d("Scheduling alarm #${i+1}/${alarmIntentList.size} for time: ${instant}")
-            context.setExactAlarm(instant.toEpochMilliseconds(), pendingIntent)
-            logger.d("Alarm #${i+1} scheduled successfully")
-        }
+    fun scheduleAlarm(alarm: Alarm, timeInMillis: Long) {
+        logger.d("Scheduling alarm: id=${alarm.alarmId}, time=$timeInMillis")
+        
+        val alarmIntent = createAlarmIntent(alarm)
+        val intentId = idGenerator.generateSimpleId(alarm.alarmId)
+        
+        val pendingIntent = PendingIntent.getBroadcast(
+            context,
+            intentId,
+            alarmIntent,
+            PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE,
+        )
+
+        context.setExactAlarm(timeInMillis, pendingIntent)
+        logger.d("Alarm scheduled successfully: id=${alarm.alarmId} at $timeInMillis")
+    }
 
-        logger.d("All ${alarmIntentList.size} alarms scheduled successfully, returning true")
-        return true
+    /**
+     * Updates an existing alarm notification.
+     *
+     * @param alarm the alarm to update
+     */
+    fun updateAlarm(alarm: Alarm) {
+        logger.d("Update alarm called for id=${alarm.alarmId} - no action needed on Android")
+        // On Android, the notification will trigger a BroadcastReceiver which will always get the
+        // most recent Alarm data from the database, so no action needed here.
     }
 
     /**
-     * Cancels an alarm - Called when an alarm is turned off, deleted, and rescheduled
+     * Cancels all scheduled notifications for an alarm.
      *
      * @param alarm alarm to be canceled
      */
     fun cancelAlarm(alarm: Alarm) {
-        logger.d("AlarmNotificationScheduler.cancelAlarm called: alarmId=${alarm.alarmId}, time=${alarm.hour}:${alarm.minute}, repeat=${alarm.repeat}, repeatDays=${alarm.repeatDays}")
+        logger.d("Canceling alarm: id=${alarm.alarmId}")
 
-        val receiverIntent = Intent(context, AlarmReceiver::class.java)
-        receiverIntent.action = ALARM_ACTION
-        receiverIntent.putExtra(EXTRA_TASK, alarm.alarmId)
+        val receiverIntent = createAlarmIntent(alarm)
 
-        var canceledCount = 0
-        for (i in 0..6) { // For each day of the week
-            if (alarm.repeatDays.getOrNull(i) == 'T') {
-                logger.d("Canceling alarm for day $i (${fullDays[i]})")
+        cancelAlarmWithId(receiverIntent, idGenerator.generateSimpleId(alarm.alarmId))
 
-                val stringId: StringBuilder = StringBuilder().append(alarm.alarmId).append(i)
-                    .append(alarm.hour).append(alarm.minute)
-                val id = stringId.toString().split("-").joinToString("")
-                val intentId = id.toInt()
-                logger.d("Generated intent ID: $intentId for alarm ID: ${alarm.alarmId}, day: $i, time: ${alarm.hour}:${alarm.minute}")
+        // Also cancel any day-specific alarms for repeating alarms
+        for (i in 0..6) {
+            if (alarm.repeatDays.getOrNull(i) == 'T') {
+                val intentId = idGenerator.generateId(alarm, i)
+                cancelAlarmWithId(receiverIntent, intentId)
+                logger.d("Canceled alarm for day $i (${fullDays[i]})")
+            }
+        }
 
-                val cancelPendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.getBroadcast(
-                        context,
-                        intentId,
-                        receiverIntent,
-                        FLAG_UPDATE_CURRENT or FLAG_MUTABLE,
-                    )
-                } else {
-                    PendingIntent.getBroadcast(
-                        context,
-                        intentId,
-                        receiverIntent,
-                        FLAG_UPDATE_CURRENT,
-                    )
-                }
+        logger.d("Alarm canceled: id=${alarm.alarmId}")
+    }
 
-                logger.d("Calling context.cancelAlarm for intent ID: $intentId")
-                context.cancelAlarm(cancelPendingIntent)
-                cancelPendingIntent.cancel()
-                logger.d("Alarm canceled for day $i (${fullDays[i]})")
-                canceledCount++
-            }
+    private fun createAlarmIntent(alarm: Alarm): Intent {
+        return Intent(context, AlarmReceiver::class.java).apply {
+            action = ALARM_ACTION
+            putExtra(EXTRA_TASK, alarm.alarmId)
         }
+    }
+
+    private fun cancelAlarmWithId(intent: Intent, intentId: Int) {
+        val pendingIntent = PendingIntent.getBroadcast(
+            context,
+            intentId,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
+        )
 
-        logger.d("AlarmNotificationScheduler.cancelAlarm completed for alarmId=${alarm.alarmId}, canceled $canceledCount alarms")
+        context.cancelAlarm(pendingIntent)
+        pendingIntent.cancel()
     }
 }
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/AlarmService.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/AlarmService.kt
new file mode 100644
index 0000000..aeec317
--- /dev/null
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/AlarmService.kt
@@ -0,0 +1,411 @@
+package com.timilehinaregbesola.mathalarm.notification
+
+import android.app.PendingIntent
+import android.app.Service
+import android.app.TaskStackBuilder
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ServiceInfo
+import android.graphics.BitmapFactory
+import android.media.AudioAttributes
+import android.media.MediaPlayer
+import android.media.RingtoneManager
+import android.os.Build
+import android.os.Handler
+import android.os.IBinder
+import android.os.Looper
+import android.os.PowerManager
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.core.app.NotificationCompat
+import androidx.core.app.ServiceCompat
+import androidx.core.net.toUri
+import co.touchlab.kermit.Logger
+import com.timilehinaregbesola.mathalarm.AlarmReceiver
+import com.timilehinaregbesola.mathalarm.R
+import com.timilehinaregbesola.mathalarm.domain.model.Alarm
+import com.timilehinaregbesola.mathalarm.framework.database.AlarmEntity
+import com.timilehinaregbesola.mathalarm.framework.database.AlarmMapper
+import com.timilehinaregbesola.mathalarm.presentation.MainActivity
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.serialization.json.Json
+import org.koin.android.ext.android.inject
+import java.io.InputStream
+import java.net.URLEncoder
+
+/**
+ * Foreground service that handles alarm playback independently of the app lifecycle.
+ * This ensures the alarm keeps ringing even if the user force-closes the app.
+ */
+@ExperimentalAnimationApi
+@InternalCoroutinesApi
+@ExperimentalComposeUiApi
+@ExperimentalMaterial3Api
+@ExperimentalFoundationApi
+class AlarmService : Service() {
+
+    private val channel: MathAlarmNotificationChannel by inject()
+    private val logger = Logger.withTag("AlarmService")
+    
+    private var mediaPlayer: MediaPlayer? = null
+    private var wakeLock: PowerManager.WakeLock? = null
+    private var currentAlarm: Alarm? = null
+    private val timeoutHandler = Handler(Looper.getMainLooper())
+    
+    // Timing controller for ring/pause/restart cycle
+    private var timingController: AlarmTimingController? = null
+    
+    // Handler-based scheduler for the timing controller
+    private val handlerScheduler = object : AlarmTimingController.TimingScheduler {
+        override fun scheduleDelayed(task: Runnable, delayMillis: Long) {
+            timeoutHandler.postDelayed(task, delayMillis)
+        }
+        
+        override fun cancel(task: Runnable) {
+            timeoutHandler.removeCallbacks(task)
+        }
+    }
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    override fun onCreate() {
+        super.onCreate()
+        logger.d("AlarmService created")
+        
+        // Acquire wake lock to keep CPU running
+        val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
+        wakeLock = powerManager.newWakeLock(
+            PowerManager.PARTIAL_WAKE_LOCK,
+            "mathalarm:alarmservice"
+        ).apply {
+            // Acquire for max 1 hour - service will be stopped when user dismisses
+            acquire(MAX_WAKE_LOCK_MILLIS)
+        }
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        logger.d("onStartCommand: action=${intent?.action}")
+        
+        when (intent?.action) {
+            ACTION_START_ALARM -> {
+                val alarmJson = intent.getStringExtra(EXTRA_ALARM_JSON)
+                if (alarmJson != null) {
+                    try {
+                        val alarmEntity = Json.decodeFromString<AlarmEntity>(alarmJson)
+                        val alarm = AlarmMapper().mapToDomainModel(alarmEntity)
+                        startAlarm(alarm)
+                    } catch (e: Exception) {
+                        logger.e("Failed to parse alarm JSON", e)
+                        stopSelf()
+                    }
+                } else {
+                    logger.e("No alarm JSON provided")
+                    stopSelf()
+                }
+            }
+            ACTION_STOP_ALARM -> {
+                logger.d("Stopping alarm service")
+                stopSelf()
+            }
+            ACTION_REFRESH_NOTIFICATION -> {
+                // Refresh notification to trigger full-screen intent again
+                currentAlarm?.let { alarm ->
+                    logger.d("Refreshing notification for alarm: ${alarm.title}")
+                    refreshNotificationForAlarm(alarm)
+                }
+            }
+            else -> {
+                logger.w("Unknown action: ${intent?.action}")
+            }
+        }
+        
+        return START_NOT_STICKY
+    }
+
+    private fun startAlarm(alarm: Alarm) {
+        logger.d("Starting alarm: ${alarm.title}")
+        currentAlarm = alarm
+        
+        ActiveAlarmManager.setActiveAlarm(alarm.alarmId)
+        
+        // Initialize timing controller with callbacks
+        timingController = AlarmTimingController(
+            ringDurationMillis = RING_DURATION_MILLIS,
+            silencePeriodMillis = SILENCE_PERIOD_MILLIS,
+            onStartRinging = { onStartRinging(alarm) },
+            onPauseRinging = { onPauseRinging(alarm) },
+            scheduler = handlerScheduler
+        )
+        
+        // Show initial notification
+        showForegroundNotification(alarm, isPaused = false)
+        
+        // Start the timing controller (will call onStartRinging)
+        timingController?.start()
+    }
+    
+    private fun onStartRinging(alarm: Alarm) {
+        logger.d("Starting/Restarting alarm audio")
+        showForegroundNotification(alarm, isPaused = false)
+        startAudioPlayback(alarm)
+    }
+    
+    private fun onPauseRinging(alarm: Alarm) {
+        logger.d("Pausing alarm audio, will restart in ${SILENCE_PERIOD_MILLIS / 1000}s")
+        stopAudioPlayback()
+        showForegroundNotification(alarm, isPaused = true)
+    }
+    
+    private fun showForegroundNotification(alarm: Alarm, isPaused: Boolean) {
+        val notification = buildNotification(alarm, isPaused = isPaused)
+        
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            ServiceCompat.startForeground(
+                this,
+                alarm.alarmId.toInt(),
+                notification.build(),
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
+            )
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            startForeground(
+                alarm.alarmId.toInt(),
+                notification.build(),
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
+            )
+        } else {
+            startForeground(alarm.alarmId.toInt(), notification.build())
+        }
+    }
+
+    private fun refreshNotificationForAlarm(alarm: Alarm) {
+        val isPaused = timingController?.currentState == AlarmTimingController.State.PAUSED
+        showForegroundNotification(alarm, isPaused = isPaused)
+    }
+
+    private fun startAudioPlayback(alarm: Alarm) {
+        try {
+            stopAudioPlayback()
+            
+            val toneUri = alarm.alarmTone.toUri()
+            var uriExists = false
+            
+            try {
+                val inputStream: InputStream? = contentResolver.openInputStream(toneUri)
+                inputStream?.close()
+                uriExists = true
+            } catch (_: Exception) {
+                logger.w("Alarm tone URI does not exist: $toneUri")
+            }
+            
+            val toneString = if (uriExists) {
+                alarm.alarmTone
+            } else {
+                RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM).toString()
+            }
+            
+            mediaPlayer = MediaPlayer().apply {
+                setAudioAttributes(
+                    AudioAttributes.Builder()
+                        .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+                        .setUsage(AudioAttributes.USAGE_ALARM)
+                        .build()
+                )
+                setDataSource(this@AlarmService, toneString.toUri())
+                isLooping = true
+                setOnErrorListener { mp, _, _ ->
+                    logger.e("MediaPlayer error")
+                    mp.release()
+                    mediaPlayer = null
+                    true
+                }
+                prepare()
+                start()
+            }
+            
+            logger.d("Audio playback started")
+        } catch (e: Exception) {
+            logger.e("Failed to start audio playback", e)
+        }
+    }
+
+    private fun stopAudioPlayback() {
+        try {
+            mediaPlayer?.run {
+                if (isPlaying) stop()
+                release()
+            }
+        } catch (e: Exception) {
+            logger.w("Error stopping media player", e)
+        } finally {
+            mediaPlayer = null
+        }
+    }
+
+    private fun buildNotification(alarm: Alarm, isPaused: Boolean = false): NotificationCompat.Builder {
+        val alarmImage = BitmapFactory.decodeResource(resources, R.drawable.icon)
+        val vibratePattern = if (isPaused) null else longArrayOf(0, 100, 200, 300)
+        val bigPicStyle = NotificationCompat.BigPictureStyle()
+            .bigPicture(alarmImage)
+        
+        val contentText = if (isPaused) {
+            "Paused - will ring again soon. Tap to dismiss."
+        } else {
+            alarm.title
+        }
+        
+        return NotificationCompat.Builder(this, channel.getAlarmChannelId()).apply {
+            setContentIntent(buildPendingIntent(alarm))
+            setSmallIcon(R.drawable.icon)
+            setContentTitle(getString(R.string.notification_title))
+            setContentText(contentText)
+            setStyle(bigPicStyle)
+            setSound(null) // We handle audio separately
+            setLargeIcon(alarmImage)
+            setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+            setCategory(NotificationCompat.CATEGORY_ALARM)
+            if (vibratePattern != null) {
+                setVibrate(vibratePattern)
+            }
+            setPriority(NotificationCompat.PRIORITY_HIGH)
+            setOngoing(true) // Cannot be dismissed by swiping
+            setAutoCancel(false)
+            addAction(getSnoozeAction(alarm))
+            // Only set full-screen intent when actively ringing
+            if (!isPaused) {
+                setFullScreenIntent(buildPendingIntent(alarm), true)
+            }
+            // Re-show notification immediately if user somehow manages to dismiss it
+            setDeleteIntent(getDismissIntent(alarm))
+        }
+    }
+
+    private fun getDismissIntent(alarm: Alarm): PendingIntent {
+        return getActionIntent(alarm, AlarmReceiver.DISMISS_ACTION, REQUEST_CODE_ACTION_DISMISS)
+    }
+
+    private fun buildPendingIntent(alarm: Alarm): PendingIntent {
+        val alarmEntity = AlarmMapper().mapFromDomainModel(alarm)
+        val json = Json.encodeToString(alarmEntity)
+        val alarmJson = URLEncoder.encode(json, "utf-8")
+        val notificationIntent = Intent(
+            Intent.ACTION_VIEW,
+            "https://timilehinaregbesola.com/alarmId=$alarmJson".toUri(),
+            this,
+            MainActivity::class.java,
+        )
+        return TaskStackBuilder.create(this).run {
+            addNextIntentWithParentStack(notificationIntent)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                getPendingIntent(REQUEST_CODE_OPEN_TASK, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE)
+            } else {
+                getPendingIntent(REQUEST_CODE_OPEN_TASK, PendingIntent.FLAG_UPDATE_CURRENT)
+            }
+        }!!
+    }
+
+    private fun getSnoozeAction(alarm: Alarm): NotificationCompat.Action {
+        val actionTitle = getString(R.string.notification_action_snooze)
+        val intent = getActionIntent(alarm, AlarmReceiver.SNOOZE_ACTION, REQUEST_CODE_ACTION_SNOOZE)
+        return NotificationCompat.Action(0, actionTitle, intent)
+    }
+
+    private fun getActionIntent(
+        alarm: Alarm,
+        intentAction: String,
+        requestCode: Int,
+    ): PendingIntent {
+        val receiverIntent = Intent(this, AlarmReceiver::class.java).apply {
+            action = intentAction
+            putExtra(AlarmReceiver.EXTRA_TASK, alarm.alarmId)
+        }
+
+        return PendingIntent.getBroadcast(
+            this,
+            requestCode,
+            receiverIntent,
+            PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE,
+        )
+    }
+
+    override fun onDestroy() {
+        logger.d("AlarmService destroyed")
+        
+        ActiveAlarmManager.clearActiveAlarm()
+        
+        // Stop timing controller (cancels all scheduled callbacks)
+        timingController?.stop()
+        timingController = null
+        
+        stopAudioPlayback()
+        
+        try {
+            wakeLock?.let {
+                if (it.isHeld) it.release()
+            }
+        } catch (e: Exception) {
+            logger.w("Error releasing wake lock", e)
+        }
+        wakeLock = null
+        
+        super.onDestroy()
+    }
+
+    companion object {
+        const val ACTION_START_ALARM = "com.timilehinaregbesola.mathalarm.START_ALARM"
+        const val ACTION_STOP_ALARM = "com.timilehinaregbesola.mathalarm.STOP_ALARM"
+        const val ACTION_REFRESH_NOTIFICATION = "com.timilehinaregbesola.mathalarm.REFRESH_NOTIFICATION"
+        const val EXTRA_ALARM_JSON = "extra_alarm_json"
+        
+        private const val REQUEST_CODE_OPEN_TASK = 1_121_111
+        private const val REQUEST_CODE_ACTION_SNOOZE = 4_321
+        private const val REQUEST_CODE_ACTION_DISMISS = 5_678
+        
+        // Ring for 10 minutes before auto-pausing
+        private const val RING_DURATION_MILLIS = 10 * 60 * 1000L
+        
+        // Silence period before ringing again (1 minute)
+        private const val SILENCE_PERIOD_MILLIS = 1 * 60 * 1000L
+        
+        // Maximum wake lock duration (1 hour) - service stops when user dismisses
+        private const val MAX_WAKE_LOCK_MILLIS = 60 * 60 * 1000L
+        
+        /**
+         * Start the alarm service with the given alarm.
+         */
+        fun startAlarm(context: Context, alarm: Alarm) {
+            val alarmEntity = AlarmMapper().mapFromDomainModel(alarm)
+            val alarmJson = Json.encodeToString(alarmEntity)
+            
+            val intent = Intent(context, AlarmService::class.java).apply {
+                action = ACTION_START_ALARM
+                putExtra(EXTRA_ALARM_JSON, alarmJson)
+            }
+
+            context.startForegroundService(intent)
+        }
+        
+        /**
+         * Stop the alarm service.
+         */
+        fun stopAlarm(context: Context) {
+            val intent = Intent(context, AlarmService::class.java).apply {
+                action = ACTION_STOP_ALARM
+            }
+            context.stopService(intent)
+        }
+        
+        /**
+         * Refresh the notification to trigger full-screen intent again.
+         * Call this when the user closes the app while alarm is active.
+         */
+        fun refreshNotification(context: Context) {
+            val intent = Intent(context, AlarmService::class.java).apply {
+                action = ACTION_REFRESH_NOTIFICATION
+            }
+
+            context.startForegroundService(intent)
+        }
+    }
+}
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/AlarmTimingController.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/AlarmTimingController.kt
new file mode 100644
index 0000000..252d367
--- /dev/null
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/AlarmTimingController.kt
@@ -0,0 +1,104 @@
+package com.timilehinaregbesola.mathalarm.notification
+
+/**
+ * Controls the timing state machine for alarm ringing behavior.
+ * Extracted from AlarmService for testability.
+ * 
+ * State flow:
+ * IDLE -> RINGING (start) -> PAUSED (after ringDuration) -> RINGING (after silencePeriod) -> ...
+ */
+class AlarmTimingController(
+    private val ringDurationMillis: Long = DEFAULT_RING_DURATION_MILLIS,
+    private val silencePeriodMillis: Long = DEFAULT_SILENCE_PERIOD_MILLIS,
+    private val onStartRinging: () -> Unit,
+    private val onPauseRinging: () -> Unit,
+    private val scheduler: TimingScheduler
+) {
+    
+    enum class State {
+        IDLE,
+        RINGING,
+        PAUSED
+    }
+    
+    var currentState: State = State.IDLE
+        private set
+    
+    private var ringTimeoutTask: Runnable? = null
+    private var restartTask: Runnable? = null
+    
+    /**
+     * Start the alarm - begins ringing and schedules auto-pause.
+     */
+    fun start() {
+        if (currentState != State.IDLE) {
+            // Already running, just restart the ringing
+            restartRinging()
+            return
+        }
+        
+        currentState = State.RINGING
+        onStartRinging()
+        scheduleAutoPause()
+    }
+    
+    /**
+     * Stop the alarm completely - cancels all scheduled tasks.
+     */
+    fun stop() {
+        cancelAllTasks()
+        currentState = State.IDLE
+    }
+    
+    /**
+     * Called when ring duration expires - pauses audio and schedules restart.
+     */
+    private fun pauseRinging() {
+        if (currentState != State.RINGING) return
+        
+        currentState = State.PAUSED
+        onPauseRinging()
+        scheduleRestart()
+    }
+    
+    /**
+     * Called after silence period - restarts audio and schedules next pause.
+     */
+    private fun restartRinging() {
+        currentState = State.RINGING
+        onStartRinging()
+        scheduleAutoPause()
+    }
+    
+    private fun scheduleAutoPause() {
+        ringTimeoutTask?.let { scheduler.cancel(it) }
+        ringTimeoutTask = Runnable { pauseRinging() }
+        scheduler.scheduleDelayed(ringTimeoutTask!!, ringDurationMillis)
+    }
+    
+    private fun scheduleRestart() {
+        restartTask?.let { scheduler.cancel(it) }
+        restartTask = Runnable { restartRinging() }
+        scheduler.scheduleDelayed(restartTask!!, silencePeriodMillis)
+    }
+    
+    private fun cancelAllTasks() {
+        ringTimeoutTask?.let { scheduler.cancel(it) }
+        restartTask?.let { scheduler.cancel(it) }
+        ringTimeoutTask = null
+        restartTask = null
+    }
+    
+    /**
+     * Interface for scheduling - allows injection of test scheduler.
+     */
+    interface TimingScheduler {
+        fun scheduleDelayed(task: Runnable, delayMillis: Long)
+        fun cancel(task: Runnable)
+    }
+    
+    companion object {
+        const val DEFAULT_RING_DURATION_MILLIS = 10 * 60 * 1000L  // 10 minutes
+        const val DEFAULT_SILENCE_PERIOD_MILLIS = 1 * 60 * 1000L  // 1 minute
+    }
+}
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/MathAlarmNotification.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/MathAlarmNotification.kt
index 0ecc908..2cfea33 100644
--- a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/MathAlarmNotification.kt
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/MathAlarmNotification.kt
@@ -49,26 +49,30 @@ class MathAlarmNotification(
         logger.d("Showing notification for '${alarm.title}'")
         val builder = buildNotification(alarm)
 //        builder.addAction(getCompleteAction(alarm))
-        var uriExists: Boolean
-        val toneUri = alarm.alarmTone.toUri()
-        player.apply {
-            init()
-            reset()
-            try {
-                val inputStream: InputStream? = context.contentResolver.openInputStream(toneUri)
-                inputStream?.close()
-                uriExists = true
-            } catch (e: Exception) {
-                uriExists = false
-                logger.w("File corresponding to the uri does not exist $toneUri")
+        
+        // Only start audio if not already playing (to avoid duplicate sounds on notification re-show)
+        if (!player.isPlaying) {
+            var uriExists: Boolean
+            val toneUri = alarm.alarmTone.toUri()
+            player.apply {
+                init()
+                reset()
+                try {
+                    val inputStream: InputStream? = context.contentResolver.openInputStream(toneUri)
+                    inputStream?.close()
+                    uriExists = true
+                } catch (e: Exception) {
+                    uriExists = false
+                    logger.w("File corresponding to the uri does not exist $toneUri")
+                }
+                val toneString = if (uriExists) {
+                    alarm.alarmTone
+                } else {
+                    RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM).toString()
+                }
+                setDataSourceFromString(toneString)
+                startAlarmAudio()
             }
-            val toneString = if (uriExists) {
-                alarm.alarmTone
-            } else {
-                RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM).toString()
-            }
-            setDataSourceFromString(toneString)
-            startAlarmAudio()
         }
         context.getNotificationManager()?.notify(alarm.alarmId.toInt(), builder.build())
     }
@@ -116,6 +120,8 @@ class MathAlarmNotification(
             setAutoCancel(true)
             addAction(getSnoozeAction(alarm))
             setFullScreenIntent(buildPendingIntent(alarm), true)
+            // Re-show notification immediately if user tries to dismiss it
+            setDeleteIntent(getDismissIntent(alarm))
         }
 
     private fun buildPendingIntent(alarm: Alarm): PendingIntent {
@@ -150,6 +156,10 @@ class MathAlarmNotification(
         return NotificationCompat.Action(ACTION_NO_ICON, actionTitle, intent)
     }
 
+    private fun getDismissIntent(alarm: Alarm): PendingIntent {
+        return getIntent(alarm, AlarmReceiver.DISMISS_ACTION, REQUEST_CODE_ACTION_DISMISS)
+    }
+
     private fun getIntent(
         alarm: Alarm,
         intentAction: String,
@@ -177,6 +187,8 @@ class MathAlarmNotification(
 
         private const val REQUEST_CODE_ACTION_SNOOZE = 4_321
 
+        private const val REQUEST_CODE_ACTION_DISMISS = 5_678
+
         private const val ACTION_NO_ICON = 0
     }
 }
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/MathAlarmNotificationChannel.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/MathAlarmNotificationChannel.kt
index 91583c5..9938924 100644
--- a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/MathAlarmNotificationChannel.kt
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/MathAlarmNotificationChannel.kt
@@ -18,6 +18,8 @@ class MathAlarmNotificationChannel(context: Context) {
         val alarmDescription = context.getString(R.string.channel_alarm_description)
         NotificationChannel(ALARM_CHANNEL_ID, alarmName, NotificationManager.IMPORTANCE_HIGH).apply {
             description = alarmDescription
+            setBypassDnd(true)
+            lockscreenVisibility = android.app.Notification.VISIBILITY_PUBLIC
             context.getNotificationManager()?.createNotificationChannel(this)
         }
 
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/PendingIntentIdGenerator.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/PendingIntentIdGenerator.kt
new file mode 100644
index 0000000..bec8978
--- /dev/null
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/notification/PendingIntentIdGenerator.kt
@@ -0,0 +1,37 @@
+package com.timilehinaregbesola.mathalarm.notification
+
+import com.timilehinaregbesola.mathalarm.domain.model.Alarm
+
+/**
+ * Generates unique PendingIntent IDs for alarms.
+ */
+class PendingIntentIdGenerator {
+
+    /**
+     * Generates a unique PendingIntent ID for a specific alarm and day combination.
+     * 
+     * The ID is generated from: alarmId + dayIndex + hour + minute
+     * This ensures each alarm/day combination has a unique ID.
+     *
+     * @param alarm the alarm
+     * @param dayIndex the day index (0-6, Sunday to Saturday)
+     * @return unique integer ID for the PendingIntent
+     */
+    fun generateId(alarm: Alarm, dayIndex: Int): Int {
+        val stringId = StringBuilder()
+            .append(alarm.alarmId)
+            .append(dayIndex)
+            .append(alarm.hour)
+            .append(alarm.minute)
+        return stringId.toString().replace("-", "").toInt()
+    }
+
+    /**
+     * Generates a simple PendingIntent ID using just the alarm ID.
+     * Useful for one-time alarms or snooze operations.
+     *
+     * @param alarmId the alarm ID
+     * @return integer ID for the PendingIntent
+     */
+    fun generateSimpleId(alarmId: Long): Int = alarmId.toInt()
+}
diff --git a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/MainActivity.kt b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/MainActivity.kt
index 118ce43..3918470 100644
--- a/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/MainActivity.kt
+++ b/app/src/androidMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/MainActivity.kt
@@ -1,10 +1,17 @@
 package com.timilehinaregbesola.mathalarm.presentation
 
+import android.app.KeyguardManager
+import android.content.Context
 import android.content.Intent
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
+import android.view.WindowManager
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
+import co.touchlab.kermit.Logger
+import com.timilehinaregbesola.mathalarm.notification.ActiveAlarmManager
+import com.timilehinaregbesola.mathalarm.notification.AlarmService
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -37,11 +44,14 @@ import java.nio.charset.StandardCharsets
 class MainActivity : AppCompatActivity() {
     val preferences: AlarmPreferencesImpl by inject()
     private lateinit var lyricist: Lyricist<Strings>
+    private val logger = Logger.withTag("MainActivity")
 
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
         super.onCreate(savedInstanceState)
 
+        setupLockScreenFlags()
+
         deeplinkInfo = intent.extractAlarmJson()
 
         setContent {
@@ -56,6 +66,22 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun setupLockScreenFlags() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            setShowWhenLocked(true)
+            setTurnScreenOn(true)
+            val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+            keyguardManager.requestDismissKeyguard(this, null)
+        } else {
+            @Suppress("DEPRECATION")
+            window.addFlags(
+                WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+                    WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
+                    WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+            )
+        }
+    }
+
     private fun updateTheme(darkTheme: Boolean) {
         window.apply {
             statusBarColor = if (darkTheme) darkPrimary.toArgb() else Color.WHITE
@@ -65,6 +91,16 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onStop() {
+        super.onStop()
+        // If user closes the app while alarm is active, refresh the notification
+        // This will trigger the full-screen intent to pop up again
+        if (ActiveAlarmManager.hasActiveAlarm()) {
+            logger.d("App stopped with active alarm - refreshing notification")
+            AlarmService.refreshNotification(this)
+        }
+    }
+
     private fun Intent.extractAlarmJson(): String? {
         return data?.lastPathSegment
             ?.takeIf { it.startsWith("$PARAM=") }
diff --git a/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/di/CommonModule.kt b/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/di/CommonModule.kt
index 93f3d59..db622e5 100644
--- a/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/di/CommonModule.kt
+++ b/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/di/CommonModule.kt
@@ -1,6 +1,7 @@
 package com.timilehinaregbesola.mathalarm.di
 
 import com.russhwolf.settings.Settings
+import com.timilehinaregbesola.mathalarm.coroutines.AppCoroutineScope
 import com.timilehinaregbesola.mathalarm.data.AlarmDataSource
 import com.timilehinaregbesola.mathalarm.data.AlarmRepository
 import com.timilehinaregbesola.mathalarm.framework.RoomAlarmDataSource
@@ -11,6 +12,8 @@ import com.timilehinaregbesola.mathalarm.presentation.alarmmath.AlarmMathViewMod
 import com.timilehinaregbesola.mathalarm.presentation.alarmsettings.AlarmSettingsViewModel
 import com.timilehinaregbesola.mathalarm.presentation.appsettings.AlarmPreferencesImpl
 import com.timilehinaregbesola.mathalarm.presentation.appsettings.AppThemeOptionsMapper
+import com.timilehinaregbesola.mathalarm.provider.AlarmTimeCalculator
+import com.timilehinaregbesola.mathalarm.provider.AlarmTimeCalculatorImpl
 import com.timilehinaregbesola.mathalarm.provider.DateTimeProvider
 import com.timilehinaregbesola.mathalarm.provider.DateTimeProviderImpl
 import com.timilehinaregbesola.mathalarm.usecases.AddAlarm
@@ -36,11 +39,17 @@ val commonModule = module {
     single { AlarmMapper() }
     single { AppThemeOptionsMapper() }
     
+    // Coroutine Scope - replaces GlobalScope usage
+    single { AppCoroutineScope() }
+    
     // DateTime Provider
     single<DateTimeProvider> { DateTimeProviderImpl() }
     
-    // Schedule Next Alarm
-    single { ScheduleNextAlarm(get()) }
+    // Alarm Time Calculator - moves time calculation to domain layer
+    single<AlarmTimeCalculator> { AlarmTimeCalculatorImpl() }
+    
+    // Schedule Next Alarm (now depends on AlarmTimeCalculator)
+    single { ScheduleNextAlarm(get(), get()) }
     
     // Data Source and Repository
     single<AlarmDataSource> { RoomAlarmDataSource(get(), get()) }
@@ -65,9 +74,9 @@ val commonModule = module {
             findAlarm = FindAlarm(get()),
             getSavedAlarms = GetSavedAlarms(get()),
             updateAlarm = UpdateAlarm(get()),
-            scheduleAlarm = ScheduleAlarm(get(), get()),
+            scheduleAlarm = ScheduleAlarm(get(), get(), get()),
             completeAlarm = CompleteAlarm(get(), get(), get()),
-            rescheduleFutureAlarms = RescheduleFutureAlarms(get(), get()),
+            rescheduleFutureAlarms = RescheduleFutureAlarms(get(), get(), get(), get()),
             scheduleNextAlarm = get(),
             showAlarm = ShowAlarm(get(), get(), get()),
             snoozeAlarm = SnoozeAlarm(get(), get(), get(), get()),
diff --git a/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermission.kt b/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermission.kt
index 7ef7133..de6d763 100644
--- a/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermission.kt
+++ b/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermission.kt
@@ -1,7 +1,7 @@
 package com.timilehinaregbesola.mathalarm.framework.app.permission
 
 /**
- * Platform-abstracted interface for checking alarm permissions.
+ * Platform-abstracted interface for checking and managing alarm permissions.
  */
 interface AlarmPermission {
     /**
@@ -10,4 +10,16 @@ interface AlarmPermission {
      * @return `true` if the permission is granted, `false` otherwise
      */
     fun hasExactAlarmPermission(): Boolean
+
+    /**
+     * Opens the system settings screen for exact alarm permission.
+     * On Android S+, this opens the SCHEDULE_EXACT_ALARM permission screen.
+     */
+    fun openExactAlarmPermissionScreen()
+
+    /**
+     * Opens the app settings screen.
+     * Useful for directing users to manually enable permissions.
+     */
+    fun openAppSettings()
 }
diff --git a/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt b/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt
index 185e8ad..a69baf7 100644
--- a/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt
+++ b/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt
@@ -5,6 +5,7 @@ package com.timilehinaregbesola.mathalarm.interactors
 expect interface AudioPlayer {
     val currentPosition: Int
     val duration: Int
+    val isPlaying: Boolean
 
     fun init()
     fun startAlarmAudio()
diff --git a/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/components/LabelTextField.kt b/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/components/LabelTextField.kt
index 3dc1751..e65d932 100644
--- a/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/components/LabelTextField.kt
+++ b/app/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/components/LabelTextField.kt
@@ -2,6 +2,7 @@ package com.timilehinaregbesola.mathalarm.presentation.alarmsettings.components
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -10,6 +11,7 @@ import androidx.compose.material3.TextFieldDefaults.colors
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color.Companion.Transparent
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import com.timilehinaregbesola.mathalarm.presentation.ui.icon.Label
@@ -33,6 +35,9 @@ fun LabelTextField(
         label = label,
         placeholder = placeholder,
         singleLine = true,
+        keyboardOptions = KeyboardOptions(
+            imeAction = ImeAction.Done
+        ),
         colors = colors(
             unfocusedContainerColor = Transparent,
             focusedContainerColor = Transparent,
diff --git a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmInteractorFake.kt b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmInteractorFake.kt
index d470666..1851e5e 100644
--- a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmInteractorFake.kt
+++ b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmInteractorFake.kt
@@ -2,26 +2,44 @@ package com.timilehinaregbesola.mathalarm.fake
 
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.interactors.AlarmInteractor
-import com.timilehinaregbesola.mathalarm.utils.initLocalDateTimeInSystemZone
 import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
+import kotlin.time.Instant
 
 class AlarmInteractorFake : AlarmInteractor {
     private val alarmMap: MutableMap<Long, FakeData> = mutableMapOf()
-    override fun schedule(alarm: Alarm, reschedule: Boolean): Boolean {
-        alarmMap[alarm.alarmId] = FakeData(reschedule, alarm.initLocalDateTimeInSystemZone())
-        return true
+    
+    override fun schedule(alarm: Alarm, timeInMillis: Long) {
+        val instant = Instant.fromEpochMilliseconds(timeInMillis)
+        val dateTime = instant.toLocalDateTime(TimeZone.currentSystemDefault())
+        alarmMap[alarm.alarmId] = FakeData(timeInMillis, dateTime)
     }
 
     override fun cancel(alarm: Alarm) {
         alarmMap.remove(alarm.alarmId)
     }
 
+    override fun update(alarm: Alarm) {
+        val existing = alarmMap[alarm.alarmId]
+        if (existing != null) {
+            alarmMap[alarm.alarmId] = existing.copy(updated = true)
+        }
+    }
+
     fun isAlarmScheduled(alarm: Alarm): Boolean = alarmMap.contains(alarm.alarmId)
 
     fun clear() = alarmMap.clear()
 
-    fun getAlarmTime(alarmId: Long): LocalDateTime? =
-        alarmMap[alarmId]?.time
+    fun getAlarmTimeMillis(alarmId: Long): Long? = alarmMap[alarmId]?.timeInMillis
+
+    fun getAlarmTime(alarmId: Long): LocalDateTime? = alarmMap[alarmId]?.dateTime
+
+    fun getScheduledAlarms(): Map<Long, FakeData> = alarmMap.toMap()
 }
 
-data class FakeData(val reschedule: Boolean, val time: LocalDateTime)
+data class FakeData(
+    val timeInMillis: Long,
+    val dateTime: LocalDateTime,
+    val updated: Boolean = false
+)
diff --git a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmPermissionFake.kt b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmPermissionFake.kt
index f211591..d31fa97 100644
--- a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmPermissionFake.kt
+++ b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmPermissionFake.kt
@@ -5,9 +5,27 @@ import com.timilehinaregbesola.mathalarm.framework.app.permission.AlarmPermissio
 class AlarmPermissionFake(
     private var hasPermission: Boolean = true
 ) : AlarmPermission {
+    var exactAlarmPermissionScreenOpened = false
+        private set
+    var appSettingsOpened = false
+        private set
+
     override fun hasExactAlarmPermission(): Boolean = hasPermission
     
+    override fun openExactAlarmPermissionScreen() {
+        exactAlarmPermissionScreenOpened = true
+    }
+
+    override fun openAppSettings() {
+        appSettingsOpened = true
+    }
+    
     fun setPermission(granted: Boolean) {
         hasPermission = granted
     }
+
+    fun reset() {
+        exactAlarmPermissionScreenOpened = false
+        appSettingsOpened = false
+    }
 }
diff --git a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmTimeCalculatorFake.kt b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmTimeCalculatorFake.kt
new file mode 100644
index 0000000..da73594
--- /dev/null
+++ b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmTimeCalculatorFake.kt
@@ -0,0 +1,35 @@
+package com.timilehinaregbesola.mathalarm.fake
+
+import com.timilehinaregbesola.mathalarm.domain.model.Alarm
+import com.timilehinaregbesola.mathalarm.provider.AlarmTimeCalculator
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
+
+/**
+ * Fake implementation of AlarmTimeCalculator for testing.
+ */
+@OptIn(ExperimentalTime::class)
+class AlarmTimeCalculatorFake : AlarmTimeCalculator {
+    
+    private var currentTimeMillis: Long = Clock.System.now().toEpochMilliseconds()
+    
+    /**
+     * Set a custom current time for testing.
+     */
+    fun setCurrentTime(timeMillis: Long) {
+        currentTimeMillis = timeMillis
+    }
+
+    override fun calculateAlarmTimes(alarm: Alarm): List<Long> {
+        // Return a simple future time for testing (1 hour from "now")
+        return listOf(currentTimeMillis + 3600_000L)
+    }
+
+    override fun calculateNextAlarmTime(alarm: Alarm): Long? {
+        return currentTimeMillis + 3600_000L
+    }
+
+    override fun isInFuture(timeInMillis: Long): Boolean {
+        return timeInMillis > currentTimeMillis
+    }
+}
diff --git a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AudioPlayerFake.kt b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AudioPlayerFake.kt
index 78f5585..433c600 100644
--- a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AudioPlayerFake.kt
+++ b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AudioPlayerFake.kt
@@ -6,7 +6,8 @@ class AudioPlayerFake : AudioPlayer {
     var isInitialized = false
     var isReset = false
     var dataSource: String? = null
-    var isPlaying = false
+    private var _isPlaying = false
+    override val isPlaying: Boolean get() = _isPlaying
     var isStopped = false
     var volume: Float = 1.0f
     
@@ -27,13 +28,13 @@ class AudioPlayerFake : AudioPlayer {
     }
 
     override fun startAlarmAudio() {
-        isPlaying = true
+        _isPlaying = true
         isStopped = false
     }
 
     override fun stop() {
         isStopped = true
-        isPlaying = false
+        _isPlaying = false
     }
     
     override fun setPerceivedVolume(perceived: Float) {
diff --git a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmlist/AlarmListViewModelTest.kt b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmlist/AlarmListViewModelTest.kt
index 4051947..f2d6103 100644
--- a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmlist/AlarmListViewModelTest.kt
+++ b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmlist/AlarmListViewModelTest.kt
@@ -42,21 +42,22 @@ class AlarmListViewModelTest {
         dateTimeProvider = DateTimeProviderFake()
         permission = AlarmPermissionFake()
         
-        val scheduleNextAlarm = ScheduleNextAlarm(alarmInteractor)
+        val alarmTimeCalculator = AlarmTimeCalculatorFake()
+        val scheduleNextAlarm = ScheduleNextAlarm(alarmInteractor, alarmTimeCalculator)
         
         usecases = Usecases(
             addAlarm = AddAlarm(repository),
             findAlarm = FindAlarm(repository),
             deleteAlarm = DeleteAlarm(repository, alarmInteractor),
             getSavedAlarms = GetSavedAlarms(repository),
-            scheduleAlarm = ScheduleAlarm(repository, alarmInteractor),
+            scheduleAlarm = ScheduleAlarm(repository, alarmInteractor, alarmTimeCalculator),
             showAlarm = ShowAlarm(repository, notificationInteractor, scheduleNextAlarm),
             completeAlarm = CompleteAlarm(repository, alarmInteractor, notificationInteractor),
             updateAlarm = UpdateAlarm(repository),
             cancelAlarm = CancelAlarm(alarmInteractor),
             clearAlarms = ClearAlarms(repository, alarmInteractor),
             scheduleNextAlarm = scheduleNextAlarm,
-            rescheduleFutureAlarms = RescheduleFutureAlarms(repository, alarmInteractor),
+            rescheduleFutureAlarms = RescheduleFutureAlarms(repository, alarmInteractor, alarmTimeCalculator, scheduleNextAlarm),
             snoozeAlarm = SnoozeAlarm(dateTimeProvider, notificationInteractor, alarmInteractor, repository)
         )
         
diff --git a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/AlarmMathViewModelTest.kt b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/AlarmMathViewModelTest.kt
index e0b4e9e..278a594 100644
--- a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/AlarmMathViewModelTest.kt
+++ b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmmath/AlarmMathViewModelTest.kt
@@ -6,6 +6,7 @@ import com.timilehinaregbesola.mathalarm.data.AlarmRepository
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.fake.AlarmInteractorFake
 import com.timilehinaregbesola.mathalarm.fake.AlarmRepositoryFake
+import com.timilehinaregbesola.mathalarm.fake.AlarmTimeCalculatorFake
 import com.timilehinaregbesola.mathalarm.fake.AudioPlayerFake
 import com.timilehinaregbesola.mathalarm.fake.DateTimeProviderFake
 import com.timilehinaregbesola.mathalarm.fake.NotificationInteractorFake
@@ -60,21 +61,22 @@ class AlarmMathViewModelTest {
         notificationInteractor = NotificationInteractorFake()
         dateTimeProvider = DateTimeProviderFake()
         
-        val scheduleNextAlarm = ScheduleNextAlarm(alarmInteractor)
+        val alarmTimeCalculator = AlarmTimeCalculatorFake()
+        val scheduleNextAlarm = ScheduleNextAlarm(alarmInteractor, alarmTimeCalculator)
         
         usecases = Usecases(
             addAlarm = AddAlarm(repository),
             findAlarm = FindAlarm(repository),
             deleteAlarm = DeleteAlarm(repository, alarmInteractor),
             getSavedAlarms = GetSavedAlarms(repository),
-            scheduleAlarm = ScheduleAlarm(repository, alarmInteractor),
+            scheduleAlarm = ScheduleAlarm(repository, alarmInteractor, alarmTimeCalculator),
             showAlarm = ShowAlarm(repository, notificationInteractor, scheduleNextAlarm),
             completeAlarm = CompleteAlarm(repository, alarmInteractor, notificationInteractor),
             updateAlarm = UpdateAlarm(repository),
             cancelAlarm = CancelAlarm(alarmInteractor),
             clearAlarms = ClearAlarms(repository, alarmInteractor),
             scheduleNextAlarm = scheduleNextAlarm,
-            rescheduleFutureAlarms = RescheduleFutureAlarms(repository, alarmInteractor),
+            rescheduleFutureAlarms = RescheduleFutureAlarms(repository, alarmInteractor, alarmTimeCalculator, scheduleNextAlarm),
             snoozeAlarm = SnoozeAlarm(dateTimeProvider, notificationInteractor, alarmInteractor, repository)
         )
         
diff --git a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/AlarmSettingsViewModelTest.kt b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/AlarmSettingsViewModelTest.kt
index 4b97e11..21fe85b 100644
--- a/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/AlarmSettingsViewModelTest.kt
+++ b/app/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/presentation/alarmsettings/AlarmSettingsViewModelTest.kt
@@ -38,21 +38,22 @@ class AlarmSettingsViewModelTest {
         notificationInteractor = NotificationInteractorFake()
         dateTimeProvider = DateTimeProviderFake()
         
-        val scheduleNextAlarm = ScheduleNextAlarm(alarmInteractor)
+        val alarmTimeCalculator = AlarmTimeCalculatorFake()
+        val scheduleNextAlarm = ScheduleNextAlarm(alarmInteractor, alarmTimeCalculator)
         
         usecases = Usecases(
             addAlarm = AddAlarm(repository),
             findAlarm = FindAlarm(repository),
             deleteAlarm = DeleteAlarm(repository, alarmInteractor),
             getSavedAlarms = GetSavedAlarms(repository),
-            scheduleAlarm = ScheduleAlarm(repository, alarmInteractor),
+            scheduleAlarm = ScheduleAlarm(repository, alarmInteractor, alarmTimeCalculator),
             showAlarm = ShowAlarm(repository, notificationInteractor, scheduleNextAlarm),
             completeAlarm = CompleteAlarm(repository, alarmInteractor, notificationInteractor),
             updateAlarm = UpdateAlarm(repository),
             cancelAlarm = CancelAlarm(alarmInteractor),
             clearAlarms = ClearAlarms(repository, alarmInteractor),
             scheduleNextAlarm = scheduleNextAlarm,
-            rescheduleFutureAlarms = RescheduleFutureAlarms(repository, alarmInteractor),
+            rescheduleFutureAlarms = RescheduleFutureAlarms(repository, alarmInteractor, alarmTimeCalculator, scheduleNextAlarm),
             snoozeAlarm = SnoozeAlarm(dateTimeProvider, notificationInteractor, alarmInteractor, repository)
         )
         
diff --git a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/MainViewController.kt b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/MainViewController.kt
index 2ac245e..42206f3 100644
--- a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/MainViewController.kt
+++ b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/MainViewController.kt
@@ -10,19 +10,67 @@ import androidx.compose.ui.window.ComposeUIViewController
 import cafe.adriel.lyricist.ProvideStrings
 import cafe.adriel.lyricist.rememberStrings
 import com.timilehinaregbesola.mathalarm.di.initKoin
+import com.timilehinaregbesola.mathalarm.di.prewarmDatabase
 import com.timilehinaregbesola.mathalarm.navigation.NavGraph
-import com.timilehinaregbesola.mathalarm.notification.IosNotificationSetup
 import com.timilehinaregbesola.mathalarm.notification.NotificationDeeplinkHolder
 import com.timilehinaregbesola.mathalarm.presentation.appsettings.AlarmPreferencesImpl
 import com.timilehinaregbesola.mathalarm.presentation.appsettings.shouldUseDarkColors
 import com.timilehinaregbesola.mathalarm.presentation.ui.MathAlarmTheme
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import platform.UIKit.UIViewController
 
+/**
+ * Initialize Koin early - called from Swift App init() before UI loads.
+ */
+fun doInitKoin() {
+    initKoin()
+}
+
+/**
+ * Prewarm the database in background - called after Koin init
+ * This initializes Room in background so it's ready when UI needs it
+ */
+fun prewarmDatabaseInBackground() {
+    prewarmDatabase()
+}
+
+/**
+ * Request notification permissions in a non-blocking way.
+ * Call this after the UI is shown to avoid blocking startup.
+ * 
+ * The permission request is deferred to not block app launch,
+ * following best practices for permission timing.
+ */
+fun requestNotificationPermissionsDeferred() {
+    CoroutineScope(Dispatchers.Main).launch {
+        // Small delay to ensure UI is fully rendered first
+        delay(500)
+        
+        try {
+            val koinComponent = object : KoinComponent {}
+            val scheduler: com.timilehinaregbesola.mathalarm.notification.IosAlarmScheduler = 
+                koinComponent.getKoin().get()
+            
+            scheduler.requestPermissions { granted ->
+                println("requestNotificationPermissionsDeferred: granted = $granted")
+            }
+        } catch (e: Exception) {
+            println("requestNotificationPermissionsDeferred: error = ${e.message}")
+        }
+    }
+}
+
 /**
  * iOS Main View Controller - Entry point for the Compose Multiplatform UI
- * Note: Notification delegate is set up in Swift AppDelegate for proper timing
+ * 
+ * Note: Koin is initialized earlier via doInitKoin() from Swift's App init().
+ * Notification categories are registered via IosAlarmScheduler on first access.
+ * Notification delegate is set up in Swift AppDelegate for proper timing.
  */
 @OptIn(
     ExperimentalAnimationApi::class,
@@ -32,18 +80,7 @@ import platform.UIKit.UIViewController
     InternalCoroutinesApi::class
 )
 fun MainViewController(): UIViewController {
-    println("MainViewController: Initializing...")
-    
-    // Initialize Koin DI
-    initKoin()
-    
-    // Setup notification categories for alarm actions
-    IosNotificationSetup.setupNotificationCategories()
-    
-    // Request notification permissions
-    IosNotificationSetup.requestPermissions { granted ->
-        println("MainViewController: Notification permissions granted = $granted")
-    }
+    println("MainViewController: Creating Compose UI...")
     
     return ComposeUIViewController(configure = { enforceStrictPlistSanityCheck = false }) {
         val preferences = rememberKoinInject<AlarmPreferencesImpl>()
diff --git a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/di/IosModule.kt b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/di/IosModule.kt
index cff6fbc..b5c1675 100644
--- a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/di/IosModule.kt
+++ b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/di/IosModule.kt
@@ -16,8 +16,16 @@ import com.timilehinaregbesola.mathalarm.interactors.AudioPlayer
 import com.timilehinaregbesola.mathalarm.interactors.IosAudioPlayer
 import com.timilehinaregbesola.mathalarm.interactors.NotificationInteractor
 import com.timilehinaregbesola.mathalarm.interactors.NotificationInteractorImpl
+import com.timilehinaregbesola.mathalarm.notification.IosAlarmNotification
 import com.timilehinaregbesola.mathalarm.notification.IosAlarmScheduler
+import com.timilehinaregbesola.mathalarm.notification.NotificationActionDelegate
 import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.IO
+import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import org.koin.core.context.startKoin
 import org.koin.dsl.module
 import platform.Foundation.NSDocumentDirectory
@@ -28,8 +36,10 @@ import platform.Foundation.NSUserDomainMask
  * iOS-specific Koin module
  */
 val iosModule = module {
-    // Room Database for iOS
+    // Room Database for iOS - uses lazy initialization
+    // The database will only be built when first injected
     single<AlarmDatabase> {
+        println("IosModule: Building Room database (lazy init)")
         val dbFile = documentDirectory() + "/alarm_history_database.db"
         Room.databaseBuilder<AlarmDatabase>(
             name = dbFile
@@ -41,9 +51,21 @@ val iosModule = module {
     
     single { get<AlarmDatabase>().alarmDatabaseDao }
     
-    // iOS Alarm Scheduler
+    // iOS Alarm Scheduler - schedules notifications
     single { IosAlarmScheduler(getWith("IosAlarmScheduler")) }
     
+    // iOS Alarm Notification - handles showing/dismissing delivered notifications
+    single { IosAlarmNotification(getWith("IosAlarmNotification")) }
+    
+    // Notification Action Delegate - handles snooze/dismiss actions from notifications
+    single { 
+        NotificationActionDelegate(
+            appCoroutineScope = get(),
+            usecases = get(),
+            logger = getWith("NotificationActionDelegate")
+        )
+    }
+    
     // iOS Audio Player
     single<AudioPlayer> { IosAudioPlayer(getWith("IosAudioPlayer")) }
     
@@ -70,14 +92,39 @@ val iosModule = module {
 }
 
 /**
- * Initialize Koin for iOS
+ * Initialize Koin for iOS.
+ * Called once from Swift's App init() before UI loads.
  */
 fun initKoin() {
+    println("IosModule: Initializing Koin")
     startKoin {
         modules(commonModule, iosModule)
     }
 }
 
+/**
+ * Prewarm the database in background.
+ * Call this after Koin init to initialize Room on a background thread,
+ * so it's ready when the UI needs it.
+ * 
+ */
+fun prewarmDatabase() {
+    CoroutineScope(Dispatchers.IO).launch {
+        try {
+            println("IosModule: Prewarming database in background")
+            val helper = object : KoinComponent {
+                val database: AlarmDatabase by inject()
+            }
+            // Trigger lazy initialization by accessing the database
+            // This runs the Room builder and migrations off the main thread
+            helper.database.alarmDatabaseDao
+            println("IosModule: Database prewarmed successfully")
+        } catch (e: Exception) {
+            println("IosModule: Database prewarm failed: ${e.message}")
+        }
+    }
+}
+
 /**
  * Get iOS document directory path
  */
diff --git a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermissionImpl.kt b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermissionImpl.kt
index 19d7e38..261f7c9 100644
--- a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermissionImpl.kt
+++ b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermissionImpl.kt
@@ -1,5 +1,9 @@
 package com.timilehinaregbesola.mathalarm.framework.app.permission
 
+import platform.Foundation.NSURL
+import platform.UIKit.UIApplication
+import platform.UIKit.UIApplicationOpenSettingsURLString
+
 /**
  * iOS implementation of AlarmPermission.
  * iOS doesn't require explicit exact alarm permissions - local notifications
@@ -13,4 +17,22 @@ class AlarmPermissionImpl : AlarmPermission {
      * @return Always returns true on iOS
      */
     override fun hasExactAlarmPermission(): Boolean = true
+
+    /**
+     * On iOS, opens the app settings screen.
+     * iOS doesn't have a separate exact alarm permission screen.
+     */
+    override fun openExactAlarmPermissionScreen() {
+        openAppSettings()
+    }
+
+    /**
+     * Opens the iOS Settings app to this app's settings page.
+     */
+    override fun openAppSettings() {
+        val url = NSURL.URLWithString(UIApplicationOpenSettingsURLString)
+        if (url != null) {
+            UIApplication.sharedApplication.openURL(url)
+        }
+    }
 }
diff --git a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AlarmInteractorImpl.kt b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AlarmInteractorImpl.kt
index fcc7ffd..edde3c3 100644
--- a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AlarmInteractorImpl.kt
+++ b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AlarmInteractorImpl.kt
@@ -13,13 +13,22 @@ class AlarmInteractorImpl(
 
     private val scheduler = IosAlarmScheduler(logger)
 
-    override fun schedule(alarm: Alarm, reschedule: Boolean): Boolean {
-        logger.d { "AlarmInteractorImpl.schedule called: alarmId=${alarm.alarmId}, time=${alarm.hour}:${alarm.minute}, reschedule=$reschedule" }
-        return scheduler.scheduleAlarm(alarm, reschedule)
+    override fun schedule(alarm: Alarm, timeInMillis: Long) {
+        logger.d { "AlarmInteractorImpl.schedule: alarmId=${alarm.alarmId}, timeInMillis=$timeInMillis" }
+        // iOS scheduler handles time internally via UNCalendarNotificationTrigger
+        // We pass the alarm and it schedules based on alarm's hour/minute
+        scheduler.scheduleAlarm(alarm, reschedule = false)
     }
 
     override fun cancel(alarm: Alarm) {
-        logger.d { "AlarmInteractorImpl.cancel called: alarmId=${alarm.alarmId}" }
+        logger.d { "AlarmInteractorImpl.cancel: alarmId=${alarm.alarmId}" }
         scheduler.cancelAlarm(alarm)
     }
+
+    override fun update(alarm: Alarm) {
+        logger.d { "AlarmInteractorImpl.update: alarmId=${alarm.alarmId}" }
+        // On iOS, we need to cancel and reschedule to update
+        scheduler.cancelAlarm(alarm)
+        scheduler.scheduleAlarm(alarm, reschedule = true)
+    }
 }
diff --git a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt
index 990dfe8..4b45d3b 100644
--- a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt
+++ b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt
@@ -12,6 +12,7 @@ import platform.Foundation.NSURL
 actual interface AudioPlayer {
     actual val currentPosition: Int
     actual val duration: Int
+    actual val isPlaying: Boolean
 
     actual fun init()
     actual fun startAlarmAudio()
@@ -38,6 +39,9 @@ class IosAudioPlayer(
     override val duration: Int
         get() = (audioPlayer?.duration?.times(1000))?.toInt() ?: 0
     
+    override val isPlaying: Boolean
+        get() = audioPlayer?.isPlaying() == true
+    
     override fun init() {
         try {
             // Configure audio session for playback
diff --git a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosAlarmNotification.kt b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosAlarmNotification.kt
new file mode 100644
index 0000000..7a0e2da
--- /dev/null
+++ b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosAlarmNotification.kt
@@ -0,0 +1,78 @@
+package com.timilehinaregbesola.mathalarm.notification
+
+import co.touchlab.kermit.Logger
+import platform.UserNotifications.UNUserNotificationCenter
+
+/**
+ * iOS implementation for showing and dismissing alarm notifications.
+ * 
+ * Following Alkaa's pattern of separating notification display concerns
+ * from scheduling concerns for better code organization.
+ * 
+ * On iOS, the notification scheduler handles showing notifications via triggers,
+ * so the show methods are no-ops. This class primarily handles dismissing
+ * delivered notifications.
+ */
+class IosAlarmNotification(
+    private val logger: Logger
+) {
+    private val notificationCenter = UNUserNotificationCenter.currentNotificationCenter()
+
+    /**
+     * Show an alarm notification.
+     * On iOS, notifications are shown by the system when the trigger fires,
+     * so this is a no-op.
+     */
+    fun show(alarmId: Long) {
+        logger.d { "IosAlarmNotification.show - no-op on iOS (handled by trigger)" }
+        // On iOS, the notification scheduler is responsible for showing notifications
+        // via UNCalendarNotificationTrigger. This method exists for API consistency.
+    }
+
+    /**
+     * Show a repeating alarm notification.
+     * On iOS, repeating notifications are handled by the trigger configuration,
+     * so this is a no-op.
+     */
+    fun showRepeating(alarmId: Long) {
+        logger.d { "IosAlarmNotification.showRepeating - no-op on iOS (handled by trigger)" }
+        // Repeating notifications are configured in the trigger, not shown manually
+    }
+
+    /**
+     * Dismiss a delivered notification for the given alarm.
+     * 
+     * @param alarmId the alarm ID to dismiss notifications for
+     */
+    fun dismiss(alarmId: Long) {
+        logger.d { "IosAlarmNotification.dismiss - alarmId: $alarmId" }
+        
+        val identifiers = buildNotificationIdentifiers(alarmId)
+        notificationCenter.removeDeliveredNotificationsWithIdentifiers(identifiers)
+        
+        logger.d { "IosAlarmNotification.dismiss - removed ${identifiers.size} delivered notifications" }
+    }
+
+    /**
+     * Dismiss all delivered notifications.
+     */
+    fun dismissAll() {
+        logger.d { "IosAlarmNotification.dismissAll" }
+        notificationCenter.removeAllDeliveredNotifications()
+    }
+
+    /**
+     * Build list of notification identifiers for an alarm.
+     * Includes main alarm identifier and day-specific identifiers for repeating alarms.
+     */
+    private fun buildNotificationIdentifiers(alarmId: Long): List<String> {
+        val identifiers = mutableListOf("alarm_$alarmId")
+        
+        // Include day-specific identifiers for repeating alarms
+        for (i in 0..6) {
+            identifiers.add("alarm_${alarmId}_day_$i")
+        }
+        
+        return identifiers
+    }
+}
diff --git a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosAlarmScheduler.kt b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosAlarmScheduler.kt
index c1856e8..049108b 100644
--- a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosAlarmScheduler.kt
+++ b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosAlarmScheduler.kt
@@ -5,43 +5,88 @@ import com.timilehinaregbesola.mathalarm.alarm.AlarmScheduleRequest
 import com.timilehinaregbesola.mathalarm.alarm.AlarmSchedulerBridge
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import kotlinx.cinterop.ExperimentalForeignApi
-import kotlinx.datetime.Clock
-import kotlinx.datetime.DateTimeUnit
-import kotlinx.datetime.DayOfWeek
+import kotlinx.datetime.DatePeriod
 import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.LocalTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.plus
+import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
 import platform.Foundation.NSCalendar
 import platform.Foundation.NSCalendarUnitDay
 import platform.Foundation.NSCalendarUnitHour
 import platform.Foundation.NSCalendarUnitMinute
 import platform.Foundation.NSCalendarUnitMonth
-import platform.Foundation.NSCalendarUnitSecond
-import platform.Foundation.NSCalendarUnitWeekday
 import platform.Foundation.NSCalendarUnitYear
+import platform.Foundation.NSDate
 import platform.Foundation.NSDateComponents
+import platform.Foundation.dateWithTimeIntervalSince1970
 import platform.UserNotifications.UNAuthorizationOptionAlert
 import platform.UserNotifications.UNAuthorizationOptionBadge
 import platform.UserNotifications.UNAuthorizationOptionSound
 import platform.UserNotifications.UNCalendarNotificationTrigger
 import platform.UserNotifications.UNMutableNotificationContent
+import platform.UserNotifications.UNNotificationAction
+import platform.UserNotifications.UNNotificationActionOptionDestructive
+import platform.UserNotifications.UNNotificationActionOptionNone
+import platform.UserNotifications.UNNotificationCategory
+import platform.UserNotifications.UNNotificationCategoryOptionNone
 import platform.UserNotifications.UNNotificationRequest
 import platform.UserNotifications.UNNotificationSound
 import platform.UserNotifications.UNUserNotificationCenter
 import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
 /**
  * iOS Alarm Scheduler - Hybrid Implementation
  * 
  * Uses AlarmKit on iOS 26+ for native alarm experience,
  * falls back to UNUserNotificationCenter on iOS 15-25.
+ * 
+ * Following Alkaa's patterns:
+ * - Registers notification categories with action buttons on init
+ * - Uses NSDate for cleaner time conversion
+ * - Separates notification display concerns to IosAlarmNotification
  */
 class IosAlarmScheduler(
     private val logger: Logger
 ) {
     private val notificationCenter = UNUserNotificationCenter.currentNotificationCenter()
     
+    init {
+        registerNotificationCategories()
+    }
+    
+    /**
+     * Register notification categories with Snooze and Dismiss action buttons.
+     * This enables interactive buttons on the alarm notification.
+     */
+    private fun registerNotificationCategories() {
+        logger.d { "Registering notification categories with actions" }
+        
+        val snoozeAction = UNNotificationAction.actionWithIdentifier(
+            identifier = IosNotificationConstants.ACTION_IDENTIFIER_SNOOZE,
+            title = "Snooze",
+            options = UNNotificationActionOptionNone
+        )
+        
+        val dismissAction = UNNotificationAction.actionWithIdentifier(
+            identifier = IosNotificationConstants.ACTION_IDENTIFIER_DISMISS,
+            title = "Dismiss",
+            options = UNNotificationActionOptionDestructive
+        )
+        
+        val alarmCategory = UNNotificationCategory.categoryWithIdentifier(
+            identifier = IosNotificationConstants.CATEGORY_IDENTIFIER_ALARM,
+            actions = listOf(snoozeAction, dismissAction),
+            intentIdentifiers = emptyList<String>(),
+            options = UNNotificationCategoryOptionNone
+        )
+        
+        notificationCenter.setNotificationCategories(setOf(alarmCategory))
+        logger.d { "Notification categories registered successfully" }
+    }
+    
     /**
      * Check if AlarmKit is available (iOS 26+)
      */
@@ -146,18 +191,18 @@ class IosAlarmScheduler(
     }
     
     /**
-     * Schedule a one-time alarm that fires at the next occurrence of the specified time
+     * Schedule a one-time alarm that fires at the next occurrence of the specified time.
+     * Uses NSDate for cleaner time conversion following Alkaa's pattern.
      */
     @OptIn(ExperimentalForeignApi::class, ExperimentalTime::class)
     private fun scheduleOneTimeAlarm(alarm: Alarm): Boolean {
         val content = createNotificationContent(alarm)
         
-        // Create date components for the alarm time
-        val dateComponents = NSDateComponents().apply {
-            hour = alarm.hour.toLong()
-            minute = alarm.minute.toLong()
-            second = 0
-        }
+        // Calculate the next occurrence time in milliseconds
+        val timeInMillis = calculateNextAlarmTimeMillis(alarm.hour, alarm.minute)
+        
+        // Convert to NSDate and extract components (cleaner than manual NSDateComponents)
+        val dateComponents = dateComponentsFromMillis(timeInMillis)
         
         val trigger = UNCalendarNotificationTrigger.triggerWithDateMatchingComponents(
             dateComponents = dateComponents,
@@ -170,6 +215,7 @@ class IosAlarmScheduler(
             trigger = trigger
         )
         
+        logger.d { "Scheduling one-time alarm: id=${alarm.alarmId} at $timeInMillis" }
         notificationCenter.addNotificationRequest(request) { error ->
             if (error != null) {
                 logger.e { "Failed to schedule one-time alarm: ${error.localizedDescription}" }
@@ -181,6 +227,50 @@ class IosAlarmScheduler(
         return true
     }
     
+    /**
+     * Convert milliseconds timestamp to NSDateComponents.
+     * Following Alkaa's cleaner approach using NSDate.
+     */
+    @OptIn(ExperimentalForeignApi::class)
+    private fun dateComponentsFromMillis(timeInMillis: Long): NSDateComponents {
+        val nsDate = NSDate.dateWithTimeIntervalSince1970(timeInMillis / 1000.0)
+        return NSCalendar.currentCalendar.components(
+            NSCalendarUnitYear or NSCalendarUnitMonth or NSCalendarUnitDay
+                or NSCalendarUnitHour or NSCalendarUnitMinute,
+            fromDate = nsDate
+        )
+    }
+    
+    /**
+     * Calculate the next occurrence of the given hour:minute in milliseconds.
+     */
+    @OptIn(ExperimentalTime::class)
+    private fun calculateNextAlarmTimeMillis(hour: Int, minute: Int): Long {
+        val now = Instant.fromEpochMilliseconds(kotlin.time.Clock.System.now().toEpochMilliseconds())
+        val tz = TimeZone.currentSystemDefault()
+        val localNow = now.toLocalDateTime(tz)
+        val today = localNow.date
+        
+        // Create alarm time for today
+        val alarmTimeToday = LocalDateTime(
+            date = today,
+            time = LocalTime(hour, minute, 0)
+        )
+        val alarmInstantToday = alarmTimeToday.toInstant(tz)
+        
+        // If alarm time has passed today, schedule for tomorrow
+        return if (alarmInstantToday > now) {
+            alarmInstantToday.toEpochMilliseconds()
+        } else {
+            val tomorrow = today.plus(DatePeriod(days = 1))
+            val alarmTimeTomorrow = LocalDateTime(
+                date = tomorrow,
+                time = LocalTime(hour, minute, 0)
+            )
+            alarmTimeTomorrow.toInstant(tz).toEpochMilliseconds()
+        }
+    }
+    
     /**
      * Schedule a repeating alarm for specific days of the week
      */
@@ -237,50 +327,57 @@ class IosAlarmScheduler(
     }
     
     /**
-     * Create notification content for an alarm
+     * Create notification content for an alarm.
+     * Uses constants from IosNotificationConstants for consistency.
+     * 
+     * Note: Critical alerts require special Apple entitlement (not available to most apps).
+     * Instead, we use:
+     * - TimeSensitive interruption level (breaks through Focus modes)
+     * - Default sound for notification
+     * - AlarmAudioController plays full alarm sound when notification arrives/is tapped
      */
     private fun createNotificationContent(alarm: Alarm): UNMutableNotificationContent {
         return UNMutableNotificationContent().apply {
             setTitle("Math Alarm")
             setBody(alarm.title.ifEmpty { "Time to wake up! Solve the math problem to dismiss." })
             
-            // Use critical sound with max volume for alarm
-            // This bypasses Do Not Disturb and silent mode
-            // Note: Critical alerts require special entitlement from Apple for App Store
-            // For development, we use the default critical sound
+            // Use default sound or custom sound if bundled
+            // The actual alarm sound is played by AlarmAudioController in Swift
+            // when the notification arrives (foreground) or is tapped (background)
             val alarmSound = if (alarm.alarmTone.isNotEmpty()) {
-                // Try to use custom sound file if specified
-                UNNotificationSound.criticalSoundNamed(alarm.alarmTone, withAudioVolume = 1.0f)
+                // Try to use custom sound from bundle (must be .caf, .wav, .aiff, max 30 seconds)
+                UNNotificationSound.soundNamed(alarm.alarmTone)
             } else {
-                // Use default critical sound at max volume
-                UNNotificationSound.defaultCriticalSoundWithAudioVolume(1.0f)
+                // Use default notification sound - AlarmAudioController handles full alarm
+                UNNotificationSound.defaultSound
             }
             setSound(alarmSound)
             
             // Set relevance score to maximum for alarm notifications
             setRelevanceScore(1.0)
             
-            // Mark as interruptive (iOS 15+)
-            setInterruptionLevel(platform.UserNotifications.UNNotificationInterruptionLevel.UNNotificationInterruptionLevelCritical)
+            // Use TimeSensitive interruption level (iOS 15+)
+            // This breaks through Focus modes without requiring critical alerts entitlement
+            setInterruptionLevel(platform.UserNotifications.UNNotificationInterruptionLevel.UNNotificationInterruptionLevelTimeSensitive)
             
-            // Add ALL alarm data to userInfo for handling when notification is tapped
-            // This data is used to navigate to the MathScreen with the alarm info
+            // Add alarm data to userInfo using constants for key names
+            // This data is used by NotificationActionDelegate and for navigating to MathScreen
             setUserInfo(mapOf(
-                "alarmId" to alarm.alarmId,
-                "hour" to alarm.hour,
-                "minute" to alarm.minute,
-                "repeat" to alarm.repeat,
-                "repeatDays" to alarm.repeatDays,
-                "difficulty" to alarm.difficulty,
-                "snooze" to alarm.snooze,
-                "vibrate" to alarm.vibrate,
-                "alarmTone" to alarm.alarmTone,
-                "title" to alarm.title,
-                "isOn" to alarm.isOn
+                IosNotificationConstants.USER_INFO_ALARM_ID to alarm.alarmId,
+                IosNotificationConstants.USER_INFO_HOUR to alarm.hour,
+                IosNotificationConstants.USER_INFO_MINUTE to alarm.minute,
+                IosNotificationConstants.USER_INFO_REPEAT to alarm.repeat,
+                IosNotificationConstants.USER_INFO_REPEAT_DAYS to alarm.repeatDays,
+                IosNotificationConstants.USER_INFO_DIFFICULTY to alarm.difficulty,
+                IosNotificationConstants.USER_INFO_SNOOZE to alarm.snooze,
+                IosNotificationConstants.USER_INFO_VIBRATE to alarm.vibrate,
+                IosNotificationConstants.USER_INFO_ALARM_TONE to alarm.alarmTone,
+                IosNotificationConstants.USER_INFO_TITLE to alarm.title,
+                IosNotificationConstants.USER_INFO_IS_ON to alarm.isOn
             ))
             
-            // Set category for action buttons
-            setCategoryIdentifier("ALARM_CATEGORY")
+            // Set category for action buttons (registered in init)
+            setCategoryIdentifier(IosNotificationConstants.CATEGORY_IDENTIFIER_ALARM)
         }
     }
     
diff --git a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationConstants.kt b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationConstants.kt
new file mode 100644
index 0000000..8daf700
--- /dev/null
+++ b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationConstants.kt
@@ -0,0 +1,79 @@
+package com.timilehinaregbesola.mathalarm.notification
+
+/**
+ * Constants for iOS notification configuration.
+ * Centralized to avoid magic strings and ensure consistency.
+ */
+object IosNotificationConstants {
+    
+    /**
+     * Category identifier for alarm notifications.
+     * Used to associate actions with the notification.
+     */
+    const val CATEGORY_IDENTIFIER_ALARM = "ALARM_CATEGORY"
+    
+    /**
+     * Action identifier for snooze button.
+     */
+    const val ACTION_IDENTIFIER_SNOOZE = "SNOOZE_ACTION"
+    
+    /**
+     * Action identifier for dismiss button.
+     */
+    const val ACTION_IDENTIFIER_DISMISS = "DISMISS_ACTION"
+    
+    /**
+     * Key for storing alarm ID in notification userInfo.
+     */
+    const val USER_INFO_ALARM_ID = "alarmId"
+    
+    /**
+     * Key for storing alarm hour in notification userInfo.
+     */
+    const val USER_INFO_HOUR = "hour"
+    
+    /**
+     * Key for storing alarm minute in notification userInfo.
+     */
+    const val USER_INFO_MINUTE = "minute"
+    
+    /**
+     * Key for storing repeat flag in notification userInfo.
+     */
+    const val USER_INFO_REPEAT = "repeat"
+    
+    /**
+     * Key for storing repeat days in notification userInfo.
+     */
+    const val USER_INFO_REPEAT_DAYS = "repeatDays"
+    
+    /**
+     * Key for storing difficulty in notification userInfo.
+     */
+    const val USER_INFO_DIFFICULTY = "difficulty"
+    
+    /**
+     * Key for storing snooze duration in notification userInfo.
+     */
+    const val USER_INFO_SNOOZE = "snooze"
+    
+    /**
+     * Key for storing vibrate flag in notification userInfo.
+     */
+    const val USER_INFO_VIBRATE = "vibrate"
+    
+    /**
+     * Key for storing alarm tone in notification userInfo.
+     */
+    const val USER_INFO_ALARM_TONE = "alarmTone"
+    
+    /**
+     * Key for storing alarm title in notification userInfo.
+     */
+    const val USER_INFO_TITLE = "title"
+    
+    /**
+     * Key for storing isOn flag in notification userInfo.
+     */
+    const val USER_INFO_IS_ON = "isOn"
+}
diff --git a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationSetup.kt b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationSetup.kt
index 0335f07..bede9da 100644
--- a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationSetup.kt
+++ b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/IosNotificationSetup.kt
@@ -2,7 +2,6 @@ package com.timilehinaregbesola.mathalarm.notification
 
 import platform.UserNotifications.UNAuthorizationOptionAlert
 import platform.UserNotifications.UNAuthorizationOptionBadge
-import platform.UserNotifications.UNAuthorizationOptionCriticalAlert
 import platform.UserNotifications.UNAuthorizationOptionSound
 import platform.UserNotifications.UNNotificationAction
 import platform.UserNotifications.UNNotificationActionOptionDestructive
@@ -61,16 +60,20 @@ object IosNotificationSetup {
     /**
      * Request notification permissions
      * Call this when appropriate in the app flow
+     * 
+     * Note: Critical alerts require special Apple entitlement (not available to most apps).
+     * We use standard notification permissions - actual alarm sound is played by
+     * AlarmAudioController when the notification arrives.
      */
     fun requestPermissions(onResult: (Boolean) -> Unit) {
         val notificationCenter = UNUserNotificationCenter.currentNotificationCenter()
         
-        // Request authorization including critical alerts for alarm sounds
+        // Request standard notification authorization
+        // Critical alerts require Apple approval - we handle alarm sounds via AlarmAudioController
         notificationCenter.requestAuthorizationWithOptions(
             options = UNAuthorizationOptionAlert or 
                      UNAuthorizationOptionSound or 
-                     UNAuthorizationOptionBadge or
-                     UNAuthorizationOptionCriticalAlert
+                     UNAuthorizationOptionBadge
         ) { granted, error ->
             onResult(granted)
         }
diff --git a/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/NotificationActionDelegate.kt b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/NotificationActionDelegate.kt
new file mode 100644
index 0000000..0fee5c5
--- /dev/null
+++ b/app/src/iosMain/kotlin/com/timilehinaregbesola/mathalarm/notification/NotificationActionDelegate.kt
@@ -0,0 +1,84 @@
+package com.timilehinaregbesola.mathalarm.notification
+
+import co.touchlab.kermit.Logger
+import com.timilehinaregbesola.mathalarm.coroutines.AppCoroutineScope
+import com.timilehinaregbesola.mathalarm.framework.Usecases
+import platform.UserNotifications.UNNotificationResponse
+
+/**
+ * Delegate class to handle iOS notification actions.
+ * 
+ * Following Alkaa's pattern of separating notification action handling
+ * from the scheduler for cleaner code organization.
+ */
+class NotificationActionDelegate(
+    private val appCoroutineScope: AppCoroutineScope,
+    private val usecases: Usecases,
+    private val logger: Logger
+) {
+
+    /**
+     * Handles the notification response when user interacts with notification actions.
+     *
+     * @param response the notification response from iOS
+     * @param onCompletion callback to execute after handling is complete
+     */
+    fun handleNotificationResponse(response: UNNotificationResponse, onCompletion: () -> Unit) {
+        logger.d { "NotificationActionDelegate - handling response" }
+        
+        val content = response.notification.request.content
+        val userInfo = content.userInfo
+        
+        val alarmId = (userInfo[IosNotificationConstants.USER_INFO_ALARM_ID] as? Long) ?: run {
+            logger.e { "NotificationActionDelegate - alarmId not found in userInfo" }
+            onCompletion()
+            return
+        }
+        
+        logger.d { "NotificationActionDelegate - alarmId: $alarmId, action: ${response.actionIdentifier}" }
+
+        when (response.actionIdentifier) {
+            IosNotificationConstants.ACTION_IDENTIFIER_SNOOZE -> {
+                snoozeAlarm(alarmId, onCompletion)
+            }
+            IosNotificationConstants.ACTION_IDENTIFIER_DISMISS -> {
+                dismissAlarm(alarmId, onCompletion)
+            }
+            // Default action when user taps the notification itself
+            "com.apple.UNNotificationDefaultActionIdentifier" -> {
+                logger.d { "NotificationActionDelegate - default action (notification tapped)" }
+                onCompletion()
+            }
+            else -> {
+                logger.w { "NotificationActionDelegate - Unknown action: ${response.actionIdentifier}" }
+                onCompletion()
+            }
+        }
+    }
+
+    private fun snoozeAlarm(alarmId: Long, onCompletion: () -> Unit) {
+        logger.d { "NotificationActionDelegate - snoozing alarm $alarmId" }
+        appCoroutineScope.launch {
+            try {
+                usecases.snoozeAlarm(alarmId)
+                logger.d { "NotificationActionDelegate - alarm $alarmId snoozed successfully" }
+            } catch (e: Exception) {
+                logger.e { "NotificationActionDelegate - failed to snooze alarm: ${e.message}" }
+            }
+            onCompletion()
+        }
+    }
+
+    private fun dismissAlarm(alarmId: Long, onCompletion: () -> Unit) {
+        logger.d { "NotificationActionDelegate - dismissing alarm $alarmId" }
+        appCoroutineScope.launch {
+            try {
+                usecases.completeAlarm(alarmId)
+                logger.d { "NotificationActionDelegate - alarm $alarmId dismissed successfully" }
+            } catch (e: Exception) {
+                logger.e { "NotificationActionDelegate - failed to dismiss alarm: ${e.message}" }
+            }
+            onCompletion()
+        }
+    }
+}
diff --git a/app/src/test/java/com/timilehinaregbesola/mathalarm/AlarmReceiverTest.kt b/app/src/test/java/com/timilehinaregbesola/mathalarm/AlarmReceiverTest.kt
new file mode 100644
index 0000000..2e9fb29
--- /dev/null
+++ b/app/src/test/java/com/timilehinaregbesola/mathalarm/AlarmReceiverTest.kt
@@ -0,0 +1,120 @@
+package com.timilehinaregbesola.mathalarm
+
+import android.app.AlarmManager
+import android.app.Application
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.test.core.app.ApplicationProvider
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [Build.VERSION_CODES.R], application = TestApplication::class)
+class AlarmReceiverTest {
+
+    private lateinit var context: Context
+
+    @Before
+    fun setUp() {
+        context = ApplicationProvider.getApplicationContext<Application>()
+    }
+
+    @Test
+    fun `ALARM_ACTION intent should have correct extras`() {
+        val alarmId = 123L
+        val intent = createAlarmIntent(AlarmReceiver.ALARM_ACTION, alarmId)
+
+        assertEquals("Action should be ALARM_ACTION", AlarmReceiver.ALARM_ACTION, intent.action)
+        assertEquals("Should have correct alarm ID", alarmId, intent.getLongExtra(AlarmReceiver.EXTRA_TASK, 0))
+    }
+
+    @Test
+    fun `COMPLETE_ACTION intent should have correct extras`() {
+        val alarmId = 456L
+        val intent = createAlarmIntent(AlarmReceiver.COMPLETE_ACTION, alarmId)
+
+        assertEquals("Action should be COMPLETE_ACTION", AlarmReceiver.COMPLETE_ACTION, intent.action)
+        assertEquals("Should have correct alarm ID", alarmId, intent.getLongExtra(AlarmReceiver.EXTRA_TASK, 0))
+    }
+
+    @Test
+    fun `SNOOZE_ACTION intent should have correct extras`() {
+        val alarmId = 789L
+        val intent = createAlarmIntent(AlarmReceiver.SNOOZE_ACTION, alarmId)
+
+        assertEquals("Action should be SNOOZE_ACTION", AlarmReceiver.SNOOZE_ACTION, intent.action)
+        assertEquals("Should have correct alarm ID", alarmId, intent.getLongExtra(AlarmReceiver.EXTRA_TASK, 0))
+    }
+
+    @Test
+    fun `DISMISS_ACTION intent should have correct extras`() {
+        val alarmId = 111L
+        val intent = createAlarmIntent(AlarmReceiver.DISMISS_ACTION, alarmId)
+
+        assertEquals("Action should be DISMISS_ACTION", AlarmReceiver.DISMISS_ACTION, intent.action)
+        assertEquals("Should have correct alarm ID", alarmId, intent.getLongExtra(AlarmReceiver.EXTRA_TASK, 0))
+    }
+
+    // ==================== Boot Event Intent Tests ====================
+
+    @Test
+    fun `BOOT_COMPLETED intent should have correct action`() {
+        val intent = Intent(Intent.ACTION_BOOT_COMPLETED)
+
+        assertEquals("Action should be BOOT_COMPLETED", Intent.ACTION_BOOT_COMPLETED, intent.action)
+    }
+
+    @Test
+    fun `QUICKBOOT_POWERON intent should have correct action`() {
+        val intent = Intent("android.intent.action.QUICKBOOT_POWERON")
+
+        assertEquals("Action should be QUICKBOOT_POWERON", 
+            "android.intent.action.QUICKBOOT_POWERON", 
+            intent.action)
+    }
+
+    @Test
+    fun `MY_PACKAGE_REPLACED intent should have correct action`() {
+        val intent = Intent("android.intent.action.MY_PACKAGE_REPLACED")
+
+        assertEquals("Action should be MY_PACKAGE_REPLACED", 
+            "android.intent.action.MY_PACKAGE_REPLACED", 
+            intent.action)
+    }
+
+    @Test
+    fun `SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED intent should have correct action`() {
+        val intent = Intent(AlarmManager.ACTION_SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED)
+
+        assertEquals("Action should be SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED", 
+            AlarmManager.ACTION_SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED, 
+            intent.action)
+    }
+
+    @Test
+    fun `alarm intent with zero ID should work`() {
+        val intent = createAlarmIntent(AlarmReceiver.ALARM_ACTION, 0L)
+
+        assertEquals("Should have zero alarm ID", 0L, intent.getLongExtra(AlarmReceiver.EXTRA_TASK, -1))
+    }
+
+    @Test
+    fun `alarm intent with large ID should work`() {
+        val largeId = Long.MAX_VALUE
+        val intent = createAlarmIntent(AlarmReceiver.ALARM_ACTION, largeId)
+
+        assertEquals("Should have large alarm ID", largeId, intent.getLongExtra(AlarmReceiver.EXTRA_TASK, 0))
+    }
+
+    private fun createAlarmIntent(action: String, alarmId: Long): Intent {
+        return Intent(context, AlarmReceiver::class.java).apply {
+            this.action = action
+            putExtra(AlarmReceiver.EXTRA_TASK, alarmId)
+        }
+    }
+}
diff --git a/app/src/test/java/com/timilehinaregbesola/mathalarm/TestApplication.kt b/app/src/test/java/com/timilehinaregbesola/mathalarm/TestApplication.kt
new file mode 100644
index 0000000..11d287c
--- /dev/null
+++ b/app/src/test/java/com/timilehinaregbesola/mathalarm/TestApplication.kt
@@ -0,0 +1,14 @@
+package com.timilehinaregbesola.mathalarm
+
+import android.app.Application
+
+/**
+ * Test Application class that does NOT initialize Koin.
+ * This is used by Robolectric tests to avoid Koin initialization conflicts.
+ */
+class TestApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        // Do NOT start Koin - tests will manage their own state
+    }
+}
diff --git a/app/src/test/java/com/timilehinaregbesola/mathalarm/fake/PermissionCheckerFake.kt b/app/src/test/java/com/timilehinaregbesola/mathalarm/fake/PermissionCheckerFake.kt
new file mode 100644
index 0000000..0fe2f33
--- /dev/null
+++ b/app/src/test/java/com/timilehinaregbesola/mathalarm/fake/PermissionCheckerFake.kt
@@ -0,0 +1,12 @@
+package com.timilehinaregbesola.mathalarm.fake
+
+import com.timilehinaregbesola.mathalarm.framework.app.permission.PermissionChecker
+
+/**
+ * Fake implementation of PermissionChecker for testing.
+ */
+class PermissionCheckerFake(
+    var canScheduleExactAlarms: Boolean = true
+) : PermissionChecker {
+    override fun canScheduleExactAlarms(): Boolean = canScheduleExactAlarms
+}
diff --git a/app/src/test/java/com/timilehinaregbesola/mathalarm/fake/ScreenNavigatorFake.kt b/app/src/test/java/com/timilehinaregbesola/mathalarm/fake/ScreenNavigatorFake.kt
new file mode 100644
index 0000000..22f4708
--- /dev/null
+++ b/app/src/test/java/com/timilehinaregbesola/mathalarm/fake/ScreenNavigatorFake.kt
@@ -0,0 +1,26 @@
+package com.timilehinaregbesola.mathalarm.fake
+
+import com.timilehinaregbesola.mathalarm.framework.app.permission.ScreenNavigator
+
+/**
+ * Fake implementation of ScreenNavigator for testing.
+ */
+class ScreenNavigatorFake : ScreenNavigator {
+    var exactAlarmPermissionScreenOpened = false
+        private set
+    var appSettingsOpened = false
+        private set
+
+    override fun openExactAlarmPermissionScreen() {
+        exactAlarmPermissionScreenOpened = true
+    }
+
+    override fun openAppSettings() {
+        appSettingsOpened = true
+    }
+
+    fun reset() {
+        exactAlarmPermissionScreenOpened = false
+        appSettingsOpened = false
+    }
+}
diff --git a/app/src/test/java/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermissionTest.kt b/app/src/test/java/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermissionTest.kt
index de9b91f..1fbfad9 100644
--- a/app/src/test/java/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermissionTest.kt
+++ b/app/src/test/java/com/timilehinaregbesola/mathalarm/framework/app/permission/AlarmPermissionTest.kt
@@ -1,23 +1,29 @@
 package com.timilehinaregbesola.mathalarm.framework.app.permission
 
-import android.app.AlarmManager
 import android.os.Build
 import com.timilehinaregbesola.mathalarm.fake.AndroidVersionFake
-import io.mockk.every
-import io.mockk.mockk
+import com.timilehinaregbesola.mathalarm.fake.PermissionCheckerFake
+import com.timilehinaregbesola.mathalarm.fake.ScreenNavigatorFake
 import org.junit.Assert
+import org.junit.Before
 import org.junit.Test
 
 class AlarmPermissionTest {
-    private val alarmManager = mockk<AlarmManager>(relaxed = true)
-
+    private val screenNavigator = ScreenNavigatorFake()
+    private val permissionChecker = PermissionCheckerFake()
     private val androidVersion = AndroidVersionFake()
 
-    private val alarmPermission = AlarmPermissionImpl(alarmManager, androidVersion)
+    private lateinit var alarmPermission: AlarmPermissionImpl
+
+    @Before
+    fun setup() {
+        alarmPermission = AlarmPermissionImpl(screenNavigator, permissionChecker, androidVersion)
+        screenNavigator.reset()
+    }
 
     @Test
     fun `test if when permission is granted returns true`() {
-        every { alarmManager.canScheduleExactAlarms() } returns true
+        permissionChecker.canScheduleExactAlarms = true
         androidVersion.version = Build.VERSION_CODES.S
 
         val result = alarmPermission.hasExactAlarmPermission()
@@ -27,7 +33,7 @@ class AlarmPermissionTest {
 
     @Test
     fun `test if when permission is not granted returns false`() {
-        every { alarmManager.canScheduleExactAlarms() } returns false
+        permissionChecker.canScheduleExactAlarms = false
         androidVersion.version = Build.VERSION_CODES.S
 
         val result = alarmPermission.hasExactAlarmPermission()
@@ -38,9 +44,24 @@ class AlarmPermissionTest {
     @Test
     fun `test if Android below S returns true`() {
         androidVersion.version = Build.VERSION_CODES.M
+        permissionChecker.canScheduleExactAlarms = false // Should be ignored
 
         val result = alarmPermission.hasExactAlarmPermission()
 
         Assert.assertTrue(result)
     }
+
+    @Test
+    fun `test openExactAlarmPermissionScreen delegates to navigator`() {
+        alarmPermission.openExactAlarmPermissionScreen()
+
+        Assert.assertTrue(screenNavigator.exactAlarmPermissionScreenOpened)
+    }
+
+    @Test
+    fun `test openAppSettings delegates to navigator`() {
+        alarmPermission.openAppSettings()
+
+        Assert.assertTrue(screenNavigator.appSettingsOpened)
+    }
 }
diff --git a/app/src/test/java/com/timilehinaregbesola/mathalarm/notification/AlarmNotificationSchedulerTest.kt b/app/src/test/java/com/timilehinaregbesola/mathalarm/notification/AlarmNotificationSchedulerTest.kt
index ce3a5da..b7b242b 100644
--- a/app/src/test/java/com/timilehinaregbesola/mathalarm/notification/AlarmNotificationSchedulerTest.kt
+++ b/app/src/test/java/com/timilehinaregbesola/mathalarm/notification/AlarmNotificationSchedulerTest.kt
@@ -1,44 +1,253 @@
 package com.timilehinaregbesola.mathalarm.notification
 
+import android.app.AlarmManager
+import android.app.Application
 import android.content.Context
+import android.os.Build
+import androidx.test.core.app.ApplicationProvider
 import co.touchlab.kermit.Logger
+import com.timilehinaregbesola.mathalarm.AlarmReceiver
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.mockkStatic
-import kotlinx.datetime.LocalDateTime
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+import org.robolectric.shadows.ShadowAlarmManager
 
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [Build.VERSION_CODES.R], application = com.timilehinaregbesola.mathalarm.TestApplication::class)
 class AlarmNotificationSchedulerTest {
 
-    private val mockContext = mockk<Context>(relaxed = true)
-    private val mockLogger = Logger.withTag("AlarmNotificationSchedulerTest")
-
-    private val mockAlarm = mockk<Alarm>()
-
-    private val scheduler = AlarmNotificationScheduler(mockContext, mockLogger)
+    private lateinit var context: Context
+    private lateinit var alarmManager: AlarmManager
+    private lateinit var shadowAlarmManager: ShadowAlarmManager
+    private lateinit var scheduler: AlarmNotificationScheduler
+    private lateinit var logger: Logger
 
     @Before
     fun setUp() {
-        val now = LocalDateTime(2023, 1, 1, 10, 30) // Example LocalDateTime
-        mockkStatic("com.timilehinaregbesola.mathalarm.utils.extension-context")
-        every { mockAlarm.repeatDays } returns "FFFTFFF"
-        every { mockAlarm.alarmId } returns 22L
-        every { mockAlarm.repeat } returns false
-        every { mockAlarm.newDateTime } returns now
-        every { mockAlarm.hour } returns now.hour
-        every { mockAlarm.minute } returns now.minute
-    }
-
-//    @Test
-//    fun `check if alarm scheduled is valid`() {
-//        scheduler.scheduleAlarm(mockAlarm, false)
-//        verify { mockContext.setExactAlarm(mockAlarm.newDateTime.time.toNanosecondOfDay(), any()) }
-//    }
-//
-//    @Test
-//    fun `check if alarm canceled is valid`() {
-//        scheduler.cancelAlarm(mockAlarm)
-//        verify { mockContext.cancelAlarm(any()) }
-//    }
+        context = ApplicationProvider.getApplicationContext<Application>()
+        alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+        shadowAlarmManager = shadowOf(alarmManager)
+        logger = Logger.withTag("AlarmNotificationSchedulerTest")
+        scheduler = AlarmNotificationScheduler(context, logger)
+    }
+
+    @Test
+    fun `scheduleAlarm should schedule alarm with correct time`() {
+        val alarm = createAlarm(id = 1L)
+        val triggerTime = System.currentTimeMillis() + 60_000L // 1 minute from now
+
+        scheduler.scheduleAlarm(alarm, triggerTime)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertEquals("Should have one scheduled alarm", 1, scheduledAlarms.size)
+        assertEquals("Trigger time should match", triggerTime, scheduledAlarms[0].triggerAtTime)
+    }
+
+    @Test
+    fun `scheduleAlarm should create correct PendingIntent targeting AlarmReceiver`() {
+        val alarmId = 123L
+        val alarm = createAlarm(id = alarmId)
+        val triggerTime = System.currentTimeMillis() + 60_000L
+
+        scheduler.scheduleAlarm(alarm, triggerTime)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertNotNull("Should have scheduled alarm", scheduledAlarms.firstOrNull())
+        assertEquals("Should use RTC_WAKEUP type", AlarmManager.RTC_WAKEUP, scheduledAlarms[0].type)
+        
+        val pendingIntent = scheduledAlarms[0].operation
+        val shadowPendingIntent = shadowOf(pendingIntent)
+        val savedIntent = shadowPendingIntent.savedIntent
+        
+        assertEquals("Intent should have alarm ID", alarmId, savedIntent.getLongExtra(AlarmReceiver.EXTRA_TASK, -1))
+        assertEquals("Intent action should be ALARM_ACTION", AlarmReceiver.ALARM_ACTION, savedIntent.action)
+        assertEquals("Intent should target AlarmReceiver", AlarmReceiver::class.java.name, savedIntent.component?.className)
+        assertTrue("Should be a broadcast PendingIntent", shadowPendingIntent.isBroadcastIntent)
+    }
+
+    @Test
+    fun `scheduleAlarm with different alarms should schedule multiple alarms`() {
+        val alarm1 = createAlarm(id = 1L)
+        val alarm2 = createAlarm(id = 2L)
+        val alarm3 = createAlarm(id = 3L)
+        val baseTime = System.currentTimeMillis()
+
+        scheduler.scheduleAlarm(alarm1, baseTime + 60_000L)
+        scheduler.scheduleAlarm(alarm2, baseTime + 120_000L)
+        scheduler.scheduleAlarm(alarm3, baseTime + 180_000L)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertEquals("Should have three scheduled alarms", 3, scheduledAlarms.size)
+    }
+
+    @Test
+    fun `scheduleAlarm with same alarm ID should replace previous alarm`() {
+        val alarm = createAlarm(id = 1L)
+        val firstTime = System.currentTimeMillis() + 60_000L
+        val secondTime = System.currentTimeMillis() + 120_000L
+
+        scheduler.scheduleAlarm(alarm, firstTime)
+        scheduler.scheduleAlarm(alarm, secondTime)
+
+        // Due to FLAG_CANCEL_CURRENT, the second schedule should replace the first
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        // Note: Robolectric may keep both or only the latest depending on version
+        // The important thing is that when the alarm fires, it uses the latest time
+        assertTrue("Should have at least one scheduled alarm", scheduledAlarms.isNotEmpty())
+    }
+
+
+    @Test
+    fun `cancelAlarm should remove scheduled alarm`() {
+        val alarm = createAlarm(id = 1L)
+        val triggerTime = System.currentTimeMillis() + 60_000L
+
+        scheduler.scheduleAlarm(alarm, triggerTime)
+        assertEquals("Should have one scheduled alarm before cancel", 1, shadowAlarmManager.scheduledAlarms.size)
+
+        scheduler.cancelAlarm(alarm)
+        
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertTrue("Scheduled alarms should be empty after cancel", scheduledAlarms.isEmpty())
+    }
+
+    @Test
+    fun `cancelAlarm for repeating alarm should cancel all day-specific alarms`() {
+        // Repeating alarm on Mon, Wed, Fri (indices 1, 3, 5)
+        val alarm = createAlarm(id = 1L, repeatDays = "FTFTFTF")
+
+        // Schedule the base alarm
+        scheduler.scheduleAlarm(alarm, System.currentTimeMillis() + 60_000L)
+
+        // Cancel should attempt to cancel the base alarm and all day-specific ones
+        scheduler.cancelAlarm(alarm)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertTrue("All alarms should be canceled", scheduledAlarms.isEmpty())
+    }
+
+    @Test
+    fun `cancelAlarm should not affect other alarms`() {
+        val alarm1 = createAlarm(id = 1L)
+        val alarm2 = createAlarm(id = 2L)
+        val triggerTime = System.currentTimeMillis() + 60_000L
+
+        scheduler.scheduleAlarm(alarm1, triggerTime)
+        scheduler.scheduleAlarm(alarm2, triggerTime + 60_000L)
+        assertEquals("Should have two scheduled alarms", 2, shadowAlarmManager.scheduledAlarms.size)
+
+        scheduler.cancelAlarm(alarm1)
+
+        val remainingAlarms = shadowAlarmManager.scheduledAlarms
+        assertEquals("Should have one remaining alarm", 1, remainingAlarms.size)
+        
+        // Verify the remaining alarm is for alarm2
+        val pendingIntent = remainingAlarms[0].operation
+        val shadowPendingIntent = shadowOf(pendingIntent)
+        val savedIntent = shadowPendingIntent.savedIntent
+        assertEquals("Remaining alarm should be alarm2", 2L, savedIntent.getLongExtra(AlarmReceiver.EXTRA_TASK, -1))
+    }
+
+    @Test
+    fun `different alarms should have different PendingIntent request codes`() {
+        val alarm1 = createAlarm(id = 1L)
+        val alarm2 = createAlarm(id = 2L)
+        val triggerTime = System.currentTimeMillis() + 60_000L
+
+        scheduler.scheduleAlarm(alarm1, triggerTime)
+        scheduler.scheduleAlarm(alarm2, triggerTime)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertEquals("Should have two scheduled alarms", 2, scheduledAlarms.size)
+
+        val requestCode1 = shadowOf(scheduledAlarms[0].operation).requestCode
+        val requestCode2 = shadowOf(scheduledAlarms[1].operation).requestCode
+        
+        assertTrue("Request codes should be different", requestCode1 != requestCode2)
+    }
+
+    // ==================== Edge Case Tests ====================
+
+    @Test
+    fun `scheduleAlarm with zero ID should still work`() {
+        val alarm = createAlarm(id = 0L)
+        val triggerTime = System.currentTimeMillis() + 60_000L
+
+        scheduler.scheduleAlarm(alarm, triggerTime)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertEquals("Should have one scheduled alarm", 1, scheduledAlarms.size)
+    }
+
+    @Test
+    fun `scheduleAlarm with very large ID should work`() {
+        val alarm = createAlarm(id = Long.MAX_VALUE)
+        val triggerTime = System.currentTimeMillis() + 60_000L
+
+        scheduler.scheduleAlarm(alarm, triggerTime)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertEquals("Should have one scheduled alarm", 1, scheduledAlarms.size)
+    }
+
+    @Test
+    fun `updateAlarm should not throw exception`() {
+        val alarm = createAlarm(id = 1L)
+        
+        // updateAlarm is a no-op on Android but should not throw
+        scheduler.updateAlarm(alarm)
+        
+        // No assertions needed - just verify no exception is thrown
+    }
+
+    @Test
+    fun `cancelAlarm with all days enabled should attempt to cancel 7 day-specific alarms`() {
+        val alarm = createAlarm(id = 1L, repeatDays = "TTTTTTT")
+        
+        // Schedule the alarm
+        scheduler.scheduleAlarm(alarm, System.currentTimeMillis() + 60_000L)
+        
+        // Cancel should handle all 7 days
+        scheduler.cancelAlarm(alarm)
+        
+        assertTrue("All alarms should be canceled", shadowAlarmManager.scheduledAlarms.isEmpty())
+    }
+
+    @Test
+    fun `cancelAlarm with no repeat days should only cancel base alarm`() {
+        val alarm = createAlarm(id = 1L, repeatDays = "FFFFFFF")
+        
+        scheduler.scheduleAlarm(alarm, System.currentTimeMillis() + 60_000L)
+        scheduler.cancelAlarm(alarm)
+        
+        assertTrue("Alarm should be canceled", shadowAlarmManager.scheduledAlarms.isEmpty())
+    }
+
+
+    private fun createAlarm(
+        id: Long,
+        hour: Int = 7,
+        minute: Int = 0,
+        repeatDays: String = "FFFFFFF",
+        repeat: Boolean = repeatDays.contains('T'),
+        title: String = "Test Alarm"
+    ): Alarm {
+        return Alarm(
+            alarmId = id,
+            hour = hour,
+            minute = minute,
+            repeatDays = repeatDays,
+            repeat = repeat,
+            title = title,
+            isOn = true,
+            isSaved = true
+        )
+    }
 }
diff --git a/app/src/test/java/com/timilehinaregbesola/mathalarm/notification/AlarmTimingControllerTest.kt b/app/src/test/java/com/timilehinaregbesola/mathalarm/notification/AlarmTimingControllerTest.kt
new file mode 100644
index 0000000..b5ea068
--- /dev/null
+++ b/app/src/test/java/com/timilehinaregbesola/mathalarm/notification/AlarmTimingControllerTest.kt
@@ -0,0 +1,193 @@
+package com.timilehinaregbesola.mathalarm.notification
+
+import io.mockk.mockk
+import io.mockk.verify
+import io.mockk.verifyOrder
+import io.mockk.slot
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+class AlarmTimingControllerTest {
+    
+    private lateinit var onStartRinging: () -> Unit
+    private lateinit var onPauseRinging: () -> Unit
+    private lateinit var testScheduler: TestTimingScheduler
+    private lateinit var controller: AlarmTimingController
+    
+    // Test scheduler that allows manual time advancement
+    class TestTimingScheduler : AlarmTimingController.TimingScheduler {
+        private val scheduledTasks = mutableMapOf<Runnable, Long>()
+        private var currentTime = 0L
+        
+        override fun scheduleDelayed(task: Runnable, delayMillis: Long) {
+            scheduledTasks[task] = currentTime + delayMillis
+        }
+        
+        override fun cancel(task: Runnable) {
+            scheduledTasks.remove(task)
+        }
+        
+        fun advanceTimeBy(millis: Long) {
+            currentTime += millis
+            // Execute tasks that should have fired
+            val toExecute = scheduledTasks.filter { it.value <= currentTime }.keys.toList()
+            toExecute.forEach { task ->
+                scheduledTasks.remove(task)
+                task.run()
+            }
+        }
+        
+        fun hasScheduledTasks(): Boolean = scheduledTasks.isNotEmpty()
+        
+        fun getScheduledTaskCount(): Int = scheduledTasks.size
+    }
+    
+    @Before
+    fun setup() {
+        onStartRinging = mockk(relaxed = true)
+        onPauseRinging = mockk(relaxed = true)
+        testScheduler = TestTimingScheduler()
+        
+        controller = AlarmTimingController(
+            ringDurationMillis = 10_000L,  // 10 seconds for testing
+            silencePeriodMillis = 2_000L,  // 2 seconds for testing
+            onStartRinging = onStartRinging,
+            onPauseRinging = onPauseRinging,
+            scheduler = testScheduler
+        )
+    }
+    
+    @Test
+    fun `start should trigger onStartRinging and set state to RINGING`() {
+        controller.start()
+        
+        verify(exactly = 1) { onStartRinging() }
+        assertEquals(AlarmTimingController.State.RINGING, controller.currentState)
+    }
+    
+    @Test
+    fun `start should schedule auto-pause task`() {
+        controller.start()
+        
+        assert(testScheduler.hasScheduledTasks())
+    }
+    
+    @Test
+    fun `after ring duration, should pause and call onPauseRinging`() {
+        controller.start()
+        
+        // Advance time past ring duration
+        testScheduler.advanceTimeBy(10_000L)
+        
+        verify(exactly = 1) { onPauseRinging() }
+        assertEquals(AlarmTimingController.State.PAUSED, controller.currentState)
+    }
+    
+    @Test
+    fun `after silence period, should restart ringing`() {
+        controller.start()
+        
+        // Advance to pause
+        testScheduler.advanceTimeBy(10_000L)
+        verify(exactly = 1) { onPauseRinging() }
+        
+        // Advance past silence period
+        testScheduler.advanceTimeBy(2_000L)
+        
+        // Should have called onStartRinging twice (initial + restart)
+        verify(exactly = 2) { onStartRinging() }
+        assertEquals(AlarmTimingController.State.RINGING, controller.currentState)
+    }
+    
+    @Test
+    fun `full cycle should repeat - ring, pause, ring, pause`() {
+        controller.start()
+        
+        // First ring cycle
+        verify(exactly = 1) { onStartRinging() }
+        
+        // After 10s - pause
+        testScheduler.advanceTimeBy(10_000L)
+        verify(exactly = 1) { onPauseRinging() }
+        
+        // After 2s silence - restart
+        testScheduler.advanceTimeBy(2_000L)
+        verify(exactly = 2) { onStartRinging() }
+        
+        // After another 10s - pause again
+        testScheduler.advanceTimeBy(10_000L)
+        verify(exactly = 2) { onPauseRinging() }
+        
+        // After 2s silence - restart again
+        testScheduler.advanceTimeBy(2_000L)
+        verify(exactly = 3) { onStartRinging() }
+    }
+    
+    @Test
+    fun `stop should cancel all tasks and set state to IDLE`() {
+        controller.start()
+        
+        controller.stop()
+        
+        assertEquals(AlarmTimingController.State.IDLE, controller.currentState)
+        // Advancing time should not trigger any callbacks
+        testScheduler.advanceTimeBy(100_000L)
+        verify(exactly = 1) { onStartRinging() }  // Only the initial call
+        verify(exactly = 0) { onPauseRinging() }
+    }
+    
+    @Test
+    fun `stop during paused state should cancel restart`() {
+        controller.start()
+        
+        // Advance to pause
+        testScheduler.advanceTimeBy(10_000L)
+        assertEquals(AlarmTimingController.State.PAUSED, controller.currentState)
+        
+        // Stop during pause
+        controller.stop()
+        
+        // Advancing time should not restart
+        testScheduler.advanceTimeBy(10_000L)
+        verify(exactly = 1) { onStartRinging() }  // Only initial, no restart
+    }
+    
+    @Test
+    fun `calling start when already ringing should restart cycle`() {
+        controller.start()
+        verify(exactly = 1) { onStartRinging() }
+        
+        // Advance partway through ring duration
+        testScheduler.advanceTimeBy(5_000L)
+        
+        // Call start again
+        controller.start()
+        
+        // Should restart ringing
+        verify(exactly = 2) { onStartRinging() }
+        assertEquals(AlarmTimingController.State.RINGING, controller.currentState)
+    }
+    
+    @Test
+    fun `order of callbacks should be correct`() {
+        controller.start()
+        
+        // Full cycle
+        testScheduler.advanceTimeBy(10_000L)  // Pause
+        testScheduler.advanceTimeBy(2_000L)   // Restart
+        testScheduler.advanceTimeBy(10_000L)  // Pause again
+        
+        verifyOrder {
+            onStartRinging()   // Initial
+            onPauseRinging()   // After first ring
+            onStartRinging()   // Restart
+            onPauseRinging()   // After second ring
+        }
+    }
+    
+    @Test
+    fun `initial state should be IDLE`() {
+        assertEquals(AlarmTimingController.State.IDLE, controller.currentState)
+    }
+}
diff --git a/app/src/test/java/com/timilehinaregbesola/mathalarm/utils/AlarmManagerExtensionsTest.kt b/app/src/test/java/com/timilehinaregbesola/mathalarm/utils/AlarmManagerExtensionsTest.kt
new file mode 100644
index 0000000..9234c5d
--- /dev/null
+++ b/app/src/test/java/com/timilehinaregbesola/mathalarm/utils/AlarmManagerExtensionsTest.kt
@@ -0,0 +1,177 @@
+package com.timilehinaregbesola.mathalarm.utils
+
+import android.app.AlarmManager
+import android.app.Application
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.test.core.app.ApplicationProvider
+import com.timilehinaregbesola.mathalarm.AlarmReceiver
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+import org.robolectric.shadows.ShadowAlarmManager
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [Build.VERSION_CODES.R], application = com.timilehinaregbesola.mathalarm.TestApplication::class)
+class AlarmManagerExtensionsTest {
+
+    private lateinit var context: Context
+    private lateinit var alarmManager: AlarmManager
+    private lateinit var shadowAlarmManager: ShadowAlarmManager
+
+    @Before
+    fun setUp() {
+        context = ApplicationProvider.getApplicationContext<Application>()
+        alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+        shadowAlarmManager = shadowOf(alarmManager)
+    }
+
+    @Test
+    fun `setExactAlarm with future time should schedule alarm`() {
+        val futureTime = System.currentTimeMillis() + 60_000L // 1 minute from now
+        val pendingIntent = createTestPendingIntent(1)
+
+        context.setExactAlarm(futureTime, pendingIntent)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertEquals("Should have one scheduled alarm", 1, scheduledAlarms.size)
+        assertEquals("Trigger time should match", futureTime, scheduledAlarms[0].triggerAtTime)
+    }
+
+    @Test
+    fun `setExactAlarm should use RTC_WAKEUP as default type`() {
+        val futureTime = System.currentTimeMillis() + 60_000L
+        val pendingIntent = createTestPendingIntent(1)
+
+        context.setExactAlarm(futureTime, pendingIntent)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertEquals("Should use RTC_WAKEUP type", AlarmManager.RTC_WAKEUP, scheduledAlarms[0].type)
+    }
+
+    @Test
+    fun `setExactAlarm with custom type should use that type`() {
+        val futureTime = System.currentTimeMillis() + 60_000L
+        val pendingIntent = createTestPendingIntent(1)
+
+        context.setExactAlarm(futureTime, pendingIntent, AlarmManager.ELAPSED_REALTIME_WAKEUP)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertEquals("Should use ELAPSED_REALTIME_WAKEUP type", 
+            AlarmManager.ELAPSED_REALTIME_WAKEUP, 
+            scheduledAlarms[0].type)
+    }
+
+    @Test
+    fun `setExactAlarm with past time should add one week to trigger time`() {
+        val pastTime = System.currentTimeMillis() - 60_000L // 1 minute in the past
+        val pendingIntent = createTestPendingIntent(1)
+        val oneWeekInMillis = 7 * 24 * 60 * 60 * 1000L
+
+        context.setExactAlarm(pastTime, pendingIntent)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertEquals("Should have one scheduled alarm", 1, scheduledAlarms.size)
+        
+        // The alarm should be scheduled for pastTime + 1 week
+        val expectedTime = pastTime + oneWeekInMillis
+        assertEquals("Trigger time should be past time + 1 week", expectedTime, scheduledAlarms[0].triggerAtTime)
+    }
+
+    @Test
+    fun `setExactAlarm with null PendingIntent should not schedule alarm`() {
+        val futureTime = System.currentTimeMillis() + 60_000L
+
+        context.setExactAlarm(futureTime, null)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertTrue("Should have no scheduled alarms", scheduledAlarms.isEmpty())
+    }
+
+    @Test
+    fun `multiple setExactAlarm calls should schedule multiple alarms`() {
+        val baseTime = System.currentTimeMillis()
+        
+        context.setExactAlarm(baseTime + 60_000L, createTestPendingIntent(1))
+        context.setExactAlarm(baseTime + 120_000L, createTestPendingIntent(2))
+        context.setExactAlarm(baseTime + 180_000L, createTestPendingIntent(3))
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertEquals("Should have three scheduled alarms", 3, scheduledAlarms.size)
+    }
+
+    // ==================== cancelAlarm Tests ====================
+
+    @Test
+    fun `cancelAlarm should remove scheduled alarm`() {
+        val futureTime = System.currentTimeMillis() + 60_000L
+        val pendingIntent = createTestPendingIntent(1)
+        
+        context.setExactAlarm(futureTime, pendingIntent)
+        assertEquals("Should have one alarm before cancel", 1, shadowAlarmManager.scheduledAlarms.size)
+
+        context.cancelAlarm(pendingIntent)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertTrue("Should have no alarms after cancel", scheduledAlarms.isEmpty())
+    }
+
+    @Test
+    fun `cancelAlarm with null PendingIntent should not throw`() {
+        // This should not throw any exception
+        context.cancelAlarm(null)
+        
+        // No assertion needed - just verify no exception is thrown
+    }
+
+    @Test
+    fun `cancelAlarm should only cancel matching alarm`() {
+        val futureTime = System.currentTimeMillis() + 60_000L
+        val pendingIntent1 = createTestPendingIntent(1)
+        val pendingIntent2 = createTestPendingIntent(2)
+        
+        context.setExactAlarm(futureTime, pendingIntent1)
+        context.setExactAlarm(futureTime + 60_000L, pendingIntent2)
+        assertEquals("Should have two alarms before cancel", 2, shadowAlarmManager.scheduledAlarms.size)
+
+        context.cancelAlarm(pendingIntent1)
+
+        val scheduledAlarms = shadowAlarmManager.scheduledAlarms
+        assertEquals("Should have one alarm after cancel", 1, scheduledAlarms.size)
+    }
+
+    @Test
+    fun `cancelAlarm for non-existent alarm should not throw`() {
+        val pendingIntent = createTestPendingIntent(999)
+        
+        // This should not throw any exception even though the alarm was never scheduled
+        context.cancelAlarm(pendingIntent)
+    }
+
+    @Test
+    fun `getAlarmManager should return AlarmManager instance`() {
+        val alarmManager = context.getAlarmManager()
+        
+        assertTrue("Should return AlarmManager", alarmManager is AlarmManager)
+    }
+
+    private fun createTestPendingIntent(requestCode: Int): PendingIntent {
+        val intent = Intent(context, AlarmReceiver::class.java).apply {
+            action = AlarmReceiver.ALARM_ACTION
+            putExtra(AlarmReceiver.EXTRA_TASK, requestCode.toLong())
+        }
+        return PendingIntent.getBroadcast(
+            context,
+            requestCode,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+    }
+}
diff --git a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/coroutines/AppCoroutineScope.kt b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/coroutines/AppCoroutineScope.kt
new file mode 100644
index 0000000..d7c262f
--- /dev/null
+++ b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/coroutines/AppCoroutineScope.kt
@@ -0,0 +1,38 @@
+package com.timilehinaregbesola.mathalarm.coroutines
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * Application-scoped coroutine scope for background operations.
+ * 
+ * This replaces GlobalScope usage with a properly managed scope that:
+ * - Uses SupervisorJob so child failures don't cancel siblings
+ * - Uses Default dispatcher for CPU-intensive work
+ * - Can be properly cancelled if needed during app shutdown
+ * 
+ */
+class AppCoroutineScope : CoroutineScope {
+    
+    private val job = SupervisorJob()
+    
+    override val coroutineContext: CoroutineContext
+        get() = Dispatchers.Default + job
+
+    /**
+     * Launch a coroutine in the application scope.
+     */
+    fun launch(block: suspend CoroutineScope.() -> Unit) = 
+        (this as CoroutineScope).launch(block = block)
+
+    /**
+     * Cancel all coroutines in this scope.
+     * Should be called during application shutdown if needed.
+     */
+    fun cancel() {
+        job.cancel()
+    }
+}
diff --git a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AlarmInteractor.kt b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AlarmInteractor.kt
index fc90c20..c1c85ef 100644
--- a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AlarmInteractor.kt
+++ b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/interactors/AlarmInteractor.kt
@@ -11,9 +11,9 @@ interface AlarmInteractor {
      * Schedules a new alarm.
      *
      * @param alarm the alarm
-     * @param reschedule whether repeating
+     * @param timeInMillis the time to schedule the alarm in milliseconds
      */
-    fun schedule(alarm: Alarm, reschedule: Boolean): Boolean
+    fun schedule(alarm: Alarm, timeInMillis: Long)
 
     /**
      * Cancels an alarm.
@@ -21,4 +21,13 @@ interface AlarmInteractor {
      * @param alarm the alarm
      */
     fun cancel(alarm: Alarm)
+
+    /**
+     * Updates an existing alarm.
+     * On Android, the notification will trigger a BroadcastReceiver which will always get the
+     * most recent Alarm data from the database, so this may be a no-op on some platforms.
+     *
+     * @param alarm the alarm to be updated
+     */
+    fun update(alarm: Alarm)
 }
diff --git a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/provider/AlarmTimeCalculator.kt b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/provider/AlarmTimeCalculator.kt
new file mode 100644
index 0000000..794b14f
--- /dev/null
+++ b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/provider/AlarmTimeCalculator.kt
@@ -0,0 +1,37 @@
+package com.timilehinaregbesola.mathalarm.provider
+
+import com.timilehinaregbesola.mathalarm.domain.model.Alarm
+
+/**
+ * Provides alarm time calculations, respecting Inversion of Control.
+ */
+interface AlarmTimeCalculator {
+
+    /**
+     * Calculates all trigger times for an alarm based on its repeat configuration.
+     * 
+     * For non-repeating alarms, returns a single time.
+     * For repeating alarms, returns times for each enabled day.
+     *
+     * @param alarm the alarm to calculate times for
+     * @return list of times in milliseconds when the alarm should trigger
+     */
+    fun calculateAlarmTimes(alarm: Alarm): List<Long>
+
+    /**
+     * Calculates the next single trigger time for an alarm.
+     * Useful for snooze and one-time scheduling.
+     *
+     * @param alarm the alarm
+     * @return the next trigger time in milliseconds, or null if no valid time
+     */
+    fun calculateNextAlarmTime(alarm: Alarm): Long?
+
+    /**
+     * Checks if the given time is in the future.
+     *
+     * @param timeInMillis the time to check
+     * @return true if the time is in the future
+     */
+    fun isInFuture(timeInMillis: Long): Boolean
+}
diff --git a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/provider/AlarmTimeCalculatorImpl.kt b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/provider/AlarmTimeCalculatorImpl.kt
new file mode 100644
index 0000000..198691b
--- /dev/null
+++ b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/provider/AlarmTimeCalculatorImpl.kt
@@ -0,0 +1,127 @@
+package com.timilehinaregbesola.mathalarm.provider
+
+import com.timilehinaregbesola.mathalarm.domain.model.Alarm
+import kotlinx.datetime.DatePeriod
+import kotlinx.datetime.DayOfWeek
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.LocalTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.plus
+import kotlinx.datetime.toInstant
+import kotlin.time.ExperimentalTime
+
+@OptIn(ExperimentalTime::class)
+class AlarmTimeCalculatorImpl(
+    private val dateTimeProvider: DateTimeProvider = DateTimeProviderImpl()
+) : AlarmTimeCalculator {
+
+    companion object {
+        private const val SUN = 0
+        private const val SAT = 6
+    }
+
+    override fun calculateAlarmTimes(alarm: Alarm): List<Long> {
+        val tz = TimeZone.currentSystemDefault()
+        val localNow = dateTimeProvider.getCurrentDateTime()
+        val nowInstant = localNow.toInstant(tz)
+        val todayDate = localNow.date
+        val currentDayIndex = todayDate.dayOfWeek.toIndex()
+
+        val times = mutableListOf<Long>()
+
+        // Determine which days to schedule
+        val repeatDays = if (alarm.repeatDays == "FFFFFFF") {
+            // No repeat days set - determine the closest possible date
+            val alarmTimeToday = LocalDateTime(
+                date = todayDate,
+                time = LocalTime(alarm.hour, alarm.minute, 0)
+            )
+            val alarmInstantToday = alarmTimeToday.toInstant(tz)
+
+            val dayIndex = if (alarmInstantToday > nowInstant) {
+                currentDayIndex // Set for today
+            } else {
+                // Set for tomorrow
+                if (currentDayIndex == SAT) SUN else currentDayIndex + 1
+            }
+
+            "FFFFFFF".toCharArray().apply {
+                this[dayIndex] = 'T'
+            }.concatToString()
+        } else {
+            alarm.repeatDays
+        }
+
+        for (i in SUN..SAT) {
+            if (repeatDays.getOrNull(i) == 'T') {
+                val targetDate = calculateTargetDate(
+                    currentDayIndex = currentDayIndex,
+                    targetDayIndex = i,
+                    todayDate = todayDate,
+                    alarmHour = alarm.hour,
+                    alarmMinute = alarm.minute,
+                    nowInstant = nowInstant,
+                    tz = tz
+                )
+
+                val targetDateTime = LocalDateTime(
+                    date = targetDate,
+                    time = LocalTime(alarm.hour, alarm.minute, 0)
+                )
+
+                times.add(targetDateTime.toInstant(tz).toEpochMilliseconds())
+            }
+        }
+
+        return times
+    }
+
+    override fun calculateNextAlarmTime(alarm: Alarm): Long? {
+        val times = calculateAlarmTimes(alarm)
+        return times.minOrNull()
+    }
+
+    @OptIn(ExperimentalTime::class)
+    override fun isInFuture(timeInMillis: Long): Boolean {
+        val tz = TimeZone.currentSystemDefault()
+        val currentTime = dateTimeProvider.getCurrentDateTime().toInstant(tz).toEpochMilliseconds()
+        return timeInMillis > currentTime
+    }
+
+    private fun calculateTargetDate(
+        currentDayIndex: Int,
+        targetDayIndex: Int,
+        todayDate: kotlinx.datetime.LocalDate,
+        alarmHour: Int,
+        alarmMinute: Int,
+        nowInstant: kotlin.time.Instant,
+        tz: TimeZone
+    ): kotlinx.datetime.LocalDate {
+        val alarmTimeToday = LocalDateTime(
+            date = todayDate,
+            time = LocalTime(alarmHour, alarmMinute, 0)
+        )
+        val alarmInstantToday = alarmTimeToday.toInstant(tz)
+        val isPastToday = alarmInstantToday < nowInstant
+
+        val daysUntilAlarm = if (currentDayIndex > targetDayIndex || (currentDayIndex == targetDayIndex && isPastToday)) {
+            // Schedule for next week
+            SAT - currentDayIndex + 1 + targetDayIndex
+        } else {
+            // Schedule for this week
+            targetDayIndex - currentDayIndex
+        }
+
+        return todayDate.plus(DatePeriod(days = daysUntilAlarm))
+    }
+
+    private fun DayOfWeek.toIndex(): Int = when (this) {
+        DayOfWeek.SUNDAY -> 0
+        DayOfWeek.MONDAY -> 1
+        DayOfWeek.TUESDAY -> 2
+        DayOfWeek.WEDNESDAY -> 3
+        DayOfWeek.THURSDAY -> 4
+        DayOfWeek.FRIDAY -> 5
+        DayOfWeek.SATURDAY -> 6
+    }
+}
diff --git a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/RescheduleFutureAlarms.kt b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/RescheduleFutureAlarms.kt
index 521ff55..ee256c3 100644
--- a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/RescheduleFutureAlarms.kt
+++ b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/RescheduleFutureAlarms.kt
@@ -3,27 +3,67 @@ package com.timilehinaregbesola.mathalarm.usecases
 import com.timilehinaregbesola.mathalarm.data.AlarmRepository
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.interactors.AlarmInteractor
+import com.timilehinaregbesola.mathalarm.provider.AlarmTimeCalculator
+import kotlinx.coroutines.flow.first
 
 /**
  * Use case to reschedule tasks scheduled in the future or missing repeating.
  */
 class RescheduleFutureAlarms(
     private val alarmRepository: AlarmRepository,
-    private val alarmInteractor: AlarmInteractor
+    private val alarmInteractor: AlarmInteractor,
+    private val alarmTimeCalculator: AlarmTimeCalculator,
+    private val scheduleNextAlarm: ScheduleNextAlarm
 ) {
 
     /**
-     * Reschedule scheduled and misses repeating tasks.
+     * Reschedule scheduled and missed repeating alarms.
+     * 
+     * This separates handling into two categories:
+     * 1. Future alarms - alarms with next trigger time in the future
+     * 2. Missed repeating alarms - repeating alarms whose time has passed
      */
     suspend operator fun invoke() {
-        alarmRepository.getSavedAlarms().collect { list ->
-            val futureAlarms = list.filter { it.isOn }
-            futureAlarms.forEach { rescheduleFutureAlarm(it) }
-        }
+        val activeAlarms = alarmRepository.getSavedAlarms().first().filter { it.isOn }
+        
+        val futureAlarms = activeAlarms.filter { isFutureAlarm(it) }
+        val missedRepeating = activeAlarms.filter { isMissedRepeating(it) }
+
+        futureAlarms.forEach { rescheduleFutureAlarm(it) }
+        missedRepeating.forEach { rescheduleRepeatingAlarm(it) }
     }
 
+    /**
+     * Checks if the alarm's next trigger time is in the future.
+     */
+    private fun isFutureAlarm(alarm: Alarm): Boolean {
+        val nextTime = alarmTimeCalculator.calculateNextAlarmTime(alarm) ?: return false
+        return alarmTimeCalculator.isInFuture(nextTime)
+    }
+
+    /**
+     * Checks if this is a repeating alarm whose time has already passed.
+     */
+    private fun isMissedRepeating(alarm: Alarm): Boolean {
+        if (!alarm.repeat) return false
+        val nextTime = alarmTimeCalculator.calculateNextAlarmTime(alarm) ?: return false
+        return !alarmTimeCalculator.isInFuture(nextTime)
+    }
+
+    /**
+     * Reschedule a future alarm by calculating its times and scheduling each.
+     */
     private fun rescheduleFutureAlarm(alarm: Alarm) {
-        alarmInteractor.schedule(alarm, alarm.repeat)
-//        logger.debug("Task '${alarm.title} rescheduled to '${alarm.dueDate}")
+        val alarmTimes = alarmTimeCalculator.calculateAlarmTimes(alarm)
+        alarmTimes.forEach { timeInMillis ->
+            alarmInteractor.schedule(alarm, timeInMillis)
+        }
+    }
+
+    /**
+     * Reschedule a missed repeating alarm by advancing to its next occurrence.
+     */
+    private fun rescheduleRepeatingAlarm(alarm: Alarm) {
+        scheduleNextAlarm(alarm)
     }
 }
diff --git a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleAlarm.kt b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleAlarm.kt
index 8cbdb55..b6ee0b8 100644
--- a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleAlarm.kt
+++ b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleAlarm.kt
@@ -3,28 +3,48 @@ package com.timilehinaregbesola.mathalarm.usecases
 import com.timilehinaregbesola.mathalarm.data.AlarmRepository
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.interactors.AlarmInteractor
+import com.timilehinaregbesola.mathalarm.provider.AlarmTimeCalculator
 
 class ScheduleAlarm(
     private val alarmRepository: AlarmRepository,
-    private val alarmInteractor: AlarmInteractor
+    private val alarmInteractor: AlarmInteractor,
+    private val alarmTimeCalculator: AlarmTimeCalculator
 ) {
 
     /**
      * Schedules a new alarm.
      *
      * @param alarm the alarm
-     * @param reschedule whether alarm should reschedule
+     * @param reschedule whether alarm should reschedule (cancels existing before scheduling)
      */
     suspend operator fun invoke(alarm: Alarm, reschedule: Boolean) {
         val foundAlarm = if (alarm.alarmId == 0L) {
             alarmRepository.getLatestAlarm()
         } else {
-            val found = alarmRepository.findAlarm(alarm.alarmId) ?: return
-            found
+            alarmRepository.findAlarm(alarm.alarmId) ?: return
+        } ?: return
+
+        // Cancel existing alarm if rescheduling
+        if (reschedule) {
+            alarmInteractor.cancel(foundAlarm)
+        }
+
+        // Calculate all alarm times and schedule each one
+        val alarmTimes = alarmTimeCalculator.calculateAlarmTimes(foundAlarm)
+        
+        if (alarmTimes.isEmpty()) {
+            // No valid times to schedule
+            val updatedAlarm = foundAlarm.copy(isOn = false)
+            alarmRepository.updateAlarm(updatedAlarm)
+            return
         }
-//        val foundAlarm = alarmRepository.findAlarm(alarm.alarmId) ?: return
-        val isOn = alarmInteractor.schedule(foundAlarm!!, reschedule)
-        val updatedAlarm = foundAlarm.copy(isOn = isOn)
+
+        // Schedule each alarm time
+        alarmTimes.forEach { timeInMillis ->
+            alarmInteractor.schedule(foundAlarm, timeInMillis)
+        }
+
+        val updatedAlarm = foundAlarm.copy(isOn = true)
         alarmRepository.updateAlarm(updatedAlarm)
         alarmRepository.getAlarms()
     }
diff --git a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleNextAlarm.kt b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleNextAlarm.kt
index b0e163a..8edf452 100644
--- a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleNextAlarm.kt
+++ b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleNextAlarm.kt
@@ -2,12 +2,14 @@ package com.timilehinaregbesola.mathalarm.usecases
 
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.interactors.AlarmInteractor
+import com.timilehinaregbesola.mathalarm.provider.AlarmTimeCalculator
 
 /**
  * Schedules the next alarm entry or the missing ones in a repeating alarm.
  */
 class ScheduleNextAlarm(
     private val alarmInteractor: AlarmInteractor,
+    private val alarmTimeCalculator: AlarmTimeCalculator,
 ) {
 
     /**
@@ -19,7 +21,9 @@ class ScheduleNextAlarm(
         require(alarm.repeat) { "Alarm is not repeating" }
         require(alarm.isOn) { "Alarm is not on" }
 
-        alarmInteractor.schedule(alarm, alarm.repeat)
-//        logger.debug("ScheduleNextAlarm = Task = '${alarm.title}' at ${alarm.dueDate.time} ")
+        val alarmTimes = alarmTimeCalculator.calculateAlarmTimes(alarm)
+        alarmTimes.forEach { timeInMillis ->
+            alarmInteractor.schedule(alarm, timeInMillis)
+        }
     }
 }
diff --git a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/SnoozeAlarm.kt b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/SnoozeAlarm.kt
index cb427ed..5e810d0 100644
--- a/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/SnoozeAlarm.kt
+++ b/core/src/commonMain/kotlin/com/timilehinaregbesola/mathalarm/usecases/SnoozeAlarm.kt
@@ -35,11 +35,15 @@ class SnoozeAlarm(
         val alarm = alarmRepository.findAlarm(alarmId) ?: return
 
         val snoozedTime = getSnoozedDateTime(dateTimeProvider.getCurrentDateTime(), minutes)
-        alarm.apply {
-            hour = snoozedTime.hour
+        val updatedAlarm = alarm.copy(
+            hour = snoozedTime.hour,
             minute = snoozedTime.minute
-        }
-        alarmInteractor.schedule(alarm, alarm.repeat)
+        )
+        
+        // Calculate snooze time in millis and schedule
+        val tz = TimeZone.currentSystemDefault()
+        val timeInMillis = snoozedTime.toInstant(tz).toEpochMilliseconds()
+        alarmInteractor.schedule(updatedAlarm, timeInMillis)
         notificationInteractor.dismiss(alarmId)
     }
 
diff --git a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmInteractorFake.kt b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmInteractorFake.kt
index 50b3fd0..36a8132 100644
--- a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmInteractorFake.kt
+++ b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmInteractorFake.kt
@@ -5,38 +5,40 @@ import com.timilehinaregbesola.mathalarm.interactors.AlarmInteractor
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
-import kotlin.time.Clock
-import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
 class AlarmInteractorFake : AlarmInteractor {
     private val alarmMap: MutableMap<Long, FakeData> = mutableMapOf()
     
-    override fun schedule(alarm: Alarm, reschedule: Boolean): Boolean {
-        alarmMap[alarm.alarmId] = FakeData(reschedule, getAlarmDateTime(alarm))
-        return true
+    override fun schedule(alarm: Alarm, timeInMillis: Long) {
+        val instant = Instant.fromEpochMilliseconds(timeInMillis)
+        val dateTime = instant.toLocalDateTime(TimeZone.currentSystemDefault())
+        alarmMap[alarm.alarmId] = FakeData(timeInMillis, dateTime)
     }
 
     override fun cancel(alarm: Alarm) {
         alarmMap.remove(alarm.alarmId)
     }
 
+    override fun update(alarm: Alarm) {
+        // For testing, update just marks the alarm as updated
+        val existing = alarmMap[alarm.alarmId]
+        if (existing != null) {
+            alarmMap[alarm.alarmId] = existing.copy(updated = true)
+        }
+    }
+
     fun isAlarmScheduled(alarm: Alarm): Boolean = alarmMap.contains(alarm.alarmId)
 
     fun clear() = alarmMap.clear()
 
-    fun getAlarmTime(alarmId: Long): LocalDateTime? =
-        alarmMap[alarmId]?.time
-        
-    @OptIn(ExperimentalTime::class)
-    private fun getAlarmDateTime(alarm: Alarm): LocalDateTime {
-        val nowInstant = Clock.System.now()
-        val tz = TimeZone.currentSystemDefault()
-        val today = nowInstant.toLocalDateTime(tz).date
-        return LocalDateTime(
-            date = today,
-            time = kotlinx.datetime.LocalTime(alarm.hour, alarm.minute, 0)
-        )
-    }
+    fun getAlarmTimeMillis(alarmId: Long): Long? = alarmMap[alarmId]?.timeInMillis
+
+    fun getScheduledAlarms(): Map<Long, FakeData> = alarmMap.toMap()
 }
 
-data class FakeData(val reschedule: Boolean, val time: LocalDateTime)
+data class FakeData(
+    val timeInMillis: Long,
+    val dateTime: LocalDateTime,
+    val updated: Boolean = false
+)
diff --git a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmTimeCalculatorFake.kt b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmTimeCalculatorFake.kt
new file mode 100644
index 0000000..da73594
--- /dev/null
+++ b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/AlarmTimeCalculatorFake.kt
@@ -0,0 +1,35 @@
+package com.timilehinaregbesola.mathalarm.fake
+
+import com.timilehinaregbesola.mathalarm.domain.model.Alarm
+import com.timilehinaregbesola.mathalarm.provider.AlarmTimeCalculator
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
+
+/**
+ * Fake implementation of AlarmTimeCalculator for testing.
+ */
+@OptIn(ExperimentalTime::class)
+class AlarmTimeCalculatorFake : AlarmTimeCalculator {
+    
+    private var currentTimeMillis: Long = Clock.System.now().toEpochMilliseconds()
+    
+    /**
+     * Set a custom current time for testing.
+     */
+    fun setCurrentTime(timeMillis: Long) {
+        currentTimeMillis = timeMillis
+    }
+
+    override fun calculateAlarmTimes(alarm: Alarm): List<Long> {
+        // Return a simple future time for testing (1 hour from "now")
+        return listOf(currentTimeMillis + 3600_000L)
+    }
+
+    override fun calculateNextAlarmTime(alarm: Alarm): Long? {
+        return currentTimeMillis + 3600_000L
+    }
+
+    override fun isInFuture(timeInMillis: Long): Boolean {
+        return timeInMillis > currentTimeMillis
+    }
+}
diff --git a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/DateTimeProviderFake.kt b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/DateTimeProviderFake.kt
new file mode 100644
index 0000000..8c72e3a
--- /dev/null
+++ b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/fake/DateTimeProviderFake.kt
@@ -0,0 +1,45 @@
+package com.timilehinaregbesola.mathalarm.fake
+
+import com.timilehinaregbesola.mathalarm.provider.DateTimeProvider
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
+
+class DateTimeProviderFake : DateTimeProvider {
+    private var fixedDateTime: LocalDateTime? = null
+
+    @OptIn(ExperimentalTime::class)
+    override fun getCurrentDateTime(): LocalDateTime {
+        return fixedDateTime ?: Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())
+    }
+
+    /**
+     * Set a fixed date/time for deterministic testing.
+     */
+    fun setFixedDateTime(dateTime: LocalDateTime) {
+        fixedDateTime = dateTime
+    }
+
+    /**
+     * Set a fixed date/time using individual components.
+     */
+    fun setFixedDateTime(
+        year: Int,
+        month: Int,
+        dayOfMonth: Int,
+        hour: Int,
+        minute: Int,
+        second: Int = 0
+    ) {
+        fixedDateTime = LocalDateTime(year, month, dayOfMonth, hour, minute, second)
+    }
+
+    /**
+     * Clear the fixed time and return to using the real clock.
+     */
+    fun clearFixedDateTime() {
+        fixedDateTime = null
+    }
+}
diff --git a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/provider/AlarmTimeCalculatorImplTest.kt b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/provider/AlarmTimeCalculatorImplTest.kt
new file mode 100644
index 0000000..f5e5b86
--- /dev/null
+++ b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/provider/AlarmTimeCalculatorImplTest.kt
@@ -0,0 +1,287 @@
+package com.timilehinaregbesola.mathalarm.provider
+
+import com.timilehinaregbesola.mathalarm.domain.model.Alarm
+import com.timilehinaregbesola.mathalarm.fake.DateTimeProviderFake
+import io.kotest.matchers.collections.shouldHaveSize
+import io.kotest.matchers.shouldBe
+import kotlinx.datetime.DayOfWeek
+import kotlinx.datetime.Instant
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toInstant
+import kotlinx.datetime.toLocalDateTime
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+
+class AlarmTimeCalculatorImplTest {
+
+    private lateinit var dateTimeProvider: DateTimeProviderFake
+    private lateinit var calculator: AlarmTimeCalculatorImpl
+
+    @BeforeTest
+    fun setup() {
+        dateTimeProvider = DateTimeProviderFake()
+        calculator = AlarmTimeCalculatorImpl(dateTimeProvider)
+    }
+
+    @Test
+    fun `non-repeating alarm in the future today should be scheduled for today`() {
+        // Wednesday, January 8, 2025 at 9:00 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 9, 0)
+        
+        // Alarm set for 10:00 AM (1 hour in future)
+        val alarm = Alarm(hour = 10, minute = 0, repeatDays = "FFFFFFF")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        times shouldHaveSize 1
+        val alarmDateTime = instantToLocalDateTime(times.first())
+        alarmDateTime.dayOfMonth shouldBe 8
+        alarmDateTime.hour shouldBe 10
+        alarmDateTime.minute shouldBe 0
+    }
+
+    @Test
+    fun `non-repeating alarm in the past today should be scheduled for tomorrow`() {
+        // Wednesday, January 8, 2025 at 11:00 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 11, 0)
+        
+        // Alarm set for 10:00 AM (already passed)
+        val alarm = Alarm(hour = 10, minute = 0, repeatDays = "FFFFFFF")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        times shouldHaveSize 1
+        val alarmDateTime = instantToLocalDateTime(times.first())
+        alarmDateTime.dayOfMonth shouldBe 9 // Tomorrow
+        alarmDateTime.hour shouldBe 10
+        alarmDateTime.minute shouldBe 0
+    }
+
+    @Test
+    fun `non-repeating alarm at midnight should handle day rollover`() {
+        // Saturday at 11:30 PM
+        dateTimeProvider.setFixedDateTime(2025, 1, 11, 23, 30)
+        
+        // Alarm set for midnight (00:00) - should be tomorrow
+        val alarm = Alarm(hour = 0, minute = 0, repeatDays = "FFFFFFF")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        times shouldHaveSize 1
+        val alarmDateTime = instantToLocalDateTime(times.first())
+        alarmDateTime.dayOfMonth shouldBe 12 // Sunday
+        alarmDateTime.hour shouldBe 0
+        alarmDateTime.minute shouldBe 0
+    }
+
+    @Test
+    fun `repeating alarm for weekdays only should return 5 times`() {
+        // Sunday, January 5, 2025 at 8:00 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 5, 8, 0)
+        
+        // Alarm for weekdays: Mon-Fri (indices 1-5)
+        // repeatDays format: "FTTTTFF" (Sun=F, Mon=T, Tue=T, Wed=T, Thu=T, Fri=F, Sat=F)
+        // Wait, let me check the format - indices are SUN=0, MON=1, etc.
+        // So weekdays Mon-Fri = indices 1,2,3,4,5 = "FTTTTTF"
+        val alarm = Alarm(hour = 7, minute = 0, repeat = true, repeatDays = "FTTTTTF")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        times shouldHaveSize 5
+    }
+
+    @Test
+    fun `repeating alarm for weekends only should return 2 times`() {
+        // Monday, January 6, 2025 at 8:00 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 6, 8, 0)
+        
+        // Alarm for weekends: Sat and Sun (indices 0 and 6)
+        // repeatDays = "TFFFFFT"
+        val alarm = Alarm(hour = 9, minute = 0, repeat = true, repeatDays = "TFFFFFT")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        times shouldHaveSize 2
+    }
+
+    @Test
+    fun `repeating alarm for all days should return 7 times`() {
+        // Monday, January 6, 2025 at 8:00 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 6, 8, 0)
+        
+        val alarm = Alarm(hour = 6, minute = 30, repeat = true, repeatDays = "TTTTTTT")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        times shouldHaveSize 7
+    }
+
+    @Test
+    fun `repeating alarm for single day in future this week`() {
+        // Monday, January 6, 2025 at 8:00 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 6, 8, 0)
+        
+        // Alarm only on Wednesday (index 3)
+        val alarm = Alarm(hour = 7, minute = 0, repeat = true, repeatDays = "FFFTFFF")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        times shouldHaveSize 1
+        val alarmDateTime = instantToLocalDateTime(times.first())
+        alarmDateTime.dayOfWeek shouldBe DayOfWeek.WEDNESDAY
+        alarmDateTime.dayOfMonth shouldBe 8 // Wednesday Jan 8
+    }
+
+    @Test
+    fun `repeating alarm for single day already passed this week should schedule next week`() {
+        // Wednesday, January 8, 2025 at 8:00 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 8, 0)
+        
+        // Alarm only on Monday (index 1) - already passed this week
+        val alarm = Alarm(hour = 7, minute = 0, repeat = true, repeatDays = "FTFFFFF")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        times shouldHaveSize 1
+        val alarmDateTime = instantToLocalDateTime(times.first())
+        alarmDateTime.dayOfWeek shouldBe DayOfWeek.MONDAY
+        alarmDateTime.dayOfMonth shouldBe 13 // Next Monday
+    }
+
+    @Test
+    fun `repeating alarm for today but time already passed should schedule next week`() {
+        // Wednesday, January 8, 2025 at 10:00 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 10, 0)
+        
+        // Alarm only on Wednesday (index 3) at 7:00 AM - already passed
+        val alarm = Alarm(hour = 7, minute = 0, repeat = true, repeatDays = "FFFTFFF")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        times shouldHaveSize 1
+        val alarmDateTime = instantToLocalDateTime(times.first())
+        alarmDateTime.dayOfWeek shouldBe DayOfWeek.WEDNESDAY
+        alarmDateTime.dayOfMonth shouldBe 15 // Next Wednesday
+    }
+
+    @Test
+    fun `repeating alarm for today in the future should schedule today`() {
+        // Wednesday, January 8, 2025 at 6:00 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 6, 0)
+        
+        // Alarm only on Wednesday (index 3) at 7:00 AM - in the future
+        val alarm = Alarm(hour = 7, minute = 0, repeat = true, repeatDays = "FFFTFFF")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        times shouldHaveSize 1
+        val alarmDateTime = instantToLocalDateTime(times.first())
+        alarmDateTime.dayOfWeek shouldBe DayOfWeek.WEDNESDAY
+        alarmDateTime.day shouldBe 8 // Today
+    }
+
+    @Test
+    fun `saturday to sunday rollover for non-repeating alarm`() {
+        // Saturday at 11:00 PM
+        dateTimeProvider.setFixedDateTime(2025, 1, 11, 23, 0)
+        
+        // Alarm set for 8:00 AM (already passed today, so tomorrow)
+        val alarm = Alarm(hour = 8, minute = 0, repeatDays = "FFFFFFF")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        times shouldHaveSize 1
+        val alarmDateTime = instantToLocalDateTime(times.first())
+        alarmDateTime.dayOfWeek shouldBe DayOfWeek.SUNDAY
+        alarmDateTime.day shouldBe 12
+    }
+
+    @Test
+    fun `calculateNextAlarmTime returns soonest time`() {
+        // Monday, January 6, 2025 at 8:00 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 6, 8, 0)
+        
+        // Alarm for Tuesday and Thursday
+        val alarm = Alarm(hour = 7, minute = 0, repeat = true, repeatDays = "FFTFTFF")
+        
+        val nextTime = calculator.calculateNextAlarmTime(alarm)
+        
+        // Should return Tuesday (soonest)
+        val nextDateTime = instantToLocalDateTime(nextTime!!)
+        nextDateTime.dayOfWeek shouldBe DayOfWeek.TUESDAY
+    }
+
+    @Test
+    fun `isInFuture returns true for future time`() {
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 10, 0)
+        
+        val futureTime = LocalDateTime(2025, 1, 8, 11, 0)
+            .toInstant(TimeZone.currentSystemDefault())
+            .toEpochMilliseconds()
+        
+        calculator.isInFuture(futureTime) shouldBe true
+    }
+
+    @Test
+    fun `isInFuture returns false for past time`() {
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 10, 0)
+        
+        val pastTime = LocalDateTime(2025, 1, 8, 9, 0)
+            .toInstant(TimeZone.currentSystemDefault())
+            .toEpochMilliseconds()
+        
+        calculator.isInFuture(pastTime) shouldBe false
+    }
+
+    @Test
+    fun `alarm at same minute should be treated as passed`() {
+        // Wednesday at 7:00:30 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 7, 0, 30)
+        
+        // Alarm at 7:00 AM - same minute but seconds past
+        val alarm = Alarm(hour = 7, minute = 0, repeatDays = "FFFFFFF")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        // Should schedule for tomorrow since the time has effectively passed
+        val alarmDateTime = instantToLocalDateTime(times.first())
+        alarmDateTime.day shouldBe 9
+    }
+
+    @Test
+    fun `alarm crossing month boundary`() {
+        // January 31st at 10:00 PM
+        dateTimeProvider.setFixedDateTime(2025, 1, 31, 22, 0)
+        
+        // Alarm at 8:00 AM (already passed, should be February 1st)
+        val alarm = Alarm(hour = 8, minute = 0, repeatDays = "FFFFFFF")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        val alarmDateTime = instantToLocalDateTime(times.first())
+        alarmDateTime.monthNumber shouldBe 2
+        alarmDateTime.dayOfMonth shouldBe 1
+    }
+
+    @Test
+    fun `alarm crossing year boundary`() {
+        // December 31st at 10:00 PM
+        dateTimeProvider.setFixedDateTime(2024, 12, 31, 22, 0)
+        
+        // Alarm at 8:00 AM (already passed, should be January 1st next year)
+        val alarm = Alarm(hour = 8, minute = 0, repeatDays = "FFFFFFF")
+        
+        val times = calculator.calculateAlarmTimes(alarm)
+        
+        val alarmDateTime = instantToLocalDateTime(times.first())
+        alarmDateTime.year shouldBe 2025
+        alarmDateTime.monthNumber shouldBe 1
+        alarmDateTime.dayOfMonth shouldBe 1
+    }
+
+    private fun instantToLocalDateTime(epochMillis: Long): LocalDateTime {
+        return Instant.fromEpochMilliseconds(epochMillis)
+            .toLocalDateTime(TimeZone.currentSystemDefault())
+    }
+}
diff --git a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/BootPersistenceTest.kt b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/BootPersistenceTest.kt
new file mode 100644
index 0000000..d192609
--- /dev/null
+++ b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/BootPersistenceTest.kt
@@ -0,0 +1,292 @@
+package com.timilehinaregbesola.mathalarm.usecases
+
+import com.timilehinaregbesola.mathalarm.data.AlarmRepository
+import com.timilehinaregbesola.mathalarm.domain.model.Alarm
+import com.timilehinaregbesola.mathalarm.fake.AlarmInteractorFake
+import com.timilehinaregbesola.mathalarm.fake.AlarmRepositoryFake
+import com.timilehinaregbesola.mathalarm.fake.DateTimeProviderFake
+import com.timilehinaregbesola.mathalarm.provider.AlarmTimeCalculatorImpl
+import io.kotest.matchers.shouldBe
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import kotlinx.datetime.DayOfWeek
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.time.Instant
+
+/**
+ * Integration-style tests that verify alarms are correctly rescheduled after
+ * boot/reboot scenarios. Uses real AlarmTimeCalculatorImpl with a fake time provider
+ * to simulate realistic scenarios.
+ */
+@ExperimentalCoroutinesApi
+class BootPersistenceTest {
+    private lateinit var dataSource: AlarmRepositoryFake
+    private lateinit var alarmRepository: AlarmRepository
+    private lateinit var alarmInteractor: AlarmInteractorFake
+    private lateinit var dateTimeProvider: DateTimeProviderFake
+    private lateinit var alarmTimeCalculator: AlarmTimeCalculatorImpl
+    private lateinit var scheduleNextAlarm: ScheduleNextAlarm
+    private lateinit var rescheduleFutureAlarms: RescheduleFutureAlarms
+    private lateinit var addAlarm: AddAlarm
+
+    @BeforeTest
+    fun setup() = runTest {
+        dataSource = AlarmRepositoryFake()
+        alarmRepository = AlarmRepository(dataSource)
+        alarmInteractor = AlarmInteractorFake()
+        dateTimeProvider = DateTimeProviderFake()
+        alarmTimeCalculator = AlarmTimeCalculatorImpl(dateTimeProvider)
+        scheduleNextAlarm = ScheduleNextAlarm(alarmInteractor, alarmTimeCalculator)
+        rescheduleFutureAlarms = RescheduleFutureAlarms(
+            alarmRepository,
+            alarmInteractor,
+            alarmTimeCalculator,
+            scheduleNextAlarm
+        )
+        addAlarm = AddAlarm(alarmRepository)
+        
+        alarmRepository.clear()
+        alarmInteractor.clear()
+    }
+
+    @Test
+    fun `after reboot - future one-time alarms are rescheduled`() = runTest {
+        // Scenario: User has a one-time alarm set for 7:00 AM tomorrow
+        // Device reboots at 10:00 PM today
+        // After reboot, the alarm should be rescheduled
+        
+        // Set current time to Wednesday 10:00 PM
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 22, 0)
+        
+        // Alarm for 7:00 AM (tomorrow since time is 10 PM)
+        val alarm = Alarm(
+            alarmId = 1,
+            hour = 7,
+            minute = 0,
+            repeatDays = "FFFFFFF", // Non-repeating
+            isOn = true,
+            isSaved = true,
+            title = "Wake up"
+        )
+        addAlarm(alarm)
+        
+        // Simulate boot - reschedule alarms
+        rescheduleFutureAlarms()
+        
+        // Verify alarm is scheduled
+        alarmInteractor.isAlarmScheduled(alarm) shouldBe true
+        
+        // Verify it's scheduled for tomorrow (Thursday)
+        val scheduledTime = alarmInteractor.getAlarmTimeMillis(alarm.alarmId)
+        val scheduledDateTime = instantToLocalDateTime(scheduledTime!!)
+        scheduledDateTime.day shouldBe 9 // Thursday
+        scheduledDateTime.hour shouldBe 7
+        scheduledDateTime.minute shouldBe 0
+    }
+
+    @Test
+    fun `after reboot - repeating weekday alarms are rescheduled`() = runTest {
+        // Set current time to Sunday 8:00 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 5, 8, 0)
+        
+        // Weekday alarm at 6:30 AM (Mon-Fri)
+        val alarm = Alarm(
+            alarmId = 2,
+            hour = 6,
+            minute = 30,
+            repeat = true,
+            repeatDays = "FTTTTTF", // Mon-Fri (indices 1-5)
+            isOn = true,
+            isSaved = true,
+            title = "Workday alarm"
+        )
+        addAlarm(alarm)
+        
+        // Simulate boot
+        rescheduleFutureAlarms()
+        
+        // Alarm should be scheduled (the actual scheduling creates entries for all enabled days,
+        // but the fake only stores the last scheduled time. The important thing is that
+        // the alarm IS scheduled)
+        alarmInteractor.isAlarmScheduled(alarm) shouldBe true
+        
+        // Verify scheduled time is at the correct hour/minute
+        val scheduledTime = alarmInteractor.getAlarmTimeMillis(alarm.alarmId)
+        val scheduledDateTime = instantToLocalDateTime(scheduledTime!!)
+        scheduledDateTime.hour shouldBe 6
+        scheduledDateTime.minute shouldBe 30
+    }
+
+    @Test
+    fun `after reboot - disabled alarms are NOT rescheduled`() = runTest {
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 8, 0)
+        
+        val enabledAlarm = Alarm(
+            alarmId = 1,
+            hour = 7,
+            minute = 0,
+            isOn = true,
+            isSaved = true
+        )
+        val disabledAlarm = Alarm(
+            alarmId = 2,
+            hour = 8,
+            minute = 0,
+            isOn = false, // Disabled
+            isSaved = true
+        )
+        addAlarm(enabledAlarm)
+        addAlarm(disabledAlarm)
+        
+        rescheduleFutureAlarms()
+        
+        alarmInteractor.isAlarmScheduled(enabledAlarm) shouldBe true
+        alarmInteractor.isAlarmScheduled(disabledAlarm) shouldBe false
+    }
+
+    @Test
+    fun `after reboot - daily repeating alarm is rescheduled`() = runTest {
+        // Scenario: User had a daily 7:00 AM alarm
+        // Device reboots at 9:00 AM (after the alarm time passed)
+        // The alarm should be rescheduled for future days
+        
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 9, 0) // Wednesday 9 AM
+        
+        val repeatingAlarm = Alarm(
+            alarmId = 3,
+            hour = 7,
+            minute = 0,
+            repeat = true,
+            repeatDays = "TTTTTTT", // Daily
+            isOn = true,
+            isSaved = true
+        )
+        addAlarm(repeatingAlarm)
+        
+        rescheduleFutureAlarms()
+        
+        // Should be scheduled
+        alarmInteractor.isAlarmScheduled(repeatingAlarm) shouldBe true
+        
+        // Verify time is correct (7:00 AM)
+        val scheduledTime = alarmInteractor.getAlarmTimeMillis(repeatingAlarm.alarmId)
+        val scheduledDateTime = instantToLocalDateTime(scheduledTime!!)
+        scheduledDateTime.hour shouldBe 7
+        scheduledDateTime.minute shouldBe 0
+    }
+
+    @Test
+    fun `after reboot with multiple alarms - all active alarms rescheduled correctly`() = runTest {
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 12, 0) // Wednesday noon
+        
+        val morningAlarm = Alarm(alarmId = 1, hour = 6, minute = 0, isOn = true, isSaved = true)
+        val eveningAlarm = Alarm(alarmId = 2, hour = 18, minute = 0, isOn = true, isSaved = true)
+        val disabledAlarm = Alarm(alarmId = 3, hour = 8, minute = 0, isOn = false, isSaved = true)
+        val weekendAlarm = Alarm(
+            alarmId = 4, 
+            hour = 10, 
+            minute = 0, 
+            repeat = true, 
+            repeatDays = "TFFFFFT", // Sat & Sun
+            isOn = true, 
+            isSaved = true
+        )
+        
+        addAlarm(morningAlarm)
+        addAlarm(eveningAlarm)
+        addAlarm(disabledAlarm)
+        addAlarm(weekendAlarm)
+        
+        rescheduleFutureAlarms()
+        
+        // Morning alarm: 6 AM already passed today, should be tomorrow
+        alarmInteractor.isAlarmScheduled(morningAlarm) shouldBe true
+        val morningTime = alarmInteractor.getAlarmTimeMillis(morningAlarm.alarmId)
+        instantToLocalDateTime(morningTime!!).dayOfMonth shouldBe 9
+        
+        // Evening alarm: 6 PM is in the future, should be today
+        alarmInteractor.isAlarmScheduled(eveningAlarm) shouldBe true
+        val eveningTime = alarmInteractor.getAlarmTimeMillis(eveningAlarm.alarmId)
+        instantToLocalDateTime(eveningTime!!).dayOfMonth shouldBe 8
+        instantToLocalDateTime(eveningTime).hour shouldBe 18
+        
+        // Disabled alarm should not be scheduled
+        alarmInteractor.isAlarmScheduled(disabledAlarm) shouldBe false
+        
+        // Weekend alarm should be scheduled for Saturday (Jan 11)
+        alarmInteractor.isAlarmScheduled(weekendAlarm) shouldBe true
+        val weekendTime = alarmInteractor.getAlarmTimeMillis(weekendAlarm.alarmId)
+        instantToLocalDateTime(weekendTime!!).dayOfWeek shouldBe DayOfWeek.SATURDAY
+    }
+
+    @Test
+    fun `package replaced event - alarms are rescheduled same as boot`() = runTest {
+        // This tests the same flow as ACTION_MY_PACKAGE_REPLACED
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 10, 0)
+        
+        val alarm = Alarm(
+            alarmId = 1,
+            hour = 15,
+            minute = 30,
+            isOn = true,
+            isSaved = true
+        )
+        addAlarm(alarm)
+        
+        // Simulate package replacement (app updated)
+        rescheduleFutureAlarms()
+        
+        alarmInteractor.isAlarmScheduled(alarm) shouldBe true
+        val scheduledTime = alarmInteractor.getAlarmTimeMillis(alarm.alarmId)
+        instantToLocalDateTime(scheduledTime!!).hour shouldBe 15
+        instantToLocalDateTime(scheduledTime).minute shouldBe 30
+    }
+
+
+    @Test
+    fun `reboot at midnight - correctly handles day transition`() = runTest {
+        // Reboot exactly at midnight
+        dateTimeProvider.setFixedDateTime(2025, 1, 9, 0, 0)
+        
+        // Alarm at 00:30 (30 minutes after midnight)
+        val alarm = Alarm(
+            alarmId = 1,
+            hour = 0,
+            minute = 30,
+            isOn = true,
+            isSaved = true
+        )
+        addAlarm(alarm)
+        
+        rescheduleFutureAlarms()
+        
+        alarmInteractor.isAlarmScheduled(alarm) shouldBe true
+        val scheduledTime = alarmInteractor.getAlarmTimeMillis(alarm.alarmId)
+        val scheduledDateTime = instantToLocalDateTime(scheduledTime!!)
+        scheduledDateTime.day shouldBe 9 // Same day (today)
+        scheduledDateTime.hour shouldBe 0
+        scheduledDateTime.minute shouldBe 30
+    }
+
+    @Test
+    fun `no saved alarms - reschedule completes without error`() = runTest {
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 10, 0)
+        
+        // No alarms added
+        
+        rescheduleFutureAlarms()
+        
+        // Should complete without error, no alarms scheduled
+        alarmInteractor.getScheduledAlarms().size shouldBe 0
+    }
+
+
+    private fun instantToLocalDateTime(epochMillis: Long): LocalDateTime {
+        return Instant.fromEpochMilliseconds(epochMillis)
+            .toLocalDateTime(TimeZone.currentSystemDefault())
+    }
+}
diff --git a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/RescheduleFutureAlarmsTest.kt b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/RescheduleFutureAlarmsTest.kt
index c32b5c2..8951808 100644
--- a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/RescheduleFutureAlarmsTest.kt
+++ b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/RescheduleFutureAlarmsTest.kt
@@ -4,6 +4,7 @@ import com.timilehinaregbesola.mathalarm.data.AlarmRepository
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.fake.AlarmInteractorFake
 import com.timilehinaregbesola.mathalarm.fake.AlarmRepositoryFake
+import com.timilehinaregbesola.mathalarm.fake.AlarmTimeCalculatorFake
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import kotlin.test.BeforeTest
@@ -19,10 +20,19 @@ class RescheduleFutureAlarmsTest {
     private val alarmRepository = AlarmRepository(dataSource)
 
     private val alarmInteractor = AlarmInteractorFake()
+    
+    private val alarmTimeCalculator = AlarmTimeCalculatorFake()
 
     private val addAlarmUseCase = AddAlarm(alarmRepository)
+    
+    private val scheduleNextAlarmUseCase = ScheduleNextAlarm(alarmInteractor, alarmTimeCalculator)
 
-    private val rescheduleFutureAlarmUseCase = RescheduleFutureAlarms(alarmRepository, alarmInteractor)
+    private val rescheduleFutureAlarmUseCase = RescheduleFutureAlarms(
+        alarmRepository, 
+        alarmInteractor, 
+        alarmTimeCalculator,
+        scheduleNextAlarmUseCase
+    )
 
     @BeforeTest
     fun setup() = runTest {
diff --git a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleAlarmTest.kt b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleAlarmTest.kt
index ecf5305..705d33d 100644
--- a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleAlarmTest.kt
+++ b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleAlarmTest.kt
@@ -4,6 +4,7 @@ import com.timilehinaregbesola.mathalarm.data.AlarmRepository
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.fake.AlarmInteractorFake
 import com.timilehinaregbesola.mathalarm.fake.AlarmRepositoryFake
+import com.timilehinaregbesola.mathalarm.fake.AlarmTimeCalculatorFake
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import kotlin.test.BeforeTest
@@ -17,12 +18,14 @@ class ScheduleAlarmTest {
     private val alarmRepository = AlarmRepository(dataSource)
 
     private val alarmInteractor = AlarmInteractorFake()
+    
+    private val alarmTimeCalculator = AlarmTimeCalculatorFake()
 
     private val addAlarmUseCase = AddAlarm(alarmRepository)
 
     private val findAlarmUseCase = FindAlarm(alarmRepository)
 
-    private val scheduleAlarmUseCase = ScheduleAlarm(alarmRepository, alarmInteractor)
+    private val scheduleAlarmUseCase = ScheduleAlarm(alarmRepository, alarmInteractor, alarmTimeCalculator)
 
     @BeforeTest
     fun setup() = runTest {
diff --git a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleNextAlarmTest.kt b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleNextAlarmTest.kt
index 6216cc6..2b76acf 100644
--- a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleNextAlarmTest.kt
+++ b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/ScheduleNextAlarmTest.kt
@@ -4,6 +4,7 @@ import com.timilehinaregbesola.mathalarm.data.AlarmRepository
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.fake.AlarmInteractorFake
 import com.timilehinaregbesola.mathalarm.fake.AlarmRepositoryFake
+import com.timilehinaregbesola.mathalarm.fake.AlarmTimeCalculatorFake
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import kotlin.test.BeforeTest
@@ -19,10 +20,12 @@ class ScheduleNextAlarmTest {
     private val alarmRepository = AlarmRepository(dataSource)
 
     private val alarmInteractor = AlarmInteractorFake()
+    
+    private val alarmTimeCalculator = AlarmTimeCalculatorFake()
 
     private val addAlarmUseCase = AddAlarm(alarmRepository)
 
-    private val scheduleNextAlarmUseCase = ScheduleNextAlarm(alarmInteractor)
+    private val scheduleNextAlarmUseCase = ScheduleNextAlarm(alarmInteractor, alarmTimeCalculator)
 
     private val baseAlarm = Alarm(alarmId = 2, title = "new alarm", isOn = true)
 
diff --git a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/ShowAlarmTest.kt b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/ShowAlarmTest.kt
index ff310be..aea7ffb 100644
--- a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/ShowAlarmTest.kt
+++ b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/ShowAlarmTest.kt
@@ -4,6 +4,7 @@ import com.timilehinaregbesola.mathalarm.data.AlarmRepository
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.fake.AlarmInteractorFake
 import com.timilehinaregbesola.mathalarm.fake.AlarmRepositoryFake
+import com.timilehinaregbesola.mathalarm.fake.AlarmTimeCalculatorFake
 import com.timilehinaregbesola.mathalarm.fake.NotificationInteractorFake
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
@@ -19,12 +20,14 @@ class ShowAlarmTest {
     private val alarmRepository = AlarmRepository(dataSource)
 
     private val alarmInteractor = AlarmInteractorFake()
+    
+    private val alarmTimeCalculator = AlarmTimeCalculatorFake()
 
     private val notificationInteractor = NotificationInteractorFake()
 
     private val addAlarmUseCase = AddAlarm(alarmRepository)
 
-    private val scheduleNextAlarmUseCase = ScheduleNextAlarm(alarmInteractor)
+    private val scheduleNextAlarmUseCase = ScheduleNextAlarm(alarmInteractor, alarmTimeCalculator)
 
     private val showAlarmUseCase = ShowAlarm(alarmRepository, notificationInteractor, scheduleNextAlarmUseCase)
 
diff --git a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/SnoozeAlarmTest.kt b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/SnoozeAlarmTest.kt
index fa52e52..6796fc6 100644
--- a/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/SnoozeAlarmTest.kt
+++ b/core/src/commonTest/kotlin/com/timilehinaregbesola/mathalarm/usecases/SnoozeAlarmTest.kt
@@ -4,56 +4,115 @@ import com.timilehinaregbesola.mathalarm.data.AlarmRepository
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.fake.AlarmInteractorFake
 import com.timilehinaregbesola.mathalarm.fake.AlarmRepositoryFake
+import com.timilehinaregbesola.mathalarm.fake.DateTimeProviderFake
 import com.timilehinaregbesola.mathalarm.fake.NotificationInteractorFake
-import com.timilehinaregbesola.mathalarm.provider.DateTimeProviderImpl
+import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.time.Instant
 
 @ExperimentalCoroutinesApi
 class SnoozeAlarmTest {
-    private val dataSource = AlarmRepositoryFake()
-
-    private val alarmRepository = AlarmRepository(dataSource)
-
-    private val alarmInteractor = AlarmInteractorFake()
-
-    private val notificationInteractor = NotificationInteractorFake()
-
-    private val calendarProvider = DateTimeProviderImpl()
-
-    private val addAlarmUseCase = AddAlarm(alarmRepository)
-
-    private val snoozeAlarmUseCase = SnoozeAlarm(
-        calendarProvider, notificationInteractor, alarmInteractor, alarmRepository
-    )
+    private lateinit var dataSource: AlarmRepositoryFake
+    private lateinit var alarmRepository: AlarmRepository
+    private lateinit var alarmInteractor: AlarmInteractorFake
+    private lateinit var notificationInteractor: NotificationInteractorFake
+    private lateinit var dateTimeProvider: DateTimeProviderFake
+    private lateinit var addAlarmUseCase: AddAlarm
+    private lateinit var snoozeAlarmUseCase: SnoozeAlarm
 
     private val baseAlarm = Alarm(alarmId = 216L, title = "snooze me", isOn = true)
+
     @BeforeTest
     fun setup() = runTest {
+        dataSource = AlarmRepositoryFake()
+        alarmRepository = AlarmRepository(dataSource)
+        alarmInteractor = AlarmInteractorFake()
+        notificationInteractor = NotificationInteractorFake()
+        dateTimeProvider = DateTimeProviderFake()
+        addAlarmUseCase = AddAlarm(alarmRepository)
+        snoozeAlarmUseCase = SnoozeAlarm(
+            dateTimeProvider, notificationInteractor, alarmInteractor, alarmRepository
+        )
+        
         alarmRepository.clear()
         alarmInteractor.clear()
         notificationInteractor.clear()
     }
 
-    // Test fails sometimes
- /*   @Test
-    fun `test if alarm is snoozed`() = runTest {
+    @Test
+    fun `test if alarm is snoozed for correct time`() = runTest {
+        // Set fixed time: 7:00 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 7, 0)
         addAlarmUseCase(baseAlarm)
         val snoozeMinutes = 5
 
         snoozeAlarmUseCase(baseAlarm.alarmId, snoozeMinutes)
 
-        val calendarAssert = Calendar.getInstance().apply {
-            time = calendarProvider.getCurrentCalendar().time
-            add(Calendar.MINUTE, snoozeMinutes)
-        }
+        // Should be scheduled for 7:05 AM
+        val scheduledTime = alarmInteractor.getAlarmTimeMillis(baseAlarm.alarmId)
+        val scheduledDateTime = instantToLocalDateTime(scheduledTime!!)
+        
+        scheduledDateTime.hour shouldBe 7
+        scheduledDateTime.minute shouldBe 5
+    }
+
+    @Test
+    fun `test if snooze correctly handles hour rollover`() = runTest {
+        // Set fixed time: 7:58 AM
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 7, 58)
+        addAlarmUseCase(baseAlarm)
+        val snoozeMinutes = 5
+
+        snoozeAlarmUseCase(baseAlarm.alarmId, snoozeMinutes)
+
+        // Should be scheduled for 8:03 AM
+        val scheduledTime = alarmInteractor.getAlarmTimeMillis(baseAlarm.alarmId)
+        val scheduledDateTime = instantToLocalDateTime(scheduledTime!!)
+        
+        scheduledDateTime.hour shouldBe 8
+        scheduledDateTime.minute shouldBe 3
+    }
+
+    @Test
+    fun `test if snooze correctly handles day rollover`() = runTest {
+        // Set fixed time: 11:58 PM
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 23, 58)
+        addAlarmUseCase(baseAlarm)
+        val snoozeMinutes = 5
+
+        snoozeAlarmUseCase(baseAlarm.alarmId, snoozeMinutes)
+
+        // Should be scheduled for 12:03 AM next day
+        val scheduledTime = alarmInteractor.getAlarmTimeMillis(baseAlarm.alarmId)
+        val scheduledDateTime = instantToLocalDateTime(scheduledTime!!)
+
+        scheduledDateTime.day shouldBe 9
+        scheduledDateTime.hour shouldBe 0
+        scheduledDateTime.minute shouldBe 3
+    }
+
+    @Test
+    fun `test if snooze with custom duration works`() = runTest {
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 9, 0)
+        addAlarmUseCase(baseAlarm)
+        val snoozeMinutes = 15
+
+        snoozeAlarmUseCase(baseAlarm.alarmId, snoozeMinutes)
 
-        val result = alarmInteractor.getAlarmTime(baseAlarm.alarmId)
-        Assert.assertEquals(calendarAssert.time.time, result?.time?.time)
-    }*/
+        val scheduledTime = alarmInteractor.getAlarmTimeMillis(baseAlarm.alarmId)
+        val scheduledDateTime = instantToLocalDateTime(scheduledTime!!)
+        
+        scheduledDateTime.hour shouldBe 9
+        scheduledDateTime.minute shouldBe 15
+    }
 
     @Test
     fun `test if error is shown when snoozing with negative number`() = runTest {
@@ -63,11 +122,36 @@ class SnoozeAlarmTest {
     }
 
     @Test
-    fun `test if notification is dismissed`() = runTest {
+    fun `test if error is shown when snoozing with zero minutes`() = runTest {
+        assertFailsWith<IllegalArgumentException> {
+            snoozeAlarmUseCase(baseAlarm.alarmId, 0)
+        }
+    }
+
+    @Test
+    fun `test if notification is dismissed after snooze`() = runTest {
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 7, 0)
+        addAlarmUseCase(baseAlarm)
         notificationInteractor.show(baseAlarm)
 
         snoozeAlarmUseCase(baseAlarm.alarmId, 5)
 
-        notificationInteractor.isNotificationShown(baseAlarm.alarmId)
+        assertFalse(notificationInteractor.isNotificationShown(baseAlarm.alarmId))
+    }
+
+    @Test
+    fun `test snooze with non-existent alarm does nothing`() = runTest {
+        dateTimeProvider.setFixedDateTime(2025, 1, 8, 7, 0)
+        // Don't add alarm to repository
+
+        snoozeAlarmUseCase(999L, 5)
+
+        // Should not throw, but alarm should not be scheduled
+        alarmInteractor.getAlarmTimeMillis(999L) shouldBe null
+    }
+
+    private fun instantToLocalDateTime(epochMillis: Long): LocalDateTime {
+        return Instant.fromEpochMilliseconds(epochMillis)
+            .toLocalDateTime(TimeZone.currentSystemDefault())
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 146e580..af4e586 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -37,6 +37,7 @@ test_espresso_core = "3.7.0"
 test_junit = "4.13.2"
 test_junit_ext = "1.3.0"
 test_mockk = "1.14.7"
+test_robolectric = "4.16"
 test_turbine = "1.2.1"
 test_kotest = "6.0.7"
 timber = "4.7.1"
@@ -89,6 +90,7 @@ lyricist = { module = "cafe.adriel.lyricist:lyricist", version.ref = "lyricist"
 lyricist-processor = { module = "cafe.adriel.lyricist:lyricist-processor", version.ref = "lyricist" }
 material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "material3" }
 mockk = { module = "io.mockk:mockk", version.ref = "test_mockk" }
+robolectric = { module = "org.robolectric:robolectric", version.ref = "test_robolectric" }
 turbine = { module = "app.cash.turbine:turbine", version.ref = "test_turbine" }
 kotest-assertions = { module = "io.kotest:kotest-assertions-core", version.ref = "test_kotest" }
 multiplatform-settings-no-arg = { module = "com.russhwolf:multiplatform-settings-no-arg", version.ref = "multiplatformSettingsNoArg" }
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
index 8865cee..3448f42 100644
--- a/iosApp/iosApp.xcodeproj/project.pbxproj
+++ b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -11,6 +11,7 @@
 		058557D9273AAEEB004C7B11 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* ContentView.swift */; };
 		2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
 		ALARMKIT01273AAA24004C7B11 /* AlarmKitWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = ALARMKIT02273AAA24004C7B11 /* AlarmKitWrapper.swift */; };
+		ALARMAUDIO01273AAA24004C7B /* AlarmAudioController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ALARMAUDIO02273AAA24004C7B /* AlarmAudioController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -20,6 +21,7 @@
 		7555FF7B242A565900829871 /* MathAlarm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MathAlarm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		ALARMKIT02273AAA24004C7B11 /* AlarmKitWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlarmKitWrapper.swift; sourceTree = "<group>"; };
+		ALARMAUDIO02273AAA24004C7B /* AlarmAudioController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlarmAudioController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -36,6 +38,7 @@
 		058557D7273AAEEB004C7B11 /* iosApp */ = {
 			isa = PBXGroup;
 			children = (
+				ALARMAUDIO02273AAA24004C7B /* AlarmAudioController.swift */,
 				ALARMKIT02273AAA24004C7B11 /* AlarmKitWrapper.swift */,
 				058557BA273AAA24004C7B11 /* Assets.xcassets */,
 				058557D8273AAEEB004C7B11 /* ContentView.swift */,
@@ -160,6 +163,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				ALARMAUDIO01273AAA24004C7B /* AlarmAudioController.swift in Sources */,
 				ALARMKIT01273AAA24004C7B11 /* AlarmKitWrapper.swift in Sources */,
 				2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */,
 				058557D9273AAEEB004C7B11 /* ContentView.swift in Sources */,
diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/timilehin.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/timilehin.xcuserdatad/UserInterfaceState.xcuserstate
index 1d33eae..7e5c8b0 100644
Binary files a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/timilehin.xcuserdatad/UserInterfaceState.xcuserstate and b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/timilehin.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/iosApp/iosApp.xcodeproj/xcuserdata/timilehin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/iosApp/iosApp.xcodeproj/xcuserdata/timilehin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index b813454..8a11e74 100644
--- a/iosApp/iosApp.xcodeproj/xcuserdata/timilehin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/iosApp/iosApp.xcodeproj/xcuserdata/timilehin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -8,7 +8,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "8D31FD86-810D-4547-A46E-ECF19241E8A9"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "iosApp/AlarmKitWrapper.swift"
@@ -20,5 +20,53 @@
             landmarkType = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A68095DB-2952-4922-B1F4-143807F54EA3"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "iosApp/AlarmKitWrapper.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "578"
+            endingLineNumber = "578"
+            landmarkName = "scheduleWithAlarmKit(alarmId:hour:minute:title:soundName:repeatDays:snoozeMinutes:vibrate:difficulty:repeats:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "BE5D18CA-C876-456C-8D58-D20208F937CA"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "iosApp/AlarmKitWrapper.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "579"
+            endingLineNumber = "579"
+            landmarkName = "scheduleWithAlarmKit(alarmId:hour:minute:title:soundName:repeatDays:snoozeMinutes:vibrate:difficulty:repeats:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E7F800A1-EC4A-4737-9063-ABACEAC8B753"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "iosApp/AlarmKitWrapper.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "580"
+            endingLineNumber = "580"
+            landmarkName = "scheduleWithAlarmKit(alarmId:hour:minute:title:soundName:repeatDays:snoozeMinutes:vibrate:difficulty:repeats:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/iosApp/iosApp/AlarmAudioController.swift b/iosApp/iosApp/AlarmAudioController.swift
new file mode 100644
index 0000000..2d9a637
--- /dev/null
+++ b/iosApp/iosApp/AlarmAudioController.swift
@@ -0,0 +1,205 @@
+import Foundation
+import AVFoundation
+import AudioToolbox
+
+/// Controller for playing alarm sounds and haptic feedback
+/// Used when notifications arrive (both foreground and when user taps notification)
+class AlarmAudioController: NSObject, AVAudioPlayerDelegate {
+    
+    static let shared = AlarmAudioController()
+    
+    private var audioPlayer: AVAudioPlayer?
+    private var vibrationTimer: Timer?
+    private var soundTimer: Timer?
+    private var isPlaying = false
+    
+    /// Default alarm sound name (bundled with app)
+    static let defaultSoundName = "alarm_default"
+    
+    // System sound IDs that are known to work
+    // See: https://github.com/TUNER88/iOSSystemSoundsLibrary
+    private let alarmSoundID: SystemSoundID = 1005  // SMS Alert - loud and noticeable
+    private let alternateSoundID: SystemSoundID = 1007  // SMS Tri-tone
+    
+    private override init() {
+        super.init()
+        print("AlarmAudioController: Initialized")
+    }
+    
+    // MARK: - Audio Session Configuration
+    
+    private func configureAudioSession() {
+        do {
+            let session = AVAudioSession.sharedInstance()
+            // Use playback category to play even when device is silent/locked
+            // Don't mix with others - alarm should be prominent
+            try session.setCategory(.playback, mode: .default, options: [])
+            try session.setActive(true, options: .notifyOthersOnDeactivation)
+            print("AlarmAudioController: Audio session configured for playback")
+        } catch {
+            print("AlarmAudioController: Failed to configure audio session: \(error)")
+        }
+    }
+    
+    // MARK: - Public Interface
+    
+    /// Start playing alarm sound
+    /// - Parameters:
+    ///   - soundName: Name of the sound file (without extension), empty for default
+    ///   - vibrate: Whether to enable vibration
+    func startAlarm(soundName: String, vibrate: Bool) {
+        // Allow restarting if called again
+        if isPlaying {
+            print("AlarmAudioController: Already playing, restarting...")
+            stopAlarm()
+        }
+        
+        print("AlarmAudioController: 🔔 Starting alarm - sound='\(soundName)', vibrate=\(vibrate)")
+        isPlaying = true
+        
+        // Configure audio session for playback
+        configureAudioSession()
+        
+        // Try to play custom/bundled sound first
+        if !playBundledSound(named: soundName) {
+            // Fall back to system sounds
+            print("AlarmAudioController: No bundled sound, using system alert sounds")
+            startSystemSoundLoop()
+        }
+        
+        // Start vibration if enabled
+        if vibrate {
+            startVibration()
+        }
+    }
+    
+    /// Stop the alarm sound and vibration
+    func stopAlarm() {
+        print("AlarmAudioController: 🔕 Stopping alarm")
+        isPlaying = false
+        
+        audioPlayer?.stop()
+        audioPlayer = nil
+        
+        soundTimer?.invalidate()
+        soundTimer = nil
+        
+        stopVibration()
+        
+        // Deactivate audio session
+        do {
+            try AVAudioSession.sharedInstance().setActive(false, options: .notifyOthersOnDeactivation)
+        } catch {
+            print("AlarmAudioController: Failed to deactivate audio session: \(error)")
+        }
+    }
+    
+    /// Snooze the alarm - stops current sound, will be rescheduled
+    func snoozeAlarm(minutes: Int32) {
+        print("AlarmAudioController: Snoozing alarm for \(minutes) minutes")
+        stopAlarm()
+    }
+    
+    // MARK: - Bundled Sound Playback
+    
+    private func playBundledSound(named soundName: String) -> Bool {
+        let effectiveName = soundName.isEmpty ? AlarmAudioController.defaultSoundName : soundName
+        
+        // Try to find the sound file in bundle with various extensions
+        let extensions = ["caf", "aiff", "wav", "mp3", "m4a", "aac"]
+        var soundURL: URL? = nil
+        
+        for ext in extensions {
+            if let url = Bundle.main.url(forResource: effectiveName, withExtension: ext) {
+                soundURL = url
+                print("AlarmAudioController: Found bundled sound: \(effectiveName).\(ext)")
+                break
+            }
+        }
+        
+        // Also try without extension (file might have extension in name)
+        if soundURL == nil, let url = Bundle.main.url(forResource: effectiveName, withExtension: nil) {
+            soundURL = url
+            print("AlarmAudioController: Found bundled sound (no ext): \(effectiveName)")
+        }
+        
+        guard let url = soundURL else {
+            print("AlarmAudioController: No bundled sound found for '\(effectiveName)'")
+            return false
+        }
+        
+        do {
+            audioPlayer = try AVAudioPlayer(contentsOf: url)
+            audioPlayer?.delegate = self
+            audioPlayer?.numberOfLoops = -1 // Loop indefinitely
+            audioPlayer?.volume = 1.0
+            audioPlayer?.prepareToPlay()
+            
+            if audioPlayer?.play() == true {
+                print("AlarmAudioController: ▶️ Playing bundled sound: \(url.lastPathComponent)")
+                return true
+            } else {
+                print("AlarmAudioController: Failed to start playback")
+                return false
+            }
+        } catch {
+            print("AlarmAudioController: Failed to play bundled sound: \(error)")
+            return false
+        }
+    }
+    
+    // MARK: - System Sound Playback (Fallback)
+    
+    private func startSystemSoundLoop() {
+        print("AlarmAudioController: Starting system sound loop")
+        playSystemSound()
+        
+        // Repeat every 1.5 seconds for alarm effect
+        soundTimer = Timer.scheduledTimer(withTimeInterval: 1.5, repeats: true) { [weak self] _ in
+            guard let self = self, self.isPlaying else { return }
+            self.playSystemSound()
+        }
+    }
+    
+    private func playSystemSound() {
+        guard isPlaying else { return }
+        
+        // Play alert sound (respects ringer volume, plays through speaker)
+        AudioServicesPlayAlertSound(alarmSoundID)
+        print("AlarmAudioController: 🔊 Playing system sound \(alarmSoundID)")
+    }
+    
+    // MARK: - Vibration
+    
+    private func startVibration() {
+        print("AlarmAudioController: Starting vibration")
+        
+        // Vibrate immediately
+        AudioServicesPlaySystemSound(kSystemSoundID_Vibrate)
+        
+        // Set up repeating vibration
+        vibrationTimer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { [weak self] _ in
+            guard self?.isPlaying == true else { return }
+            AudioServicesPlaySystemSound(kSystemSoundID_Vibrate)
+        }
+    }
+    
+    private func stopVibration() {
+        vibrationTimer?.invalidate()
+        vibrationTimer = nil
+    }
+    
+    // MARK: - AVAudioPlayerDelegate
+    
+    func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
+        print("AlarmAudioController: Audio player finished (success: \(flag))")
+    }
+    
+    func audioPlayerDecodeErrorDidOccur(_ player: AVAudioPlayer, error: Error?) {
+        print("AlarmAudioController: Audio decode error: \(error?.localizedDescription ?? "unknown")")
+        // Fall back to system sounds
+        if isPlaying {
+            startSystemSoundLoop()
+        }
+    }
+}
diff --git a/iosApp/iosApp/AlarmKitWrapper.swift b/iosApp/iosApp/AlarmKitWrapper.swift
index 2b762ef..1e1ec71 100644
--- a/iosApp/iosApp/AlarmKitWrapper.swift
+++ b/iosApp/iosApp/AlarmKitWrapper.swift
@@ -557,16 +557,63 @@ class AlarmKitWrapperImpl: NSObject {
                 let stopIntent = StopAlarmIntent(alarmUUID: alarmUUID)
                 let snoozeIntent: SnoozeAlarmIntent? = snoozeMinutes > 0 ? SnoozeAlarmIntent(alarmUUID: alarmUUID) : nil
                 
-                // Create alarm configuration with intents
-                // Note: .default may not play sounds in some cases, .named("") plays default sound
-                let configuration = MathAlarmConfiguration(
-                    countdownDuration: countdownDuration,
-                    schedule: schedule,
-                    attributes: attributes,
-                    stopIntent: stopIntent,
-                    secondaryIntent: snoozeIntent,
-                    sound: .named("")
-                )
+                // Create alarm configuration
+                // Note on AlarmKit sounds (from https://levelup.gitconnected.com/swiftui-alarm-app-copycat-with-alarmkit-wwdc-2025-part-2-5c3cb2194c54):
+                // - .default does NOT play any sound (AlarmKit bug/quirk)
+                // - .named("") plays the default system alarm sound
+                // - .named("customSound") plays a custom sound from bundle
+                let hasCustomSound = !soundName.isEmpty && Bundle.main.url(forResource: soundName, withExtension: "caf") != nil
+                
+                let configuration: MathAlarmConfiguration
+                if countdownDuration == nil {
+                    // Traditional alarm without countdown - use .alarm() factory
+                    print("AlarmKitWrapper: Creating traditional alarm configuration")
+                    if hasCustomSound {
+                        print("AlarmKitWrapper: Using custom sound: \(soundName)")
+                        configuration = MathAlarmConfiguration.alarm(
+                            schedule: schedule,
+                            attributes: attributes,
+                            stopIntent: stopIntent,
+                            secondaryIntent: snoozeIntent,
+                            sound: .named(soundName)
+                        )
+                    } else {
+                        // Using .named("") to get default system alarm sound
+                        print("AlarmKitWrapper: Using default system alarm sound via .named(\"\")")
+                        configuration = MathAlarmConfiguration.alarm(
+                            schedule: schedule,
+                            attributes: attributes,
+                            stopIntent: stopIntent,
+                            secondaryIntent: snoozeIntent,
+                            sound: .named("")
+                        )
+                    }
+                } else {
+                    // Alarm with countdown/snooze - use generic initializer
+                    print("AlarmKitWrapper: Creating alarm with countdown configuration")
+                    if hasCustomSound {
+                        print("AlarmKitWrapper: Using custom sound: \(soundName)")
+                        configuration = MathAlarmConfiguration(
+                            countdownDuration: countdownDuration,
+                            schedule: schedule,
+                            attributes: attributes,
+                            stopIntent: stopIntent,
+                            secondaryIntent: snoozeIntent,
+                            sound: .named(soundName)
+                        )
+                    } else {
+                        // Using .named("") to get default system alarm sound
+                        print("AlarmKitWrapper: Using default system alarm sound via .named(\"\")")
+                        configuration = MathAlarmConfiguration(
+                            countdownDuration: countdownDuration,
+                            schedule: schedule,
+                            attributes: attributes,
+                            stopIntent: stopIntent,
+                            secondaryIntent: snoozeIntent,
+                            sound: .named("")
+                        )
+                    }
+                }
                 print("AlarmKitWrapper: Created configuration with intents, about to schedule...")
                 
                 // Schedule the alarm with id and configuration
diff --git a/iosApp/iosApp/iOSApp.swift b/iosApp/iosApp/iOSApp.swift
index db5c5ec..c3c0eef 100644
--- a/iosApp/iosApp/iOSApp.swift
+++ b/iosApp/iosApp/iOSApp.swift
@@ -9,9 +9,23 @@ struct iOSApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     @Environment(\.scenePhase) private var scenePhase
     
+    init() {
+        print("iOSApp.init: Initializing Koin early (before UI)")
+        MainViewControllerKt.doInitKoin()
+        
+        // Prewarm database in background so it's ready when UI needs it
+        MainViewControllerKt.prewarmDatabaseInBackground()
+    }
+    
     var body: some Scene {
         WindowGroup {
-            ContentView().ignoresSafeArea()
+            ContentView()
+                .ignoresSafeArea()
+                .onAppear {
+                    // Request notification permissions after UI is shown
+                    // This is deferred to not block startup
+                    MainViewControllerKt.requestNotificationPermissionsDeferred()
+                }
         }
         .onChange(of: scenePhase) { newPhase in
             if newPhase == .active {
@@ -186,6 +200,9 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
     
     // Handle alarm notification - start audio and set deeplink
     private func handleAlarmNotification(userInfo: [AnyHashable: Any]) {
+        print("iOSApp: 🔔 handleAlarmNotification called")
+        print("iOSApp: userInfo keys = \(userInfo.keys)")
+        
         // Extract alarm data
         let alarmId = (userInfo["alarmId"] as? NSNumber)?.int64Value ?? 0
         let hour = (userInfo["hour"] as? NSNumber)?.intValue ?? 0
@@ -196,9 +213,14 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
         let title = (userInfo["title"] as? String) ?? ""
         let alarmTone = (userInfo["alarmTone"] as? String) ?? ""
         
+        print("iOSApp: Extracted - alarmId=\(alarmId), tone='\(alarmTone)', vibrate=\(vibrate)")
+        
         // Start alarm audio immediately when notification is tapped
-        print("iOSApp: Starting alarm audio - tone=\(alarmTone), vibrate=\(vibrate)")
-        AlarmAudioController.shared.startAlarm(soundName: alarmTone, vibrate: vibrate)
+        // Run on main thread to ensure audio session works correctly
+        print("iOSApp: 🔊 Starting AlarmAudioController...")
+        DispatchQueue.main.async {
+            AlarmAudioController.shared.startAlarm(soundName: alarmTone, vibrate: vibrate)
+        }
         
         // Create JSON string for the alarm - matching AlarmEntity format
         let vibrateStr = vibrate ? "true" : "false"
@@ -216,18 +238,26 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
                                 withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
         let userInfo = notification.request.content.userInfo
         
-        print("iOSApp: Notification arrived in foreground")
+        print("iOSApp: 🔔 Notification arrived in foreground!")
+        print("iOSApp: userInfo = \(userInfo)")
         
         // Start alarm audio immediately when notification arrives in foreground
         let alarmTone = (userInfo["alarmTone"] as? String) ?? ""
         let vibrate = (userInfo["vibrate"] as? NSNumber)?.boolValue ?? false
         
-        AlarmAudioController.shared.startAlarm(soundName: alarmTone, vibrate: vibrate)
+        print("iOSApp: Starting AlarmAudioController - tone='\(alarmTone)', vibrate=\(vibrate)")
+        
+        // Run on main thread to ensure audio session works
+        DispatchQueue.main.async {
+            AlarmAudioController.shared.startAlarm(soundName: alarmTone, vibrate: vibrate)
+        }
         
         // Also set the deeplink so the UI navigates to MathScreen
         handleAlarmNotification(userInfo: userInfo)
         
-        // Show banner and badge (sound is handled by our audio player)
-        completionHandler([.banner, .badge])
+        // Show banner, badge, AND sound (sound as backup in case AlarmAudioController fails)
+        // Our AlarmAudioController provides the full looping alarm, but notification sound
+        // gives us at least something if that fails
+        completionHandler([.banner, .badge, .sound])
     }
 }