Show the gallery folder name from the first frame

- Carry the folder name through GalleryRoute into the ViewModel's
  SavedStateHandle, so the TopBar title is correct immediately on
  navigation, before any directory listing completes
- Seed a provisional name from the SAF URI segment in loadPhotos as a
  fallback for entry points without a name (after-camera navigation)
- Drop the 'Gallery' fallback title and the unused gallery_title string

app/src/main/java/com/example/onecamera/navigation/OneCameraNavGraph.kt

@@ -32,7 +32,10 @@ import kotlinx.serialization.Serializable
 object FoldersRoute
 
 @Serializable
-data class GalleryRoute(val folderUri: String)
+data class GalleryRoute(
+    val folderUri: String,
+    val folderName: String = "",
+)
 
 @Serializable
 data class CameraRoute(
@@ -70,8 +73,8 @@ fun OneCameraNavGraph(navController: NavHostController) {
     ) {
         composable<FoldersRoute> {
             FoldersScreen(
-                onNavigateToGallery = { folderUri ->
+                onNavigateToGallery = { folderUri, folderName ->
-                    navController.navigate(GalleryRoute(folderUri))
+                    navController.navigate(GalleryRoute(folderUri, folderName))
                 },
                 onNavigateToCamera = { folderUri ->
                     navController.navigate(
@@ -93,8 +96,8 @@ fun OneCameraNavGraph(navController: NavHostController) {
                 onNavigateToCamera = { folderUri ->
                     navController.navigate(CameraRoute(folderUri))
                 },
-                onNavigateToSubfolder = { folderUri ->
+                onNavigateToSubfolder = { folderUri, folderName ->
-                    navController.navigate(GalleryRoute(folderUri))
+                    navController.navigate(GalleryRoute(folderUri, folderName))
                 },
                 onNavigateBack = { navController.popBackStack() },
             )

app/src/main/java/com/example/onecamera/ui/folders/FoldersScreen.kt

@@ -57,7 +57,7 @@ import com.example.onecamera.ui.components.oneCameraTopAppBarColors
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
 @Composable
 fun FoldersScreen(
-    onNavigateToGallery: (String) -> Unit,
+    onNavigateToGallery: (folderUri: String, folderName: String) -> Unit,
     onNavigateToCamera: (String) -> Unit,
     onNavigateToSettings: () -> Unit,
     viewModel: FoldersViewModel = hiltViewModel(),
@@ -230,7 +230,7 @@ fun FoldersScreen(
 
                                         onClick = {
                                             viewModel.prefetchFolderForNavigation(folder.uri.toString())
-                                            onNavigateToGallery(folder.uri.toString())
+                                            onNavigateToGallery(folder.uri.toString(), folder.name)
                                         },
                                         onCompress = { viewModel.zipFolderAndShare(folder) },
                                         onCompressJpeg85 = {

app/src/main/java/com/example/onecamera/ui/gallery/GalleryScreen.kt

@@ -93,7 +93,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 fun GalleryScreen(
     folderUri: String,
     onNavigateToCamera: (String) -> Unit,
-    onNavigateToSubfolder: (String) -> Unit,
+    onNavigateToSubfolder: (folderUri: String, folderName: String) -> Unit,
     onNavigateBack: () -> Unit,
     viewModel: GalleryViewModel = hiltViewModel(),
 ) {
@@ -281,9 +281,7 @@ fun GalleryScreen(
                 title = {
                     Column {
                         Text(
-                            uiState.folderName.ifEmpty {
+                            uiState.folderName,
-                                stringResource(R.string.gallery_title)
-                            },
                             maxLines = 1,
                             overflow = TextOverflow.Ellipsis,
                         )
@@ -434,7 +432,7 @@ fun GalleryScreen(
 
                                 onFolderClick = {
                                     viewModel.prefetchFolderForNavigation(it.uri.toString())
-                                    onNavigateToSubfolder(it.uri.toString())
+                                    onNavigateToSubfolder(it.uri.toString(), it.name)
                                 },
                                 onFolderCompress = { viewModel.zipFolderAndShare(it) },
                                 onFolderCompressJpeg85 = { viewModel.zipFolderCompressedJpegsAndShare(it) },

app/src/main/java/com/example/onecamera/ui/gallery/GalleryViewModel.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.net.Uri
 import androidx.compose.runtime.Immutable
 import androidx.core.net.toUri
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import coil3.SingletonImageLoader
@@ -113,6 +114,7 @@ data class GalleryUiState(
 
 @HiltViewModel
 class GalleryViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
     private val preferencesRepository: UserPreferencesRepository,
     private val listGalleryUseCase: ListGalleryUseCase,
     private val listFolderTreeUseCase: ListFolderTreeUseCase,
@@ -128,7 +130,11 @@ class GalleryViewModel @Inject constructor(
 ) : ViewModel() {
 
     val uiState: StateFlow<GalleryUiState>
-        field: MutableStateFlow<GalleryUiState> = MutableStateFlow(GalleryUiState())
+        field: MutableStateFlow<GalleryUiState> = MutableStateFlow(
+            // Navigation puts type-safe route args into the SavedStateHandle, so the
+            // title is correct from the very first frame, before any listing completes.
+            GalleryUiState(folderName = savedStateHandle.get<String>("folderName").orEmpty()),
+        )
 
     private var forceReload = false
 

app/src/main/res/values/strings.xml

@@ -46,7 +46,6 @@
         <item quantity="other">%d photos</item>
     </plurals>
 
-    <string name="gallery_title">Gallery</string>
     <string name="gallery_create_subfolder">Create subfolder</string>
     <string name="gallery_sort_ascending">Sort ascending</string>
     <string name="gallery_sort_descending">Sort descending</string>