From 254f021903030551d781223089d64a74fe130197 Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 20 Jun 2022 22:51:04 -0400 Subject: [PATCH] Minor cleanup --- .../eu/kanade/domain/manga/model/Manga.kt | 3 +-- .../manga/components/MangaCoverDialog.kt | 12 +++++------ .../data/backup/full/FullBackupRestore.kt | 1 + .../ui/manga/info/MangaFullCoverDialog.kt | 21 ++++++++++++------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt b/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt index 65b4b4414..0873301be 100644 --- a/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt +++ b/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt @@ -94,7 +94,7 @@ data class Manga( } fun sortDescending(): Boolean { - return chapterFlags and CHAPTER_SORT_DIR_MASK == CHAPTER_SORTING_DESC + return chapterFlags and CHAPTER_SORT_DIR_MASK == CHAPTER_SORT_DESC } companion object { @@ -121,7 +121,6 @@ data class Manga( const val CHAPTER_SORTING_NUMBER = 0x00000100L const val CHAPTER_SORTING_UPLOAD_DATE = 0x00000200L const val CHAPTER_SORTING_MASK = 0x00000300L - const val CHAPTER_SORTING_DESC = 0x00000000L const val CHAPTER_DISPLAY_NAME = 0x00000000L const val CHAPTER_DISPLAY_NUMBER = 0x00100000L diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt index aee0bc481..03487d7df 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt @@ -15,9 +15,9 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.systemBars import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.Edit -import androidx.compose.material.icons.filled.Save -import androidx.compose.material.icons.filled.Share +import androidx.compose.material.icons.outlined.Edit +import androidx.compose.material.icons.outlined.Save +import androidx.compose.material.icons.outlined.Share import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -70,13 +70,13 @@ fun MangaCoverDialog( Spacer(modifier = Modifier.weight(1f)) IconButton(onClick = onShareClick) { Icon( - imageVector = Icons.Default.Share, + imageVector = Icons.Outlined.Share, contentDescription = stringResource(id = R.string.action_share), ) } IconButton(onClick = onSaveClick) { Icon( - imageVector = Icons.Default.Save, + imageVector = Icons.Outlined.Save, contentDescription = stringResource(id = R.string.action_save), ) } @@ -87,7 +87,7 @@ fun MangaCoverDialog( onClick = { if (isCustomCover) onExpand(true) else onEditClick(EditCoverAction.EDIT) }, ) { Icon( - imageVector = Icons.Default.Edit, + imageVector = Icons.Outlined.Edit, contentDescription = stringResource(id = R.string.action_edit_cover), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt index 4d5944508..e32086bb0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt @@ -23,6 +23,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa override suspend fun performRestore(uri: Uri): Boolean { backupManager = FullBackupManager(context) + @Suppress("BlockingMethodInNonBlockingContext") val backupString = context.contentResolver.openInputStream(uri)!!.source().gzip().buffer().use { it.readByteArray() } val backup = backupManager.parser.decodeFromByteArray(BackupSerializer, backupString) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt index 6d6452d5e..47bf4d800 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt @@ -35,6 +35,7 @@ import eu.kanade.tachiyomi.ui.base.controller.FullComposeController import eu.kanade.tachiyomi.util.editCover import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.launchUI +import eu.kanade.tachiyomi.util.lang.withUIContext import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.toShareIntent import eu.kanade.tachiyomi.util.system.toast @@ -44,11 +45,12 @@ import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import logcat.LogPriority +import nucleus.presenter.Presenter import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy -class MangaFullCoverDialog : FullComposeController { +class MangaFullCoverDialog : FullComposeController { private val mangaId: Long @@ -61,7 +63,7 @@ class MangaFullCoverDialog : FullComposeController() { + ) : Presenter() { private var presenterScope: CoroutineScope = MainScope() @@ -218,6 +220,7 @@ class MangaFullCoverDialog : FullComposeController