From 41e5d3000b6ecba8c8448ce54868886590493b93 Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Wed, 12 Oct 2022 08:04:14 -0700
Subject: [PATCH] remove param from web pref dialog onDismiss call

---
 .../omnivore/ui/reader/WebPreferencesDialog.kt         |  8 ++++----
 .../java/app/omnivore/omnivore/ui/reader/WebReader.kt  | 10 ++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebPreferencesDialog.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebPreferencesDialog.kt
index d2d1e31e4..d576e2164 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebPreferencesDialog.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebPreferencesDialog.kt
@@ -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")
 }
 
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReader.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReader.kt
index 8aeb8e619..9a0b6bd36 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReader.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReader.kt
@@ -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
         }
       }