Skip to content

refactor: date time updated version #2969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2025
Merged

refactor: date time updated version #2969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 36 additions & 25 deletions core/common/src/commonMain/kotlin/org/mifos/mobile/core/common/DateHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@
*/
package org.mifos.mobile.core.common

import kotlinx.datetime.Clock
import kotlinx.datetime.DateTimePeriod
import kotlinx.datetime.DateTimeUnit
import kotlinx.datetime.Instant
import kotlinx.datetime.LocalDate
import kotlinx.datetime.LocalDateTime
import kotlinx.datetime.Month
Expand All @@ -23,8 +21,12 @@ import kotlinx.datetime.format.FormatStringsInDatetimeFormats
import kotlinx.datetime.format.byUnicodePattern
import kotlinx.datetime.isoDayNumber
import kotlinx.datetime.minus
import kotlinx.datetime.number
import kotlinx.datetime.toLocalDateTime
import kotlin.time.Clock
import kotlin.time.Duration.Companion.days
import kotlin.time.ExperimentalTime
import kotlin.time.Instant

@Suppress("TooManyFunctions")
@OptIn(FormatStringsInDatetimeFormats::class)
Expand Down Expand Up @@ -67,11 +69,12 @@ object DateHelper {
return stringBuilder.toString()
}

@OptIn(ExperimentalTime::class)
fun getFormattedDateWithPrefix(dateList: List<Int>): String {
val inputDate = LocalDate(dateList[0], dateList[1], dateList[2])
val now = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date

val formatted = "${inputDate.dayOfMonth} ${getMonthName(inputDate.monthNumber)} ${inputDate.year}"
val formatted = "${inputDate.month.number} ${getMonthName(inputDate.month.number)} ${inputDate.year}"

val today = now
val yesterday = today.minus(1, DateTimeUnit.DAY)
Expand All @@ -83,9 +86,9 @@ object DateHelper {
val endOfLastWeek = startOfThisWeek.minus(1, DateTimeUnit.DAY)

// Last Month
val firstOfThisMonth = LocalDate(today.year, today.monthNumber, 1)
val firstOfThisMonth = LocalDate(today.year, today.month.number, 1)
val lastMonthDate = firstOfThisMonth.minus(1, DateTimeUnit.MONTH)
val startOfLastMonth = LocalDate(lastMonthDate.year, lastMonthDate.monthNumber, 1)
val startOfLastMonth = LocalDate(lastMonthDate.year, lastMonthDate.month.number, 1)
val endOfLastMonth = firstOfThisMonth.minus(1, DateTimeUnit.DAY)

// Last Year
Expand Down Expand Up @@ -132,6 +135,7 @@ object DateHelper {
return listOf(year, month, day)
}

@OptIn(ExperimentalTime::class)
fun subtractTime(number: Int, unit: String): Long {
val now: Instant = Clock.System.now()
val daysToSubtract = when (unit.lowercase()) {
Expand All @@ -153,15 +157,16 @@ object DateHelper {
val input = LocalDate.Format { byUnicodePattern(format) }
val localDate = input.parse(dateString)

val day = localDate.dayOfMonth.toString().padStart(2, '0')
val month = monthNumberToAbbreviation[localDate.monthNumber]
val day = localDate.day.toString().padStart(2, '0')
val month = monthNumberToAbbreviation[localDate.month.number]
val year = localDate.year

return "$day $month $year"
}

private val monthNumberToAbbreviation = monthMap.entries.associate { (k, v) -> v to k }

@OptIn(ExperimentalTime::class)
fun getDateAsLongFromList(integersOfDate: List<Int>?): Long? {
if (integersOfDate == null) return null
val dateStr = getDateAsString(integersOfDate)
Expand Down Expand Up @@ -202,8 +207,8 @@ object DateHelper {
// Extension function to format LocalDate
fun LocalDate.format(pattern: String): String {
val year = this.year.toString().padStart(4, '0')
val month = this.monthNumber.toString().padStart(2, '0')
val day = this.dayOfMonth.toString().padStart(2, '0')
val month = this.month.toString().padStart(2, '0')
val day = this.day.toString().padStart(2, '0')

return pattern
.replace("yyyy", year)
Expand Down Expand Up @@ -238,6 +243,7 @@ object DateHelper {
* Example timestamp "1698278400000"
* Output examples: "dd-MM-yyyy" - "14-04-2016"
*/
@OptIn(ExperimentalTime::class)
fun getDateAsStringFromLong(timeInMillis: Long): String {
val instant = Instant.fromEpochMilliseconds(timeInMillis)
.toLocalDateTime(TimeZone.currentSystemDefault())
Expand All @@ -250,20 +256,22 @@ object DateHelper {
* Example timestamp "1698278400000"
* Output examples: "14 April"
*/
@OptIn(ExperimentalTime::class)
fun getMonthAsStringFromLong(timeInMillis: Long): String {
val instant = Instant.fromEpochMilliseconds(timeInMillis)
.toLocalDateTime(TimeZone.currentSystemDefault())

val monthName = instant.month.name.lowercase().capitalize()

return "${instant.dayOfMonth} $monthName"
return "${instant.day} $monthName"
}

@OptIn(ExperimentalTime::class)
fun getDateMonthYearString(timeInMillis: Long): String {
val instant = Instant.fromEpochMilliseconds(timeInMillis)
.toLocalDateTime(TimeZone.currentSystemDefault())

val day = instant.dayOfMonth
val day = instant.day
val month = instant.month.name.lowercase().replaceFirstChar { it.uppercase() }.take(3)
val year = instant.year

Expand Down Expand Up @@ -337,6 +345,7 @@ object DateHelper {
* "Today at 05:41"
* "Tomorrow at 05:41"
*/
@OptIn(ExperimentalTime::class)
fun String.toFormattedDateTime(): String {
// Parse the datetime string
val dateTime = try {
Expand All @@ -361,41 +370,41 @@ object DateHelper {
nowDateTime.year == dateTime.year -> {
when {
// Same month
nowDateTime.monthNumber == dateTime.monthNumber -> {
nowDateTime.month.number == dateTime.month.number -> {
when {
// Tomorrow
dateTime.dayOfMonth - nowDateTime.dayOfMonth == 1 -> {
dateTime.month.number - nowDateTime.month.number == 1 -> {
"Tomorrow at ${dateTime.format()}"
}
// Today
dateTime.dayOfMonth == nowDateTime.dayOfMonth -> {
dateTime.month.number == nowDateTime.month.number -> {
"Today at ${dateTime.format()}"
}
// Yesterday
nowDateTime.dayOfMonth - dateTime.dayOfMonth == 1 -> {
nowDateTime.month.number - dateTime.month.number == 1 -> {
"Yesterday at ${dateTime.format()}"
}
// Same month but different day
else -> {
"${
dateTime.month.name.lowercase().capitalize()
} ${dateTime.dayOfMonth}, ${dateTime.format()}"
} ${dateTime.month.number}, ${dateTime.format()}"
}
}
}
// Different month, same year
else -> {
"${
dateTime.month.name.lowercase().capitalize()
} ${dateTime.dayOfMonth}, ${dateTime.format()}"
} ${dateTime.month.number}, ${dateTime.format()}"
}
}
}
// Different year
else -> {
"${
dateTime.month.name.lowercase().capitalize()
} ${dateTime.dayOfMonth} ${dateTime.year}, ${dateTime.format()}"
} ${dateTime.month.number} ${dateTime.year}, ${dateTime.format()}"
}
}
}
Expand All @@ -407,6 +416,7 @@ object DateHelper {
* "Today at 12:00"
* "Tomorrow at 15:30"
*/
@OptIn(ExperimentalTime::class)
fun String.toPrettyDate(): String {
val timestamp = this.toLong()
val instant = Instant.fromEpochMilliseconds(timestamp)
Expand All @@ -419,44 +429,44 @@ object DateHelper {
nowDateTime.year == neededDateTime.year -> {
when {
// Same month
nowDateTime.monthNumber == neededDateTime.monthNumber -> {
nowDateTime.month.number == neededDateTime.month.number -> {
when {
// Tomorrow
neededDateTime.dayOfMonth - nowDateTime.dayOfMonth == 1 -> {
neededDateTime.month.number - nowDateTime.month.number == 1 -> {
val time = neededDateTime.format()
"Tomorrow at $time"
}
// Today
neededDateTime.dayOfMonth == nowDateTime.dayOfMonth -> {
neededDateTime.month.number == nowDateTime.month.number -> {
val time = neededDateTime.format()
"Today at $time"
}
// Yesterday
nowDateTime.dayOfMonth - neededDateTime.dayOfMonth == 1 -> {
nowDateTime.month.number - neededDateTime.month.number == 1 -> {
val time = neededDateTime.format()
"Yesterday at $time"
}
// Same month but different day
else -> {
"${
neededDateTime.month.name.lowercase().capitalize()
} ${neededDateTime.dayOfMonth}, ${neededDateTime.format()}"
} ${neededDateTime.month.number}, ${neededDateTime.format()}"
}
}
}
// Different month, same year
else -> {
"${
neededDateTime.month.name.lowercase().capitalize()
} ${neededDateTime.dayOfMonth}, ${neededDateTime.format()}"
} ${neededDateTime.month.number}, ${neededDateTime.format()}"
}
}
}
// Different year
else -> {
"${
neededDateTime.month.name.lowercase().capitalize()
} ${neededDateTime.dayOfMonth} ${neededDateTime.year}, ${neededDateTime.format()}"
} ${neededDateTime.month.number} ${neededDateTime.year}, ${neededDateTime.format()}"
}
}
}
Expand All @@ -471,6 +481,7 @@ object DateHelper {
if (it.isLowerCase()) it.titlecase() else it.toString()
}

@OptIn(ExperimentalTime::class)
val currentDate = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())

/**
Expand Down
5 changes: 3 additions & 2 deletions ...lin/org/mifos/mobile/feature/transfer/process/transferProcess/TransferProcessViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import androidx.navigation.toRoute
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.datetime.number
import mifos_mobile.feature.transfer_process.generated.resources.Res
import mifos_mobile.feature.transfer_process.generated.resources.back_to_accounts
import mifos_mobile.feature.transfer_process.generated.resources.transfer_failed
Expand Down Expand Up @@ -62,8 +63,8 @@ internal class TransferProcessViewModel(
initialState = run {
val route = savedStateHandle.toRoute<TransferProcessRoute>()
val transferDate = listOf(
currentDate.dayOfMonth,
currentDate.monthNumber,
currentDate.day,
currentDate.month.number,
currentDate.year,
)
println("TransferProcessViewModel: route = ${route.transferSuccessDestination}")
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,3 @@ android.defaults.buildfeatures.shaders=false
org.jetbrains.compose.experimental.jscanvas.enabled=true
kotlin.native.ignoreDisabledTargets=true

org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ compottie = "2.0.0-rc05"
kotlin = "2.1.20"
kotlinInject = "0.7.2"
kotlinxCoroutines = "1.10.1"
kotlinxDatetime = "0.6.2"
kotlinxDatetime = "0.7.1"
kotlinxImmutable = "0.3.8"
kotlinxSerializationJson = "1.8.1"
ksp = "2.1.20-2.0.1"
Expand Down
Loading