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

some fixes

Browse source
This commit is contained in:
Rosty 2017-01-10 12:08:37 +02:00
parent 47f3fbddac
commit 0fd6b8d339
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/layout-land/quick_action_widget.xml
View file

@ -19,12 +19,12 @@
android:layout_width="match_parent"
android:layout_height="200dp" />
<!-- android:background="@drawable/quick_action_controls_background" -->
<LinearLayout
android:id="@+id/controls"
android:layout_width="match_parent"
android:layout_height="24dp"
android:orientation="horizontal">
android:orientation="horizontal"
android:background="@drawable/quick_action_controls_background">
<ImageButton
android:id="@+id/btnPrev"

4
OsmAnd/res/layout/quick_action_widget.xml
View file

@ -19,12 +19,12 @@
android:layout_width="match_parent"
android:layout_height="200dp" />
<!-- android:background="@drawable/quick_action_controls_background" -->
<LinearLayout
android:id="@+id/controls"
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal">
android:orientation="horizontal"
android:background="@drawable/quick_action_controls_background">
<ImageButton
android:id="@+id/btnPrev"

13
OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java
View file

@ -788,12 +788,14 @@ public class QuickActionFactory {
String filtersId = getParams().get(KEY_FILTERS);
Collections.addAll(filters, filtersId.split(","));
if (app.getPoiFilters() == null) return super.getIconRes();
PoiUIFilter filter = app.getPoiFilters().getFilterById(filters.get(0));
Object res = filter.getIconResource();
if (filter == null) return super.getIconRes();
Object res = filter.getIconResource();
if (res instanceof String && RenderingIcons.containsBigIcon(res.toString())) {
return RenderingIcons.getBigIconResourceId(res.toString());
@ -818,8 +820,6 @@ public class QuickActionFactory {
} else pf.clearSelectedPoiFilters();
activity.getMapLayers().updateLayers(activity.getMapView());
}
@ -2543,7 +2543,7 @@ public class QuickActionFactory {
String oldTitle = getTitle(itemsList);
String defaultName = holder.handleView.getContext().getString(getNameRes());
deleteItem(position);
deleteItem(holder.getAdapterPosition());
if (oldTitle.equals(title.getText().toString()) || title.getText().toString().equals(defaultName)) {
@ -2561,8 +2561,9 @@ public class QuickActionFactory {
public void deleteItem(int position) {
if (position == -1)
if (position == -1) {
return;
}
itemsList.remove(position);