gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] fix: UI fixes.

Browse source
This commit is contained in:
Alexander Marchuk 2015-09-28 14:17:24 +03:00
parent fba2b19fc0
commit eb652f4b23
6 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/layout-w840dp/activity_map.xml
View file

@ -35,7 +35,7 @@
android:id="@+id/layout__routing"
android:layout_width="@dimen/panel_width"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"/>
android:paddingBottom="@dimen/margin_base"/>
<com.mapswithme.maps.widget.placepage.PlacePageView
android:id="@+id/info_box"

3
android/res/layout/activity_map.xml
View file

@ -21,7 +21,8 @@
android:id="@+id/layout__routing"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"/>
android:layout_below="@id/toolbar"
android:paddingBottom="@dimen/margin_base"/>
<include
android:id="@+id/navigation_buttons"

9
android/res/layout/layout_routing_full.xml
View file

@ -5,13 +5,13 @@
<include
android:id="@+id/layout__routing_setup"
layout="@layout/layout_routing_setup"
tools:visibility="gone"/>
layout="@layout/layout_routing_setup"/>
<include
android:id="@+id/layout__turn_instructions"
layout="@layout/layout_turn_instructions"
android:visibility="gone"/>
android:visibility="gone"
tools:visibility="visible"/>
<LinearLayout
android:id="@+id/next_turn"
@ -27,7 +27,8 @@
android:paddingLeft="@dimen/margin_base"
android:paddingRight="@dimen/margin_base"
android:paddingTop="@dimen/margin_quarter"
android:visibility="gone">
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/tv__next_turn"

5
android/res/layout/layout_routing_setup.xml
View file

@ -4,10 +4,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:wheel="http://schemas.android.com/apk/res-auto"
android:background="@color/bg_top_panels"
style="@style/MwmWidget.Floating.Panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false">
android:clipToPadding="false"
android:elevation="@dimen/appbar_elevation">
<LinearLayout
android:id="@+id/content"

5
android/res/values/styles.xml
View file

@ -112,8 +112,7 @@
<style name="MwmWidget.Floating"/>
<style name="MwmWidget.Floating.Panel"
parent="MwmWidget.Floating">
<style name="MwmWidget.Floating.Panel">
<item name="android:background">@color/bg_top_panels</item>
</style>
@ -338,4 +337,4 @@
<!-- Text appearance -->
</resources>
</resources>

2
android/src/com/mapswithme/maps/widget/RoutingLayout.java
View file

@ -101,7 +101,7 @@ public class RoutingLayout extends RelativeLayout implements View.OnClickListene
super(context, attrs, defStyleAttr);
inflate(getContext(), R.layout.layout_routing_full, this);
setClipToPadding(false);
setPadding(0, 0, 0, UiUtils.dimen(R.dimen.margin_quarter));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
setElevation(UiUtils.dimen(R.dimen.appbar_elevation));