Configure manga directories

app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalStorageManager.kt

@@ -21,6 +21,7 @@ import java.io.File
 import javax.inject.Inject
 
 private const val DIR_NAME = "manga"
+private const val NOMEDIA = ".nomedia"
 private const val CACHE_DISK_PERCENTAGE = 0.02
 private const val CACHE_SIZE_MIN: Long = 10 * 1024 * 1024 // 10MB
 private const val CACHE_SIZE_MAX: Long = 250 * 1024 * 1024 // 250MB
@@ -77,18 +78,23 @@ class LocalStorageManager @Inject constructor(
 		preferredDir ?: getFallbackStorageDir()?.takeIf { it.isWriteable() }
 	}
 
+	suspend fun getApplicationStorageDirs(): Set<File> = runInterruptible(Dispatchers.IO) {
+		getAvailableStorageDirs()
+	}
+
 	suspend fun resolveUri(uri: Uri): File? = runInterruptible(Dispatchers.IO) {
 		uri.resolveFile(context)
 	}
 
+	suspend fun setDirIsNoMedia(dir: File) = runInterruptible(Dispatchers.IO) {
+		File(dir, NOMEDIA).createNewFile()
+	}
+
 	fun takePermissions(uri: Uri) {
 		val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
 		contentResolver.takePersistableUriPermission(uri, flags)
 	}
 
-	@Deprecated("")
-	fun getStorageDisplayName(file: File) = file.getStorageName(context)
-
 	suspend fun getDirectoryDisplayName(dir: File, isFullPath: Boolean): String = runInterruptible(Dispatchers.IO) {
 		val packageName = context.packageName
 		if (dir.absolutePath.contains(packageName)) {
@@ -104,9 +110,6 @@ class LocalStorageManager @Inject constructor(
 	private fun getConfiguredStorageDirs(): MutableSet<File> {
 		val set = getAvailableStorageDirs()
 		set.addAll(settings.userSpecifiedMangaDirectories)
-		settings.mangaStorageDir?.let {
-			set.add(it)
-		}
 		return set
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalListFragment.kt

@@ -33,7 +33,7 @@ class LocalListFragment : MangaListFragment(), FilterOwner {
 
 	override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		addMenuProvider(LocalListMenuProvider(this::onEmptyActionClick))
+		addMenuProvider(LocalListMenuProvider(binding.root.context, this::onEmptyActionClick))
 		viewModel.onMangaRemoved.observeEvent(viewLifecycleOwner) { onItemRemoved() }
 	}
 
@@ -45,7 +45,7 @@ class LocalListFragment : MangaListFragment(), FilterOwner {
 		FilterSheetFragment.show(childFragmentManager)
 	}
 
-	override fun onScrolledToEnd() = Unit
+	override fun onScrolledToEnd() = viewModel.loadNextPage()
 
 	override fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
 		mode.menuInflater.inflate(R.menu.mode_local, menu)

app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalListMenuProvider.kt

@@ -1,12 +1,15 @@
 package org.koitharu.kotatsu.local.ui
 
+import android.content.Context
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.core.view.MenuProvider
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.settings.storage.directories.MangaDirectoriesActivity
 
 class LocalListMenuProvider(
+	private val context: Context,
 	private val onImportClick: Function0<Unit>,
 ) : MenuProvider {
 
@@ -20,6 +23,12 @@ class LocalListMenuProvider(
 				onImportClick()
 				true
 			}
+
+			R.id.action_settings -> {
+				context.startActivity(MangaDirectoriesActivity.newIntent(context))
+				true
+			}
+
 			else -> false
 		}
 	}

app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.local.ui
 
+import android.content.SharedPreferences
 import androidx.lifecycle.SavedStateHandle
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -24,7 +25,7 @@ class LocalListViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,
 	mangaRepositoryFactory: MangaRepository.Factory,
 	filter: FilterCoordinator,
-	settings: AppSettings,
+	private val settings: AppSettings,
 	downloadScheduler: DownloadWorker.Scheduler,
 	listExtraProvider: ListExtraProvider,
 	private val deleteLocalMangaUseCase: DeleteLocalMangaUseCase,
@@ -36,7 +37,7 @@ class LocalListViewModel @Inject constructor(
 	settings,
 	listExtraProvider,
 	downloadScheduler,
-) {
+), SharedPreferences.OnSharedPreferenceChangeListener {
 
 	val onMangaRemoved = MutableEventFlow<Unit>()
 
@@ -47,6 +48,18 @@ class LocalListViewModel @Inject constructor(
 					loadList(filter.snapshot(), append = false).join()
 				}
 		}
+		settings.subscribe(this)
+	}
+
+	override fun onCleared() {
+		settings.unsubscribe(this)
+		super.onCleared()
+	}
+
+	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+		if (key == AppSettings.KEY_LOCAL_MANGA_DIRS) {
+			onRefresh()
+		}
 	}
 
 	fun delete(ids: Set<Long>) {