prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove param from web pref dialog onDismiss call

Browse source
This commit is contained in:
Satindar Dhillon 2022-10-12 08:04:14 -07:00
parent 84de7ea640
commit 41e5d3000b
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebPreferencesDialog.kt
View file

@ -9,19 +9,19 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
@Composable
fun WebPreferencesDialog(onDismiss: (WebPreferences?) -> Unit) {
Dialog(onDismissRequest = { onDismiss(null) }) {
fun WebPreferencesDialog(onDismiss: () -> Unit) {
Dialog(onDismissRequest = { onDismiss() }) {
Surface(
shape = RoundedCornerShape(16.dp),
color = Color.White
) {
WebPreferencesView(onDismiss)
WebPreferencesView()
}
}
}
@Composable
fun WebPreferencesView(onDismiss: (WebPreferences?) -> Unit) {
fun WebPreferencesView() {
Text("Web Prefs")
}

10
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReader.kt
View file

@ -44,7 +44,6 @@ fun WebReaderLoadingContainer(slug: String, webReaderViewModel: WebReaderViewMod
)
var showWebPreferencesDialog by remember { mutableStateOf(false ) }
var webPreferences by remember { mutableStateOf(defaultWebPreferences ) }
val webReaderParams: WebReaderParams? by webReaderViewModel.webReaderParamsLiveData.observeAsState(null)
val annotation: String? by webReaderViewModel.annotationLiveData.observeAsState(null)
@ -87,7 +86,7 @@ fun WebReaderLoadingContainer(slug: String, webReaderViewModel: WebReaderViewMod
.requiredHeight(height = maxToolbarHeight)
) {
}
WebReader(webReaderParams!!, webPreferences, webReaderViewModel)
WebReader(webReaderParams!!, defaultWebPreferences, webReaderViewModel)
}
TopAppBar(
@ -108,12 +107,7 @@ fun WebReaderLoadingContainer(slug: String, webReaderViewModel: WebReaderViewMod
)
if (showWebPreferencesDialog) {
WebPreferencesDialog { preferences ->
if (preferences != null) {
webPreferences = preferences!!
showWebPreferencesDialog = false
}
WebPreferencesDialog {
showWebPreferencesDialog = false
}
}