From 2e9193784fff44409572456b27c3a0148a0ee6f9 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 15 Apr 2018 20:20:25 -0400 Subject: [PATCH] Dismiss keyboard when drawer is opened --- .../java/common/util/extensions/ContextExtensions.kt | 11 +++++++++++ .../src/main/java/feature/main/MainActivity.kt | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/common/util/extensions/ContextExtensions.kt b/presentation/src/main/java/common/util/extensions/ContextExtensions.kt index 85cb4db4..0f042ef3 100644 --- a/presentation/src/main/java/common/util/extensions/ContextExtensions.kt +++ b/presentation/src/main/java/common/util/extensions/ContextExtensions.kt @@ -18,9 +18,11 @@ */ package common.util.extensions +import android.app.Activity import android.content.Context import android.support.annotation.StringRes import android.support.v4.content.ContextCompat +import android.view.inputmethod.InputMethodManager import android.widget.Toast fun Context.getColorCompat(colorRes: Int): Int { @@ -33,4 +35,13 @@ fun Context.makeToast(@StringRes res: Int, duration: Int = Toast.LENGTH_SHORT) { fun Context.makeToast(text: String, duration: Int = Toast.LENGTH_SHORT) { Toast.makeText(this, text, duration).show() +} + +fun Activity.dismissKeyboard() { + window.currentFocus?.let { focus -> + val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + imm.hideSoftInputFromWindow(focus.windowToken, 0) + + focus.clearFocus() + } } \ No newline at end of file diff --git a/presentation/src/main/java/feature/main/MainActivity.kt b/presentation/src/main/java/feature/main/MainActivity.kt index 2f194de2..3fd91cd2 100644 --- a/presentation/src/main/java/feature/main/MainActivity.kt +++ b/presentation/src/main/java/feature/main/MainActivity.kt @@ -41,6 +41,7 @@ import common.MenuItemAdapter import common.Navigator import common.base.QkThemedActivity import common.util.extensions.autoScrollToStart +import common.util.extensions.dismissKeyboard import common.util.extensions.dpToPx import common.util.extensions.setBackgroundTint import common.util.extensions.setTint @@ -68,7 +69,11 @@ class MainActivity : QkThemedActivity(), MainView { override val queryChangedIntent by lazy { toolbarSearch.textChanges() } override val queryCancelledIntent: PublishSubject = PublishSubject.create() override val composeIntent by lazy { compose.clicks() } - override val drawerOpenIntent by lazy { drawerLayout.drawerOpen(Gravity.START) } + override val drawerOpenIntent: Observable by lazy { + drawerLayout + .drawerOpen(Gravity.START) + .doOnNext { dismissKeyboard() } + } override val drawerItemIntent: Observable by lazy { Observable.merge(listOf( inbox.clicks().map { DrawerItem.INBOX }, @@ -253,6 +258,7 @@ class MainActivity : QkThemedActivity(), MainView { } override fun clearSearch() { + dismissKeyboard() toolbarSearch.text = null }