Skip to content

Commit c83ebf3

Browse files
committed
fix: Group updates by date and not time
1 parent 291c24b commit c83ebf3

6 files changed

Lines changed: 14 additions & 14 deletions

File tree

app/src/main/java/eu/kanade/presentation/updates/anime/AnimeUpdatesScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import tachiyomi.presentation.core.screens.EmptyScreen
3030
import tachiyomi.presentation.core.screens.LoadingScreen
3131
import uy.kohesive.injekt.Injekt
3232
import uy.kohesive.injekt.api.get
33-
import java.time.LocalDateTime
33+
import java.time.LocalDate
3434
import kotlin.time.Duration.Companion.seconds
3535

3636
@Composable
@@ -153,6 +153,6 @@ private fun AnimeUpdatesBottomBar(
153153
}
154154

155155
sealed interface AnimeUpdatesUiModel {
156-
data class Header(val date: LocalDateTime) : AnimeUpdatesUiModel
156+
data class Header(val date: LocalDate) : AnimeUpdatesUiModel
157157
data class Item(val item: AnimeUpdatesItem) : AnimeUpdatesUiModel
158158
}

app/src/main/java/eu/kanade/presentation/updates/anime/AnimeUpdatesUiItem.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import androidx.compose.ui.platform.LocalHapticFeedback
3232
import androidx.compose.ui.text.font.FontStyle
3333
import androidx.compose.ui.text.style.TextOverflow
3434
import androidx.compose.ui.unit.dp
35-
import eu.kanade.presentation.components.relativeDateTimeText
35+
import eu.kanade.presentation.components.relativeDateText
3636
import eu.kanade.presentation.entries.anime.components.EpisodeDownloadAction
3737
import eu.kanade.presentation.entries.anime.components.EpisodeDownloadIndicator
3838
import eu.kanade.presentation.entries.components.DotSeparatorText
@@ -96,7 +96,7 @@ internal fun LazyListScope.animeUpdatesUiItems(
9696
is AnimeUpdatesUiModel.Header -> {
9797
ListGroupHeader(
9898
modifier = Modifier.animateItem(),
99-
text = relativeDateTimeText(item.date),
99+
text = relativeDateText(item.date),
100100
)
101101
}
102102
is AnimeUpdatesUiModel.Item -> {

app/src/main/java/eu/kanade/presentation/updates/manga/MangaUpdatesScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import tachiyomi.presentation.core.components.material.PullRefresh
2727
import tachiyomi.presentation.core.components.material.Scaffold
2828
import tachiyomi.presentation.core.screens.EmptyScreen
2929
import tachiyomi.presentation.core.screens.LoadingScreen
30-
import java.time.LocalDateTime
30+
import java.time.LocalDate
3131
import kotlin.time.Duration.Companion.seconds
3232

3333
@Composable
@@ -141,6 +141,6 @@ private fun MangaUpdatesBottomBar(
141141
}
142142

143143
sealed interface MangaUpdatesUiModel {
144-
data class Header(val date: LocalDateTime) : MangaUpdatesUiModel
144+
data class Header(val date: LocalDate) : MangaUpdatesUiModel
145145
data class Item(val item: MangaUpdatesItem) : MangaUpdatesUiModel
146146
}

app/src/main/java/eu/kanade/presentation/updates/manga/MangaUpdatesUiItem.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import androidx.compose.ui.platform.LocalHapticFeedback
3232
import androidx.compose.ui.text.font.FontStyle
3333
import androidx.compose.ui.text.style.TextOverflow
3434
import androidx.compose.ui.unit.dp
35-
import eu.kanade.presentation.components.relativeDateTimeText
35+
import eu.kanade.presentation.components.relativeDateText
3636
import eu.kanade.presentation.entries.components.DotSeparatorText
3737
import eu.kanade.presentation.entries.components.ItemCover
3838
import eu.kanade.presentation.entries.manga.components.ChapterDownloadAction
@@ -92,7 +92,7 @@ internal fun LazyListScope.mangaUpdatesUiItems(
9292
is MangaUpdatesUiModel.Header -> {
9393
ListGroupHeader(
9494
modifier = Modifier.animateItem(),
95-
text = relativeDateTimeText(item.date),
95+
text = relativeDateText(item.date),
9696
)
9797
}
9898
is MangaUpdatesUiModel.Item -> {

app/src/main/java/eu/kanade/tachiyomi/ui/updates/anime/AnimeUpdatesScreenModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import eu.kanade.tachiyomi.data.download.anime.AnimeDownloadCache
1616
import eu.kanade.tachiyomi.data.download.anime.AnimeDownloadManager
1717
import eu.kanade.tachiyomi.data.download.anime.model.AnimeDownload
1818
import eu.kanade.tachiyomi.data.library.anime.AnimeLibraryUpdateJob
19-
import eu.kanade.tachiyomi.util.lang.toLocalDateTime
19+
import eu.kanade.tachiyomi.util.lang.toLocalDate
2020
import kotlinx.collections.immutable.PersistentList
2121
import kotlinx.collections.immutable.mutate
2222
import kotlinx.collections.immutable.persistentListOf
@@ -392,8 +392,8 @@ class AnimeUpdatesScreenModel(
392392
return items
393393
.map { AnimeUpdatesUiModel.Item(it) }
394394
.insertSeparators { before, after ->
395-
val beforeDate = before?.item?.update?.dateFetch?.toLocalDateTime()
396-
val afterDate = after?.item?.update?.dateFetch?.toLocalDateTime()
395+
val beforeDate = before?.item?.update?.dateFetch?.toLocalDate()
396+
val afterDate = after?.item?.update?.dateFetch?.toLocalDate()
397397
when {
398398
beforeDate != afterDate && afterDate != null -> AnimeUpdatesUiModel.Header(afterDate)
399399
// Return null to avoid adding a separator between two items.

app/src/main/java/eu/kanade/tachiyomi/ui/updates/manga/MangaUpdatesScreenModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import eu.kanade.tachiyomi.data.download.manga.MangaDownloadCache
1616
import eu.kanade.tachiyomi.data.download.manga.MangaDownloadManager
1717
import eu.kanade.tachiyomi.data.download.manga.model.MangaDownload
1818
import eu.kanade.tachiyomi.data.library.manga.MangaLibraryUpdateJob
19-
import eu.kanade.tachiyomi.util.lang.toLocalDateTime
19+
import eu.kanade.tachiyomi.util.lang.toLocalDate
2020
import kotlinx.collections.immutable.PersistentList
2121
import kotlinx.collections.immutable.mutate
2222
import kotlinx.collections.immutable.persistentListOf
@@ -373,8 +373,8 @@ class MangaUpdatesScreenModel(
373373
return items
374374
.map { MangaUpdatesUiModel.Item(it) }
375375
.insertSeparators { before, after ->
376-
val beforeDate = before?.item?.update?.dateFetch?.toLocalDateTime()
377-
val afterDate = after?.item?.update?.dateFetch?.toLocalDateTime()
376+
val beforeDate = before?.item?.update?.dateFetch?.toLocalDate()
377+
val afterDate = after?.item?.update?.dateFetch?.toLocalDate()
378378
when {
379379
beforeDate != afterDate && afterDate != null -> MangaUpdatesUiModel.Header(afterDate)
380380
// Return null to avoid adding a separator between two items.

0 commit comments

Comments
 (0)