Skip to content

Commit

Permalink
change search provider via qc
Browse files Browse the repository at this point in the history
  • Loading branch information
@mg4gh
mg4gh committed Apr 15, 2024
1 parent fe5ae8a commit 8b0703a
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 7 deletions.
2 changes: 1 addition & 1 deletion mgmap/src/main/java/mg/mgmap/activity/mgmap/ControlComposer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ void composeQuickControls(MGMapActivity activity, ControlView coView) {
createQC(activity, FSSearch.class,qcss[2],"posBasedSearch",gos.get(0)).setId(R.id.mi_search_posBased);
createQC(activity, FSControl.class,qcss[2],"empty",gos.get(0)).setId(R.id.mi_search_empty2);
createQC(activity, FSControl.class,qcss[2],"empty",gos.get(0)).setId(R.id.mi_search_empty3);
createQC(activity, FSControl.class,qcss[2],"empty",gos.get(0)).setId(R.id.mi_search_empty4);
createQC(activity, FSSearch.class,qcss[2],"selpro",gos.get(0)).setId(R.id.mi_search_empty4);

createQC(activity, FSControl.class,qcss[3],"help").setId(R.id.mi_marker_help);
createQC(activity, FSRouting.class,qcss[3],"routingSave",gos.get(0)).setId(R.id.mi_routing_save);
Expand Down
55 changes: 55 additions & 0 deletions mgmap/src/main/java/mg/mgmap/activity/mgmap/features/search/FSSearch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,33 @@
*/
package mg.mgmap.activity.mgmap.features.search;

import android.content.Context;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.TypedValue;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.RelativeLayout;

import org.mapsforge.core.model.LatLong;
import org.mapsforge.core.model.Point;

import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import mg.mgmap.BuildConfig;
import mg.mgmap.activity.mgmap.ControlView;
import mg.mgmap.activity.mgmap.MGMapActivity;
import mg.mgmap.activity.mgmap.FeatureService;
import mg.mgmap.R;
import mg.mgmap.activity.mgmap.util.MapViewUtility;
import mg.mgmap.activity.mgmap.view.ControlMVLayer;
import mg.mgmap.activity.settings.SearchProviderListPreference;
import mg.mgmap.generic.model.BBox;
import mg.mgmap.generic.model.PointModel;
import mg.mgmap.generic.model.PointModelImpl;
Expand Down Expand Up @@ -65,6 +72,8 @@ public class FSSearch extends FeatureService {
private final Pref<Boolean> prefSearchResultDetails = getPref(R.string.FSSearch_pref_SearchDetails_key, false);
private final Pref<Boolean> prefReverseSearchOn = getPref(R.string.FSSearch_reverseSearchOn, false);
private final Pref<Boolean> prefLocationBasedSearchOn = getPref(R.string.FSSearch_locationBasedSearchOn, false);
private final Pref<Boolean> prefQCSelectSearchProvider = new Pref<>(false);


public FSSearch(MGMapActivity mmActivity) {
super(mmActivity);
Expand Down Expand Up @@ -132,6 +141,7 @@ public void afterTextChanged(Editable s) {
prefSearchOn.addObserver(refreshObserver);
prefSearchPos.onChange();
prefShowSearchResult.onChange();
prefQCSelectSearchProvider.addObserver(v->selectSearchProvider());
}

@Override
Expand All @@ -154,6 +164,10 @@ public ExtendedTextView initQuickControl(ExtendedTextView etv, String info){
etv.setPrAction(prefPosBasedSearch);
etv.setDisabledData(prefLocationBasedSearchOn, R.drawable.search_pos_dis);
etv.setHelp(r(R.string.FSRecording_qcPosBasedSearch_help)).setHelp(r(R.string.FSRecording_qcPosBasedSearch_help1),r(R.string.FSRecording_qcPosBasedSearch_help2));
} else if ("selpro".equals(info)){
etv.setData(R.drawable.settings);
etv.setHelp("Select search provider");
etv.setPrAction(prefQCSelectSearchProvider);
}
return etv;
}
Expand Down Expand Up @@ -386,4 +400,45 @@ public void processGeoIntent(String sUri){
}
}

private void selectSearchProvider(){
Context context = getActivity();
DialogView dialogView = getActivity().findViewById(R.id.dialog_parent);

RadioGroup radioGroup = new RadioGroup(context);
String[] searchProviders = SearchProviderListPreference.getSearchProviders(getApplication());
ArrayList<Integer> checkedList = new ArrayList<>();
for (String searchProvider : searchProviders) {
RadioButton rb1 = new RadioButton(context);
if ((searchProvider != null) && (searchProvider.length() > 0)) {
rb1.setText(searchProvider);
rb1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
rb1.setId(searchProvider.hashCode());
rb1.setPadding(ControlView.dp(10), ControlView.dp(10), ControlView.dp(10), ControlView.dp(10));
radioGroup.addView(rb1);
}
}
checkedList.add(0, prefSearchProvider.getValue().hashCode());
radioGroup.check(checkedList.get(0));
radioGroup.setOnCheckedChangeListener((group, checkedId) -> checkedList.add(0, checkedId));

dialogView.lock(() -> dialogView
.setTitle("Select Search Provider")
.setContentView(radioGroup)
.setPositive("OK", evt -> {
for (String searchProvider : searchProviders) {
if (searchProvider.hashCode() == checkedList.get(0)){
prefSearchProvider.setValue(searchProvider);
setSearchProvider();
if (prefSearchOn.getValue()){
doSearch(searchView.searchText.getText().toString().trim(), EditorInfo.IME_ACTION_SEARCH);
}

break;
}
}
})
.setNegative("Cancel", null)
.show());

}
}
16 changes: 10 additions & 6 deletions mgmap/src/main/java/mg/mgmap/activity/settings/SearchProviderListPreference.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@ public SearchProviderListPreference(Context context, AttributeSet attrs) {
this.setSummaryProvider(SimpleSummaryProvider.getInstance());

if (context.getApplicationContext() instanceof MGMapApplication) {
MGMapApplication application = (MGMapApplication) context.getApplicationContext();
String[] searchCfgs = application.getPersistenceManager().getSearchConfigNames();
String[] searchProviders = new String[searchCfgs.length];
for (int i=0; i<searchCfgs.length; i++){
searchProviders[i] = searchCfgs[i].replaceAll(".cfg$", "");
}
String[] searchProviders = getSearchProviders((MGMapApplication) context.getApplicationContext());
setEntries(searchProviders);
setEntryValues(searchProviders);

Expand All @@ -54,4 +49,13 @@ protected void onClick() {
mgLog.i("key="+getKey()+" value="+getValue());
super.onClick();
}

public static String[] getSearchProviders(MGMapApplication application){
String[] searchCfgs = application.getPersistenceManager().getSearchConfigNames();
String[] searchProviders = new String[searchCfgs.length];
for (int i=0; i<searchCfgs.length; i++){
searchProviders[i] = searchCfgs[i].replaceAll(".cfg$", "");
}
return searchProviders;
}
}

0 comments on commit 8b0703a

Please sign in to comment.