ahudson20 · ahudson20 · Jan 8, 2025 · Jan 9, 2025 · Jan 12, 2025 · Jan 12, 2025
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: "checkout"
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.2.2
 
       - name: Kotlin Linter
         uses: vroy/gha-kotlin-linter@v4
@@ -44,10 +44,10 @@ jobs:
           ls /dev/kvm
 
     - name: Checkout
-      uses: actions/checkout@v4.1.1
+      uses: actions/checkout@v4.2.2
 
     - name: set up JDK 17
-      uses: actions/setup-java@v4.2.1
+      uses: actions/setup-java@v4.6.0
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -57,7 +57,7 @@ jobs:
       uses: gradle/actions/setup-gradle@v4
 
     - name: Set up Android SDK
-      uses: android-actions/[email protected].1
+      uses: android-actions/[email protected].2
 
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
@@ -69,7 +69,7 @@ jobs:
       run: ./gradlew testDebugUnitTest
 
     - name: Run instrumented test
-      uses: ReactiveCircus/android-emulator-runner@v2.30.1
+      uses: ReactiveCircus/android-emulator-runner@v2.33.0
       with:
         arch: 'x86_64'
         api-level: 33
@@ -91,7 +91,7 @@ jobs:
         update-comment: true
 
     - name: Upload Test Reports Folder
-      uses: actions/upload-artifact@v4.3.1
+      uses: actions/upload-artifact@v4.6.0
       if: ${{ always() }}
       with:
         name: reports
@@ -109,7 +109,7 @@ jobs:
     if: ${{ always() }}
     steps:
     - name: Download Test Reports Folder
-      uses: actions/[email protected].4
+      uses: actions/[email protected].8
       with:
         name: reports
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -20,8 +20,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.App.Starting"
-        >
+        android:theme="@style/Theme.App.Starting">
 
         <activity
             android:name=".activities.MainActivity"
@@ -33,7 +32,6 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
-                <data android:scheme="app" android:host="mainactivity" />
             </intent-filter>
 
             <intent-filter>
@@ -58,8 +56,7 @@
 
             <intent-filter>
                 <action android:name="android.intent.action.FullScreenNotificationActivity" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <data android:scheme="app" android:host="fullscreennotificationactivity" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
 
         </activity>
@@ -113,7 +110,7 @@
             android:exported="false">
         </receiver>
 
-        <receiver android:name=".receiver.UpcomingAlarmReceiver"
+        <receiver android:name="com.whakaara.feature.alarm.receiver.UpcomingAlarmReceiver"
             android:exported="false"
             android:enabled="true">
         </receiver>

diff --git a/app/src/main/java/com/app/whakaara/ui/settings/AlarmSettings.kt b/app/src/main/java/com/app/whakaara/ui/settings/AlarmSettings.kt
@@ -264,6 +264,20 @@ fun AlarmSettings(
         }
     )
 
