From 53761776e3202d92b26d82bb0cf7978b2e8fabef Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 19 Oct 2016 22:26:26 +0200
Subject: [PATCH] open the picked month on click

---
 .../com/simplemobiletools/calendar/NavigationListener.kt   | 2 +-
 .../simplemobiletools/calendar/activities/DayActivity.kt   | 2 +-
 .../simplemobiletools/calendar/activities/MainActivity.kt  | 7 ++++++-
 .../simplemobiletools/calendar/fragments/DayFragment.kt    | 2 +-
 .../simplemobiletools/calendar/fragments/MonthFragment.kt  | 4 ++--
 .../simplemobiletools/calendar/fragments/YearFragment.kt   | 3 +++
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/NavigationListener.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/NavigationListener.kt
index ccd605cf7..306f45112 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/NavigationListener.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/NavigationListener.kt
@@ -7,5 +7,5 @@ interface NavigationListener {
 
     fun goRight()
 
-    fun goToDateTime(dateTime: DateTime)
+    fun goToDateTime(dateTime: DateTime, switchedFromYearly: Boolean)
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt
index a3cace7cc..a6757871f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt
@@ -111,7 +111,7 @@ class DayActivity : SimpleActivity(), DayFragment.DeleteListener, ViewPager.OnPa
         view_pager.currentItem = view_pager.currentItem + 1
     }
 
-    override fun goToDateTime(dateTime: DateTime) {
+    override fun goToDateTime(dateTime: DateTime, switchedFromYearly: Boolean) {
         checkDeleteEvents()
         fillViewPager(Formatter.getDayCodeFromDateTime(dateTime))
     }
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 2b11ba946..1a2ed1d10 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
@@ -150,7 +150,12 @@ class MainActivity : SimpleActivity(), NavigationListener {
         view_pager.currentItem = view_pager.currentItem + 1
     }
 
-    override fun goToDateTime(dateTime: DateTime) {
+    override fun goToDateTime(dateTime: DateTime, switchedFromYearly: Boolean) {
         fillMonthlyViewPager(Formatter.getDayCodeFromDateTime(dateTime))
+
+        if (switchedFromYearly) {
+            mConfig.view = Constants.MONTHLY_VIEW
+            invalidateOptionsMenu()
+        }
     }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
index fbd622ca3..4f1595d04 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
@@ -109,7 +109,7 @@ class DayFragment : Fragment(), DBHelper.DBOperationsListener, AdapterView.OnIte
                 val year = datePicker.year
                 val day = datePicker.dayOfMonth
                 val newDateTime = dateTime.withDayOfMonth(day).withMonthOfYear(month).withYear(year)
-                mListener?.goToDateTime(newDateTime)
+                mListener?.goToDateTime(newDateTime, false)
             }
 
             show()
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
index d70aeaad2..32b438907 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
@@ -126,8 +126,8 @@ class MonthFragment : Fragment(), Calendar {
             setPositiveButton(R.string.ok) { dialog, id ->
                 val month = datePicker.month + 1
                 val year = datePicker.year
-                val newDateTime = dateTime.withMonthOfYear(month).withYear(year)
-                mListener?.goToDateTime(newDateTime)
+                val newDateTime = dateTime.withDayOfMonth(1).withMonthOfYear(month).withYear(year)
+                mListener?.goToDateTime(newDateTime, false)
             }
 
             show()
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt
index ef71233fb..95c6191f3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt
@@ -48,6 +48,9 @@ class YearFragment : Fragment() {
                 dayOfWeek--
 
             monthView.setFirstDay(dayOfWeek)
+            monthView.setOnClickListener {
+                mListener?.goToDateTime(DateTime().withDayOfMonth(1).withMonthOfYear(i).withYear(mYear), true)
+            }
         }
     }