focus detected

Author: langsmith

app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/PickerAutocompleteCombinedActivity.kt

@@ -17,9 +17,6 @@ import kotlinx.android.synthetic.main.activity_picker_autocomplete_combo_launche
 import kotlinx.android.synthetic.main.activity_picker_launcher.fabLocationPicker
 import kotlinx.android.synthetic.main.activity_picker_launcher.reverseGeocodingSwitch
 
-import kotlinx.android.synthetic.main.activity_picker_launcher.*
-import kotlinx.android.synthetic.main.activity_picker_launcher.fabLocationPicker
-import kotlinx.android.synthetic.main.activity_picker_launcher.reverseGeocodingSwitch
 
 class PickerAutocompleteCombinedActivity : AppCompatActivity() {
 

plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ClearButtonListener.java

@@ -0,0 +1,9 @@
+package com.mapbox.mapboxsdk.plugins.places.autocomplete.ui;
+
+public interface ClearButtonListener {
+
+  public void onClearButtonPress();
+
+  public void onCancel();
+
+}

plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteFragment.java

@@ -30,12 +30,14 @@
 import timber.log.Timber;
 
 public class PlaceAutocompleteFragment extends Fragment implements ResultClickCallback,
-  SearchView.QueryListener, SearchView.BackButtonListener,
+  SearchView.QueryListener, QueryFocusListener, SearchView.BackButtonListener, ClearButtonListener,
   ViewTreeObserver.OnScrollChangedListener {
 
   public static final String TAG = "PlaceAutocompleteFragment";
 
   private PlaceSelectionListener placeSelectionListener;
+  private QueryFocusListener queryFocusListener;
+  private ClearButtonListener clearButtonListener;
   private PlaceAutocompleteViewModel viewModel;
   private ResultView searchHistoryView;
   private ResultView searchResultView;
@@ -48,6 +50,7 @@ public class PlaceAutocompleteFragment extends Fragment implements ResultClickCa
   private String accessToken;
   private Integer historyCount;
   private View rootView;
+  private Activity context;
   private int mode;
 
   public static PlaceAutocompleteFragment newInstance(@NonNull String accessToken) {
@@ -108,7 +111,7 @@ private void styleView() {
       }
 
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        Activity context = (Activity) rootView.getContext();
+        context = (Activity) rootView.getContext();
         context.getWindow().setStatusBarColor(placeOptions.statusbarColor());
       }
 
@@ -162,6 +165,11 @@ public void onQueryChange(CharSequence charSequence) {
     }
   }
 
+  @Override
+  public void onClearButtonPress() {
+    clearButtonListener.onClearButtonPress();
+  }
+
   @Override
   public void onClick(CarmenFeature carmenFeature) {
     viewModel.saveCarmenFeatureToDatabase(carmenFeature);
@@ -176,6 +184,8 @@ public void onDestroyView() {
       resultScrollView.getViewTreeObserver().removeOnScrollChangedListener(this);
     }
     placeSelectionListener = null;
+    queryFocusListener = null;
+    clearButtonListener = null;
     super.onDestroyView();
   }
 
@@ -184,18 +194,44 @@ public void onBackButtonPress() {
     if (placeSelectionListener != null) {
       placeSelectionListener.onCancel();
     }
+    if (queryFocusListener != null) {
+      queryFocusListener.onCancel();
+    }
+    if (clearButtonListener != null) {
+      clearButtonListener.onCancel();
+    }
+  }
+
+  @Override
+  public void onSearchViewHasFocus() {
+    queryFocusListener.onSearchViewHasFocus();
+  }
+
+  @Override
+  public void onCancel() {
+    queryFocusListener.onCancel();
   }
 
   public void setOnPlaceSelectedListener(PlaceSelectionListener listener) {
     placeSelectionListener = listener;
   }
 
+  public void setOnSearchUiHasFocusListener(QueryFocusListener listener) {
+    queryFocusListener = listener;
+  }
+
+  public void setOnClearButtonListener(ClearButtonListener listener) {
+    clearButtonListener = listener;
+  }
+
   private void bindClickListeners() {
     searchHistoryView.setOnItemClickListener(this);
     searchResultView.setOnItemClickListener(this);
     starredView.setOnItemClickListener(this);
     searchView.setBackButtonListener(this);
+    searchView.setClearButtonListener(this);
     searchView.setQueryListener(this);
+    searchView.setQueryFocusListener(this);
   }
 
   private void bindViews() {
@@ -288,4 +324,5 @@ public String getAccessToken() {
   public Integer getHistoryCount() {
     return historyCount;
   }
+
 }

plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/QueryFocusListener.java

@@ -0,0 +1,9 @@
+package com.mapbox.mapboxsdk.plugins.places.autocomplete.ui;
+
+public interface QueryFocusListener {
+
+  public void onSearchViewHasFocus();
+
+  public void onCancel();
+
+}

plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/SearchView.java

@@ -16,19 +16,25 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import com.mapbox.mapboxsdk.log.Logger;
 import com.mapbox.mapboxsdk.places.R;
 
 public class SearchView extends LinearLayout implements ImageButton.OnClickListener, TextWatcher,
-  LifecycleObserver {
+  LifecycleObserver, View.OnFocusChangeListener {
 
   @Nullable
   private BackButtonListener backButtonListener;
   @Nullable
+  private ClearButtonListener clearButtonListener;
+  @Nullable
   private QueryListener queryListener;
+  @Nullable
+  private QueryFocusListener focusListener;
 
   private final ImageView backButton;
   private final ImageView clearButton;
   private final EditText searchEditText;
+  private CharSequence previousText;
 
   public SearchView(@NonNull Context context) {
     this(context, null);
@@ -51,6 +57,7 @@ private void initialize() {
     backButton.setOnClickListener(this);
     clearButton.setOnClickListener(this);
     searchEditText.addTextChangedListener(this);
+    searchEditText.setOnFocusChangeListener(this);
     ((LifecycleOwner) getContext()).getLifecycle().addObserver(this);
   }
 
@@ -62,30 +69,45 @@ public void onClick(View view) {
       }
     } else {
       searchEditText.getText().clear();
+      if (clearButtonListener != null) {
+        clearButtonListener.onClearButtonPress();
+      }
+    }
+  }
+
+  @Override
+  public void onFocusChange(View view, boolean hasFocus) {
+    if (view.getId() == searchEditText.getId()) {
+      if (focusListener != null) {
+        focusListener.onSearchViewHasFocus();
+      }
     }
   }
 
   @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
   public void onDestroy() {
     backButtonListener = null;
     queryListener = null;
+    focusListener = null;
+    clearButtonListener = null;
   }
 
   public void setHint(String hint) {
     searchEditText.setHint(hint);
   }
 
   @Override
-  public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+  public void onTextChanged(CharSequence charSequence, int start, int count, int after) {
     if (queryListener != null) {
       queryListener.onQueryChange(charSequence);
     }
     clearButton.setVisibility(charSequence.length() > 0 ? View.VISIBLE : INVISIBLE);
   }
 
   @Override
-  public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-    // Not used
+  public void beforeTextChanged(CharSequence charSequence, int start, int count, int after) {
+    Logger.d("SearchView", "charSequence = " + charSequence);
+    previousText = charSequence;
   }
 
   @Override
@@ -97,10 +119,18 @@ public void setBackButtonListener(@Nullable BackButtonListener backButtonListene
     this.backButtonListener = backButtonListener;
   }
 
+  public void setClearButtonListener(@Nullable ClearButtonListener clearButtonListener) {
+    this.clearButtonListener = clearButtonListener;
+  }
+
   public void setQueryListener(@Nullable QueryListener queryListener) {
     this.queryListener = queryListener;
   }
 
+  public void setQueryFocusListener(@Nullable QueryFocusListener focusListener) {
+    this.focusListener = focusListener;
+  }
+
   interface QueryListener {
     void onQueryChange(CharSequence charSequence);
   }