fix: solid notification icon and hardened background service starts

karOS555 · karOS555 · commit b11bf04b4065 · 2026-07-06T23:44:34.000+02:00
Replace the notification small icon with one bold shape so it stops falling back to the Android placeholder at status-bar size. Wrap the alarm and digest foreground-service starts so an OEM refusing a background start can't break the alarm flow. Expand the restricted-settings guidance with the Samsung path.
diff --git a/app/src/main/java/com/focusforceplus/app/service/RoutineAlarmReceiver.kt b/app/src/main/java/com/focusforceplus/app/service/RoutineAlarmReceiver.kt
@@ -49,12 +49,16 @@ class RoutineAlarmReceiver : BroadcastReceiver() {
         // AlarmLaunchService calls startForeground() + startActivity() from within the service.
         // On Android 12+ this is a no-op in practice (the activity is already running from Path A),
         // but having the service post the notification ensures it survives stopForeground(detach).
-        context.startForegroundService(
-            Intent(context, AlarmLaunchService::class.java).apply {
-                putExtra("routineId", routineId)
-                putExtra("routineName", routineName)
-            }
-        )
+        // Wrapped: some OEMs (e.g. Samsung) can still refuse a background FGS start, and that
+        // must not take down the whole alarm — the full-screen activity from Path A already ran.
+        runCatching {
+            context.startForegroundService(
+                Intent(context, AlarmLaunchService::class.java).apply {
+                    putExtra("routineId", routineId)
+                    putExtra("routineName", routineName)
+                }
+            )
+        }
 
         val pendingResult = goAsync()
         CoroutineScope(SupervisorJob() + Dispatchers.IO).launch {
diff --git a/app/src/main/java/com/focusforceplus/app/service/TodoAlarmReceiver.kt b/app/src/main/java/com/focusforceplus/app/service/TodoAlarmReceiver.kt
@@ -42,13 +42,18 @@ class TodoAlarmReceiver : BroadcastReceiver() {
                         }
                     )
                 }
