Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 18:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Go back to emoji selection on keyboard close in search.

Browse Source
This commit is contained in:
Alex Hart
2021-06-03 14:21:38 -03:00
parent 84e27e7bff
commit c59006e06e
4 changed files with 56 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java
View File

@@ -167,7 +167,7 @@ public class MediaKeyboard extends FrameLayout implements InputView,
transaction.runOnCommit(() -> show(latestKeyboardHeight, false));
}
transaction.commit();
transaction.commitAllowingStateLoss();
}
public void onOpenEmojiSearch() {
@@ -182,7 +182,7 @@ public class MediaKeyboard extends FrameLayout implements InputView,
.add(R.id.media_keyboard_fragment_container, new EmojiSearchFragment(), EMOJI_SEARCH)
.runOnCommit(() -> show(latestKeyboardHeight, true))
.setCustomAnimations(R.anim.fade_in, R.anim.fade_out)
.commit();
.commitAllowingStateLoss();
}
private void initView() {

10
app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/search/EmojiSearchFragment.kt
View File

@@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.keyboard.emoji.search
import android.content.Context
import android.graphics.Rect
import android.os.Bundle
import android.view.View
import android.widget.FrameLayout
@@ -10,6 +11,7 @@ import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout
import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider
import org.thoughtcrime.securesms.components.emoji.EmojiPageView
import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter
@@ -34,6 +36,7 @@ class EmojiSearchFragment : Fragment(R.layout.emoji_search_fragment), EmojiPageV
viewModel = ViewModelProviders.of(this, factory)[EmojiSearchViewModel::class.java]
val keyboardAwareLinearLayout: KeyboardAwareLinearLayout = view.findViewById(R.id.kb_aware_layout)
val eventListener: EmojiKeyboardProvider.EmojiEventListener = requireNotNull(findListener())
val searchBar: KeyboardPageSearchView = view.findViewById(R.id.emoji_search_view)
val resultsContainer: FrameLayout = view.findViewById(R.id.emoji_search_results_container)
@@ -56,12 +59,17 @@ class EmojiSearchFragment : Fragment(R.layout.emoji_search_fragment), EmojiPageV
noResults.visibility = View.VISIBLE
}
}
view.post {
keyboardAwareLinearLayout.addOnKeyboardHiddenListener {
callback.closeEmojiSearch()
}
}
}
private inner class SearchCallbacks : KeyboardPageSearchView.Callbacks {
override fun onNavigationClicked() {
ViewUtil.hideKeyboard(requireContext(), requireView())
callback.closeEmojiSearch()
}
override fun onQueryChanged(query: String) {