feat: redesign Android UI with Neural Expressive direction

.github/workflows/android-build.yml

@@ -0,0 +1,31 @@
+name: Android build verification
+
+on:
+  pull_request:
+    branches: [main]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Compile Android app
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '17'
+          cache: gradle
+
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Build debug APK
+        run: bash ./gradlew assembleDebug --stacktrace

app/src/main/java/com/olavbg/javazone/JavaZoneConfig.kt

@@ -0,0 +1,6 @@
+package com.olavbg.javazone
+
+object JavaZoneConfig {
+    const val CURRENT_YEAR = 2026
+    const val FIRST_ARCHIVE_YEAR = 2014
+}

app/src/main/java/com/olavbg/javazone/ui/JavaZoneApp.kt

@@ -1,27 +1,19 @@
 package com.olavbg.javazone.ui
 
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.History
-import androidx.compose.material.icons.filled.Schedule
-import androidx.compose.material3.Icon
-import androidx.compose.material3.NavigationBar
-import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.runtime.rememberNavBackStack
 import androidx.navigation3.scene.SinglePaneSceneStrategy
 import androidx.navigation3.ui.NavDisplay
+import com.olavbg.javazone.JavaZoneConfig
 import com.olavbg.javazone.data.repository.SessionRepository
 import com.olavbg.javazone.data.repository.SettingsRepository
 import com.olavbg.javazone.notifications.ReminderManager
-import com.olavbg.javazone.ui.archive.ArchiveScreen
-import com.olavbg.javazone.ui.archive.ArchiveViewModelFactory
+import com.olavbg.javazone.ui.components.YearPickerSheet
 import com.olavbg.javazone.ui.detail.SessionDetailScreen
 import com.olavbg.javazone.ui.navigation.NavDestination
 import com.olavbg.javazone.ui.settings.SettingsScreen
@@ -30,84 +22,43 @@ import com.olavbg.javazone.ui.timeline.TimelineScreen
 import com.olavbg.javazone.ui.timeline.TimelineViewModel
 import com.olavbg.javazone.ui.timeline.TimelineViewModelFactory
 
