diff options
Diffstat (limited to 'android/res/layout')
-rw-r--r-- | android/res/layout/layout_routing_full.xml | 71 | ||||
-rw-r--r-- | android/res/layout/layout_turn_and_street.xml | 68 |
2 files changed, 79 insertions, 60 deletions
diff --git a/android/res/layout/layout_routing_full.xml b/android/res/layout/layout_routing_full.xml index 1d1a6c801d..db9500cf83 100644 --- a/android/res/layout/layout_routing_full.xml +++ b/android/res/layout/layout_routing_full.xml @@ -1,51 +1,52 @@ <?xml version="1.0" encoding="utf-8"?> <merge - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools"> <include - android:id="@+id/layout__routing_setup" - layout="@layout/layout_routing_setup"/> + android:id="@+id/layout__routing_setup" + layout="@layout/layout_routing_setup"/> <include - android:id="@+id/layout__turn_instructions" - layout="@layout/layout_turn_instructions" - android:visibility="gone" - tools:visibility="visible"/> + android:id="@+id/layout__turn_instructions" + layout="@layout/layout_turn_instructions" + android:visibility="gone" + tools:visibility="visible"/> <LinearLayout - android:id="@+id/next_turn" + android:id="@+id/next_turn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/layout__turn_instructions" + android:layout_centerHorizontal="true" + android:layout_marginTop="@dimen/margin_half" + android:background="@drawable/bg_next_turn" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingBottom="@dimen/margin_quarter" + android:paddingLeft="@dimen/margin_base" + android:paddingRight="@dimen/margin_base" + android:paddingTop="@dimen/margin_quarter" + android:visibility="gone" + tools:visibility="visible"> + + <TextView + android:id="@+id/tv__next_turn" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@id/layout__turn_instructions" - android:layout_centerHorizontal="true" - android:layout_marginTop="@dimen/margin_half" - android:background="@drawable/bg_next_turn" android:gravity="center_vertical" - android:orientation="horizontal" - android:paddingBottom="@dimen/margin_quarter" - android:paddingLeft="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" - android:paddingTop="@dimen/margin_quarter" - android:visibility="gone" - tools:visibility="visible"> - - <TextView - android:id="@+id/tv__next_turn" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:padding="@dimen/margin_quarter" - android:text="@string/next_turn_then" - android:textColor="@android:color/white" - android:textSize="@dimen/text_size_toolbar"/> + android:padding="@dimen/margin_quarter" + android:text="@string/next_turn_then" + android:textColor="@android:color/white" + android:textSize="@dimen/text_size_toolbar"/> <ImageView - android:id="@+id/iv__next_turn" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/next_turn_then" - tools:src="@drawable/ic_round_then"/> + android:id="@+id/iv__next_turn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:contentDescription="@string/next_turn_then" + tools:src="@drawable/ic_round_then"/> </LinearLayout> diff --git a/android/res/layout/layout_turn_and_street.xml b/android/res/layout/layout_turn_and_street.xml index 4117e95c38..e18f2ee1ad 100644 --- a/android/res/layout/layout_turn_and_street.xml +++ b/android/res/layout/layout_turn_and_street.xml @@ -1,38 +1,56 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout - android:id="@+id/turns" - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="@dimen/panel_width" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:padding="@dimen/padding_routing_turns"> + android:id="@+id/turns" + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="@dimen/panel_width" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:padding="@dimen/padding_routing_turns"> + + <FrameLayout + android:id="@+id/turn" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> - <com.mapswithme.maps.widget.ArrowView + <com.mapswithme.maps.widget.ArrowView android:id="@+id/iv__turn" android:layout_width="wrap_content" android:layout_height="wrap_content" - tools:src="@drawable/ic_slight_left_light"/> + tools:src="@drawable/ic_round"/> - <TextView - android:id="@+id/tv__turn_distance" + <TextView + android:id="@+id/tv__exit_num" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/margin_base" - android:layout_toRightOf="@+id/iv__turn" - android:textAppearance="@style/MwmTextAppearance.Display1.Plus" + android:layout_gravity="center" + android:textAppearance="@style/MwmTextAppearance.Title" android:textColor="@color/routing_blue" - tools:text="300 m"/> + android:visibility="gone" + tools:text="2" + tools:visibility="visible"/> + + </FrameLayout> <TextView - android:id="@+id/tv__next_street" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignLeft="@id/tv__turn_distance" - android:layout_below="@id/tv__turn_distance" - android:textAppearance="@style/MwmTextAppearance.Body2" - android:textSize="@dimen/text_size_title" - android:maxLines="2" - tools:text="Oxford str." - tools:visibility="visible"/> + android:id="@+id/tv__turn_distance" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/margin_base" + android:layout_toRightOf="@+id/turn" + android:textAppearance="@style/MwmTextAppearance.Display1.Plus" + android:textColor="@color/routing_blue" + tools:text="300 m"/> + + <TextView + android:id="@+id/tv__next_street" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignLeft="@id/tv__turn_distance" + android:layout_below="@id/tv__turn_distance" + android:maxLines="2" + android:textAppearance="@style/MwmTextAppearance.Body2" + android:textSize="@dimen/text_size_title" + tools:text="Oxford str." + tools:visibility="visible"/> </RelativeLayout>
\ No newline at end of file |