From 779624301737c16cf3c5aec65ef8997814088849 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Tue, 30 Mar 2021 02:18:32 -0400
Subject: [PATCH] Fix brightness reset when leaving filter tab

---
 .../tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt  | 3 ++-
 .../java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt
index 09ccc98a8d..c5f8812db2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.ui.reader.settings
 
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import androidx.core.content.ContextCompat
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.tabs.TabLayout
@@ -90,7 +91,7 @@ class TabbedReaderSettingsSheet(val readerActivity: ReaderActivity) :
                 } else {
                     sheetBehavior.expand()
                     sheetBehavior.skipCollapsed = true
-                    window?.attributes = window?.attributes?.apply { screenBrightness = 0.01f }
+                    window?.attributes = window?.attributes?.apply { screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE }
                 }
             }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt
index a3275bf399..a18b259052 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt
@@ -86,7 +86,7 @@ class MaterialSpinnerView @JvmOverloads constructor(context: Context, attrs: Att
         this.pref = pref
         prefOffset = 0
         val intValues = resources.getStringArray(intValuesResource).map { it.toIntOrNull() }
-        setSelection(max(0,intValues.indexOf(pref.get())))
+        setSelection(max(0, intValues.indexOf(pref.get())))
         popup = makeSettingsPopup(pref, intValues, block)
         setOnTouchListener(popup?.dragToOpenListener)
         setOnClickListener {