fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

move the refresh_caldav_calendars menu visibility check in onPrepareOptionsMenu

Browse Source
This commit is contained in:
tibbi
2018-02-17 23:48:45 +01:00
parent 8969043de2
commit 398653ee64
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
View File

@@ -123,10 +123,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
} }
dbHelper.getEventTypes { dbHelper.getEventTypes {
eventTypeColors.clear() mShouldFilterBeVisible = it.size > 1 || config.displayEventTypes.isEmpty()
it.map { eventTypeColors.put(it.id, it.color) }
mShouldFilterBeVisible = eventTypeColors.size() > 1 || config.displayEventTypes.isEmpty()
invalidateOptionsMenu()
} }
if (config.storedView == WEEKLY_VIEW) { if (config.storedView == WEEKLY_VIEW) {
@@ -162,13 +159,20 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
goToTodayButton = findItem(R.id.go_to_today) goToTodayButton = findItem(R.id.go_to_today)
findItem(R.id.filter).isVisible = mShouldFilterBeVisible findItem(R.id.filter).isVisible = mShouldFilterBeVisible
findItem(R.id.go_to_today).isVisible = shouldGoToTodayBeVisible && config.storedView != EVENTS_LIST_VIEW findItem(R.id.go_to_today).isVisible = shouldGoToTodayBeVisible && config.storedView != EVENTS_LIST_VIEW
findItem(R.id.refresh_caldav_calendars).isVisible = config.caldavSync
} }
setupSearch(menu) setupSearch(menu)
return true return true
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
menu!!.apply {
findItem(R.id.refresh_caldav_calendars).isVisible = config.caldavSync
}
return true
}
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) { when (item.itemId) {
R.id.change_view -> showViewDialog() R.id.change_view -> showViewDialog()