From 39127577581381bb37ae3ba227b6de3ac928bbd7 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sat, 24 Jun 2023 10:34:46 -0400
Subject: [PATCH] Fix build

---
 .../browse/components/MigrationActionIcon.kt        | 13 +++++++------
 .../library/components/LibraryToolbar.kt            |  4 ++--
 .../presentation/manga/components/MangaToolbar.kt   |  8 ++++----
 .../presentation/webview/EhLoginWebViewScreen.kt    |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt
index 4012aa787..76fd05097 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt
@@ -4,6 +4,8 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material.icons.outlined.MoreVert
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
@@ -18,7 +20,6 @@ import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga
-import me.saket.cascade.CascadeDropdownMenu
 
 @Composable
 fun MigrationActionIcon(
@@ -47,19 +48,19 @@ fun MigrationActionIcon(
                     contentDescription = stringResource(R.string.abc_action_menu_overflow_description),
                 )
             }
-            CascadeDropdownMenu(
+            DropdownMenu(
                 expanded = moreExpanded,
                 onDismissRequest = closeMenu,
                 offset = DpOffset(8.dp, (-56).dp),
             ) {
-                androidx.compose.material3.DropdownMenuItem(
+                DropdownMenuItem(
                     text = { Text(stringResource(R.string.action_search_manually)) },
                     onClick = {
                         searchManually()
                         closeMenu()
                     },
                 )
-                androidx.compose.material3.DropdownMenuItem(
+                DropdownMenuItem(
                     text = { Text(stringResource(R.string.action_skip_entry)) },
                     onClick = {
                         skipManga()
@@ -67,14 +68,14 @@ fun MigrationActionIcon(
                     },
                 )
                 if (result is MigratingManga.SearchResult.Result) {
-                    androidx.compose.material3.DropdownMenuItem(
+                    DropdownMenuItem(
                         text = { Text(stringResource(R.string.action_migrate_now)) },
                         onClick = {
                             migrateNow()
                             closeMenu()
                         },
                     )
-                    androidx.compose.material3.DropdownMenuItem(
+                    DropdownMenuItem(
                         text = { Text(stringResource(R.string.action_copy_now)) },
                         onClick = {
                             copyNow()
diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
index 692316b9a..62d439ea9 100644
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
@@ -127,11 +127,11 @@ private fun LibraryRegularToolbar(
                     if (onClickSyncExh != null) {
                         AppBar.OverflowAction(
                             title = stringResource(R.string.sync_favorites),
-                            onClick = onClickSyncExh
+                            onClick = onClickSyncExh,
                         )
                     } else {
                         null
-                    }
+                    },
                     // SY <--
                 ),
             )
diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
index 4a86a04d3..aafbdd252 100644
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
@@ -161,7 +161,7 @@ fun MangaToolbar(
                                 add(
                                     AppBar.OverflowAction(
                                         title = stringResource(R.string.merge),
-                                        onClick = onClickMerge
+                                        onClick = onClickMerge,
                                     ),
                                 )
                             }
@@ -170,14 +170,14 @@ fun MangaToolbar(
                                     AppBar.OverflowAction(
                                         title = stringResource(R.string.action_edit_info),
                                         onClick = onClickEditInfo,
-                                    )
+                                    ),
                                 )
                             }
                             if (onClickRecommend != null) {
                                 add(
                                     AppBar.OverflowAction(
                                         title = stringResource(R.string.az_recommends),
-                                        onClick = onClickRecommend
+                                        onClick = onClickRecommend,
                                     ),
                                 )
                             }
@@ -185,7 +185,7 @@ fun MangaToolbar(
                                 add(
                                     AppBar.OverflowAction(
                                         title = stringResource(R.string.merge_settings),
-                                        onClick = onClickMergedSettings
+                                        onClick = onClickMergedSettings,
                                     ),
                                 )
                             }
diff --git a/app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt b/app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt
index 15d312d71..c51ff3293 100644
--- a/app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt
@@ -101,7 +101,7 @@ fun EhLoginWebViewScreen(
 
         val webClient = remember {
             object : AccompanistWebViewClient() {
-                override fun onPageFinished(view: WebView?, url: String?) {
+                override fun onPageFinished(view: WebView, url: String?) {
                     super.onPageFinished(view, url)
                     onPageFinished(view ?: return, url ?: return)
                 }