From 4cb647e84bf428edeb9055236df5ee21c0231755 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 5 Dec 2017 18:58:46 +0100 Subject: [PATCH] reference the supportactionbar for changing the title --- .../calendar/activities/EventActivity.kt | 4 ++-- .../calendar/activities/MainActivity.kt | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt index 477989432..a5d85a58f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -108,7 +108,7 @@ class EventActivity : SimpleActivity() { val realStart = if (mEventOccurrenceTS == 0) mEvent.startTS else mEventOccurrenceTS val duration = mEvent.endTS - mEvent.startTS window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN) - title = resources.getString(R.string.edit_event) + supportActionBar?.title = resources.getString(R.string.edit_event) mEventStartDateTime = Formatter.getDateTimeFromTS(realStart) mEventEndDateTime = Formatter.getDateTimeFromTS(realStart + duration) event_title.setText(mEvent.title) @@ -129,7 +129,7 @@ class EventActivity : SimpleActivity() { private fun setupNewEvent(dateTime: DateTime) { window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE) - title = resources.getString(R.string.new_event) + supportActionBar?.title = resources.getString(R.string.new_event) mEventStartDateTime = dateTime val addHours = if (intent.getBooleanExtra(NEW_EVENT_SET_HOUR_DURATION, false)) 1 else 0 diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index 83c2a0069..be43e5ff1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -570,7 +570,7 @@ class MainActivity : SimpleActivity(), NavigationListener { } private fun resetTitle() { - title = getString(R.string.app_launcher_name) + supportActionBar?.title = getString(R.string.app_launcher_name) supportActionBar?.subtitle = "" } @@ -595,7 +595,7 @@ class MainActivity : SimpleActivity(), NavigationListener { invalidateOptionsMenu() if (config.storedView == YEARLY_VIEW) { val dateTime = Formatter.getDateTimeFromCode(codes[position]) - title = "${getString(R.string.app_launcher_name)} - ${Formatter.getYear(dateTime)}" + supportActionBar?.title = "${getString(R.string.app_launcher_name)} - ${Formatter.getYear(dateTime)}" } } }) @@ -665,7 +665,7 @@ class MainActivity : SimpleActivity(), NavigationListener { weeklyAdapter.updateScrollY(week_view_view_pager.currentItem, y) } }) - week_view_hours_scrollview.setOnTouchListener{ view, motionEvent -> true } + week_view_hours_scrollview.setOnTouchListener { view, motionEvent -> true } } fun updateHoursTopMargin(margin: Int) { @@ -689,10 +689,10 @@ class MainActivity : SimpleActivity(), NavigationListener { var newTitle = startMonthName if (startDateTime.year != DateTime().year) newTitle += " - ${startDateTime.year}" - title = newTitle + supportActionBar?.title = newTitle } else { val endMonthName = Formatter.getMonthName(applicationContext, endDateTime.monthOfYear) - title = "$startMonthName - $endMonthName" + supportActionBar?.title = "$startMonthName - $endMonthName" } supportActionBar?.subtitle = "${getString(R.string.week)} ${startDateTime.plusDays(3).weekOfWeekyear}" } @@ -716,14 +716,15 @@ class MainActivity : SimpleActivity(), NavigationListener { override fun onPageSelected(position: Int) { invalidateOptionsMenu() - if (position < years.size) - title = "${getString(R.string.app_launcher_name)} - ${years[position]}" + if (position < years.size) { + supportActionBar?.title = "${getString(R.string.app_launcher_name)} - ${years[position]}" + } } }) currentItem = mDefaultYearlyPage beVisible() } - title = "${getString(R.string.app_launcher_name)} - ${years[years.size / 2]}" + supportActionBar?.title = "${getString(R.string.app_launcher_name)} - ${years[years.size / 2]}" calendar_event_list_holder.beGone() }