show keyboard update

(cherry picked from commit bc414d3)
crackededed · Feb 21, 2024 · 2c7a6e8 · 2c7a6e8
1 parent 85293af
commit 2c7a6e8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 35 deletions.
diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ChatFragment.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ChatFragment.kt
@@ -28,7 +28,6 @@ import com.github.andreyasadchy.xtra.util.chat.Command
 import com.github.andreyasadchy.xtra.util.chat.PointsEarned
 import com.github.andreyasadchy.xtra.util.chat.Raid
 import com.github.andreyasadchy.xtra.util.chat.RoomState
-import com.github.andreyasadchy.xtra.util.hideKeyboard
 import com.github.andreyasadchy.xtra.util.prefs
 import com.github.andreyasadchy.xtra.util.visible
 import dagger.hilt.android.AndroidEntryPoint
@@ -263,11 +262,6 @@ class ChatFragment : BaseNetworkFragment(), LifecycleListener, MessageClickedDia
         }
     }
 
-    fun hideKeyboard() {
-        binding.chatView.hideKeyboard()
-        binding.chatView.clearFocus()
-    }
-
     fun emoteMenuIsVisible() = binding.chatView.emoteMenuIsVisible()
 
     fun toggleEmoteMenu(enable: Boolean) = binding.chatView.toggleEmoteMenu(enable)

diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/BasePlayerFragment.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/BasePlayerFragment.kt
@@ -448,6 +448,8 @@ abstract class BasePlayerFragment : BaseNetworkFragment(), LifecycleListener, Sl
     }
 
     override fun onMinimize() {
+        chatLayout.hideKeyboard()
+        chatLayout.clearFocus()
         if (this@BasePlayerFragment is StreamPlayerFragment && emoteMenuIsVisible()) {
             toggleBackPressedCallback(false)
         }

diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/stream/StreamPlayerFragment.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/stream/StreamPlayerFragment.kt
@@ -496,11 +496,6 @@ class StreamPlayerFragment : BasePlayerFragment() {
 
     fun toggleBackPressedCallback(enable: Boolean) = chatFragment.toggleBackPressedCallback(enable)
 
-    override fun onMinimize() {
-        super.onMinimize()
-        chatFragment.hideKeyboard()
-    }
-
 //    override fun play(obj: Parcelable) {
 //        val stream = obj as Stream
 //        if (viewModel.stream != stream) {

diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/search/SearchPagerFragment.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/search/SearchPagerFragment.kt
@@ -31,7 +31,6 @@ import com.github.andreyasadchy.xtra.util.getAlertDialogBuilder
 import com.github.andreyasadchy.xtra.util.gone
 import com.github.andreyasadchy.xtra.util.prefs
 import com.github.andreyasadchy.xtra.util.reduceDragSensitivity
-import com.github.andreyasadchy.xtra.util.showKeyboard
 import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Job
@@ -155,7 +154,9 @@ class SearchPagerFragment : BaseNetworkFragment(), FragmentHost {
                     else -> false
                 }
             }
-            searchView.showKeyboard()
+            searchView.post {
+                searchView.isIconified = false
+            }
             ViewCompat.setOnApplyWindowInsetsListener(view) { _, windowInsets ->
                 val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
                 toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {

diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/search/tags/TagSearchFragment.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/search/tags/TagSearchFragment.kt
@@ -26,7 +26,6 @@ import com.github.andreyasadchy.xtra.ui.main.IntegrityDialog
 import com.github.andreyasadchy.xtra.util.C
 import com.github.andreyasadchy.xtra.util.TwitchApiHelper
 import com.github.andreyasadchy.xtra.util.prefs
-import com.github.andreyasadchy.xtra.util.showKeyboard
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
@@ -55,7 +54,9 @@ class TagSearchFragment : PagedListFragment() {
             val navController = findNavController()
             val appBarConfiguration = AppBarConfiguration(setOf(R.id.rootGamesFragment, R.id.rootTopFragment, R.id.followPagerFragment, R.id.followMediaFragment, R.id.savedPagerFragment, R.id.savedMediaFragment))
             toolbar.setupWithNavController(navController, appBarConfiguration)
-            searchView.showKeyboard()
+            searchView.post {
+                searchView.isIconified = false
+            }
             ViewCompat.setOnApplyWindowInsetsListener(view) { _, windowInsets ->
                 val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
                 toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {

diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/view/chat/ChatView.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/view/chat/ChatView.kt
@@ -15,6 +15,8 @@ import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.res.use
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.widget.TextViewCompat
@@ -337,7 +339,8 @@ class ChatView : ConstraintLayout {
         binding.editText.apply {
             setText(text)
             setSelection(text.length)
-            showKeyboard()
+            requestFocus()
+            WindowCompat.getInsetsController(fragment.requireActivity().window, this).show(WindowInsetsCompat.Type.ime())
         }
     }
 
@@ -543,7 +546,7 @@ class ChatView : ConstraintLayout {
             override fun publishResults(constraint: CharSequence?, results: FilterResults) {
                 val objectsField = ArrayAdapter::class.java.getDeclaredField("mObjects")
                 objectsField.isAccessible = true
-                objectsField.set(this@AutoCompleteAdapter, results.values as? List<*> ?: emptyList<Any>())
+                objectsField.set(this@AutoCompleteAdapter, results.values as? List<*> ?: mutableListOf<Any>())
                 if (results.count > 0) {
                     notifyDataSetChanged()
                 } else {

diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/util/ViewExtensions.kt b/app/src/main/java/com/github/andreyasadchy/xtra/util/ViewExtensions.kt
@@ -9,11 +9,9 @@ import android.os.Build
 import android.util.AttributeSet
 import android.view.View
 import android.view.inputmethod.InputMethodManager
-import android.widget.EditText
 import android.widget.ImageView
 import androidx.annotation.ColorRes
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.isVisible
@@ -78,22 +76,6 @@ fun ImageView.loadBitmap(url: String) {
     }
 }
 
-fun EditText.showKeyboard() {
-    requestFocus()
-    val imm: InputMethodManager? = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager?
-    this.postDelayed({
-        imm?.showSoftInput(this, 0)
-    }, 100)
-}
-
-fun SearchView.showKeyboard() {
-    val imm: InputMethodManager? = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager?
-    this.postDelayed({
-        this.isIconified = false
-        imm?.showSoftInput(this, 0)
-    }, 100)
-}
-
 fun View.hideKeyboard() {
     (context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager).hideSoftInputFromWindow(windowToken, 0)
 }