Release 1.0.0-RC.9 with several overall improvements

Author: dzikoysk

pom-application/app/build.gradle

@@ -26,8 +26,8 @@ android {
         applicationId "net.dzikoysk.presenceofmind"
         minSdk 29
         targetSdk 32
-        versionCode 8
-        versionName "1.0.0-RC.8"
+        versionCode 9
+        versionName "1.0.0-RC.9"
         archivesBaseName = "presence-of-mind-$versionName"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

pom-application/app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
     <uses-permission android:name="android.permission.USE_EXACT_ALARM"/>
@@ -18,19 +19,27 @@
         android:theme="@style/Theme.LightPresenceOfMind">
         <activity
             android:name=".PresenceOfMindActivity"
+            android:enabled="true"
             android:exported="true"
             android:theme="@style/Theme.LightPresenceOfMind">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <receiver android:name=".StartUpBroadcastReceiver" android:enabled="true" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
         <receiver
-            android:name="net.dzikoysk.presenceofmind.model.task.reminder.AlarmReceiver"
+            android:name="net.dzikoysk.presenceofmind.model.task.reminder.EventReminderReceiver"
+            android:enabled="true"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.media.action.DISPLAY_NOTIFICATION" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.media.action.DISPLAY_NOTIFICATION" />
+                <action android:name="pom-event-reminder-notification-cancelled"/>
             </intent-filter>
         </receiver>
     </application>

pom-application/app/src/main/java/net/dzikoysk/presenceofmind/PresenceOfMind.kt

@@ -13,12 +13,12 @@ import net.dzikoysk.presenceofmind.model.task.attributes.PomodoroAttribute
 import net.dzikoysk.presenceofmind.model.task.attributes.RepetitiveAttribute
 import net.dzikoysk.presenceofmind.model.task.attributes.date.EventAttribute
 import net.dzikoysk.presenceofmind.model.task.attributes.date.EventDateTime
-import net.dzikoysk.presenceofmind.model.task.attributes.date.MarkAsWatcher
+import net.dzikoysk.presenceofmind.model.task.attributes.date.MarkAsTaskWatcher
 import net.dzikoysk.presenceofmind.model.task.category.CategoryService
 import net.dzikoysk.presenceofmind.model.task.category.SharedPreferencesCategoryRepository
-import net.dzikoysk.presenceofmind.model.task.reminder.ReminderWatcher
+import net.dzikoysk.presenceofmind.model.task.reminder.ReminderTaskWatcher
 
-internal class PresenceOfMind constructor(
+class PresenceOfMind constructor(
     val presenceRepository: PresenceRepository,
     val categoryService: CategoryService,
     val taskService: TaskService,
@@ -63,9 +63,9 @@ private object PresenceOfMindFactory {
                 ),
                 version = DATA_VERSION
             ),
-            watchers = listOf(
-                MarkAsWatcher(),
-                ReminderWatcher(context)
+            taskWatchers = listOf(
+                MarkAsTaskWatcher(),
+                ReminderTaskWatcher(context)
             )
         )
 

pom-application/app/src/main/java/net/dzikoysk/presenceofmind/PresenceOfMindActivity.kt

@@ -7,7 +7,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.runtime.LaunchedEffect
 import com.google.android.play.core.appupdate.AppUpdateManagerFactory
-import com.google.android.play.core.install.model.AppUpdateType.FLEXIBLE
+import com.google.android.play.core.install.model.AppUpdateType.IMMEDIATE
 import com.google.android.play.core.install.model.UpdateAvailability.UPDATE_AVAILABLE
 import kotlinx.coroutines.delay
 import net.dzikoysk.presenceofmind.pages.Page
@@ -34,15 +34,16 @@ class PresenceOfMindActivity : ComponentActivity() {
 
             appUpdateInfoTask.addOnSuccessListener {
                 when {
-                    !it.isUpdateTypeAllowed(FLEXIBLE) -> return@addOnSuccessListener
+                    !it.isUpdateTypeAllowed(IMMEDIATE) -> return@addOnSuccessListener
                     it.updateAvailability() != UPDATE_AVAILABLE -> return@addOnSuccessListener
                     it.availableVersionCode() == presenceOfMind.presenceRepository.getLatestVersionCode() -> return@addOnSuccessListener
                 }
                 presenceOfMind.presenceRepository.setLatestVersionCode(it.availableVersionCode())
-                appUpdateManager.startUpdateFlowForResult(it, FLEXIBLE, this, UPDATE_CODE)
+                appUpdateManager.startUpdateFlowForResult(it, IMMEDIATE, this, UPDATE_CODE)
             }
         }
 
+        presenceOfMind.taskService.initializeWatchers(intent.extras)
         presenceOfMind.taskService.refreshTasksState()
 
         setContent {

pom-application/app/src/main/java/net/dzikoysk/presenceofmind/StartUpBroadcastReceiver.kt

@@ -0,0 +1,16 @@
+package net.dzikoysk.presenceofmind
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.Intent.ACTION_BOOT_COMPLETED
+
+internal class StartUpBroadcastReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == ACTION_BOOT_COMPLETED) {
+            PresenceOfMind.getInstance(context).taskService.refreshTasksState()
+        }
+    }
+
+}

