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

Revert a mishap in 7ff95e21babda98dd1b479912278d6029cd15f0d

Browse Source 
(cherry picked from commit e183cbb231c6d48a17c573dbd3f2c8ce04ff7031)
This commit is contained in:
AntsyLich 2024-02-17 03:28:48 +06:00 committed by Jobobby04
parent 3a1d0d65bf
commit 598d622d0b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import eu.kanade.domain.ui.UiPreferences import eu.kanade.domain.ui.UiPreferences
import eu.kanade.tachiyomi.util.lang.toRelativeSting import eu.kanade.tachiyomi.util.lang.toRelativeString
import tachiyomi.i18n.MR import tachiyomi.i18n.MR
import tachiyomi.presentation.core.i18n.stringResource import tachiyomi.presentation.core.i18n.stringResource
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
@ -36,7 +36,7 @@ fun relativeDateText(
val relativeTime = remember { preferences.relativeTime().get() } val relativeTime = remember { preferences.relativeTime().get() }
val dateFormat = remember { UiPreferences.dateFormat(preferences.dateFormat().get()) } val dateFormat = remember { UiPreferences.dateFormat(preferences.dateFormat().get()) }
return localDate?.toRelativeSting( return localDate?.toRelativeString(
context = context, context = context,
relative = relativeTime, relative = relativeTime,
dateFormat = dateFormat, dateFormat = dateFormat,

4
app/src/main/java/eu/kanade/presentation/reader/ChapterListDialog.kt
View File

@ -16,7 +16,7 @@ import eu.kanade.presentation.manga.components.MangaChapterListItem
import eu.kanade.tachiyomi.data.download.model.Download import eu.kanade.tachiyomi.data.download.model.Download
import eu.kanade.tachiyomi.ui.reader.chapter.ReaderChapterItem import eu.kanade.tachiyomi.ui.reader.chapter.ReaderChapterItem
import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
import eu.kanade.tachiyomi.util.lang.toRelativeSting import eu.kanade.tachiyomi.util.lang.toRelativeString
import exh.metadata.MetadataUtil import exh.metadata.MetadataUtil
import exh.source.isEhBasedManga import exh.source.isEhBasedManga
import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableList
@ -65,7 +65,7 @@ fun ChapterListDialog(
LocalDate.ofInstant( LocalDate.ofInstant(
Instant.ofEpochMilli(it), Instant.ofEpochMilli(it),
ZoneId.systemDefault(), ZoneId.systemDefault(),
).toRelativeSting(context, dateRelativeTime, chapterItem.dateFormat) ).toRelativeString(context, dateRelativeTime, chapterItem.dateFormat)
} }
// SY <-- // SY <--
}, },

2
app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt
View File

@ -38,7 +38,7 @@ fun Long.toLocalDate(): LocalDate {
return LocalDate.ofInstant(Instant.ofEpochMilli(this), ZoneId.systemDefault()) return LocalDate.ofInstant(Instant.ofEpochMilli(this), ZoneId.systemDefault())
} }
fun LocalDate.toRelativeSting( fun LocalDate.toRelativeString(
context: Context, context: Context,
relative: Boolean = true, relative: Boolean = true,
dateFormat: DateTimeFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT), dateFormat: DateTimeFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT),