nordiccalendar

commit d37769ed5a453eef1ca20ea54f08775bf1f43c0f
parent eca9f874a7f1d891947172d1ca9e9507aca4711b
Author: MTRNord <MTRNord@users.noreply.github.com>
Date:   Thu, 31 Jul 2025 21:24:43 +0200

Improve the notifications

Diffstat:
M
app/src/main/java/space/midnightthoughts/nordiccalendar/MainActivity.kt
 | 
6
++++++
M
app/src/main/java/space/midnightthoughts/nordiccalendar/NordicCalendarApp.kt
 | 
2
+-
M
app/src/main/java/space/midnightthoughts/nordiccalendar/notifications/NotificationHelper.kt
 | 
4
++--

3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/space/midnightthoughts/nordiccalendar/MainActivity.kt b/app/src/main/java/space/midnightthoughts/nordiccalendar/MainActivity.kt
@@ -84,6 +84,7 @@ class MainActivity : ComponentActivity() {
         }
         val showOnboarding = OnboardingPrefs.isOnboardingNeeded(this, currentVersion)
 
+        val navigateToEventId = intent.getLongExtra("navigateToEventId", -1)
 
         setContent {
             NordicCalendarTheme {
@@ -102,6 +103,11 @@ class MainActivity : ComponentActivity() {
                         permissionsState.launchMultiplePermissionRequest()
                     }
                 } else {
+                    LaunchedEffect(navigateToEventId) {
+                        if (navigateToEventId > 0) {
+                            navController.navigate("eventDetails/$navigateToEventId")
+                        }
+                    }
                     NavHost(
                         navController = navController,
                         startDestination = if (showOnboarding) Destinations.Intro.route else Destinations.Calendar.route,
diff --git a/app/src/main/java/space/midnightthoughts/nordiccalendar/NordicCalendarApp.kt b/app/src/main/java/space/midnightthoughts/nordiccalendar/NordicCalendarApp.kt
@@ -37,7 +37,7 @@ class NordicCalendarApp : Application(), Configuration.Provider {
         Log.d("NordicCalendarApp", "Setting up periodic calendar sync work")
         val workRequest =
             PeriodicWorkRequestBuilder<CalendarSyncWorker>(
-                30,
+                15,
                 TimeUnit.MINUTES
             )
                 .build()
diff --git a/app/src/main/java/space/midnightthoughts/nordiccalendar/notifications/NotificationHelper.kt b/app/src/main/java/space/midnightthoughts/nordiccalendar/notifications/NotificationHelper.kt
@@ -51,6 +51,7 @@ object NotificationHelper {
         }
         val intent = Intent(context, MainActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+            putExtra("navigateToEventId", eventId)
         }
         val pendingIntent = PendingIntent.getActivity(
             context,
@@ -74,11 +75,10 @@ object NotificationHelper {
                 )
             } ${timeFormat.format(endCal.time)}"
         }
-        val contentText = "Beginn: $timeText"
         val builder = NotificationCompat.Builder(context, CHANNEL_ID)
             .setSmallIcon(R.drawable.outline_calendar_clock_24)
             .setContentTitle(eventTitle)
-            .setContentText(contentText)
+            .setContentText(timeText)
             .setPriority(NotificationCompat.PRIORITY_HIGH)
             .setContentIntent(pendingIntent)
             .setCategory(CATEGORY_EVENT)