diff options
-rw-r--r-- | android/res/layout-land/fragment_direction.xml | 13 | ||||
-rw-r--r-- | android/res/layout/fragment_direction.xml | 18 | ||||
-rw-r--r-- | android/res/values/colors.xml | 6 | ||||
-rw-r--r-- | android/res/values/dimens.xml | 3 |
4 files changed, 24 insertions, 16 deletions
diff --git a/android/res/layout-land/fragment_direction.xml b/android/res/layout-land/fragment_direction.xml index fab923f223..d4a512e8bb 100644 --- a/android/res/layout-land/fragment_direction.xml +++ b/android/res/layout-land/fragment_direction.xml @@ -2,7 +2,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/semitransparent_black" + android:background="@color/semitransparent_black_dark" android:paddingBottom="@dimen/margin_direction_top" android:paddingLeft="@dimen/margin_direction_left" android:paddingRight="@dimen/margin_direction_left" @@ -22,8 +22,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_above="@+id/tv__subtitle" + android:layout_alignLeft="@id/tv__subtitle" android:layout_marginBottom="@dimen/margin_direction_small" - android:layout_toRightOf="@id/anchor_center"/> + android:textSize="@dimen/text_direction_title"/> <TextView android:id="@+id/tv__subtitle" @@ -31,8 +32,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignBottom="@id/anchor_center" - android:layout_alignLeft="@id/tv__title" - android:textSize="@dimen/place_page_subtitle"/> + android:layout_toRightOf="@id/anchor_center" + android:textColor="@color/semitransparent_white" + android:textSize="@dimen/text_direction_subtitle"/> <com.mapswithme.maps.widget.ArrowView android:id="@+id/av__direction" @@ -48,6 +50,7 @@ android:layout_height="wrap_content" android:layout_alignLeft="@id/tv__title" android:layout_below="@id/tv__subtitle" - android:layout_marginTop="@dimen/margin_direction_mid"/> + android:layout_marginTop="@dimen/margin_direction_mid" + android:textSize="@dimen/text_direction_dist"/> </RelativeLayout>
\ No newline at end of file diff --git a/android/res/layout/fragment_direction.xml b/android/res/layout/fragment_direction.xml index dc3aa1dac3..711713aa0a 100644 --- a/android/res/layout/fragment_direction.xml +++ b/android/res/layout/fragment_direction.xml @@ -2,7 +2,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/semitransparent_black" + android:background="@color/semitransparent_black_dark" android:orientation="vertical" android:paddingBottom="@dimen/margin_direction_top" android:paddingLeft="@dimen/margin_direction_left" @@ -14,25 +14,28 @@ style="@style/DirectionTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_above="@+id/tv__subtitle" android:layout_centerHorizontal="true" - android:layout_marginBottom="@dimen/margin_direction_small"/> + android:layout_marginBottom="@dimen/margin_direction_small" + android:textSize="@dimen/text_direction_title"/> <TextView android:id="@+id/tv__subtitle" style="@style/DirectionTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@id/tv__title" + android:layout_above="@+id/av__direction" android:layout_centerHorizontal="true" android:layout_marginBottom="@dimen/margin_direction_big" android:layout_marginLeft="@dimen/margin_medium_and_half" android:layout_marginRight="@dimen/margin_medium_and_half" - android:textSize="@dimen/place_page_subtitle"/> + android:textColor="@color/semitransparent_white" + android:textSize="@dimen/text_direction_subtitle"/> <com.mapswithme.maps.widget.ArrowView android:id="@+id/av__direction" - android:layout_width="160dp" - android:layout_height="160dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_centerInParent="true"/> <TextView @@ -42,6 +45,7 @@ android:layout_height="wrap_content" android:layout_below="@id/av__direction" android:layout_centerHorizontal="true" - android:layout_marginTop="@dimen/margin_direction_big"/> + android:layout_marginTop="@dimen/margin_direction_big" + android:textSize="@dimen/text_direction_dist"/> </RelativeLayout>
\ No newline at end of file diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index a17c0bbb2c..9d0a25e3bc 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -12,11 +12,9 @@ <drawable name="semitransparent_white">#30FFFFFF</drawable> - <color name="semitransparent_white">#30FFFFFF</color> - - <drawable name="semitransparent_black">#30000000</drawable> - + <color name="semitransparent_white">#99FFFFFF</color> <color name="semitransparent_black">#60000000</color> + <color name="semitransparent_black_dark">#BB000000</color> <color name="search_background_gray">#efeff4</color> diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml index e88a677ddf..aa05f2ac65 100644 --- a/android/res/values/dimens.xml +++ b/android/res/values/dimens.xml @@ -83,5 +83,8 @@ <dimen name="margin_direction_top">40dp</dimen> <dimen name="margin_direction_mid">24dp</dimen> <dimen name="margin_direction_around_center">0dp</dimen> + <dimen name="text_direction_dist">52sp</dimen> + <dimen name="text_direction_subtitle">22sp</dimen> + <dimen name="text_direction_title">58sp</dimen> </resources> |