From 768bb7b503a478eecac7426da95d8e4cca8d1f4c Mon Sep 17 00:00:00 2001
From: zbue <108109611+zbue@users.noreply.github.com>
Date: Fri, 13 Jan 2023 11:26:04 +0800
Subject: [PATCH] Fix downloaded filter unmatched state in manga screen (#8897)

---
 .../presentation/manga/ChapterSettingsDialog.kt  | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
index e83a7856cb..c6b9b35dad 100644
--- a/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
@@ -3,7 +3,6 @@ package eu.kanade.presentation.manga
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -76,14 +75,9 @@ fun ChapterSettingsDialog(
         ) {
             when (page) {
                 0 -> {
-                    val forceDownloaded = manga?.forceDownloaded() == true
                     FilterPage(
-                        downloadFilter = if (forceDownloaded) {
-                            TriStateFilter.ENABLED_NOT
-                        } else {
-                            manga?.downloadedFilter
-                        } ?: TriStateFilter.DISABLED,
-                        onDownloadFilterChanged = onDownloadFilterChanged.takeUnless { forceDownloaded },
+                        downloadFilter = manga?.downloadedFilter ?: TriStateFilter.DISABLED,
+                        onDownloadFilterChanged = onDownloadFilterChanged.takeUnless { manga?.forceDownloaded() == true },
                         unreadFilter = manga?.unreadFilter ?: TriStateFilter.DISABLED,
                         onUnreadFilterChanged = onUnreadFilterChanged,
                         bookmarkedFilter = manga?.bookmarkedFilter ?: TriStateFilter.DISABLED,
@@ -158,7 +152,7 @@ private fun SetAsDefaultDialog(
 }
 
 @Composable
-private fun ColumnScope.FilterPage(
+private fun FilterPage(
     downloadFilter: TriStateFilter,
     onDownloadFilterChanged: ((TriStateFilter) -> Unit)?,
     unreadFilter: TriStateFilter,
@@ -184,7 +178,7 @@ private fun ColumnScope.FilterPage(
 }
 
 @Composable
-private fun ColumnScope.SortPage(
+private fun SortPage(
     sortingMode: Long,
     sortDescending: Boolean,
     onItemSelected: (Long) -> Unit,
@@ -207,7 +201,7 @@ private fun ColumnScope.SortPage(
 }
 
 @Composable
-private fun ColumnScope.DisplayPage(
+private fun DisplayPage(
     displayMode: Long,
     onItemSelected: (Long) -> Unit,
 ) {