pom-application/app/src/main/java/net/dzikoysk/presenceofmind/model/task/TaskService.kt

@@ -1,5 +1,6 @@
 package net.dzikoysk.presenceofmind.model.task
 
+import android.os.Bundle
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import java.util.UUID
@@ -11,7 +12,7 @@ typealias DeleteTask = (Task) -> Unit
 
 class TaskService(
     val taskRepository: TaskRepository = InMemoryTaskRepository(),
-    val watchers: Collection<Watcher> = emptyList()
+    val taskWatchers: Collection<TaskWatcher> = emptyList()
 ) {
 
     private val tasks = mutableStateListOf<Task>()
@@ -20,8 +21,11 @@ class TaskService(
         tasks.addAll(taskRepository.loadOrderedTasks())
     }
 
+    fun initializeWatchers(extras: Bundle?) =
+        taskWatchers.forEach { it.initialize(this, extras) }
+
     fun refreshTasksState() =
-        watchers.forEach { it.onRefresh(this) }
+        taskWatchers.forEach { it.onRefresh(this) }
 
     fun saveTask(task: Task) =
         saveTasks(listOf(task))

pom-application/app/src/main/java/net/dzikoysk/presenceofmind/model/task/TaskWatcher.kt

@@ -0,0 +1,11 @@
+package net.dzikoysk.presenceofmind.model.task
+
+import android.os.Bundle
+
+interface TaskWatcher {
+
+    fun initialize(taskService: TaskService, extras: Bundle?) {}
+
+    fun onRefresh(taskService: TaskService)
+
+}

pom-application/app/src/main/java/net/dzikoysk/presenceofmind/model/task/Watcher.kt

@@ -8,9 +8,16 @@ import net.dzikoysk.presenceofmind.model.task.reminder.hasOutdatedSchedule
 import net.dzikoysk.presenceofmind.shared.OUTDATED
 import net.dzikoysk.presenceofmind.shared.incomingDurationToHumanReadableFormat
 import net.dzikoysk.presenceofmind.shared.plural
-import java.time.*
+import java.time.Duration
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
 import kotlin.time.toKotlinDuration
 
+val EVENT_DATE_FORMATTER = DateTimeFormatter.ofPattern("dd.MM HH:mm")
+
 /** One-time events */
 data class EventAttribute(
     val eventDate: EventDateTime = EventDateTime.now(),

pom-application/app/src/main/java/net/dzikoysk/presenceofmind/model/task/attributes/date/EventAttribute.kt

@@ -2,7 +2,7 @@ package net.dzikoysk.presenceofmind.model.task.attributes.date
 
 import net.dzikoysk.presenceofmind.model.task.Task
 import net.dzikoysk.presenceofmind.model.task.TaskService
-import net.dzikoysk.presenceofmind.model.task.Watcher
+import net.dzikoysk.presenceofmind.model.task.TaskWatcher
 import net.dzikoysk.presenceofmind.model.task.attributes.RepetitiveAttribute
 import net.dzikoysk.presenceofmind.model.task.isDone
 import net.dzikoysk.presenceofmind.shared.DefaultTimeProvider
@@ -11,7 +11,7 @@ import java.time.Instant
 import java.time.ZoneId
 import java.time.temporal.ChronoUnit
 
-class MarkAsWatcher(private val timeProvider: TimeProvider = DefaultTimeProvider()) : Watcher {
+class MarkAsTaskWatcher(private val timeProvider: TimeProvider = DefaultTimeProvider()) : TaskWatcher {
 
     override fun onRefresh(taskService: TaskService) {
         // marks repetitive tasks as unfinished