Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile

Browse Source
This commit is contained in:
Jobobby04 2023-07-15 19:25:23 -04:00
parent 07d0ceb140
commit c8c9e79a3e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt
View File

@ -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
}

3
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
View File

@ -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 <-- */)