wbrawner/Simple-Commons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improving some time string formatting

Browse source
This commit is contained in:
tibbi 2019-02-22 19:53:01 +01:00
parent 5afef69ddc
commit b7d350418d
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -7,7 +7,7 @@ buildscript {
propMinSdkVersion = 21
propTargetSdkVersion = propCompileSdkVersion
propVersionCode = 1
propVersionName = '5.9.3'
propVersionName = '5.9.5'
kotlin_version = '1.3.21'
}

22
commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt
View file

@ -461,13 +461,23 @@ fun Context.getFormattedSeconds(seconds: Int, showBefore: Boolean = true) = when
-1 -> getString(R.string.no_reminder)
0 -> getString(R.string.at_start)
else -> {
if (seconds % YEAR_SECONDS == 0)
resources.getQuantityString(R.plurals.years, seconds / YEAR_SECONDS, seconds / YEAR_SECONDS)
when {
seconds % MONTH_SECONDS == 0 -> resources.getQuantityString(R.plurals.months, seconds / MONTH_SECONDS, seconds / MONTH_SECONDS)
seconds % WEEK_SECONDS == 0 -> resources.getQuantityString(R.plurals.weeks, seconds / WEEK_SECONDS, seconds / WEEK_SECONDS)
seconds % DAY_SECONDS == 0 -> resources.getQuantityString(R.plurals.days, seconds / DAY_SECONDS, seconds / DAY_SECONDS)
seconds % YEAR_SECONDS == 0 -> {
val base = if (showBefore) R.plurals.years_before else R.plurals.by_years
resources.getQuantityString(base, seconds / YEAR_SECONDS, seconds / YEAR_SECONDS)
}
seconds % MONTH_SECONDS == 0 -> {
val base = if (showBefore) R.plurals.months_before else R.plurals.by_months
resources.getQuantityString(base, seconds / MONTH_SECONDS, seconds / MONTH_SECONDS)
}
seconds % WEEK_SECONDS == 0 -> {
val base = if (showBefore) R.plurals.weeks_before else R.plurals.by_weeks
resources.getQuantityString(base, seconds / WEEK_SECONDS, seconds / WEEK_SECONDS)
}
seconds % DAY_SECONDS == 0 -> {
val base = if (showBefore) R.plurals.days_before else R.plurals.by_days
resources.getQuantityString(base, seconds / DAY_SECONDS, seconds / DAY_SECONDS)
}
seconds % HOUR_SECONDS == 0 -> {
val base = if (showBefore) R.plurals.hours_before else R.plurals.by_hours
resources.getQuantityString(base, seconds / HOUR_SECONDS, seconds / HOUR_SECONDS)