-@OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
 fun JavaZoneApp(
     repository: SessionRepository,
     settingsRepository: SettingsRepository,
     reminderManager: ReminderManager,
     initialSessionId: String? = null,
 ) {
-    val timelineViewModel: TimelineViewModel = viewModel(
-        factory = TimelineViewModelFactory(repository, settingsRepository)
-    )
+    val timelineViewModel: TimelineViewModel = viewModel(factory = TimelineViewModelFactory(repository, settingsRepository))
+    var yearPickerVisible by rememberSaveable { mutableStateOf(false) }
+    val years = remember { (JavaZoneConfig.FIRST_ARCHIVE_YEAR..JavaZoneConfig.CURRENT_YEAR).toList().reversed() }
 
     val backStack = if (initialSessionId != null) {
-        rememberNavBackStack(
-            NavDestination.Timeline, NavDestination.SessionDetail(initialSessionId)
-        )
+        rememberNavBackStack(NavDestination.Timeline, NavDestination.SessionDetail(initialSessionId))
     } else {
         rememberNavBackStack(NavDestination.Timeline)
     }
 
-    Scaffold(
-        bottomBar = {
-            val currentEntry = backStack.lastOrNull()
-            NavigationBar {
-                NavigationBarItem(
-                    selected = currentEntry == NavDestination.Timeline,
-                    onClick = {
-                        if (currentEntry != NavDestination.Timeline) {
-                            backStack.clear()
-                            backStack.add(NavDestination.Timeline)
-                        }
-                    },
-                    icon = { Icon(Icons.Default.Schedule, contentDescription = "Tidslinje") },
-                    label = { Text("Tidslinje") })
-                NavigationBarItem(
-                    selected = currentEntry == NavDestination.Archive,
-                    onClick = {
-                        if (currentEntry != NavDestination.Archive) {
-                            backStack.clear()
-                            backStack.add(NavDestination.Archive)
-                        }
-                    },
-                    icon = { Icon(Icons.Default.History, contentDescription = "Arkiv") },
-                    label = { Text("Arkiv") })
-            }
-        }) { innerPadding ->
+    Scaffold { innerPadding ->
         NavDisplay(
             backStack = backStack,
             sceneStrategies = listOf(SinglePaneSceneStrategy()),
-            modifier = Modifier.fillMaxSize(),
+            modifier = androidx.compose.ui.Modifier.fillMaxSize(),
             entryProvider = { key ->
                 when (key) {
-                    NavDestination.Timeline -> NavEntry(
-                        key = key
-                    ) {
+                    NavDestination.Timeline -> NavEntry(key = key) {
                         TimelineScreen(
-                            viewModel = timelineViewModel, onSessionClick = { id ->
-                            backStack.add(NavDestination.SessionDetail(id))
-                        }, onSettingsClick = {
-                            backStack.add(NavDestination.Settings)
-                        }, contentPadding = innerPadding
-                        )
-                    }
-
-                    NavDestination.Archive -> NavEntry(
-                        key = key
-                    ) {
-                        ArchiveScreen(
-                            viewModel = viewModel(factory = ArchiveViewModelFactory(repository)),
+                            viewModel = timelineViewModel,
+                            onSessionClick = { id -> backStack.add(NavDestination.SessionDetail(id, timelineViewModel.selectedYear.value)) },
+                            onSettingsClick = { backStack.add(NavDestination.Settings) },
+                            onYearClick = { yearPickerVisible = true },
                             contentPadding = innerPadding
                         )
                     }
-
-                    is NavDestination.SessionDetail -> NavEntry(
-                        key = key
-                    ) {
+                    is NavDestination.SessionDetail -> NavEntry(key = key) {
                         SessionDetailScreen(
                             sessionId = key.sessionId,
+                            year = key.year,
                             repository = repository,
                             settingsRepository = settingsRepository,
                             onBackClick = { backStack.removeAt(backStack.size - 1) },
@@ -118,23 +69,25 @@ fun JavaZoneApp(
                             contentPadding = innerPadding
                         )
                     }
-
-                    NavDestination.Settings -> NavEntry(
-                        key = key
-                    ) {
+                    NavDestination.Settings -> NavEntry(key = key) {
                         SettingsScreen(
-                            viewModel = viewModel(
-                                factory = SettingsViewModelFactory(
-                                    settingsRepository, repository, reminderManager
-                                )
-                            ),
+                            viewModel = viewModel(factory = SettingsViewModelFactory(settingsRepository, repository, reminderManager)),
                             onBackClick = { backStack.removeAt(backStack.size - 1) },
                             contentPadding = innerPadding
                         )
                     }
-
                     else -> NavEntry(key) { }
                 }
-            })
+            }
+        )
+    }
+
+    if (yearPickerVisible) {
+        YearPickerSheet(
+            selectedYear = timelineViewModel.selectedYear.collectAsState().value,
+            years = years,
+            onYearSelected = { year -> timelineViewModel.setYear(year); yearPickerVisible = false },
+            onDismiss = { yearPickerVisible = false },
+        )
     }
 }

app/src/main/java/com/olavbg/javazone/ui/components/YearPicker.kt

@@ -0,0 +1,79 @@
+package com.olavbg.javazone.ui.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.role
+import androidx.compose.ui.semantics.selected
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.text.font.FontWeight
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun YearPickerSheet(
+    selectedYear: Int,
+    years: List<Int>,
+    onYearSelected: (Int) -> Unit,
+    onDismiss: () -> Unit,
+) {
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
+    ) {
+        Column(
+            modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp),
+            verticalArrangement = Arrangement.spacedBy(6.dp),
+        ) {
+            Text("Velg JavaZone-år", style = MaterialTheme.typography.headlineSmall)
+            Text("Bytt program uten å forlate tidslinjen.", style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
+            LazyColumn(
+                contentPadding = PaddingValues(top = 16.dp, bottom = 32.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                items(years, key = { it }) { year ->
+                    val selected = year == selectedYear
+                    Surface(
+                        onClick = { onYearSelected(year) },
+                        shape = MaterialTheme.shapes.large,
+                        color = if (selected) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceContainerLow,
+                        tonalElevation = if (selected) 2.dp else 0.dp,
+                        modifier = Modifier.fillMaxWidth().semantics {
+                            role = Role.RadioButton
+                            this.selected = selected
+                        },
+                    ) {
+                        Row(Modifier.padding(horizontal = 18.dp, vertical = 15.dp), verticalAlignment = Alignment.CenterVertically) {
+                            Text(
+                                text = year.toString(),
+                                style = if (selected) MaterialTheme.typography.titleLarge else MaterialTheme.typography.titleMedium,
+                                fontWeight = if (selected) FontWeight.ExtraBold else FontWeight.Bold,
+                                color = if (selected) MaterialTheme.colorScheme.onPrimaryContainer else MaterialTheme.colorScheme.onSurface,
+                                modifier = Modifier.weight(1f),
+                            )
+                            if (selected) Icon(Icons.Default.Check, contentDescription = "Valgt", tint = MaterialTheme.colorScheme.onPrimaryContainer)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}