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

open the picked month on click

Browse Source
This commit is contained in:
tibbi
2016-10-19 22:26:26 +02:00
parent 8016391989
commit 53761776e3
6 changed files with 14 additions and 6 deletions
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) fun goToDateTime(dateTime: DateTime, switchedFromYearly: Boolean)
} }

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) { override fun goToDateTime(dateTime: DateTime, switchedFromYearly: Boolean) {
checkDeleteEvents() checkDeleteEvents()
fillViewPager(Formatter.getDayCodeFromDateTime(dateTime)) fillViewPager(Formatter.getDayCodeFromDateTime(dateTime))
} }

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

@@ -150,7 +150,12 @@ class MainActivity : SimpleActivity(), NavigationListener {
view_pager.currentItem = view_pager.currentItem + 1 view_pager.currentItem = view_pager.currentItem + 1
} }
override fun goToDateTime(dateTime: DateTime) { override fun goToDateTime(dateTime: DateTime, switchedFromYearly: Boolean) {
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) mListener?.goToDateTime(newDateTime, false)
} }
show() show()

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

@@ -126,8 +126,8 @@ class MonthFragment : Fragment(), Calendar {
setPositiveButton(R.string.ok) { dialog, id -> setPositiveButton(R.string.ok) { dialog, id ->
val month = datePicker.month + 1 val month = datePicker.month + 1
val year = datePicker.year val year = datePicker.year
val newDateTime = dateTime.withMonthOfYear(month).withYear(year) val newDateTime = dateTime.withDayOfMonth(1).withMonthOfYear(month).withYear(year)
mListener?.goToDateTime(newDateTime) mListener?.goToDateTime(newDateTime, false)
} }
show() show()

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

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