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

Minor cleanup

Browse Source 
(cherry picked from commit 82a9d36df7c8a22c7dbd7762ecc38dbdacd2626e)

# Conflicts:
#	.github/renovate.json5
#	app/.gitignore
This commit is contained in:
arkon 2023-10-14 22:46:51 -04:00 committed by Jobobby04
parent 80844883ee
commit 54caea4daa
5 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/.gitignore vendored
View File

@ -1,6 +1,4 @@
/build /build
*iml *iml
*.iml *.iml
custom.gradle
google-services.json google-services.json
output.json

4
app/src/main/java/eu/kanade/presentation/history/components/HistoryDialogs.kt
View File

@ -106,11 +106,11 @@ fun HistoryDeleteAllDialog(
@ThemePreviews @ThemePreviews
@Composable @Composable
internal fun HistoryDeleteDialogPreview() { private fun HistoryDeleteDialogPreview() {
TachiyomiTheme { TachiyomiTheme {
HistoryDeleteDialog( HistoryDeleteDialog(
onDismissRequest = {}, onDismissRequest = {},
onDelete = { _ -> run {} }, onDelete = {},
) )
} }
} }

6
app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt
View File

@ -30,7 +30,7 @@ import tachiyomi.domain.history.model.HistoryWithRelations
import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.util.ThemePreviews import tachiyomi.presentation.core.util.ThemePreviews
private val HISTORY_ITEM_HEIGHT = 96.dp private val HistoryItemHeight = 96.dp
@Composable @Composable
fun HistoryItem( fun HistoryItem(
@ -43,7 +43,7 @@ fun HistoryItem(
Row( Row(
modifier = modifier modifier = modifier
.clickable(onClick = onClickResume) .clickable(onClick = onClickResume)
.height(HISTORY_ITEM_HEIGHT) .height(HistoryItemHeight)
.padding(horizontal = MaterialTheme.padding.medium, vertical = MaterialTheme.padding.small), .padding(horizontal = MaterialTheme.padding.medium, vertical = MaterialTheme.padding.small),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
@ -93,7 +93,7 @@ fun HistoryItem(
@ThemePreviews @ThemePreviews
@Composable @Composable
internal fun HistoryItemPreviews( private fun HistoryItemPreviews(
@PreviewParameter(HistoryWithRelationsProvider::class) @PreviewParameter(HistoryWithRelationsProvider::class)
historyWithRelations: HistoryWithRelations, historyWithRelations: HistoryWithRelations,
) { ) {

14
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View File

@ -1,7 +1,6 @@
package eu.kanade.tachiyomi.ui.reader package eu.kanade.tachiyomi.ui.reader
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.annotation.TargetApi
import android.app.assist.AssistContent import android.app.assist.AssistContent
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -432,15 +431,11 @@ class ReaderActivity : BaseActivity() {
}, },
readingMode = ReadingModeType.fromPreference( readingMode = ReadingModeType.fromPreference(
viewModel.getMangaReadingMode( viewModel.getMangaReadingMode(resolveDefault = false),
resolveDefault = false,
),
), ),
onClickReadingMode = viewModel::openReadingModeSelectDialog, onClickReadingMode = viewModel::openReadingModeSelectDialog,
orientationMode = OrientationType.fromPreference( orientationMode = OrientationType.fromPreference(
viewModel.getMangaOrientationType( viewModel.getMangaOrientationType(resolveDefault = false),
resolveDefault = false,
),
), ),
onClickOrientationMode = viewModel::openOrientationModeSelectDialog, onClickOrientationMode = viewModel::openOrientationModeSelectDialog,
cropEnabled = cropEnabled, cropEnabled = cropEnabled,
@ -1148,11 +1143,9 @@ class ReaderActivity : BaseActivity() {
.onEach(::setTrueColor) .onEach(::setTrueColor)
.launchIn(lifecycleScope) .launchIn(lifecycleScope)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
readerPreferences.cutoutShort().changes() readerPreferences.cutoutShort().changes()
.onEach(::setCutoutShort) .onEach(::setCutoutShort)
.launchIn(lifecycleScope) .launchIn(lifecycleScope)
}
readerPreferences.keepScreenOn().changes() readerPreferences.keepScreenOn().changes()
.onEach(::setKeepScreenOn) .onEach(::setKeepScreenOn)
@ -1233,8 +1226,9 @@ class ReaderActivity : BaseActivity() {
} }
} }
@TargetApi(Build.VERSION_CODES.P)
private fun setCutoutShort(enabled: Boolean) { private fun setCutoutShort(enabled: Boolean) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return
window.attributes.layoutInDisplayCutoutMode = when (enabled) { window.attributes.layoutInDisplayCutoutMode = when (enabled) {
true -> WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES true -> WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
false -> WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER false -> WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER

1
app/src/main/res/xml/shortcuts.xml
View File

@ -1,5 +1,4 @@
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"> <shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
<shortcut <shortcut
android:enabled="true" android:enabled="true"
android:icon="@drawable/sc_collections_bookmark_48dp" android:icon="@drawable/sc_collections_bookmark_48dp"