1 files changed, 9 insertions, 3 deletions
diff --git a/app/src/main/java/org/terst/feedreader/ui/MainActivity.kt b/app/src/main/java/org/terst/feedreader/ui/MainActivity.kt
index 345bede..c080d89 100644
--- a/app/src/main/java/org/terst/feedreader/ui/MainActivity.kt
+++ b/app/src/main/java/org/terst/feedreader/ui/MainActivity.kt
@@ -6,6 +6,7 @@ import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
+import androidx.compose.material3.darkColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavType
@@ -29,7 +30,8 @@ class MainActivity : ComponentActivity() {
         FeedFetchWorker.schedulePeriodic(applicationContext)
 
         setContent {
-            MaterialTheme {
+            // Dark by default -- per user request, not following system light/dark for now.
+            MaterialTheme(colorScheme = darkColorScheme()) {
                 Surface(modifier = Modifier.fillMaxSize()) {
                     FeedReaderApp()
                 }
@@ -41,7 +43,10 @@ class MainActivity : ComponentActivity() {
 @Composable
 fun FeedReaderApp() {
     val navController = rememberNavController()
-    NavHost(navController = navController, startDestination = "feeds") {
+    // Unread is the landing screen (per user request) -- it has no "back" affordance of its
+    // own since it's the root of the back stack; ArticleListScreen instead shows a way to
+    // reach the feed list from there (a forward navigation, not a pop).
+    NavHost(navController = navController, startDestination = "articles/${encodeNavArg(UNREAD_FEED_ID)}") {
         composable("feeds") {
             FeedListScreen(
                 onOpenFeed = { feedId -> navController.navigate("articles/${encodeNavArg(feedId)}") },
@@ -59,7 +64,8 @@ fun FeedReaderApp() {
             ArticleListScreen(
                 feedId = feedId,
                 onOpenArticle = { articleId -> navController.navigate("reader/${encodeNavArg(articleId)}") },
-                onBack = { navController.popBackStack() }
+                onBack = { navController.popBackStack() },
+                onOpenFeedList = { navController.navigate("feeds") }
             )
         }
         composable(