yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO NOT USE] Introduce KMutableProperty0<T>.observed

Browse Source
This commit is contained in:
tarsin committed 2023-06-05 16:58:38 +08:00
1 parent 3b1beba570
commit 623ab63d8d
2 files changed
+43 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/ui/compose/State.kt
+21
View File
@@ -0,0 +1,21 @@
package com.hippo.ehviewer.ui.compose
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import kotlin.reflect.KMutableProperty0
val <T> KMutableProperty0<T>.observed: MutableState<T>
@Composable
get() = remember {
val mutableState = mutableStateOf(this.get())
object : MutableState<T> by mutableState {
override var value: T
get() = mutableState.value
set(value) {
this@observed.set(value)
mutableState.value = value
}
}
}
app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt
+22 -18
View File
@@ -17,8 +17,10 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext
@@ -27,6 +29,7 @@ import com.hippo.ehviewer.AppConfig
import com.hippo.ehviewer.R
import com.hippo.ehviewer.Settings
import com.hippo.ehviewer.download.downloadLocation
import com.hippo.ehviewer.ui.compose.observed
import com.hippo.ehviewer.ui.keepNoMediaFileStatus
import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
import com.hippo.ehviewer.ui.login.LocalNavController
@@ -56,31 +59,32 @@ fun DownloadScreen() {
},
snackbarHost = { SnackbarHost(snackbarHostState) },
) {
val cannotGetDownloadLocation = stringResource(id = R.string.settings_download_cant_get_download_location)
val selectDownloadDirLauncher = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocumentTree()) { treeUri ->
treeUri?.run {
coroutineScope.launch {
context.runCatching {
contentResolver.takePersistableUriPermission(treeUri, FLAG_GRANT_READ_URI_PERMISSION or FLAG_GRANT_WRITE_URI_PERMISSION)
UniFile.fromTreeUri(context, treeUri)!!.run {
downloadLocation = this
coroutineScope.launchNonCancellable {
keepNoMediaFileStatus()
Column(modifier = Modifier.padding(it).nestedScroll(scrollBehavior.nestedScrollConnection)) {
var downloadLocationState by ::downloadLocation.observed
val cannotGetDownloadLocation = stringResource(id = R.string.settings_download_cant_get_download_location)
val selectDownloadDirLauncher = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocumentTree()) { treeUri ->
treeUri?.run {
coroutineScope.launch {
context.runCatching {
contentResolver.takePersistableUriPermission(treeUri, FLAG_GRANT_READ_URI_PERMISSION or FLAG_GRANT_WRITE_URI_PERMISSION)
UniFile.fromTreeUri(context, treeUri)!!.run {
downloadLocationState = this
coroutineScope.launchNonCancellable {
keepNoMediaFileStatus()
}
}
}.onFailure {
snackbarHostState.showSnackbar(cannotGetDownloadLocation)
}
}.onFailure {
snackbarHostState.showSnackbar(cannotGetDownloadLocation)
}
}
}
}
Column(modifier = Modifier.padding(it).nestedScroll(scrollBehavior.nestedScrollConnection)) {
Preference(
title = stringResource(id = R.string.settings_download_download_location),
summary = downloadLocation.uri.toString(),
summary = downloadLocationState.uri.toString(),
) {
val file = downloadLocation
if (!UniFile.isFileUri(downloadLocation.uri)) {
val file = downloadLocationState
if (!UniFile.isFileUri(downloadLocationState.uri)) {
BaseDialogBuilder(context)
.setTitle(R.string.settings_download_download_location)
.setMessage(file.uri.toString())
@@ -88,7 +92,7 @@ fun DownloadScreen() {
.setNeutralButton(R.string.reset_download_location) { _, _ ->
val uniFile = UniFile.fromFile(AppConfig.defaultDownloadDir)
if (uniFile != null) {
downloadLocation = uniFile
downloadLocationState = uniFile
coroutineScope.launchNonCancellable { keepNoMediaFileStatus() }
} else {
coroutineScope.launch { snackbarHostState.showSnackbar(cannotGetDownloadLocation) }