Bring back simplified relative timestamp setting

Except now it's just an on/off toggle for relative up to a week.
2023-09-24 17:01:26 -04:00
parent 5de72b7d32
commit 56d2464870
15 changed files with 112 additions and 10 deletions
@@ -375,6 +375,12 @@ object Migrations {
                    pref.getAndSet { it - "battery_not_low" }
                }
            }
+            if (oldVersion < 106) {
+                val pref = preferenceStore.getInt("relative_time", 7)
+                if (pref.get() == 0) {
+                    uiPreferences.relativeTime().set(false)
+                }
+            }
            return true
        }

@@ -99,6 +99,7 @@ class MangaScreen(
        MangaScreen(
            state = successState,
            snackbarHostState = screenModel.snackbarHostState,
+            dateRelativeTime = screenModel.relativeTime,
            dateFormat = screenModel.dateFormat,
            fetchInterval = successState.manga.fetchInterval,
            isTabletUi = isTabletUi(),
@@ -125,6 +125,7 @@ class MangaScreenModel(
    val chapterSwipeStartAction = libraryPreferences.swipeToEndAction().get()
    val chapterSwipeEndAction = libraryPreferences.swipeToStartAction().get()

+    val relativeTime by uiPreferences.relativeTime().asState(coroutineScope)
    val dateFormat by mutableStateOf(UiPreferences.dateFormat(uiPreferences.dateFormat().get()))
    private val skipFiltered by readerPreferences.skipFiltered().asState(coroutineScope)

@@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
 import eu.kanade.tachiyomi.util.lang.toDateKey
+import eu.kanade.tachiyomi.util.lang.toRelativeString
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
@@ -58,12 +59,14 @@ class UpdatesScreenModel(
    private val getChapter: GetChapter = Injekt.get(),
    private val libraryPreferences: LibraryPreferences = Injekt.get(),
    val snackbarHostState: SnackbarHostState = SnackbarHostState(),
+    uiPreferences: UiPreferences = Injekt.get(),
 ) : StateScreenModel<UpdatesScreenModel.State>(State()) {

    private val _events: Channel<Event> = Channel(Int.MAX_VALUE)
    val events: Flow<Event> = _events.receiveAsFlow()

    val lastUpdated by libraryPreferences.lastUpdatedTimestamp().asState(coroutineScope)
+    val relativeTime by uiPreferences.relativeTime().asState(coroutineScope)

    // First and last selected index in list
    private val selectedPositions: Array<Int> = arrayOf(-1, -1)
@@ -373,7 +376,7 @@ class UpdatesScreenModel(
        val selected = items.filter { it.selected }
        val selectionMode = selected.isNotEmpty()

-        fun getUiModel(context: Context): List<UpdatesUiModel> {
+        fun getUiModel(context: Context, relativeTime: Boolean): List<UpdatesUiModel> {
            val dateFormat by mutableStateOf(UiPreferences.dateFormat(Injekt.get<UiPreferences>().dateFormat().get()))

            return items
@@ -383,7 +386,11 @@ class UpdatesScreenModel(
                    val afterDate = after?.item?.update?.dateFetch?.toDateKey() ?: Date(0)
                    when {
                        beforeDate.time != afterDate.time && afterDate.time != 0L -> {
-                            val text = dateFormat.format(afterDate)
+                            val text = afterDate.toRelativeString(
+                                context = context,
+                                relative = relativeTime,
+                                dateFormat = dateFormat,
+                            )
                            UpdatesUiModel.Header(text)
                        }
                        // Return null to avoid adding a separator between two items.
@@ -57,6 +57,7 @@ object UpdatesTab : Tab {
            state = state,
            snackbarHostState = screenModel.snackbarHostState,
            lastUpdated = screenModel.lastUpdated,
+            relativeTime = screenModel.relativeTime,
            onClickCover = { item -> navigator.push(MangaScreen(item.update.mangaId)) },
            onSelectAll = screenModel::toggleAllSelection,
            onInvertSelection = screenModel::invertSelection,
@@ -1,5 +1,7 @@
 package eu.kanade.tachiyomi.util.lang

+import android.content.Context
+import eu.kanade.tachiyomi.R
 import java.text.DateFormat
 import java.time.Instant
 import java.time.LocalDateTime
@@ -42,3 +44,41 @@ fun Long.toDateKey(): Date {
    cal[Calendar.MILLISECOND] = 0
    return cal.time
 }
+
+private const val MILLISECONDS_IN_DAY = 86_400_000L
+
+fun Date.toRelativeString(
+    context: Context,
+    relative: Boolean = true,
+    dateFormat: DateFormat = DateFormat.getDateInstance(DateFormat.SHORT),
+): String {
+    if (!relative) {
+        return dateFormat.format(this)
+    }
+    val now = Date()
+    val difference = now.timeWithOffset.floorNearest(MILLISECONDS_IN_DAY) - this.timeWithOffset.floorNearest(MILLISECONDS_IN_DAY)
+    val days = difference.floorDiv(MILLISECONDS_IN_DAY).toInt()
+    return when {
+        difference < 0 -> dateFormat.format(this)
+        difference < MILLISECONDS_IN_DAY -> context.getString(R.string.relative_time_today)
+        difference < MILLISECONDS_IN_DAY.times(7) -> context.resources.getQuantityString(
+            R.plurals.relative_time,
+            days,
+            days,
+        )
+        else -> dateFormat.format(this)
+    }
+}
+
+private val Date.timeWithOffset: Long
+    get() {
+        return Calendar.getInstance().run {
+            time = this@timeWithOffset
+            val dstOffset = get(Calendar.DST_OFFSET)
+            this@timeWithOffset.time + timeZone.rawOffset + dstOffset
+        }
+    }
+
+fun Long.floorNearest(to: Long): Long {
+    return this.floorDiv(to) * to
+}