Migrate to Nav3

app/build.gradle.kts

@@ -1,9 +1,7 @@
-import com.android.build.gradle.internal.tasks.factory.dependsOn
 import java.util.Properties
 
 plugins {
     id("com.android.application")
-    id("org.jetbrains.kotlin.android")
     id("kotlin-parcelize")
     kotlin("plugin.serialization") version libs.versions.kotlin
     alias(libs.plugins.compose.compiler)
@@ -23,7 +21,7 @@ if (rootProject.file("secrets.properties").exists()) {
 
 android {
     namespace = "com.capyreader.app"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "com.capyreader.app"
@@ -126,10 +124,12 @@ dependencies {
     implementation(libs.androidx.adaptive)
     implementation(libs.androidx.adaptive.layout)
     implementation(libs.androidx.adaptive.navigation)
+    implementation(libs.androidx.adaptive.navigation3)
     implementation(libs.androidx.browser)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.viewmodel.navigation3)
     implementation(libs.androidx.material)
     implementation(libs.androidx.material.icons.extended)
     implementation(libs.androidx.material3)
@@ -138,6 +138,8 @@ dependencies {
     implementation(libs.androidx.media3.exoplayer)
     implementation(libs.androidx.media3.session)
     implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.navigation3.runtime)
+    implementation(libs.androidx.navigation3.ui)
     implementation(libs.androidx.palette)
     implementation(libs.androidx.paging.compose)
     implementation(libs.androidx.paging.runtime.ktx)
@@ -204,4 +206,4 @@ tasks.register("useGMSDebugFile") {
     }
 }
 
-project.tasks.preBuild.dependsOn("useGMSDebugFile")
+tasks.named("preBuild") { dependsOn("useGMSDebugFile") }

app/src/main/AndroidManifest.xml

@@ -44,6 +44,14 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="capy" />
+            </intent-filter>
         </activity>
 
         <activity

app/src/main/java/com/capyreader/app/MainActivity.kt

@@ -6,46 +6,70 @@ import androidx.activity.compose.setContent
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import com.capyreader.app.notifications.NotificationHelper
+import androidx.navigation3.runtime.NavKey
 import com.capyreader.app.preferences.AppPreferences
 import com.capyreader.app.ui.App
+import com.capyreader.app.ui.DeepLink
 import com.capyreader.app.ui.Route
-import org.koin.android.ext.android.get
+import com.jocmp.capy.ArticleStatus
 import org.koin.android.ext.android.inject
 
 class MainActivity : BaseActivity() {
     val appPreferences by inject<AppPreferences>()
 
-    private var pendingArticleID by mutableStateOf<String?>(null)
+    private var deepLink by mutableStateOf<List<NavKey>?>(null)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        pendingArticleID = NotificationHelper.openFromIntent(intent, appPreferences = appPreferences)
+        val startBackStack = resolveBackStack(intent)
+        applyListFilter(startBackStack)
 
         setContent {
             App(
-                startDestination = startDestination(),
+                startBackStack = startBackStack,
                 appPreferences = appPreferences,
-                pendingArticleID = pendingArticleID,
-                onPendingArticleSelected = { pendingArticleID = null },
+                deepLink = deepLink,
+                onDeepLinkConsumed = { deepLink = null },
             )
         }
     }
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
-        pendingArticleID = NotificationHelper.openFromIntent(intent, appPreferences = appPreferences)
+        // A deep link must never bypass the add-account flow when no account is configured.
+        if (!hasAccount) return
+        DeepLink.parse(intent.data, currentStatus)?.let { parsed ->
+            applyListFilter(parsed)
+            deepLink = parsed
+        }
     }
 
-    private fun startDestination(): Route {
-        val appPreferences = get<AppPreferences>()
-
-        val accountID = appPreferences.accountID.get()
+    /**
+     * Keep the persisted filter in sync with the deep link's list, so the list and the reader's
+     * neighbor query (both read [AppPreferences.filter]) agree on which articles are siblings.
+     */
+    private fun applyListFilter(backStack: List<NavKey>) {
+        (backStack.firstOrNull() as? Route.ArticleList)?.let {
+            appPreferences.filter.set(it.filter)
+        }
+    }
 
-        return if (accountID.isBlank()) {
-            Route.AddAccount
-        } else {
-            Route.Articles
+    /**
+     * Resolve the launch back stack. The account gate comes first: a deep link only applies once an
+     * account exists, otherwise we always land on the add-account flow.
+     */
+    private fun resolveBackStack(intent: Intent): List<NavKey> {
+        if (!hasAccount) {
+            return listOf(Route.AddAccount)
         }
+
+        return DeepLink.parse(intent.data, currentStatus)
+            ?: listOf(Route.ArticleList(appPreferences.filter.get()))
     }
+
+    private val hasAccount: Boolean
+        get() = appPreferences.accountID.get().isNotBlank()
+
+    private val currentStatus: ArticleStatus
+        get() = appPreferences.filter.get().status
 }

app/src/main/java/com/capyreader/app/notifications/NotificationHelper.kt

@@ -6,21 +6,16 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.os.Bundle
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import com.capyreader.app.ArticleStatusBroadcastReceiver
 import com.capyreader.app.MainActivity
+import com.capyreader.app.OpenArticleInBrowserActivity
 import com.capyreader.app.R
-import com.capyreader.app.notifications.NotificationHelper.Companion.ARTICLE_ID_KEY
-import com.capyreader.app.notifications.NotificationHelper.Companion.FEED_ID_KEY
-import com.capyreader.app.preferences.AppPreferences
+import com.capyreader.app.ui.DeepLink
 import com.jocmp.capy.Account
-import com.jocmp.capy.ArticleFilter
-import com.jocmp.capy.ArticleStatus
 import com.jocmp.capy.ArticleNotification
 import com.jocmp.capy.logging.CapyLog
-import com.jocmp.capy.preferences.getAndSet
 import java.time.ZonedDateTime
 
 class NotificationHelper(
@@ -136,9 +131,6 @@ class NotificationHelper(
 
     companion object {
         const val ARTICLE_ID_KEY = "article_id"
-        const val FEED_ID_KEY = "feed_id"
-        const val UNREAD_ONLY_KEY = "unread_only"
-        const val SHOW_ALL_KEY = "show_all"
 
         private const val ARTICLE_REFRESH_GROUP = "article_refresh"
 
@@ -155,45 +147,6 @@ class NotificationHelper(
                 putExtra(ArticleStatusBroadcastReceiver.ARTICLE_ID, articleID)
             }
         }
-
-        fun openFromIntent(intent: Intent, appPreferences: AppPreferences): String? {
-            val openFromShowMore = intent.getBooleanExtra(UNREAD_ONLY_KEY, false)
-            val openShowAll = intent.getBooleanExtra(SHOW_ALL_KEY, false)
-            val articleID = intent.getStringExtra(ARTICLE_ID_KEY)
-            val feedID = intent.getStringExtra(FEED_ID_KEY)
-
-            if (openFromShowMore) {
-                intent.replaceExtras(Bundle())
-
-                appPreferences.filter.set(
-                    ArticleFilter.Articles(articleStatus = ArticleStatus.UNREAD)
-                )
-
-                return null
-            } else if (openShowAll) {
-                intent.replaceExtras(Bundle())
-
-                appPreferences.filter.set(
-                    ArticleFilter.Articles(articleStatus = ArticleStatus.ALL)
-                )
-
-                return null
-            } else if (articleID != null && feedID != null) {
-                intent.replaceExtras(Bundle())
-
-                appPreferences.filter.getAndSet { currentFilter ->
-                    ArticleFilter.Feeds(
-                        feedID,
-                        feedStatus = currentFilter.status,
-                        folderTitle = null
-                    )
-                }
-
-                return articleID
-            }
-
-            return null
-        }
     }
 }
 
@@ -206,10 +159,23 @@ private fun NotificationManagerCompat.tryNotify(id: Int, notification: Notificat
 }
 
 private fun ArticleNotification.contentIntent(context: Context): PendingIntent {
-    val notifyIntent = Intent(context, MainActivity::class.java).apply {
-        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-        putExtra(ARTICLE_ID_KEY, articleID)
-        putExtra(FEED_ID_KEY, feedID)
+    val notifyIntent = if (openInBrowser && !url.isNullOrBlank()) {
+        // Feeds flagged "open in browser" route through the activity that opens the link and marks
+        // the article read, matching the in-app list tap and the widgets.
+        Intent(context, OpenArticleInBrowserActivity::class.java).apply {
+            putExtra(NotificationHelper.ARTICLE_ID_KEY, articleID)
+            putExtra(OpenArticleInBrowserActivity.ARTICLE_URL_KEY, url)
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        }
+    } else {
+        Intent(
+            Intent.ACTION_VIEW,
+            DeepLink.articleUri(articleID = articleID, feedID = feedID),
+            context,
+            MainActivity::class.java,
+        ).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        }
     }
 
     return PendingIntent.getActivity(