mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-12-30 20:01:51 +01:00
Minor fixes
- 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:
parent
9f0052eceb
commit
688cc64dff
@ -23,6 +23,7 @@ import androidx.compose.material.icons.filled.DoneAll
|
||||
import androidx.compose.material.icons.filled.RemoveDone
|
||||
import androidx.compose.material.icons.outlined.Delete
|
||||
import androidx.compose.material.icons.outlined.Download
|
||||
import androidx.compose.material.icons.outlined.Label
|
||||
import androidx.compose.material.ripple.rememberRipple
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
@ -238,7 +239,7 @@ fun LibraryBottomActionMenu(
|
||||
if (onChangeCategoryClicked != null) {
|
||||
Button(
|
||||
title = stringResource(R.string.action_move_category),
|
||||
icon = Icons.Default.BookmarkAdd,
|
||||
icon = Icons.Outlined.Label,
|
||||
toConfirm = confirm[0],
|
||||
onLongClick = { onLongClickItem(0) },
|
||||
onClick = onChangeCategoryClicked,
|
||||
|
@ -202,7 +202,7 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
|
||||
return super.getPackageName()
|
||||
}
|
||||
|
||||
protected open fun setupAcra() {
|
||||
private fun setupAcra() {
|
||||
if (isDevFlavor.not()) {
|
||||
initAcra {
|
||||
buildConfigClass = BuildConfig::class.java
|
||||
@ -216,7 +216,7 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
|
||||
}
|
||||
}
|
||||
|
||||
protected open fun setupNotificationChannels() {
|
||||
private fun setupNotificationChannels() {
|
||||
try {
|
||||
Notifications.createChannels(this)
|
||||
} catch (e: Exception) {
|
||||
|
@ -5,6 +5,7 @@ package eu.kanade.tachiyomi
|
||||
*
|
||||
* @since extension-lib 1.3
|
||||
*/
|
||||
@Suppress("UNUSED")
|
||||
object AppInfo {
|
||||
fun getVersionCode() = BuildConfig.VERSION_CODE
|
||||
fun getVersionName() = BuildConfig.VERSION_NAME
|
||||
|
@ -387,7 +387,10 @@ open class BrowseSourcePresenter(
|
||||
* @return List of categories, not including the default category
|
||||
*/
|
||||
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? {
|
||||
|
Loading…
Reference in New Issue
Block a user