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

fix #13, use proper short day versions, dont always substring to 3 chars

This commit is contained in:
tibbi 2018-03-28 19:07:13 +02:00
parent f3c018f6b4
commit 22454df944
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -41,7 +41,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:3.17.6' implementation 'com.simplemobiletools:commons:3.17.8'
implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2' implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.shawnlin:number-picker:2.4.6' implementation 'com.shawnlin:number-picker:2.4.6'

5
app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
View File

@ -46,10 +46,9 @@ fun Context.getFormattedDate(calendar: Calendar): String {
val dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH) val dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH)
val month = calendar.get(Calendar.MONTH) val month = calendar.get(Calendar.MONTH)
val dayString = resources.getStringArray(R.array.week_days)[dayOfWeek] val dayString = resources.getStringArray(R.array.week_days_short)[dayOfWeek]
val shortDayString = dayString.substring(0, Math.min(3, dayString.length))
val monthString = resources.getStringArray(R.array.months)[month] val monthString = resources.getStringArray(R.array.months)[month]
return "$shortDayString, $dayOfMonth $monthString" return "$dayString, $dayOfMonth $monthString"
} }
fun Context.getEditedTimeZonesMap(): HashMap<Int, String> { fun Context.getEditedTimeZonesMap(): HashMap<Int, String> {