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

lets not switch to monthly view at selecting a month

Browse Source
This commit is contained in:
tibbi 2016-10-19 23:02:43 +02:00
parent 414cf82901
commit 7dc9cc73f7
6 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,5 +7,5 @@ interface NavigationListener {
fun goRight() fun goRight()
fun goToDateTime(dateTime: DateTime, switchedFromYearly: Boolean) fun goToDateTime(dateTime: DateTime)
} }

2
app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt
View File

@ -111,7 +111,7 @@ class DayActivity : SimpleActivity(), DayFragment.DeleteListener, ViewPager.OnPa
view_pager.currentItem = view_pager.currentItem + 1 view_pager.currentItem = view_pager.currentItem + 1
} }
override fun goToDateTime(dateTime: DateTime, switchedFromYearly: Boolean) { override fun goToDateTime(dateTime: DateTime) {
checkDeleteEvents() checkDeleteEvents()
fillViewPager(Formatter.getDayCodeFromDateTime(dateTime)) fillViewPager(Formatter.getDayCodeFromDateTime(dateTime))
} }

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

@ -150,12 +150,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
view_pager.currentItem = view_pager.currentItem + 1 view_pager.currentItem = view_pager.currentItem + 1
} }
override fun goToDateTime(dateTime: DateTime, switchedFromYearly: Boolean) { override fun goToDateTime(dateTime: DateTime) {
fillMonthlyViewPager(Formatter.getDayCodeFromDateTime(dateTime)) fillMonthlyViewPager(Formatter.getDayCodeFromDateTime(dateTime))
if (switchedFromYearly) {
mConfig.view = Constants.MONTHLY_VIEW
invalidateOptionsMenu()
}
} }
} }

2
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
View File

@ -109,7 +109,7 @@ class DayFragment : Fragment(), DBHelper.DBOperationsListener, AdapterView.OnIte
val year = datePicker.year val year = datePicker.year
val day = datePicker.dayOfMonth val day = datePicker.dayOfMonth
val newDateTime = dateTime.withDayOfMonth(day).withMonthOfYear(month).withYear(year) val newDateTime = dateTime.withDayOfMonth(day).withMonthOfYear(month).withYear(year)
mListener?.goToDateTime(newDateTime, false) mListener?.goToDateTime(newDateTime)
} }
show() show()

2
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
View File

@ -127,7 +127,7 @@ class MonthFragment : Fragment(), Calendar {
val month = datePicker.month + 1 val month = datePicker.month + 1
val year = datePicker.year val year = datePicker.year
val newDateTime = dateTime.withDayOfMonth(1).withMonthOfYear(month).withYear(year) val newDateTime = dateTime.withDayOfMonth(1).withMonthOfYear(month).withYear(year)
mListener?.goToDateTime(newDateTime, false) mListener?.goToDateTime(newDateTime)
} }
show() show()

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

@ -49,7 +49,7 @@ class YearFragment : Fragment() {
monthView.setFirstDay(dayOfWeek) monthView.setFirstDay(dayOfWeek)
monthView.setOnClickListener { monthView.setOnClickListener {
mListener?.goToDateTime(DateTime().withDayOfMonth(1).withMonthOfYear(i).withYear(mYear), true) mListener?.goToDateTime(DateTime().withDayOfMonth(1).withMonthOfYear(i).withYear(mYear))
} }
} }
} }