yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Minor fixes

Browse Source 
- Fix categories modal showing when adding from source with no categories
- Use old categories icon in library bottom action menu
This commit is contained in:
arkon 2022-08-06 16:23:13 -04:00
parent 9f0052eceb
commit 688cc64dff
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
View File

@ -23,6 +23,7 @@ import androidx.compose.material.icons.filled.DoneAll
import androidx.compose.material.icons.filled.RemoveDone import androidx.compose.material.icons.filled.RemoveDone
import androidx.compose.material.icons.outlined.Delete import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material.icons.outlined.Download import androidx.compose.material.icons.outlined.Download
import androidx.compose.material.icons.outlined.Label
import androidx.compose.material.ripple.rememberRipple import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
@ -238,7 +239,7 @@ fun LibraryBottomActionMenu(
if (onChangeCategoryClicked != null) { if (onChangeCategoryClicked != null) {
Button( Button(
title = stringResource(R.string.action_move_category), title = stringResource(R.string.action_move_category),
icon = Icons.Default.BookmarkAdd, icon = Icons.Outlined.Label,
toConfirm = confirm[0], toConfirm = confirm[0],
onLongClick = { onLongClickItem(0) }, onLongClick = { onLongClickItem(0) },
onClick = onChangeCategoryClicked, onClick = onChangeCategoryClicked,

4
app/src/main/java/eu/kanade/tachiyomi/App.kt
View File

@ -202,7 +202,7 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
return super.getPackageName() return super.getPackageName()
} }
protected open fun setupAcra() { private fun setupAcra() {
if (isDevFlavor.not()) { if (isDevFlavor.not()) {
initAcra { initAcra {
buildConfigClass = BuildConfig::class.java buildConfigClass = BuildConfig::class.java
@ -216,7 +216,7 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
} }
} }
protected open fun setupNotificationChannels() { private fun setupNotificationChannels() {
try { try {
Notifications.createChannels(this) Notifications.createChannels(this)
} catch (e: Exception) { } catch (e: Exception) {

1
app/src/main/java/eu/kanade/tachiyomi/AppInfo.kt
View File

@ -5,6 +5,7 @@ package eu.kanade.tachiyomi
* *
* @since extension-lib 1.3 * @since extension-lib 1.3
*/ */
@Suppress("UNUSED")
object AppInfo { object AppInfo {
fun getVersionCode() = BuildConfig.VERSION_CODE fun getVersionCode() = BuildConfig.VERSION_CODE
fun getVersionName() = BuildConfig.VERSION_NAME fun getVersionName() = BuildConfig.VERSION_NAME

5
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
View File

@ -387,7 +387,10 @@ open class BrowseSourcePresenter(
* @return List of categories, not including the default category * @return List of categories, not including the default category
*/ */
suspend fun getCategories(): List<DomainCategory> { suspend fun getCategories(): List<DomainCategory> {
return getCategories.subscribe().firstOrNull() ?: emptyList() return getCategories.subscribe()
.firstOrNull()
?.filterNot { it.id == DomainCategory.UNCATEGORIZED_ID }
?: emptyList()
} }
suspend fun getDuplicateLibraryManga(manga: DomainManga): DomainManga? { suspend fun getDuplicateLibraryManga(manga: DomainManga): DomainManga? {