+    SettingsSwitch(
+        modifier = Modifier.height(space100),
+        title = { Text(text = stringResource(id = R.string.settings_screen_flash_light_title)) },
+        subtitle = { Text(text = stringResource(id = R.string.settings_screen_flash_light_subtitle)) },
+        state = rememberBooleanSettingState(preferencesState.preferences.flashLight),
+        onCheckedChange = {
+            updatePreferences(
+                preferencesState.preferences.copy(
+                    flashLight = it
+                )
+            )
+        }
+    )
+
     SettingsListDropdown(
         modifier = Modifier.height(space100),
         state = rememberIntSettingState(defaultValue = preferencesState.preferences.autoSilenceTime.ordinal),

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -31,6 +31,8 @@
     <string name="settings_screen_snooze_title">Snooze</string>
     <string name="settings_screen_snooze_subtitle">Allow alarms to be snoozed</string>
     <string name="settings_screen_delete_title">Delete</string>
+    <string name="settings_screen_flash_light_title">Flashlight</string>
+    <string name="settings_screen_flash_light_subtitle">Strobe light when alarms go off</string>
     <string name="settings_screen_delete_subtitle">Alarms are deleted after they go off</string>
     <string name="settings_screen_snooze_duration_title">Snooze duration</string>
     <string name="settings_screen_auto_silence_title">Auto silence</string>

diff --git a/core/data/src/test/java/com/whakaara/data/PreferencesEntityImplTest.kt b/core/data/src/test/java/com/whakaara/data/PreferencesEntityImplTest.kt
@@ -102,7 +102,8 @@ class PreferencesEntityImplTest {
             autoRestartTimer = true,
             timerSoundPath = "",
             gradualSoundDuration = GradualSoundDuration.GRADUAL_INCREASE_DURATION_NEVER,
-            timerGradualSoundDuration = GradualSoundDuration.GRADUAL_INCREASE_DURATION_NEVER
+            timerGradualSoundDuration = GradualSoundDuration.GRADUAL_INCREASE_DURATION_NEVER,
+            flashLight = false
         )
         val preferencesSlot = slot<PreferencesEntity>()
         coEvery { preferencesDao.insert(any()) } returns mockk()
@@ -142,7 +143,8 @@ class PreferencesEntityImplTest {
             autoRestartTimer = true,
             timerSoundPath = "",
             gradualSoundDuration = GradualSoundDuration.GRADUAL_INCREASE_DURATION_NEVER,
-            timerGradualSoundDuration = GradualSoundDuration.GRADUAL_INCREASE_DURATION_NEVER
+            timerGradualSoundDuration = GradualSoundDuration.GRADUAL_INCREASE_DURATION_NEVER,
+            flashLight = false
         )
         val preferencesSlot = slot<PreferencesEntity>()
         coEvery { preferencesDao.updatePreferences(any()) } returns mockk()

diff --git a/core/database/src/main/assets/database/preferences.db b/core/database/src/main/assets/database/preferences.db
diff --git a/core/database/src/main/java/com/whakaara/database/di/DatabaseModule.kt b/core/database/src/main/java/com/whakaara/database/di/DatabaseModule.kt
@@ -38,7 +38,8 @@ class DatabaseModule {
         context,
         PreferencesDatabase::class.java,
         "preferences_database"
-    ).createFromAsset("database/preferences.db").build()
+    ).createFromAsset("database/preferences.db")
+        .build()
 
     @Provides
     @Singleton

