2.3.1 - Dependency Updates, Better Live Notifications, and Calendar Fixes

Reviewed-on: #6

android/app/build.gradle.kts

@@ -16,8 +16,8 @@ android {
         applicationId = "com.atridad.ascently"
         minSdk = 31
         targetSdk = 36
-        versionCode = 4
+        versionCode = 47
-        versionName = "2.3.0"
+        versionName = "2.3.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

android/app/src/main/AndroidManifest.xml

@@ -27,6 +27,7 @@
 
     <!-- Permissions for notifications and foreground service -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.POST_PROMOTED_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 

android/app/src/main/java/com/atridad/ascently/service/SessionTrackingService.kt

@@ -6,6 +6,8 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.os.Build
+import android.os.Bundle
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
 import com.atridad.ascently.MainActivity
@@ -15,6 +17,7 @@ import com.atridad.ascently.data.repository.ClimbRepository
 import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.widget.ClimbStatsWidgetProvider
 import java.time.LocalDateTime
+import java.time.ZoneId
 import java.time.temporal.ChronoUnit
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.firstOrNull
@@ -209,6 +212,54 @@ class SessionTrackingService : Service() {
                 repository.getAttemptsBySession(sessionId).firstOrNull() ?: emptyList()
             }
 
+            val notificationBuilder =
+                NotificationCompat.Builder(this, CHANNEL_ID)
+                    .setSmallIcon(R.drawable.ic_mountains)
+                    .setOngoing(true)
+                    .setAutoCancel(false)
+                    .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                    .setCategory(NotificationCompat.CATEGORY_SERVICE)
+                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                    .setContentIntent(createOpenAppIntent())
+                    .addAction(
+                        R.drawable.ic_mountains,
+                        "Open Session",
+                        createOpenAppIntent()
+                    )
+                    .addAction(
+                        android.R.drawable.ic_menu_close_clear_cancel,
+                        "End Session",
+                        createStopPendingIntent(sessionId)
+                    )
+
+            // Use Live Update
+            if (Build.VERSION.SDK_INT >= 36) {
+                val startTimeMillis =
+                    session.startTime?.let { startTime ->
+                        try {
+                            val start = LocalDateTime.parse(startTime)
+                            val zoneId = ZoneId.systemDefault()
+                            start.atZone(zoneId).toInstant().toEpochMilli()
+                        } catch (_: Exception) {
+                            System.currentTimeMillis()
+                        }
+                    }
+                        ?: System.currentTimeMillis()
+
+                notificationBuilder
+                    .setContentTitle("Climbing Session Active")
+                    .setContentText(
+                        "${gym?.name ?: "Gym"} • ${attempts.size} attempts"
+                    )
+                    .setWhen(startTimeMillis)
+                    .setUsesChronometer(true)
+                    .setShowWhen(true)
+
+                val extras = Bundle()
+                extras.putBoolean("android.extra.REQUEST_PROMOTED_ONGOING", true)
+                notificationBuilder.setExtras(extras)
+            } else {
+                // Fallback for older versions
                 val duration =
                     session.startTime?.let { startTime ->
                         try {
@@ -230,30 +281,14 @@ class SessionTrackingService : Service() {
                     }
                         ?: "Active"
 
-            val notification =
+                notificationBuilder
-                NotificationCompat.Builder(this, CHANNEL_ID)
                     .setContentTitle("Climbing Session Active")
                     .setContentText(
                         "${gym?.name ?: "Gym"} • $duration • ${attempts.size} attempts"
                     )
-                    .setSmallIcon(R.drawable.ic_mountains)
+            }
-                    .setOngoing(true)
+
-                    .setAutoCancel(false)
+            val notification = notificationBuilder.build()
-                    .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-                    .setCategory(NotificationCompat.CATEGORY_SERVICE)
-                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                    .setContentIntent(createOpenAppIntent())
-                    .addAction(
-                        R.drawable.ic_mountains,
-                        "Open Session",
-                        createOpenAppIntent()
-                    )
-                    .addAction(
-                        android.R.drawable.ic_menu_close_clear_cancel,
-                        "End Session",
-                        createStopPendingIntent(sessionId)
-                    )
-                    .build()
 
             startForeground(NOTIFICATION_ID, notification)
 

android/app/src/main/java/com/atridad/ascently/ui/screens/SessionsScreen.kt

@@ -5,8 +5,6 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -38,6 +36,7 @@ import java.time.YearMonth
 import java.time.format.DateTimeFormatter
 import java.time.format.TextStyle
 import java.util.Locale
+import androidx.core.content.edit
 
 enum class ViewMode {
     LIST,
@@ -60,7 +59,7 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
         mutableStateOf(if (savedViewMode == "CALENDAR") ViewMode.CALENDAR else ViewMode.LIST)
     }
     var selectedMonth by remember { mutableStateOf(YearMonth.now()) }
-    var selectedDate by remember { mutableStateOf<LocalDate?>(null) }
+    var selectedDate by remember { mutableStateOf<LocalDate?>(LocalDate.now()) }
 
     val completedSessions = sessions.filter { it.status == SessionStatus.COMPLETED }
     val activeSessionGym = activeSession?.let { session -> gyms.find { it.id == session.gymId } }
@@ -89,7 +88,7 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
                         viewMode =
                                 if (viewMode == ViewMode.LIST) ViewMode.CALENDAR else ViewMode.LIST
                         selectedDate = null
-                        sharedPreferences.edit().putString("view_mode", viewMode.name).apply()
+                        sharedPreferences.edit { putString("view_mode", viewMode.name) }
                     }
             ) {
                 Icon(
@@ -147,16 +146,11 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
                     CalendarView(
                             sessions = completedSessions,
                             gyms = gyms,
-                            activeSession = activeSession,
-                            activeSessionGym = activeSessionGym,
                         selectedMonth = selectedMonth,
                             onMonthChange = { selectedMonth = it },
                             selectedDate = selectedDate,
                             onDateSelected = { selectedDate = it },
-                            onNavigateToSessionDetail = onNavigateToSessionDetail,
+                            onNavigateToSessionDetail = onNavigateToSessionDetail
-                            onEndSession = {
-                                activeSession?.let { viewModel.endSession(context, it.id) }
-                            }
                     )
                 }
             }
@@ -315,14 +309,11 @@ fun EmptyStateMessage(
 fun CalendarView(
         sessions: List<ClimbSession>,
         gyms: List<com.atridad.ascently.data.model.Gym>,
-        activeSession: ClimbSession?,
-        activeSessionGym: com.atridad.ascently.data.model.Gym?,
         selectedMonth: YearMonth,
         onMonthChange: (YearMonth) -> Unit,
         selectedDate: LocalDate?,
         onDateSelected: (LocalDate?) -> Unit,
-        onNavigateToSessionDetail: (String) -> Unit,
+        onNavigateToSessionDetail: (String) -> Unit
-        onEndSession: () -> Unit
 ) {
     val sessionsByDate =
             remember(sessions) {
@@ -331,13 +322,23 @@ fun CalendarView(
                         java.time.Instant.parse(it.date)
                                 .atZone(java.time.ZoneId.systemDefault())
                                 .toLocalDate()
-                    } catch (e: Exception) {
+                    } catch (_: Exception) {
                         LocalDate.parse(it.date, DateTimeFormatter.ISO_LOCAL_DATE)
                     }
                 }
             }
 
-    Column(modifier = Modifier.fillMaxSize()) {
+    val firstDayOfMonth = selectedMonth.atDay(1)
+    val daysInMonth = selectedMonth.lengthOfMonth()
+    val firstDayOfWeek = firstDayOfMonth.dayOfWeek.value % 7
+    val totalCells =
+            ((firstDayOfWeek + daysInMonth) / 7.0).let {
+                if (it == it.toInt().toDouble()) it.toInt() * 7 else (it.toInt() + 1) * 7
+            }
+    val numRows = totalCells / 7
+
+    LazyColumn(modifier = Modifier.fillMaxSize()) {
+        item {
             Card(
                     modifier = Modifier.fillMaxWidth(),
                     colors =
@@ -346,7 +347,8 @@ fun CalendarView(
                             )
             ) {
                 Column(
-                    modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
+                        modifier =
+                                Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
                         horizontalAlignment = Alignment.CenterHorizontally
                 ) {
                     Row(
@@ -410,19 +412,15 @@ fun CalendarView(
             }
 
             Spacer(modifier = Modifier.height(8.dp))
-
-        val firstDayOfMonth = selectedMonth.atDay(1)
-        val daysInMonth = selectedMonth.lengthOfMonth()
-        val firstDayOfWeek = firstDayOfMonth.dayOfWeek.value % 7
-        val totalCells =
-                ((firstDayOfWeek + daysInMonth) / 7.0).let {
-                    if (it == it.toInt().toDouble()) it.toInt() * 7 else (it.toInt() + 1) * 7
         }
 
-        LazyVerticalGrid(columns = GridCells.Fixed(7), modifier = Modifier.fillMaxWidth()) {
+        items(numRows) { rowIndex ->
-            items(totalCells) { index ->
+            Row(modifier = Modifier.fillMaxWidth()) {
+                for (colIndex in 0 until 7) {
+                    val index = rowIndex * 7 + colIndex
                     val dayNumber = index - firstDayOfWeek + 1
 
+                    Box(modifier = Modifier.weight(1f)) {
                         if (dayNumber in 1..daysInMonth) {
                             val date = selectedMonth.atDay(dayNumber)
                             val sessionsOnDate = sessionsByDate[date] ?: emptyList()
@@ -445,10 +443,13 @@ fun CalendarView(
                         }
                     }
                 }
+            }
+        }
 
         if (selectedDate != null) {
             val sessionsOnSelectedDate = sessionsByDate[selectedDate] ?: emptyList()
 
+            item {
                 Spacer(modifier = Modifier.height(16.dp))
 
                 Text(
@@ -458,8 +459,8 @@ fun CalendarView(
                         fontWeight = FontWeight.Bold,
                         modifier = Modifier.padding(vertical = 8.dp)
                 )
+            }
 
-            LazyColumn(modifier = Modifier.fillMaxWidth()) {
             items(sessionsOnSelectedDate) { session ->
                 SessionCard(
                         session = session,
@@ -468,7 +469,8 @@ fun CalendarView(
                 )
                 Spacer(modifier = Modifier.height(8.dp))
             }
-            }
+
+            item { Spacer(modifier = Modifier.height(16.dp)) }
         }
     }
 }

android/app/src/main/java/com/atridad/ascently/ui/screens/SettingsScreen.kt

@@ -583,41 +583,6 @@ fun SettingsScreen(viewModel: ClimbViewModel) {
 
                     Spacer(modifier = Modifier.height(12.dp))
 
-                    Card(
-                            shape = RoundedCornerShape(12.dp),
-                            colors =
-                                    CardDefaults.cardColors(
-                                            containerColor =
-                                                    MaterialTheme.colorScheme.surfaceVariant.copy(
-                                                            alpha = 0.3f
-                                                    )
-                                    )
-                    ) {
-                        ListItem(
-                                headlineContent = {
-                                    Row(
-                                            verticalAlignment = Alignment.CenterVertically,
-                                            horizontalArrangement = Arrangement.spacedBy(8.dp)
-                                    ) {
-                                        Icon(
-                                                painter =
-                                                        painterResource(
-                                                                id = R.drawable.ic_mountains
-                                                        ),
-                                                contentDescription = "Ascently Logo",
-                                                modifier = Modifier.size(24.dp),
-                                                tint = MaterialTheme.colorScheme.primary
-                                        )
-                                        Text("Ascently")
-                                    }
-                                },
-                                supportingContent = { Text("Track your climbing progress") },
-                                leadingContent = {}
-                        )
-                    }
-
-                    Spacer(modifier = Modifier.height(8.dp))
-
                     Card(
                             shape = RoundedCornerShape(12.dp),
                             colors =

android/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 agp = "8.12.3"
-kotlin = "2.2.20"
+kotlin = "2.2.21"
 coreKtx = "1.17.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
@@ -9,17 +9,17 @@ androidxTestCore = "1.7.0"
 androidxTestExt = "1.3.0"
 androidxTestRunner = "1.7.0"
 androidxTestRules = "1.7.0"
-lifecycleRuntimeKtx = "2.9.4"
+lifecycleRuntimeKtx = "2.10.0"
-activityCompose = "1.11.0"
+activityCompose = "1.12.0"
-composeBom = "2025.10.00"
+composeBom = "2025.11.01"
-room = "2.8.2"
+room = "2.8.4"
-navigation = "2.9.5"
+navigation = "2.9.6"
-viewmodel = "2.9.4"
+viewmodel = "2.10.0"
 kotlinxSerialization = "1.9.0"
 kotlinxCoroutines = "1.10.2"
 coil = "2.7.0"
 ksp = "2.2.20-2.0.3"
-exifinterface = "1.3.6"
+exifinterface = "1.4.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }

docs/src/content/docs/privacy.md

@@ -5,7 +5,7 @@ description: Ascently's Privacy Policy
 
 **Last updated: September 29, 2025**
 
-This Privacy Policy describes our policies and procedures regarding the collection, use, and disclosure of your information when you use my software.
+This Privacy Policy describes my policies and procedures regarding the collection, use, and disclosure of your information when you use my software.
 
 ## No Data Collection
 
@@ -36,7 +36,7 @@ You may optionally integrate with Apple Health or Android Health Connect to impo
 
 This software does not use cookies, tracking pixels, or any other analytics or tracking mechanisms. Your usage of the software is completely private.
 
-## Contact Us
+## Contact
 
 If you have any questions about this Privacy Policy, you can contact me: