From 5d17be541c6654b14b6d98c0f50f84ba93cddc0f Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 16 Apr 2017 11:55:13 +0200
Subject: [PATCH] hide the keyboard on clicking some field at the Event
 activity

---
 .../simplemobiletools/calendar/activities/EventActivity.kt  | 6 +++++-
 .../simplemobiletools/calendar/activities/SimpleActivity.kt | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
index 28dcb6842..fa5dc1bc2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -78,8 +78,8 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
 
         event_all_day.setOnCheckedChangeListener { compoundButton, isChecked -> toggleAllDay(isChecked) }
         event_repetition.setOnClickListener { showRepeatIntervalDialog() }
-        event_repetition_limit_holder.setOnClickListener { showRepetitionLimitDialog() }
         event_repetition_rule_holder.setOnClickListener { showRepetitionRuleDialog() }
+        event_repetition_limit_holder.setOnClickListener { showRepetitionLimitDialog() }
 
         event_reminder_1.setOnClickListener { showReminder1Dialog() }
         event_reminder_2.setOnClickListener { showReminder2Dialog() }
@@ -166,6 +166,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
     }
 
     private fun showRepetitionLimitDialog() {
+        hideKeyboard()
         val now = (System.currentTimeMillis() / 1000).toInt()
         val repeatLimitDateTime = Formatter.getDateTimeFromTS(if (mRepeatLimit != 0) mRepeatLimit else now)
         DatePickerDialog(this, mDialogTheme, repetitionLimitDateSetListener, repeatLimitDateTime.year, repeatLimitDateTime.monthOfYear - 1,
@@ -192,6 +193,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
     }
 
     private fun showRepetitionRuleDialog() {
+        hideKeyboard()
         if (isXWeeklyRepetition()) {
             RepeatRuleDailyDialog(this, mRepeatRule) {
                 setRepeatRule(it)
@@ -214,6 +216,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
     }
 
     private fun showEventTypeDialog() {
+        hideKeyboard()
         SelectEventTypeDialog(this, mEventTypeId) {
             mEventTypeId = it
             updateEventType()
@@ -274,6 +277,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
     }
 
     private fun toggleAllDay(isChecked: Boolean) {
+        hideKeyboard()
         event_start_time.beGoneIf(isChecked)
         event_end_time.beGoneIf(isChecked)
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SimpleActivity.kt
index be0b5b786..a227d46b0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SimpleActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SimpleActivity.kt
@@ -12,6 +12,7 @@ import com.simplemobiletools.calendar.helpers.WEEK
 import com.simplemobiletools.calendar.helpers.YEAR
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
+import com.simplemobiletools.commons.extensions.hideKeyboard
 import com.simplemobiletools.commons.models.RadioItem
 import java.util.TreeSet
 import kotlin.collections.ArrayList
@@ -22,6 +23,7 @@ open class SimpleActivity : BaseSimpleActivity() {
     }
 
     protected fun showEventReminderDialog(curMinutes: Int, callback: (minutes: Int) -> Unit) {
+        hideKeyboard()
         val minutes = TreeSet<Int>()
         minutes.apply {
             add(-1)
@@ -57,6 +59,7 @@ open class SimpleActivity : BaseSimpleActivity() {
     }
 
     protected fun showEventRepeatIntervalDialog(curSeconds: Int, callback: (minutes: Int) -> Unit) {
+        hideKeyboard()
         val seconds = TreeSet<Int>()
         seconds.apply {
             add(0)