diff --git a/core/database/src/main/java/com/whakaara/database/preferences/entity/PreferencesEntity.kt b/core/database/src/main/java/com/whakaara/database/preferences/entity/PreferencesEntity.kt
@@ -32,7 +32,8 @@ data class PreferencesEntity(
     val autoRestartTimer: Boolean = true,
     val timerSoundPath: String = "",
     val gradualSoundDuration: GradualSoundDuration,
-    val timerGradualSoundDuration: GradualSoundDuration
+    val timerGradualSoundDuration: GradualSoundDuration,
+    val flashLight: Boolean = false
 )
 
 fun PreferencesEntity.asExternalModel() = Preferences(
@@ -56,7 +57,8 @@ fun PreferencesEntity.asExternalModel() = Preferences(
     autoRestartTimer = autoRestartTimer,
     timerSoundPath = timerSoundPath,
     gradualSoundDuration = gradualSoundDuration,
-    timerGradualSoundDuration = timerGradualSoundDuration
+    timerGradualSoundDuration = timerGradualSoundDuration,
+    flashLight = flashLight
 )
 
 fun Preferences.asInternalModel() = PreferencesEntity(
@@ -79,5 +81,6 @@ fun Preferences.asInternalModel() = PreferencesEntity(
     autoRestartTimer = autoRestartTimer,
     timerSoundPath = timerSoundPath,
     gradualSoundDuration = gradualSoundDuration,
-    timerGradualSoundDuration = timerGradualSoundDuration
+    timerGradualSoundDuration = timerGradualSoundDuration,
+    flashLight = flashLight
 )
diff --git a/core/designsystem/src/main/kotlin/com/whakaara/core/designsystem/theme/Theme.kt b/core/designsystem/src/main/kotlin/com/whakaara/core/designsystem/theme/Theme.kt
@@ -12,7 +12,6 @@ import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.platform.LocalView
@@ -293,8 +292,7 @@ fun WhakaaraTheme(
     if (!view.isInEditMode) {
         SideEffect {
             val window = (view.context as Activity).window
-            window.statusBarColor = colorScheme.primary.toArgb()
-            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
+            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme
         }
     }
 

diff --git a/core/model/src/main/java/com/whakaara/model/preferences/Preferences.kt b/core/model/src/main/java/com/whakaara/model/preferences/Preferences.kt
@@ -21,5 +21,6 @@ data class Preferences(
     val autoRestartTimer: Boolean,
     val timerSoundPath: String,
     val gradualSoundDuration: GradualSoundDuration,
-    val timerGradualSoundDuration: GradualSoundDuration
+    val timerGradualSoundDuration: GradualSoundDuration,
+    val flashLight: Boolean
 )
diff --git a/core/model/src/main/java/com/whakaara/model/preferences/PreferencesState.kt b/core/model/src/main/java/com/whakaara/model/preferences/PreferencesState.kt
@@ -23,6 +23,7 @@ data class PreferencesState(
         autoRestartTimer = true,
         timerSoundPath = "",
         gradualSoundDuration = GradualSoundDuration.GRADUAL_INCREASE_DURATION_NEVER,
-        timerGradualSoundDuration = GradualSoundDuration.GRADUAL_INCREASE_DURATION_NEVER
+        timerGradualSoundDuration = GradualSoundDuration.GRADUAL_INCREASE_DURATION_NEVER,
+        flashLight = false
     )
 )
diff --git a/core/test/src/main/java/com/whakaara/test/MockUtil.kt b/core/test/src/main/java/com/whakaara/test/MockUtil.kt
@@ -47,6 +47,7 @@ object MockUtil {
         autoRestartTimer = true,
         timerSoundPath = "",
         gradualSoundDuration = GradualSoundDuration.GRADUAL_INCREASE_DURATION_NEVER,
-        timerGradualSoundDuration = GradualSoundDuration.GRADUAL_INCREASE_DURATION_NEVER
+        timerGradualSoundDuration = GradualSoundDuration.GRADUAL_INCREASE_DURATION_NEVER,
+        flashLight = false
     )
 }
diff --git a/feature/alarm/src/main/kotlin/com/whakaara/feature/alarm/AlarmRoute.kt b/feature/alarm/src/main/kotlin/com/whakaara/feature/alarm/AlarmRoute.kt
@@ -26,7 +26,7 @@ fun AlarmRoute(
                 create = viewModel::create,
                 delete = viewModel::delete,
                 disable = viewModel::disable,
-                enable = viewModel::disable,
+                enable = viewModel::enable,
                 reset = viewModel::reset,
                 getInitialTimeToAlarm = viewModel::getInitialTimeToAlarm,
                 getTimeUntilAlarmFormatted = viewModel::getTimeUntilAlarmFormatted

diff --git a/feature/alarm/src/main/kotlin/com/whakaara/feature/alarm/AlarmViewModel.kt b/feature/alarm/src/main/kotlin/com/whakaara/feature/alarm/AlarmViewModel.kt
@@ -4,7 +4,6 @@ import android.app.AlarmManager
 import android.app.Application
 import android.app.PendingIntent
 import android.content.Intent
-import android.net.Uri
 import android.provider.Settings
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
@@ -13,6 +12,7 @@ import com.chargemap.compose.numberpicker.Hours
 import com.whakaara.core.LogUtils.logD
 import com.whakaara.core.PendingIntentUtils
 import com.whakaara.core.WidgetUpdater
+import com.whakaara.core.constants.GeneralConstants.MAIN_ACTIVITY
 import com.whakaara.core.constants.NotificationUtilsConstants
 import com.whakaara.core.di.IoDispatcher
 import com.whakaara.data.alarm.AlarmRepository
@@ -327,13 +327,18 @@ class AlarmViewModel @Inject constructor(
             PendingIntent.FLAG_UPDATE_CURRENT
         )
 
+        val deepLinkIntent = Intent(Intent.ACTION_VIEW).apply {
+            setClassName(
+                app.applicationContext.packageName,
+                MAIN_ACTIVITY
+            )
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        }
+
         val alarmInfoPendingIntent = PendingIntentUtils.getActivity(
             app,
             NotificationUtilsConstants.INTENT_REQUEST_CODE,
-            Intent(Intent.ACTION_VIEW).apply {
-                data = Uri.parse("app://mainactivity")
-                flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            },
+            deepLinkIntent,
             PendingIntent.FLAG_UPDATE_CURRENT
         )
 
@@ -352,7 +357,7 @@ class AlarmViewModel @Inject constructor(
         }
     }
 
-    fun setUpcomingAlarm(
+    private fun setUpcomingAlarm(
         alarmId: String,
         alarmDate: Calendar,
         upcomingAlarmNotificationEnabled: Boolean,
@@ -429,7 +434,7 @@ class AlarmViewModel @Inject constructor(
         widgetUpdater.updateWidget()
     }
 
-    fun cancelUpcomingAlarm(
+    private fun cancelUpcomingAlarm(
         alarmId: String,
         alarmDate: Calendar
     ) {