From c8c9e79a3efe90c365414caf6d07296ec16b13b2 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sat, 15 Jul 2023 19:25:23 -0400
Subject: [PATCH] Fix compile

---
 .../advanced/design/MigrationBottomSheetDialog.kt     | 11 +++++++++--
 .../eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt  |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt
index fa912581a..93531bea1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt
@@ -8,10 +8,12 @@ import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import android.widget.CompoundButton
 import android.widget.RadioButton
 import android.widget.RadioGroup
 import android.widget.Toast
+import androidx.core.content.getSystemService
 import androidx.core.view.isVisible
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -19,7 +21,6 @@ import com.google.android.material.bottomsheet.getElevation
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.MigrationBottomSheetBinding
 import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags
-import eu.kanade.tachiyomi.util.system.displayCompat
 import eu.kanade.tachiyomi.util.system.dpToPx
 import eu.kanade.tachiyomi.util.system.isNightMode
 import eu.kanade.tachiyomi.util.system.isTabletUi
@@ -48,8 +49,14 @@ class MigrationBottomSheetDialog(private val baseContext: Context, private val l
         }
 
         // Set peek height to 50% display height
-        context.displayCompat?.let {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            context.display
+        } else {
+            @Suppress("DEPRECATION")
+            context.getSystemService<WindowManager>()?.defaultDisplay
+        }?.let {
             val metrics = DisplayMetrics()
+            @Suppress("DEPRECATION")
             it.getRealMetrics(metrics)
             behavior.peekHeight = metrics.heightPixels / 2
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
index 42703b975..44cf40abc 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
@@ -292,7 +292,8 @@ class MangaInfoScreenModel(
                 ) { state, mergedData ->
                     state.copy(mergedData = mergedData)
                 }
-                .combine(downloadCache.changes, downloadManager.queueState) { state, _, _ -> state }
+                .combine(downloadCache.changes) { state, _ -> state }
+                .combine(downloadManager.queueState) { state, _ -> state }
                 // SY <--
                 .collectLatest { (manga, chapters /* SY --> */, flatMetadata, mergedData /* SY <-- */) ->
                     val chapterItems = chapters.toChapterItems(manga /* SY --> */, mergedData /* SY <-- */)