fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not write "before" at the display past events duration

This commit is contained in:
tibbi 2017-05-24 19:06:46 +02:00
parent 120041cd09
commit 57f246c52a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
View File

@ -240,7 +240,7 @@ class SettingsActivity : SimpleActivity() {
return if (displayPastEvents == 0) return if (displayPastEvents == 0)
getString(R.string.never) getString(R.string.never)
else else
getFormattedMinutes(displayPastEvents) getFormattedMinutes(displayPastEvents, false)
} }
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {

13
app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
View File

@ -109,7 +109,7 @@ private fun getNotificationIntent(context: Context, eventId: Int): PendingIntent
fun Context.getAppropriateTheme() = if (config.backgroundColor.getContrastColor() == Color.WHITE) R.style.MyDialogTheme_Dark else R.style.MyDialogTheme fun Context.getAppropriateTheme() = if (config.backgroundColor.getContrastColor() == Color.WHITE) R.style.MyDialogTheme_Dark else R.style.MyDialogTheme
fun Context.getFormattedMinutes(minutes: Int) = when (minutes) { fun Context.getFormattedMinutes(minutes: Int, showBefore: Boolean = true) = when (minutes) {
-1 -> getString(R.string.no_reminder) -1 -> getString(R.string.no_reminder)
0 -> getString(R.string.at_start) 0 -> getString(R.string.at_start)
else -> { else -> {
@ -121,10 +121,13 @@ fun Context.getFormattedMinutes(minutes: Int) = when (minutes) {
resources.getQuantityString(R.plurals.weeks, minutes / 10080, minutes / 10080) resources.getQuantityString(R.plurals.weeks, minutes / 10080, minutes / 10080)
else if (minutes % 1440 == 0) else if (minutes % 1440 == 0)
resources.getQuantityString(R.plurals.days, minutes / 1440, minutes / 1440) resources.getQuantityString(R.plurals.days, minutes / 1440, minutes / 1440)
else if (minutes % 60 == 0) else if (minutes % 60 == 0) {
resources.getQuantityString(R.plurals.hours_before, minutes / 60, minutes / 60) val base = if (showBefore) R.plurals.hours_before else R.plurals.hours
else resources.getQuantityString(base, minutes / 60, minutes / 60)
resources.getQuantityString(R.plurals.minutes_before, minutes, minutes) } else {
val base = if (showBefore) R.plurals.minutes_before else R.plurals.minutes
resources.getQuantityString(base, minutes, minutes)
}
} }
} }