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

Fix Configure POI Search categories

Browse source
This commit is contained in:
Nazar-Kutz 2020-02-06 15:47:50 +02:00
parent c7db70a24a
commit 0d14e5dc57
5 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/layout/bottom_sheet_item_description_long.xml
View file

@ -12,4 +12,5 @@
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
android:linksClickable="true" android:linksClickable="true"
android:lineSpacingMultiplier="1.25"
tools:text="Some long description"/> tools:text="Some long description"/>

20
OsmAnd/res/layout/order_poi_list_item.xml
View file

@ -11,20 +11,18 @@
<LinearLayout <LinearLayout
android:id="@+id/selectable_list_item" android:id="@+id/selectable_list_item"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:paddingTop="@dimen/content_padding_half"
android:paddingBottom="@dimen/content_padding_half"
android:orientation="horizontal" android:orientation="horizontal"
tools:background="?android:attr/selectableItemBackground"> tools:background="?android:attr/selectableItemBackground">
<ImageButton <ImageView
android:id="@+id/action_icon" android:id="@+id/action_icon"
style="@style/Widget.AppCompat.ActionButton" android:layout_width="wrap_content"
android:layout_width="@dimen/standard_icon_size" android:layout_height="wrap_content"
android:layout_height="@dimen/standard_icon_size"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:minHeight="@dimen/bottom_sheet_list_item_height"
tools:src="@drawable/ic_action_remove" tools:src="@drawable/ic_action_remove"
tools:tint="@color/icon_color_default_light" /> tools:tint="@color/icon_color_default_light" />
@ -47,6 +45,8 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:paddingTop="@dimen/content_padding_half"
android:paddingBottom="@dimen/content_padding_half"
android:singleLine="true" android:singleLine="true"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
@ -56,7 +56,7 @@
<ImageView <ImageView
android:id="@+id/move_icon" android:id="@+id/move_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"

2
OsmAnd/res/values/strings.xml
View file

@ -17,7 +17,7 @@
<string name="rearrange_categories">Rearrange categories</string> <string name="rearrange_categories">Rearrange categories</string>
<string name="create_custom_categories_list_promo">You can add custom categories hide categories that you don’t find necessary and change the sort order of the list. The list can be imported and exported with profiles.</string> <string name="create_custom_categories_list_promo">You can add custom categories hide categories that you don’t find necessary and change the sort order of the list. The list can be imported and exported with profiles.</string>
<string name="add_new_custom_category_button_promo">You can add a new custom category by selecting one or a few needed categories.</string> <string name="add_new_custom_category_button_promo">You can add a new custom category by selecting one or a few needed categories.</string>
<string name="reset_to_default_category_button_promo">Reset to default will delete or custom categories and reset sort order to the default state after installation.</string> <string name="reset_to_default_category_button_promo">Reset to default will reset sort order to the default state after installation.</string>
<string name="shared_string_available">Available</string> <string name="shared_string_available">Available</string>
<string name="add_custom_category">Add custom category</string> <string name="add_custom_category">Add custom category</string>
<string name="rendering_attr_streetLightingNight_name">Show only at night</string> <string name="rendering_attr_streetLightingNight_name">Show only at night</string>

2
OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
View file

@ -800,7 +800,7 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
String anotherFilterByName = another.filterByName == null ? "" : another.filterByName; String anotherFilterByName = another.filterByName == null ? "" : another.filterByName;
return thisFilterByName.compareToIgnoreCase(anotherFilterByName); return thisFilterByName.compareToIgnoreCase(anotherFilterByName);
} else { } else {
return this.name.compareTo(another.name); return this.name.compareToIgnoreCase(another.name);
} }
} }

4
OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java
View file

@ -212,7 +212,7 @@ public class RearrangePoiFiltersFragment extends DialogFragment {
String filterByName2 = o2.filterByName == null ? "" : o2.filterByName; String filterByName2 = o2.filterByName == null ? "" : o2.filterByName;
return filterByName1.compareToIgnoreCase(filterByName2); return filterByName1.compareToIgnoreCase(filterByName2);
} else { } else {
return o1.name.compareTo(o2.name); return o1.name.compareToIgnoreCase(o2.name);
} }
} }
}); });
@ -641,7 +641,7 @@ public class RearrangePoiFiltersFragment extends DialogFragment {
private TextView title; private TextView title;
private TextView description; private TextView description;
private ImageView icon; private ImageView icon;
private ImageButton actionIcon; private ImageView actionIcon;
private ImageView moveIcon; private ImageView moveIcon;
private View itemsContainer; private View itemsContainer;