add an option to keep search view query between close/open events; ad…

…d gradlew chmod +x permission
Ferfalk · Apr 9, 2019 · 69984d7 · 69984d7
1 parent 49710d2
commit 69984d7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/gradlew b/gradlew
diff --git a/simplesearchview/src/main/java/com/ferfalk/simplesearchview/SimpleSearchView.java b/simplesearchview/src/main/java/com/ferfalk/simplesearchview/SimpleSearchView.java
@@ -93,6 +93,7 @@ public class SimpleSearchView extends FrameLayout {
     private SearchViewListener searchViewListener;
 
     private boolean searchIsClosing = false;
+    private boolean keepQuery = false;
 
     public SimpleSearchView(Context context) {
         this(context, null);
@@ -258,6 +259,7 @@ public Parcelable onSaveInstanceState() {
         savedState.query = query != null ? query.toString() : null;
         savedState.isSearchOpen = isSearchOpen;
         savedState.animationDuration = animationDuration;
+        savedState.keepQuery = keepQuery;
 
         return savedState;
     }
@@ -271,6 +273,11 @@ public void onRestoreInstanceState(Parcelable state) {
 
         SavedState savedState = (SavedState) state;
 
+        query = savedState.query;
+        animationDuration = savedState.animationDuration;
+        voiceSearchPrompt = savedState.voiceSearchPrompt;
+        keepQuery = savedState.keepQuery;
+
         if (savedState.isSearchOpen) {
             showSearch(false);
             setQuery(savedState.query, false);
@@ -340,6 +347,15 @@ private boolean isVoiceAvailable() {
         return !activities.isEmpty();
     }
 
+    /**
+     * Saves query value in EditText after close/open events
+     *
+     * @param keepQuery keeps query if true
+     */
+    public void setKeepQuery(boolean keepQuery) {
+        this.keepQuery = keepQuery;
+    }
+
     /**
      * Shows search with animation
      */
@@ -357,7 +373,7 @@ public void showSearch(boolean animate) {
             return;
         }
 
-        searchEditText.setText(null);
+        searchEditText.setText(keepQuery ? query : null);
         searchEditText.requestFocus();
 
         if (animate) {
@@ -815,6 +831,7 @@ public SavedState[] newArray(int size) {
         boolean isSearchOpen;
         int animationDuration;
         String voiceSearchPrompt;
+        boolean keepQuery;
 
         SavedState(Parcelable superState) {
             super(superState);
@@ -826,6 +843,7 @@ private SavedState(Parcel in) {
             this.isSearchOpen = in.readInt() == 1;
             this.animationDuration = in.readInt();
             this.voiceSearchPrompt = in.readString();
+            this.keepQuery = in.readInt() == 1;
         }
 
         @Override
@@ -835,6 +853,7 @@ public void writeToParcel(Parcel out, int flags) {
             out.writeInt(isSearchOpen ? 1 : 0);
             out.writeInt(animationDuration);
             out.writeString(voiceSearchPrompt);
+            out.writeInt(keepQuery ? 1 : 0);
         }
     }