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

properly refresh year and month view at filtering change

Browse Source
This commit is contained in:
tibbi
2017-11-13 18:22:10 +01:00
parent 61f637c03e
commit 316832d49c
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,6 +202,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
mStoredTextColor = textColor mStoredTextColor = textColor
mStoredPrimaryColor = primaryColor mStoredPrimaryColor = primaryColor
mStoredBackgroundColor = backgroundColor mStoredBackgroundColor = backgroundColor
mStoredUse24HourFormat = use24hourFormat
} }
mStoredDayCode = Formatter.getTodayCode() mStoredDayCode = Formatter.getTodayCode()
} }
@@ -480,7 +481,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
private fun refreshViewPager() { private fun refreshViewPager() {
when { when {
config.storedView == YEARLY_VIEW -> (main_view_pager.adapter as? MyYearPagerAdapter)?.refreshEvents(main_view_pager.currentItem) config.storedView == YEARLY_VIEW && !mIsMonthSelected -> (main_view_pager.adapter as? MyYearPagerAdapter)?.refreshEvents(main_view_pager.currentItem)
config.storedView == EVENTS_LIST_VIEW -> fillEventsList() config.storedView == EVENTS_LIST_VIEW -> fillEventsList()
config.storedView == WEEKLY_VIEW -> (week_view_view_pager.adapter as? MyWeekPagerAdapter)?.refreshEvents(week_view_view_pager.currentItem) config.storedView == WEEKLY_VIEW -> (week_view_view_pager.adapter as? MyWeekPagerAdapter)?.refreshEvents(week_view_view_pager.currentItem)
else -> (main_view_pager.adapter as? MyMonthPagerAdapter)?.refreshEvents(main_view_pager.currentItem) else -> (main_view_pager.adapter as? MyMonthPagerAdapter)?.refreshEvents(main_view_pager.currentItem)

3
app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/FilterEventTypesDialog.kt
View File

@@ -6,14 +6,11 @@ import com.simplemobiletools.calendar.activities.SimpleActivity
import com.simplemobiletools.calendar.adapters.FilterEventTypeAdapter import com.simplemobiletools.calendar.adapters.FilterEventTypeAdapter
import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.calendar.extensions.config
import com.simplemobiletools.calendar.extensions.dbHelper import com.simplemobiletools.calendar.extensions.dbHelper
import com.simplemobiletools.calendar.models.EventType
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff
import kotlinx.android.synthetic.main.dialog_filter_event_types.view.* import kotlinx.android.synthetic.main.dialog_filter_event_types.view.*
import java.util.*
class FilterEventTypesDialog(val activity: SimpleActivity, val callback: () -> Unit) { class FilterEventTypesDialog(val activity: SimpleActivity, val callback: () -> Unit) {
var dialog: AlertDialog var dialog: AlertDialog
var eventTypes = ArrayList<EventType>()
val view = activity.layoutInflater.inflate(R.layout.dialog_filter_event_types, null) val view = activity.layoutInflater.inflate(R.layout.dialog_filter_event_types, null)
init { init {

1
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt
View File

@@ -94,6 +94,7 @@ class YearFragment : Fragment(), YearlyCalendar {
if (hashCode == lastHash) { if (hashCode == lastHash) {
return return
} }
lastHash = hashCode lastHash = hashCode
val res = resources val res = resources
for (i in 1..12) { for (i in 1..12) {

2
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/YearlyCalendarImpl.kt
View File

@@ -41,7 +41,7 @@ class YearlyCalendarImpl(val callback: YearlyCalendar, val context: Context, val
} }
} }
} }
callback.updateYearlyCalendar(arr, events.hashCode()) callback.updateYearlyCalendar(arr, filtered.hashCode())
} }
private fun markDay(arr: SparseArray<ArrayList<DayYearly>>, dateTime: DateTime, event: Event) { private fun markDay(arr: SparseArray<ArrayList<DayYearly>>, dateTime: DateTime, event: Event) {