From cd65bb057d4444e37aab8648425c87848a89ef2b Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Sun, 15 Oct 2023 15:45:00 +0800
Subject: [PATCH] Fix inlined constants on older versions

---
 .../ehviewer/download/DownloadService.kt      |  2 +-
 .../widget/sheet/BaseBottomSheetDialog.kt     | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt
index 810ec45e8..cf6982be0 100644
--- a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt
+++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt
@@ -415,7 +415,7 @@ class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineSc
     private fun checkStopSelf() {
         launch {
             if (deferredMgr.await().isIdle) {
-                ServiceCompat.stopForeground(this@DownloadService, STOP_FOREGROUND_REMOVE)
+                ServiceCompat.stopForeground(this@DownloadService, ServiceCompat.STOP_FOREGROUND_REMOVE)
                 stopSelf()
             }
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BaseBottomSheetDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BaseBottomSheetDialog.kt
index af64c97f1..5c78c878c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BaseBottomSheetDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BaseBottomSheetDialog.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.hippo.ehviewer.R
+import com.hippo.ehviewer.util.isAtLeastO
 import eu.kanade.tachiyomi.util.system.displayCompat
 import eu.kanade.tachiyomi.util.system.isNightMode
 import eu.kanade.tachiyomi.util.view.setNavigationBarTransparentCompat
@@ -39,14 +40,16 @@ abstract class BaseBottomSheetDialog(context: Context) : BottomSheetDialog(conte
         // Set navbar color to transparent for edge-to-edge bottom sheet if we can use light navigation bar
         // TODO Replace deprecated systemUiVisibility when material-components uses new API to modify status bar icons
         // window?.setNavigationBarTransparentCompat(context, behavior.getElevation())
-        window?.setNavigationBarTransparentCompat(context, 0f)
-        val bottomSheet = rootView.parent as ViewGroup
-        var flags = bottomSheet.systemUiVisibility
-        flags = if (context.isNightMode()) {
-            flags and View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv()
-        } else {
-            flags or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+        if (isAtLeastO) {
+            window?.setNavigationBarTransparentCompat(context, 0f)
+            val bottomSheet = rootView.parent as ViewGroup
+            var flags = bottomSheet.systemUiVisibility
+            flags = if (context.isNightMode()) {
+                flags and View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv()
+            } else {
+                flags or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+            }
+            bottomSheet.systemUiVisibility = flags
         }
-        bottomSheet.systemUiVisibility = flags
     }
 }