dm1sh/another-widget
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix #113, #111, #79, #107, #109

Browse Source
This commit is contained in:
Tommaso Berlose
2020-05-13 17:42:48 +02:00
parent ac381c8542
commit d91471d1ee
54 changed files with 122 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/tommasoberlose/anotherwidget/helpers/DateHelper.kt
View File

@ -12,27 +12,30 @@ import java.util.*
object DateHelper {
fun getDateText(context: Context, date: Calendar): String {
return if (Preferences.dateFormat != "") {
try {
val text = try {
SimpleDateFormat(Preferences.dateFormat, Locale.getDefault()).format(date.time)
} catch (e: Exception) {
getDefaultDateText(context, date)
}
if (Preferences.isDateCapitalize) text.getCapWordString() else text
} else {
val flags: Int =
DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
"%s, %s".format(
val text = "%s, %s".format(
SimpleDateFormat("EEEE", Locale.getDefault()).format(date.time),
DateUtils.formatDateTime(context, date.timeInMillis, flags)
)
if (Preferences.isDateCapitalize) text.getCapWordString() else text
}
}
fun getDefaultDateText(context: Context, date: Calendar): String {
val flags: Int =
DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
return "%s, %s".format(
val text = "%s, %s".format(
SimpleDateFormat("EEEE", Locale.getDefault()).format(date.time),
DateUtils.formatDateTime(context, date.timeInMillis, flags)
)
return if (Preferences.isDateCapitalize) text.getCapWordString() else text
}
}