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

pass context instead of activity in a couple Formatter functions

Browse source
This commit is contained in:
tibbi 2017-12-03 21:13:06 +01:00
parent 88124d4219
commit a0d8a5a5a9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
View file

@ -633,7 +633,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
week_view_hours_holder.removeAllViews()
val hourDateTime = DateTime().withDate(2000, 1, 1).withTime(0, 0, 0, 0)
for (i in 1..23) {
val formattedHours = Formatter.getHours(this, hourDateTime.withHourOfDay(i))
val formattedHours = Formatter.getHours(applicationContext, hourDateTime.withHourOfDay(i))
(layoutInflater.inflate(R.layout.weekly_view_hour_textview, null, false) as TextView).apply {
text = formattedHours
setTextColor(mStoredTextColor)
@ -684,14 +684,14 @@ class MainActivity : SimpleActivity(), NavigationListener {
private fun setupWeeklyActionbarTitle(timestamp: Int) {
val startDateTime = Formatter.getDateTimeFromTS(timestamp)
val endDateTime = Formatter.getDateTimeFromTS(timestamp + WEEK_SECONDS)
val startMonthName = Formatter.getMonthName(this, startDateTime.monthOfYear)
val startMonthName = Formatter.getMonthName(applicationContext, startDateTime.monthOfYear)
if (startDateTime.monthOfYear == endDateTime.monthOfYear) {
var newTitle = startMonthName
if (startDateTime.year != DateTime().year)
newTitle += " - ${startDateTime.year}"
title = newTitle
} else {
val endMonthName = Formatter.getMonthName(this, endDateTime.monthOfYear)
val endMonthName = Formatter.getMonthName(applicationContext, endDateTime.monthOfYear)
title = "$startMonthName - $endMonthName"
}
supportActionBar?.subtitle = "${getString(R.string.week)} ${startDateTime.plusDays(3).weekOfWeekyear}"