-                // Both High (2) and Medium (1) use a foreground service so the
-                // alarm notification cannot be swiped away on any Android version.
-                context.startForegroundService(
-                    TodoAlarmForegroundService.startIntent(
-                        context, todoId, title, snoozeCount, maxSnooze, priority,
+                // Both High (2) and Medium (1) use a foreground service that pins the
+                // alarm notification (non-dismissable up to Android 13; on 14+ the system
+                // lets users swipe FGS notifications, so the full-screen alarm above is the
+                // real attention-grabber). Wrapped so an OEM refusing the background FGS
+                // start never crashes the alarm.
+                runCatching {
+                    context.startForegroundService(
+                        TodoAlarmForegroundService.startIntent(
+                            context, todoId, title, snoozeCount, maxSnooze, priority,
+                        )
                     )
-                )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/focusforceplus/app/service/TodoDigestReceiver.kt b/app/src/main/java/com/focusforceplus/app/service/TodoDigestReceiver.kt
@@ -53,9 +53,11 @@ class TodoDigestReceiver : BroadcastReceiver() {
                 // Anchor FGS: keeps Medium/High group notifications stable
                 val pinnedCount = (overdue + undated).count { it.priority > 0 }
                 if (pinnedCount > 0) {
-                    context.startForegroundService(
-                        TodoReminderForegroundService.startIntent(context, pinnedCount)
-                    )
+                    runCatching {
+                        context.startForegroundService(
+                            TodoReminderForegroundService.startIntent(context, pinnedCount)
+                        )
+                    }
                 } else {
                     notifHelper.cancelNotification(TodoNotificationHelper.NOTIFICATION_ID_OVERDUE)
                     runCatching {
diff --git a/app/src/main/java/com/focusforceplus/app/service/TodoSnoozeReceiver.kt b/app/src/main/java/com/focusforceplus/app/service/TodoSnoozeReceiver.kt
@@ -40,11 +40,13 @@ class TodoSnoozeReceiver : BroadcastReceiver() {
                 )
 
                 // Transition FGS to snoozed notification so it stays pinned for Medium/High
-                context.startForegroundService(
-                    TodoAlarmForegroundService.startSnoozedIntent(
-                        context, todoId, todo.title, triggerMillis, newCount, todo.maxSnoozeCount, todo.priority,
+                runCatching {
+                    context.startForegroundService(
+                        TodoAlarmForegroundService.startSnoozedIntent(
+                            context, todoId, todo.title, triggerMillis, newCount, todo.maxSnoozeCount, todo.priority,
+                        )
                     )
-                )
+                }
             } finally {
                 pendingResult.finish()
             }
diff --git a/app/src/main/java/com/focusforceplus/app/ui/screens/blocker/DisclosureScreen.kt b/app/src/main/java/com/focusforceplus/app/ui/screens/blocker/DisclosureScreen.kt
@@ -263,14 +263,21 @@ private fun RestrictedSettingsCard(onOpenAppInfo: () -> Unit) {
                 color = MaterialTheme.colorScheme.primary,
             )
             Text(
-                "Because you installed FocusForce+ directly instead of from the Play " +
-                    "Store, Android blocks the accessibility toggle the first time. To " +
-                    "unblock it: open the app info page below, tap the three-dot menu in " +
-                    "the top corner, and choose \"Allow restricted settings\". Then come " +
-                    "back and turn the service on.",
+                "Because you installed FocusForce+ directly (not from the Play Store), " +
+                    "Android blocks the accessibility toggle the first time. It's a quick " +
+                    "one-time unlock. Tap \"Open app info\" below, then:",
                 style = MaterialTheme.typography.bodyMedium,
                 color = MaterialTheme.colorScheme.onSurface,
             )
+            Text(
+                "• Most phones: tap the three-dot menu (top-right) and choose " +
+                    "\"Allow restricted settings\".\n" +
+                    "• Samsung: open Permissions, tap the three-dot menu (top-right), " +
+                    "then \"Allow restricted settings\".\n\n" +
+                    "After that, come back here and turn the service on.",
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
             Button(
                 onClick = onOpenAppInfo,
                 shape = RoundedCornerShape(10.dp),
diff --git a/app/src/main/java/com/focusforceplus/app/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/focusforceplus/app/ui/screens/settings/SettingsScreen.kt
@@ -2,6 +2,7 @@ package com.focusforceplus.app.ui.screens.settings
 
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -61,6 +62,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
@@ -567,7 +570,25 @@ fun SettingsScreen(
                 }
             }
 
-            item { Spacer(Modifier.height(16.dp)) }
+            item {
+                Spacer(Modifier.height(22.dp))
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 110.dp)
+                        .height(3.dp)
+                        .clip(RoundedCornerShape(2.dp))
+                        .background(
+                            Brush.horizontalGradient(
+                                listOf(
+                                    Color(0xFFE40303), Color(0xFFFF8C00), Color(0xFFFFED00),
+                                    Color(0xFF008026), Color(0xFF004DFF), Color(0xFF750787),
+                                )
+                            )
+                        ),
+                )
+                Spacer(Modifier.height(18.dp))
+            }
         }
     }
 
diff --git a/app/src/main/java/com/focusforceplus/app/worker/TodoOverdueWorker.kt b/app/src/main/java/com/focusforceplus/app/worker/TodoOverdueWorker.kt
@@ -64,9 +64,11 @@ class TodoOverdueWorker(
 
         val pinnedCount = (overdue + undated).count { it.priority > 0 }
         if (pinnedCount > 0) {
-            applicationContext.startForegroundService(
-                TodoReminderForegroundService.startIntent(applicationContext, pinnedCount)
-            )
+            runCatching {
+                applicationContext.startForegroundService(
+                    TodoReminderForegroundService.startIntent(applicationContext, pinnedCount)
+                )
+            }
         } else {
             notifHelper.cancelNotification(TodoNotificationHelper.NOTIFICATION_ID_OVERDUE)
             runCatching {
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
@@ -1,24 +1,16 @@
 <!--
-  Monochrome status-bar / notification icon. Notification small icons are rendered
-  as pure alpha silhouettes, so this is a single flat-white path (no gradients,
-  no shadow layer) — using the full-colour ic_launcher_foreground here made Android
-  fall back to the default placeholder blob. The launcher robot mark is re-centred
-  and scaled up so it fills the small icon nicely.
+  Monochrome status-bar / notification icon. Notification small icons render as a
+  pure alpha silhouette at tiny sizes, so this is one solid flat-white path with no
+  fine detail, gradients, or group transforms (the detailed launcher robot came out
+  as the Android placeholder at status-bar size). A bold bolt reads clearly at any
+  size and fits the "Force / Focus" theme.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <group
-        android:pivotX="54"
-        android:pivotY="51.15"
-        android:scaleX="1.6"
-        android:scaleY="1.6"
-        android:translateY="2.85">
-        <path
-            android:fillColor="#FFFFFF"
-            android:fillType="nonZero"
-            android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z" />
-    </group>
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M13,2L4.5,13.5c-0.4,0.5 0,1.2 0.6,1.2H10l-1.5,7.3c-0.1,0.7 0.8,1.1 1.3,0.5L19.5,10.5c0.4,-0.5 0,-1.2 -0.6,-1.2H14l1.4,-6.8C15.5,1.8 14.6,1.4 14.1,2z" />
 </vector>

Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,18 @@ class TodoAlarmReceiver : BroadcastReceiver() {`
`42`	`42`	`}`
`43`	`43`	`)`
`44`	`44`	`}`
`45`		`- // Both High (2) and Medium (1) use a foreground service so the`
`46`		`- // alarm notification cannot be swiped away on any Android version.`
`47`		`- context.startForegroundService(`
`48`		`- TodoAlarmForegroundService.startIntent(`
`49`		`- context, todoId, title, snoozeCount, maxSnooze, priority,`
	`45`	`+ // Both High (2) and Medium (1) use a foreground service that pins the`
	`46`	`+ // alarm notification (non-dismissable up to Android 13; on 14+ the system`
	`47`	`+ // lets users swipe FGS notifications, so the full-screen alarm above is the`
	`48`	`+ // real attention-grabber). Wrapped so an OEM refusing the background FGS`
	`49`	`+ // start never crashes the alarm.`
	`50`	`+ runCatching {`
	`51`	`+ context.startForegroundService(`
	`52`	`+ TodoAlarmForegroundService.startIntent(`
	`53`	`+ context, todoId, title, snoozeCount, maxSnooze, priority,`
	`54`	`+ )`
`50`	`55`	`)`
`51`		`- )`
	`56`	`+ }`
`52`	`57`	`}`
`53`	`58`	`}`
`54`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,13 @@ class TodoSnoozeReceiver : BroadcastReceiver() {`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`// Transition FGS to snoozed notification so it stays pinned for Medium/High`
`43`		`- context.startForegroundService(`
`44`		`- TodoAlarmForegroundService.startSnoozedIntent(`
`45`		`- context, todoId, todo.title, triggerMillis, newCount, todo.maxSnoozeCount, todo.priority,`
	`43`	`+ runCatching {`
	`44`	`+ context.startForegroundService(`
	`45`	`+ TodoAlarmForegroundService.startSnoozedIntent(`
	`46`	`+ context, todoId, todo.title, triggerMillis, newCount, todo.maxSnoozeCount, todo.priority,`
	`47`	`+ )`
`46`	`48`	`)`
`47`		`- )`
	`49`	`+ }`
`48`	`50`	`} finally {`
`49`	`51`	`pendingResult.finish()`
`50`	`52`	`}`