Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix

Browse source
This commit is contained in:
Alexey Kulish 2016-10-04 21:59:11 +03:00
parent 0c876ccac5
commit abbc3a6d79
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/res/layout/poi_filter_list_item.xml
View file

@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/bg_color"
android:minHeight="48dp" android:minHeight="48dp"
android:clickable="false" android:clickable="false"
android:orientation="vertical"> android:orientation="vertical">
@ -11,8 +12,6 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_gravity="bottom"
android:background="?attr/bg_color"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingRight="16dp"> android:paddingRight="16dp">
@ -98,11 +97,10 @@
</LinearLayout> </LinearLayout>
<View <View
android:id="@+id/item_divider" android:id="@+id/divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="54dp" android:layout_marginLeft="54dp"
android:layout_marginStart="54dp"
android:background="?attr/dashboard_divider"/> android:background="?attr/dashboard_divider"/>
</LinearLayout> </LinearLayout>

13
OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java
View file

@ -205,6 +205,7 @@ public class QuickSearchPoiFilterFragment extends DialogFragment {
View editTextView = inflater.inflate(R.layout.poi_filter_list_item, listView, false); View editTextView = inflater.inflate(R.layout.poi_filter_list_item, listView, false);
editText = (EditText) editTextView.findViewById(R.id.editText); editText = (EditText) editTextView.findViewById(R.id.editText);
editTextView.findViewById(R.id.divider).setVisibility(View.GONE);
editText.setText(nameFilterText); editText.setText(nameFilterText);
editText.addTextChangedListener(new TextWatcher() { editText.addTextChangedListener(new TextWatcher() {
@Override @Override
@ -465,10 +466,12 @@ public class QuickSearchPoiFilterFragment extends DialogFragment {
if (entry.getKey().getExcludedPoiAdditionalCategories() != null) { if (entry.getKey().getExcludedPoiAdditionalCategories() != null) {
excludedPoiAdditionalCategories.addAll(entry.getKey().getExcludedPoiAdditionalCategories()); excludedPoiAdditionalCategories.addAll(entry.getKey().getExcludedPoiAdditionalCategories());
} }
for (String keyName : entry.getValue()) { if (entry.getValue() != null) {
List<String> categories = poiTypes.getPoiTypeByKey(keyName).getExcludedPoiAdditionalCategories(); for (String keyName : entry.getValue()) {
if (categories != null) { List<String> categories = poiTypes.getPoiTypeByKey(keyName).getExcludedPoiAdditionalCategories();
excludedPoiAdditionalCategories.addAll(categories); if (categories != null) {
excludedPoiAdditionalCategories.addAll(categories);
}
} }
} }
} }
@ -681,7 +684,7 @@ public class QuickSearchPoiFilterFragment extends DialogFragment {
final SwitchCompat switchItem = (SwitchCompat) view.findViewById(R.id.switchItem); final SwitchCompat switchItem = (SwitchCompat) view.findViewById(R.id.switchItem);
final CheckBox checkBoxItem = (CheckBox) view.findViewById(R.id.checkboxItem); final CheckBox checkBoxItem = (CheckBox) view.findViewById(R.id.checkboxItem);
final ImageView expandItem = (ImageView) view.findViewById(R.id.expandItem); final ImageView expandItem = (ImageView) view.findViewById(R.id.expandItem);
final View divider = view.findViewById(R.id.item_divider); final View divider = view.findViewById(R.id.divider);
if (item != null) { if (item != null) {
if (nextItem != null && nextItem.groupIndex == item.groupIndex) { if (nextItem != null && nextItem.groupIndex == item.groupIndex) {