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

Fix build

Browse Source
This commit is contained in:
Jobobby04 2023-06-24 10:34:46 -04:00
parent 3c741c13a4
commit 3912757758
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt
View File

@ -4,6 +4,8 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.Close
import androidx.compose.material.icons.outlined.MoreVert 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.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.Text import androidx.compose.material3.Text
@ -18,7 +20,6 @@ import androidx.compose.ui.unit.DpOffset
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga
import me.saket.cascade.CascadeDropdownMenu
@Composable @Composable
fun MigrationActionIcon( fun MigrationActionIcon(
@ -47,19 +48,19 @@ fun MigrationActionIcon(
contentDescription = stringResource(R.string.abc_action_menu_overflow_description), contentDescription = stringResource(R.string.abc_action_menu_overflow_description),
) )
} }
CascadeDropdownMenu( DropdownMenu(
expanded = moreExpanded, expanded = moreExpanded,
onDismissRequest = closeMenu, onDismissRequest = closeMenu,
offset = DpOffset(8.dp, (-56).dp), offset = DpOffset(8.dp, (-56).dp),
) { ) {
androidx.compose.material3.DropdownMenuItem( DropdownMenuItem(
text = { Text(stringResource(R.string.action_search_manually)) }, text = { Text(stringResource(R.string.action_search_manually)) },
onClick = { onClick = {
searchManually() searchManually()
closeMenu() closeMenu()
}, },
) )
androidx.compose.material3.DropdownMenuItem( DropdownMenuItem(
text = { Text(stringResource(R.string.action_skip_entry)) }, text = { Text(stringResource(R.string.action_skip_entry)) },
onClick = { onClick = {
skipManga() skipManga()
@ -67,14 +68,14 @@ fun MigrationActionIcon(
}, },
) )
if (result is MigratingManga.SearchResult.Result) { if (result is MigratingManga.SearchResult.Result) {
androidx.compose.material3.DropdownMenuItem( DropdownMenuItem(
text = { Text(stringResource(R.string.action_migrate_now)) }, text = { Text(stringResource(R.string.action_migrate_now)) },
onClick = { onClick = {
migrateNow() migrateNow()
closeMenu() closeMenu()
}, },
) )
androidx.compose.material3.DropdownMenuItem( DropdownMenuItem(
text = { Text(stringResource(R.string.action_copy_now)) }, text = { Text(stringResource(R.string.action_copy_now)) },
onClick = { onClick = {
copyNow() copyNow()

4
app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
View File

@ -127,11 +127,11 @@ private fun LibraryRegularToolbar(
if (onClickSyncExh != null) { if (onClickSyncExh != null) {
AppBar.OverflowAction( AppBar.OverflowAction(
title = stringResource(R.string.sync_favorites), title = stringResource(R.string.sync_favorites),
onClick = onClickSyncExh onClick = onClickSyncExh,
) )
} else { } else {
null null
} },
// SY <-- // SY <--
), ),
) )

8
app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
View File

@ -161,7 +161,7 @@ fun MangaToolbar(
add( add(
AppBar.OverflowAction( AppBar.OverflowAction(
title = stringResource(R.string.merge), title = stringResource(R.string.merge),
onClick = onClickMerge onClick = onClickMerge,
), ),
) )
} }
@ -170,14 +170,14 @@ fun MangaToolbar(
AppBar.OverflowAction( AppBar.OverflowAction(
title = stringResource(R.string.action_edit_info), title = stringResource(R.string.action_edit_info),
onClick = onClickEditInfo, onClick = onClickEditInfo,
) ),
) )
} }
if (onClickRecommend != null) { if (onClickRecommend != null) {
add( add(
AppBar.OverflowAction( AppBar.OverflowAction(
title = stringResource(R.string.az_recommends), title = stringResource(R.string.az_recommends),
onClick = onClickRecommend onClick = onClickRecommend,
), ),
) )
} }
@ -185,7 +185,7 @@ fun MangaToolbar(
add( add(
AppBar.OverflowAction( AppBar.OverflowAction(
title = stringResource(R.string.merge_settings), title = stringResource(R.string.merge_settings),
onClick = onClickMergedSettings onClick = onClickMergedSettings,
), ),
) )
} }

2
app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt
View File

@ -101,7 +101,7 @@ fun EhLoginWebViewScreen(
val webClient = remember { val webClient = remember {
object : AccompanistWebViewClient() { object : AccompanistWebViewClient() {
override fun onPageFinished(view: WebView?, url: String?) { override fun onPageFinished(view: WebView, url: String?) {
super.onPageFinished(view, url) super.onPageFinished(view, url)
onPageFinished(view ?: return, url ?: return) onPageFinished(view ?: return, url ?: return)
} }