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

Fix small issues

Browse source
This commit is contained in:
Victor Shcherb 2014-10-26 16:46:47 +01:00
parent 2ad5ca35b1
commit 913c2b4fbf
5 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/layer_poi"
android:textSize="18sp"

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

@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:minHeight="40dp"
android:layout_marginBottom="5dp">
<ImageView android:id="@+id/waypoint_icon"

10
OsmAnd/res/layout/waypoint_title.xml
View file

@ -20,22 +20,20 @@
android:layout_weight="1"
android:textSize="20sp"/>
<ImageView
<ImageButton
android:id="@+id/edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginRight="16dp"
style="?android:borderlessButtonStyle"/>
android:layout_marginRight="16dp"/>
<ImageView
<ImageButton
android:id="@+id/all"
android:contentDescription="@string/flat_list_waypoints"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginRight="16dp"
style="?android:borderlessButtonStyle"/>
android:layout_marginRight="16dp"/>
</LinearLayout>

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

@ -10,8 +10,7 @@
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="rendering_category_details">Details</string>
<string name="rendering_category_hiking">Hiking</string>
<string name="rendering_category_routes">Routes</string>
<string name="rendering_category_transport">Transport</string>
<string name="rendering_category_others">Others map attributes</string>
<string name="map_widget_appearance_rem">Remaining elements</string>
<string name="map_widget_vector_attributes">Rendering attributes</string>

11
OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
View file

@ -523,8 +523,8 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
protected View createDialogHeader(final FragmentActivity ctx, final boolean editF, final boolean flat, final AlertDialog dlg) {
View v;
v = ctx.getLayoutInflater().inflate(R.layout.waypoint_title, null);
ImageView edit = (ImageView) v.findViewById(R.id.edit);
ImageView all = (ImageView) v.findViewById(R.id.all);
ImageButton edit = (ImageButton) v.findViewById(R.id.edit);
ImageButton all = (ImageButton) v.findViewById(R.id.all);
edit.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_action_edit_light
: R.drawable.ic_action_edit_dark);
edit.setVisibility(editF ? View.GONE : View.VISIBLE);
@ -618,7 +618,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
v = ctx.getLayoutInflater().inflate(R.layout.waypoint_header, null);
ImageView sort = (ImageView) v.findViewById(R.id.sort);
//sort button in Destination header
if (type == 0 && sort != null){
if (type == 0 && sort != null && app.getTargetPointsHelper().getIntermediatePoints().size() > 0){
sort.setVisibility(View.VISIBLE);
if (app.getSettings().isLightContent()){
sort.setImageResource(R.drawable.ic_sort_waypoint_white);
@ -631,6 +631,8 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
IntermediatePointsDialog.openIntermediatePointsDialog(ctx, app, true);
}
});
} else {
sort.setVisibility(View.GONE);
}
final CompoundButton btn = (CompoundButton) v.findViewById(R.id.check_item);
btn.setVisibility(waypointHelper.isTypeConfigurable(type) ? View.VISIBLE : View.GONE);
@ -658,9 +660,6 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
return v;
}
}
private static void showOnMap(OsmandApplication app, Activity a, LocationPoint locationPoint, DialogFragment dialog) {
if (!(a instanceof MapActivity)) {