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

Renamed & edited margins.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-07-03 19:39:57 +03:00 • committed by Alex Zolotarev
parent f000f3e27e
commit 20c877a0e1
57 changed files with 212 additions and 225 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/res/drawable/bg_btn_zoom.xml
View file

@ -9,5 +9,8 @@
<item android:drawable="@drawable/btn_second_white_hover"
android:state_hovered="true"/>
<item android:drawable="@drawable/btn_second_white_disable"
android:state_enabled="false"/>
<item android:drawable="@drawable/btn_second_white_normal"/>
</selector>

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

@ -50,6 +50,6 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:padding="@dimen/margin_small"/>
android:padding="@dimen/margin_quarter"/>
</RelativeLayout>

10
android/res/layout-sw600dp-land/activity_map.xml
View file

@ -14,7 +14,7 @@
android:layout_width="@dimen/panel_width"
android:layout_height="@dimen/routing_pp_height"
android:layout_below="@+id/toolbar_search"
android:layout_margin="@dimen/margin_medium">
android:layout_margin="@dimen/margin_base">
<include layout="@layout/map_routing_full"/>
@ -29,7 +29,7 @@
android:layout_width="@dimen/panel_width"
android:layout_height="wrap_content"
android:layout_below="@+id/toolbar_search"
android:layout_margin="@dimen/margin_medium"
android:layout_margin="@dimen/margin_base"
placePage:animationType="leftTop"/>
<com.mapswithme.maps.widget.FadeView
@ -43,14 +43,14 @@
android:id="@+id/fragment_container"
android:layout_width="@dimen/panel_width"
android:layout_height="match_parent"
android:layout_margin="@dimen/margin_medium"/>
android:layout_margin="@dimen/margin_base"/>
<include
android:id="@+id/toolbar_search"
layout="@layout/toolbar_with_search"
android:layout_width="@dimen/panel_width"
android:layout_height="?attr/actionBarSize"
android:layout_margin="@dimen/margin_medium"/>
android:layout_margin="@dimen/margin_base"/>
<com.mapswithme.maps.widget.BottomButtonsLayout
android:id="@+id/map_bottom_buttons"
@ -58,6 +58,6 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:padding="@dimen/margin_small"/>
android:padding="@dimen/margin_quarter"/>
</RelativeLayout>

8
android/res/layout-sw600dp/activity_map.xml
View file

@ -15,14 +15,14 @@
layout="@layout/toolbar_with_search"
android:layout_width="@dimen/panel_width"
android:layout_height="?attr/actionBarSize"
android:layout_margin="@dimen/margin_medium"/>
android:layout_margin="@dimen/margin_base"/>
<FrameLayout
android:id="@+id/fl__routing"
android:layout_width="@dimen/panel_width"
android:layout_height="@dimen/routing_pp_height"
android:layout_below="@+id/toolbar_search"
android:layout_margin="@dimen/margin_medium">
android:layout_margin="@dimen/margin_base">
<include layout="@layout/map_routing_full"/>
@ -50,7 +50,7 @@
android:id="@+id/fragment_container"
android:layout_width="@dimen/panel_width"
android:layout_height="match_parent"
android:layout_margin="@dimen/margin_medium"/>
android:layout_margin="@dimen/margin_base"/>
<com.mapswithme.maps.widget.BottomButtonsLayout
android:id="@+id/map_bottom_buttons"
@ -58,5 +58,5 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:padding="@dimen/margin_small"/>
android:padding="@dimen/margin_quarter"/>
</RelativeLayout>

2
android/res/layout-sw600dp/download_item_placeholder.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_medium"
android:layout_height="@dimen/margin_base"
android:background="@color/downloader_gray_bg"/>

2
android/res/layout-sw600dp/fragment_downloader.xml
View file

@ -20,7 +20,7 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:gravity="center_vertical"
android:padding="@dimen/margin_small"
android:padding="@dimen/margin_half"
android:text="@string/downloader_update_all"
android:textAppearance="@style/MwmTextAppearance.Toolbar.Button"/>
</android.support.v7.widget.Toolbar>

4
android/res/layout-sw600dp/map_navigation_buttons.xml
View file

@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/margin_small">
android:padding="@dimen/margin_half">
<ImageButton
android:id="@+id/btn__myposition"
@ -15,7 +15,7 @@
android:id="@+id/yop_it"
style="@style/MwmWidget.MapButton.Zoom"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/margin_tiny"
android:layout_marginRight="@dimen/margin_quarter"
android:src="@drawable/ic_btn_yota_ptb"/>
<android.support.v4.widget.Space

2
android/res/layout-sw600dp/map_turn_instructions.xml
View file

@ -11,7 +11,7 @@
style="@style/TextAppearance.AppCompat.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_medium"/>
android:layout_marginLeft="@dimen/margin_base"/>
<TextView
android:id="@+id/tv__total_time"

12
android/res/layout-sw600dp/place_page_details.xml
View file

@ -11,8 +11,8 @@
android:layout_height="wrap_content"
android:clipChildren="false"
android:orientation="vertical"
android:paddingLeft="@dimen/margin_medium_and_half"
android:paddingRight="@dimen/margin_medium_and_half">
android:paddingLeft="@dimen/margin_base_plus"
android:paddingRight="@dimen/margin_base_plus">
<View
android:layout_width="match_parent"
@ -23,16 +23,16 @@
android:id="@+id/rl__details_attrs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/margin_small"
android:paddingTop="@dimen/margin_small">
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half">
<View
android:id="@+id/anchor_center"
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/margin_medium"
android:layout_marginRight="@dimen/margin_medium"/>
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"/>
<LinearLayout
android:id="@+id/ll__details_left"

10
android/res/layout-sw720dp/activity_map.xml
View file

@ -14,7 +14,7 @@
android:layout_width="@dimen/panel_width"
android:layout_height="@dimen/routing_pp_height"
android:layout_below="@+id/toolbar_search"
android:layout_margin="@dimen/margin_medium">
android:layout_margin="@dimen/margin_base">
<include layout="@layout/map_routing_full"/>
@ -28,7 +28,7 @@
android:id="@+id/info_box"
android:layout_width="@dimen/panel_width"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_medium"
android:layout_margin="@dimen/margin_base"
placePage:animationType="leftTop"/>
<com.mapswithme.maps.widget.FadeView
@ -42,14 +42,14 @@
android:id="@+id/fragment_container"
android:layout_width="@dimen/panel_width"
android:layout_height="match_parent"
android:layout_margin="@dimen/margin_medium"/>
android:layout_margin="@dimen/margin_base"/>
<include
android:id="@+id/toolbar_search"
layout="@layout/toolbar_with_search"
android:layout_width="@dimen/panel_width"
android:layout_height="?attr/actionBarSize"
android:layout_margin="@dimen/margin_medium"/>
android:layout_margin="@dimen/margin_base"/>
<com.mapswithme.maps.widget.BottomButtonsLayout
android:id="@+id/map_bottom_buttons"
@ -57,6 +57,6 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:padding="@dimen/margin_small"/>
android:padding="@dimen/margin_quarter"/>
</RelativeLayout>

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

@ -57,5 +57,5 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:padding="@dimen/margin_small"/>
android:padding="@dimen/margin_quarter"/>
</RelativeLayout>

2
android/res/layout/color_row.xml
View file

@ -3,7 +3,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/clickableBackground"
android:padding="@dimen/margin_small_and_half">
android:padding="@dimen/margin_half_plus">
<ImageView
android:id="@+id/iv__color"

4
android/res/layout/dialog_edit_text.xml
View file

@ -2,12 +2,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/margin_medium_and_half">
android:padding="@dimen/margin_base_plus">
<TextView
android:id="@+id/tv__title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_medium"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Title"/>
<com.mapswithme.maps.widget.CustomTextInputLayout

18
android/res/layout/download_item_country.xml
View file

@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:background="?attr/clickableBackground"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingLeft="@dimen/margin_small">
android:paddingLeft="@dimen/margin_half">
<TextView
android:id="@+id/title"
@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_half"
android:layout_toLeftOf="@+id/ll__info_slided"
android:maxLines="2"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
@ -26,11 +26,11 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/progress_wheel_width_neg"
android:paddingLeft="@dimen/margin_tiny"
android:paddingRight="@dimen/margin_tiny"
android:paddingLeft="@dimen/margin_quarter"
android:paddingRight="@dimen/margin_quarter"
wheel:progressColor="@color/downloader_blue"
wheel:secondaryColor="@color/downloader_progress_bg"
wheel:wheelThickness="@dimen/margin_micro"/>
wheel:wheelThickness="@dimen/margin_eighth"/>
<ImageView
android:id="@+id/iv__routing_status_slided"
@ -47,11 +47,11 @@
android:layout_height="@dimen/progress_wheel_height"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/margin_tiny"
android:paddingRight="@dimen/margin_tiny"
android:paddingLeft="@dimen/margin_quarter"
android:paddingRight="@dimen/margin_quarter"
wheel:progressColor="@color/downloader_blue"
wheel:secondaryColor="@color/downloader_progress_bg"
wheel:wheelThickness="@dimen/margin_micro"/>
wheel:wheelThickness="@dimen/margin_eighth"/>
<LinearLayout
android:id="@+id/ll__info"
@ -59,7 +59,7 @@
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/margin_small"
android:layout_marginRight="@dimen/margin_half"
android:gravity="right"
android:minWidth="60dp"
android:orientation="vertical">

4
android/res/layout/download_item_dialog.xml
View file

@ -21,8 +21,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/divider_top"
android:layout_marginLeft="@dimen/margin_medium_and_half"
android:layout_marginRight="@dimen/margin_medium_and_half"
android:layout_marginLeft="@dimen/margin_base_plus"
android:layout_marginRight="@dimen/margin_base_plus"
android:gravity="center_vertical"
android:minHeight="60dp"
android:orientation="horizontal">

4
android/res/layout/download_item_extended.xml
View file

@ -9,8 +9,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/margin_medium"
android:layout_marginRight="@dimen/margin_medium"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:text="@string/downloader_downloaded"
android:textAppearance="@style/MwmTextAppearance.Body1"/>

2
android/res/layout/download_item_group.xml
View file

@ -10,7 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/margin_medium"
android:layout_marginLeft="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
</RelativeLayout>

2
android/res/layout/download_item_placeholder.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_medium"
android:layout_height="@dimen/margin_base"
android:background="@color/downloader_gray_bg"/>

4
android/res/layout/download_item_updated.xml
View file

@ -5,6 +5,6 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@color/downloader_gray_bg"
android:paddingLeft="@dimen/margin_medium"
android:paddingTop="@dimen/margin_small"
android:paddingLeft="@dimen/margin_base"
android:paddingTop="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Body3"/>

30
android/res/layout/edit_bookmark_common.xml
View file

@ -4,14 +4,14 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/margin_small">
android:padding="@dimen/margin_half">
<LinearLayout
android:id="@+id/ll__bookmark_name"
android:layout_width="match_parent"
android:layout_height="@dimen/height_item_edit_bookmark"
android:layout_marginLeft="@dimen/margin_small"
android:layout_marginRight="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_half"
android:layout_marginRight="@dimen/margin_half"
android:orientation="vertical">
<com.mapswithme.maps.widget.CustomTextInputLayout
@ -36,15 +36,15 @@
android:layout_width="match_parent"
android:layout_height="@dimen/height_item_edit_bookmark"
android:layout_below="@id/ll__bookmark_name"
android:layout_marginLeft="@dimen/margin_small_and_half"
android:layout_marginTop="@dimen/margin_small">
android:layout_marginLeft="@dimen/margin_half_plus"
android:layout_marginTop="@dimen/margin_half">
<TextView
android:id="@+id/tv__bookmark_set_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_extra_large"
android:layout_marginTop="@dimen/margin_medium"
android:layout_marginRight="@dimen/margin_quadruple"
android:layout_marginTop="@dimen/margin_base"
android:text="@string/set"
android:textAppearance="@style/MwmTextAppearance.Body3"/>
@ -54,20 +54,20 @@
android:layout_height="wrap_content"
android:layout_below="@id/tv__bookmark_set_title"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/margin_extra_large"
android:layout_marginRight="@dimen/margin_quadruple"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_down"
android:paddingBottom="@dimen/margin_small"
android:paddingTop="@dimen/margin_tiny_and_half"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_quarter_plus"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/margin_small"
android:layout_marginRight="@dimen/margin_extra_large"
android:layout_marginBottom="@dimen/margin_half"
android:layout_marginRight="@dimen/margin_quadruple"
android:background="@color/base_black_divider"/>
<ImageView
@ -77,7 +77,7 @@
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:background="?attr/clickableBackground"
android:padding="@dimen/margin_small"
android:padding="@dimen/margin_half"
android:src="@drawable/color_picker_red_on"/>
</RelativeLayout>
@ -85,9 +85,9 @@
android:layout_width="match_parent"
android:layout_height="@dimen/height_item_edit_bookmark"
android:layout_below="@id/rl__bookmark_set"
android:layout_margin="@dimen/margin_small"
android:layout_margin="@dimen/margin_half"
android:orientation="vertical"
android:paddingTop="@dimen/margin_medium">
android:paddingTop="@dimen/margin_base">
<com.mapswithme.maps.widget.CustomTextInputLayout
android:layout_width="match_parent"

16
android/res/layout/fragment_app_invites_dialog.xml
View file

@ -14,7 +14,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_medium_and_half"
android:layout_margin="@dimen/margin_base_plus"
android:contentDescription="@null"
android:src="@drawable/img_smile"/>
@ -22,9 +22,9 @@
android:id="@+id/tv__title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/margin_medium"
android:layout_marginLeft="@dimen/margin_medium_and_half"
android:layout_marginRight="@dimen/margin_medium_and_half"
android:layout_marginBottom="@dimen/margin_base"
android:layout_marginLeft="@dimen/margin_base_plus"
android:layout_marginRight="@dimen/margin_base_plus"
android:text="@string/rating_do_like_maps"
android:textAppearance="@style/MwmTextAppearance.Title.Light"
android:textStyle="bold"/>
@ -34,10 +34,10 @@
android:id="@+id/tv__subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_medium_and_half"
android:layout_marginLeft="@dimen/margin_medium_and_half"
android:layout_marginRight="@dimen/margin_medium_and_half"
android:layout_marginTop="@dimen/margin_medium"
android:layout_marginBottom="@dimen/margin_base_plus"
android:layout_marginLeft="@dimen/margin_base_plus"
android:layout_marginRight="@dimen/margin_base_plus"
android:layout_marginTop="@dimen/margin_base"
android:text="@string/rating_tap_star"
android:textAppearance="@style/MwmTextAppearance.Body2"/>

2
android/res/layout/fragment_color_grid.xml
View file

@ -3,6 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/margin_small"
android:paddingTop="@dimen/margin_half"
android:gravity="center"
android:numColumns="4"/>

4
android/res/layout/fragment_direction.xml
View file

@ -32,8 +32,8 @@
android:layout_below="@id/tv__title"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_direction_small"
android:layout_marginLeft="@dimen/margin_medium_and_half"
android:layout_marginRight="@dimen/margin_medium_and_half"
android:layout_marginLeft="@dimen/margin_base_plus"
android:layout_marginRight="@dimen/margin_base_plus"
android:textColor="@color/semitransparent_white"
android:textSize="@dimen/text_direction_subtitle"/>

2
android/res/layout/fragment_downloader.xml
View file

@ -18,7 +18,7 @@
android:layout_gravity="right"
android:background="?attr/selectableItemBackgroundBorderless"
android:gravity="center_vertical"
android:padding="@dimen/margin_small"
android:padding="@dimen/margin_half"
android:text="@string/downloader_update_all"
android:textAppearance="@style/MwmTextAppearance.Toolbar.Button"/>
</android.support.v7.widget.Toolbar>

2
android/res/layout/fragment_edit_bookmark.xml
View file

@ -19,7 +19,7 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:gravity="center_vertical"
android:padding="@dimen/margin_small"
android:padding="@dimen/margin_half"
android:text="@string/save"
android:textAppearance="@style/MwmTextAppearance.Toolbar.Button"/>
</android.support.v7.widget.Toolbar>

6
android/res/layout/fragment_edit_description.xml
View file

@ -19,7 +19,7 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:gravity="center_vertical"
android:padding="@dimen/margin_small"
android:padding="@dimen/margin_half"
android:text="@string/save"
android:textAppearance="@style/MwmTextAppearance.Toolbar.Button"/>
</android.support.v7.widget.Toolbar>
@ -29,8 +29,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
android:paddingLeft="@dimen/margin_medium"
android:paddingRight="@dimen/margin_medium">
android:paddingLeft="@dimen/margin_base"
android:paddingRight="@dimen/margin_base">
<EditText
android:id="@+id/et__description"

16
android/res/layout/fragment_google_play_dialog.xml
View file

@ -8,10 +8,10 @@
android:id="@+id/tv__title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_medium_and_half"
android:layout_marginRight="@dimen/margin_medium_and_half"
android:layout_marginTop="@dimen/margin_medium_and_half"
android:layout_marginBottom="@dimen/margin_half"
android:layout_marginLeft="@dimen/margin_base_plus"
android:layout_marginRight="@dimen/margin_base_plus"
android:layout_marginTop="@dimen/margin_base_plus"
android:fontFamily="@string/robotoMedium"
android:text="@string/rating_do_like_maps"
android:textColor="@color/text_dark"
@ -22,9 +22,9 @@
android:id="@+id/tv__subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_medium_and_half"
android:layout_marginLeft="@dimen/margin_medium_and_half"
android:layout_marginRight="@dimen/margin_medium_and_half"
android:layout_marginBottom="@dimen/margin_base_plus"
android:layout_marginLeft="@dimen/margin_base_plus"
android:layout_marginRight="@dimen/margin_base_plus"
android:fontFamily="@string/robotoRegular"
android:text="@string/rating_tap_star"
android:textColor="@color/text_dark_subtitle"
@ -59,7 +59,7 @@
android:drawableLeft="@drawable/ic_rate_send"
android:fontFamily="@string/robotoRegular"
android:gravity="center_vertical"
android:padding="@dimen/margin_medium"
android:padding="@dimen/margin_base"
android:text="@string/rating_send_feedback"
android:textColor="@color/text_dark"
android:visibility="gone"/>

8
android/res/layout/fragment_google_plus_dialog.xml
View file

@ -9,7 +9,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="@dimen/margin_medium"
android:padding="@dimen/margin_base"
android:src="@drawable/ic_launcher"/>
<TextView
@ -18,14 +18,14 @@
android:textSize="20sp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="@dimen/margin_small"
android:padding="@dimen/margin_half"
android:text="@string/rating_do_like_maps"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@string/robotoLight"
android:padding="@dimen/margin_small"
android:padding="@dimen/margin_half"
android:textSize="14sp"
android:text="@string/rating_google_plus"/>
@ -39,7 +39,7 @@
xmlns:plus="http://schemas.android.com/apk/lib/com.google.android.gms.plus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_small"
android:layout_margin="@dimen/margin_half"
plus:annotation="inline"
plus:size="normal"/>

6
android/res/layout/item_bookmark.xml
View file

@ -9,8 +9,8 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/margin_medium"
android:layout_marginRight="@dimen/margin_medium"/>
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"/>
<TextView
android:id="@+id/tv__bookmark_name"
@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/margin_medium"
android:layout_marginRight="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body3"/>
</RelativeLayout>

6
android/res/layout/item_bookmark_category.xml
View file

@ -4,8 +4,8 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="@dimen/height_item_oneline"
android:paddingLeft="@dimen/margin_medium"
android:paddingRight="@dimen/margin_medium">
android:paddingLeft="@dimen/margin_base"
android:paddingRight="@dimen/margin_base">
<CheckBox
android:id="@+id/chb__set_visible"
@ -20,7 +20,7 @@
android:id="@+id/tv__set_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_medium"
android:layout_marginLeft="@dimen/margin_base"
android:layout_weight="1"
android:ellipsize="marquee"
android:singleLine="true"

8
android/res/layout/item_bookmark_hint.xml
View file

@ -5,9 +5,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="@dimen/dp_x_3"
android:paddingLeft="@dimen/dp_x_8"
android:paddingRight="@dimen/dp_x_8"
android:paddingTop="@dimen/dp_x_3"
android:paddingBottom="@dimen/margin_base"
android:paddingLeft="@dimen/margin_double_plus"
android:paddingRight="@dimen/margin_double_plus"
android:paddingTop="@dimen/margin_base"
android:text="@string/bookmarks_usage_hint"
android:textAppearance="@style/MwmTextAppearance.Body2"/>

4
android/res/layout/item_bookmark_set_chooser.xml
View file

@ -5,8 +5,8 @@
android:layout_height="48dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/margin_medium"
android:paddingRight="@dimen/margin_medium">
android:paddingLeft="@dimen/margin_base"
android:paddingRight="@dimen/margin_base">
<TextView
android:id="@+id/tv__set_name"

4
android/res/layout/item_bookmark_set_create.xml
View file

@ -3,8 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="48dp"
android:paddingLeft="@dimen/margin_medium"
android:paddingRight="@dimen/margin_medium">
android:paddingLeft="@dimen/margin_base"
android:paddingRight="@dimen/margin_base">
<TextView
android:id="@+id/chs_footer_button"

4
android/res/layout/item_category_title.xml
View file

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/height_item_oneline"
android:gravity="left|center_vertical"
android:paddingLeft="@dimen/margin_medium"
android:paddingTop="@dimen/margin_small"
android:paddingLeft="@dimen/margin_base"
android:paddingTop="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:text="@string/bookmarks"/>

14
android/res/layout/item_search.xml
View file

@ -7,16 +7,16 @@
android:gravity="top"
android:minHeight="@dimen/search_item_height"
android:orientation="horizontal"
android:paddingBottom="@dimen/margin_medium"
android:paddingLeft="@dimen/margin_medium"
android:paddingRight="@dimen/margin_medium"
android:paddingTop="@dimen/margin_medium">
android:paddingBottom="@dimen/margin_base"
android:paddingLeft="@dimen/margin_base"
android:paddingRight="@dimen/margin_base"
android:paddingTop="@dimen/margin_base">
<ImageView
android:id="@+id/iv__search_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_medium"
android:layout_marginRight="@dimen/margin_base"
android:contentDescription="@null"/>
<LinearLayout
@ -30,7 +30,7 @@
android:id="@+id/tv__search_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_tiny"
android:layout_marginBottom="@dimen/margin_quarter"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
<TextView
@ -52,7 +52,7 @@
android:id="@+id/tv_search_item_type"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/margin_tiny"
android:layout_marginBottom="@dimen/margin_quarter"
android:layout_weight="1"
android:gravity="top"
android:textAppearance="@style/MwmTextAppearance.Body3"/>

6
android/res/layout/item_search_category.xml
View file

@ -4,8 +4,8 @@
android:layout_height="@dimen/search_item_height"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/margin_medium"
android:paddingRight="@dimen/margin_medium">
android:paddingLeft="@dimen/margin_base"
android:paddingRight="@dimen/margin_base">
<ImageView
android:id="@+id/iv__search_category"
@ -20,7 +20,7 @@
android:id="@+id/tv__search_category"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_medium"
android:layout_marginLeft="@dimen/margin_base"
android:layout_weight="1"
android:textAppearance="@style/MwmTextAppearance.Body1"/>

2
android/res/layout/item_search_message.xml
View file

@ -6,7 +6,7 @@
android:gravity="center_vertical"
android:minHeight="@dimen/search_item_height"
android:orientation="horizontal"
android:padding="@dimen/margin_medium">
android:padding="@dimen/margin_base">
<ImageView
android:id="@+id/iv__search_image"

6
android/res/layout/item_track.xml
View file

@ -9,8 +9,8 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/margin_medium"
android:layout_marginRight="@dimen/margin_medium"/>
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"/>
<TextView
android:id="@+id/tv__bookmark_name"
@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/margin_medium"
android:layout_marginRight="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body2"/>
</RelativeLayout>

6
android/res/layout/map_navigation_buttons.xml
View file

@ -3,18 +3,20 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/margin_small">
android:padding="@dimen/margin_quarter">
<ImageButton
android:id="@+id/btn__myposition"
style="@style/MwmWidget.MapButton.White"
android:layout_alignParentBottom="true"
android:contentDescription="@string/my_position"
android:src="@drawable/bg_btn_white"/>
<ImageButton
android:id="@+id/yop_it"
style="@style/MwmWidget.MapButton.White"
android:layout_alignParentRight="true"
android:contentDescription="@null"
android:src="@drawable/ic_btn_yota_ptb"/>
<android.support.v4.widget.Space
@ -28,6 +30,7 @@
style="@style/MwmWidget.MapButton.Zoom"
android:layout_above="@id/space_bottom"
android:layout_alignParentRight="true"
android:contentDescription="@null"
android:src="@drawable/btn_white_zoom_out"/>
<ImageButton
@ -35,6 +38,7 @@
style="@style/MwmWidget.MapButton.Zoom"
android:layout_above="@id/map_button_minus"
android:layout_alignParentRight="true"
android:contentDescription="@null"
android:src="@drawable/btn_white_zoom_in"/>
</RelativeLayout>

2
android/res/layout/map_routing_box.xml
View file

@ -45,7 +45,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?attr/clickableBackground"
android:padding="@dimen/margin_medium"
android:padding="@dimen/margin_base"
android:scaleType="center"
android:src="@drawable/ic_close_routing"/>

2
android/res/layout/map_turn_instructions.xml
View file

@ -11,7 +11,7 @@
style="@style/TextAppearance.AppCompat.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_medium"/>
android:layout_marginLeft="@dimen/margin_base"/>
<TextView
android:id="@+id/tv__total_time"

24
android/res/layout/place_page_bookmark_details.xml
View file

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:paddingBottom="@dimen/margin_medium"
android:paddingBottom="@dimen/margin_base"
android:visibility="invisible">
<View
@ -17,8 +17,8 @@
android:id="@+id/layout__bookmark_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_small"
android:layout_marginTop="@dimen/margin_medium">
android:layout_marginBottom="@dimen/margin_half"
android:layout_marginTop="@dimen/margin_base">
<EditText
android:id="@+id/et__bookmark_name"
@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:layout_alignLeft="@id/layout__bookmark_name"
android:layout_below="@id/layout__bookmark_name"
android:layout_marginTop="@dimen/margin_medium_and_half"
android:layout_marginTop="@dimen/margin_base_plus"
android:lineSpacingMultiplier="1.67"
android:text="@string/set"
android:textColor="@color/text_place_page_subtitle"
@ -62,9 +62,9 @@
android:background="?attr/clickableBackground"
android:drawableRight="@drawable/ic_arrow_down"
android:lineSpacingMultiplier="1.43"
android:paddingBottom="@dimen/margin_small"
android:paddingRight="@dimen/margin_small"
android:paddingTop="@dimen/margin_small"
android:paddingBottom="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:paddingTop="@dimen/margin_half"
android:textColor="@color/text_place_page"
android:textSize="@dimen/place_page_subtitle"/>
@ -72,7 +72,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/tv__bookmark_group"
android:layout_marginTop="@dimen/margin_tiny"
android:layout_marginTop="@dimen/margin_quarter"
android:layout_toLeftOf="@+id/iv__bookmark_color"
android:background="?attr/dividerHorizontal"/>
@ -84,7 +84,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="-8dp"
android:background="?attr/clickableBackground"
android:padding="@dimen/margin_small"
android:padding="@dimen/margin_half"
android:src="@drawable/color_picker_red_on"/>
</RelativeLayout>
@ -94,8 +94,8 @@
android:layout_height="wrap_content"
android:layout_alignLeft="@id/layout__bookmark_name"
android:layout_below="@id/ll__group"
android:layout_marginBottom="@dimen/margin_small"
android:layout_marginTop="@dimen/margin_medium"
android:layout_marginBottom="@dimen/margin_half"
android:layout_marginTop="@dimen/margin_base"
android:clickable="true"
android:lineSpacingMultiplier="1.67"
android:text="@string/description"
@ -114,7 +114,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@id/wv__description"
android:layout_marginRight="@dimen/margin_medium"
android:layout_marginRight="@dimen/margin_base"
android:background="?attr/selectableItemBackground"
android:text="@string/edit"
android:textAppearance="@style/MwmTextAppearance.Button"/>

12
android/res/layout/place_page_buttons.xml
View file

@ -4,14 +4,14 @@
android:layout_height="wrap_content"
android:background="@color/bg_top_panels"
android:orientation="vertical"
android:paddingLeft="@dimen/margin_small_and_half"
android:paddingRight="@dimen/margin_small_and_half">
android:paddingLeft="@dimen/margin_half_plus"
android:paddingRight="@dimen/margin_half_plus">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="@dimen/margin_small_and_half"
android:layout_marginRight="@dimen/margin_small_and_half"
android:layout_marginLeft="@dimen/margin_half_plus"
android:layout_marginRight="@dimen/margin_half_plus"
android:background="?android:attr/listDivider"/>
<LinearLayout
@ -19,8 +19,8 @@
android:layout_height="@dimen/place_page_buttons_height"
android:baselineAligned="false"
android:orientation="horizontal"
android:paddingLeft="@dimen/margin_small_and_half"
android:paddingRight="@dimen/margin_small_and_half">
android:paddingLeft="@dimen/margin_half_plus"
android:paddingRight="@dimen/margin_half_plus">
<LinearLayout
android:id="@+id/rl__api_back"

10
android/res/layout/place_page_details_common.xml
View file

@ -6,14 +6,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="@dimen/margin_medium_and_half"
android:paddingRight="@dimen/margin_medium_and_half"
android:paddingTop="@dimen/margin_medium">
android:paddingLeft="@dimen/margin_base_plus"
android:paddingRight="@dimen/margin_base_plus"
android:paddingTop="@dimen/margin_base">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginBottom="@dimen/margin_small"
android:layout_marginBottom="@dimen/margin_half"
android:background="?android:attr/listDivider"/>
<include layout="@layout/place_page_placename"/>
@ -35,7 +35,7 @@
<View
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_marginBottom="@dimen/margin_small"/>
android:layout_marginBottom="@dimen/margin_half"/>
<include
layout="@layout/place_page_bookmark_details"

6
android/res/layout/place_page_email.xml
View file

@ -7,8 +7,8 @@
android:background="?attr/clickableBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="@dimen/margin_small"
android:paddingTop="@dimen/margin_small"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half"
android:tag="email"
android:visibility="gone">
@ -16,7 +16,7 @@
android:id="@+id/iv__place_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_large"
android:layout_marginRight="@dimen/margin_double"
android:src="@drawable/ic_email"/>
<TextView

6
android/res/layout/place_page_latlon.xml
View file

@ -7,15 +7,15 @@
android:background="?attr/clickableBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="@dimen/margin_small"
android:paddingTop="@dimen/margin_small"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half"
android:tag="latlon">
<ImageView
android:id="@+id/iv__place_latlon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_large"
android:layout_marginRight="@dimen/margin_double"
android:src="@drawable/ic_text_position"/>
<TextView

6
android/res/layout/place_page_operator.xml
View file

@ -7,8 +7,8 @@
android:background="?attr/clickableBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="@dimen/margin_small"
android:paddingTop="@dimen/margin_small"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half"
android:tag="operator"
android:visibility="gone">
@ -16,7 +16,7 @@
android:id="@+id/iv__place_operator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_large"
android:layout_marginRight="@dimen/margin_double"
android:src="@drawable/ic_bank_operator"/>
<TextView

6
android/res/layout/place_page_phone.xml
View file

@ -7,8 +7,8 @@
android:background="?attr/clickableBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="@dimen/margin_small"
android:paddingTop="@dimen/margin_small"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half"
android:tag="phone"
android:visibility="gone">
@ -16,7 +16,7 @@
android:id="@+id/iv__place_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_large"
android:layout_marginRight="@dimen/margin_double"
android:src="@drawable/ic_text_phone"/>
<TextView

6
android/res/layout/place_page_placename.xml
View file

@ -7,15 +7,15 @@
android:background="?attr/clickableBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="@dimen/margin_small"
android:paddingTop="@dimen/margin_small"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half"
android:visibility="gone">
<ImageView
android:id="@+id/iv__place_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_large"
android:layout_marginRight="@dimen/margin_double"
android:src="@drawable/ic_text_adress"/>
<TextView

6
android/res/layout/place_page_preview_common.xml
View file

@ -20,7 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv__title"
android:layout_marginRight="@dimen/margin_medium"
android:layout_marginRight="@dimen/margin_base"
android:textColor="@color/text_place_page_subtitle"
android:textSize="@dimen/place_page_subtitle"/>
@ -40,7 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/tv__subtitle"
android:layout_marginBottom="@dimen/margin_micro"
android:layout_marginBottom="@dimen/margin_eighth"
android:layout_toRightOf="@id/tv__subtitle"
android:numStars="5"
android:progressDrawable="@drawable/rating_bar_stars"
@ -74,7 +74,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="-8dp"
android:clickable="true"
android:padding="@dimen/margin_small"/>
android:padding="@dimen/margin_half"/>
</merge>

6
android/res/layout/place_page_schedule.xml
View file

@ -7,8 +7,8 @@
android:background="?attr/clickableBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="@dimen/margin_small"
android:paddingTop="@dimen/margin_small"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half"
android:tag="schedule"
android:visibility="gone">
@ -16,7 +16,7 @@
android:id="@+id/iv__place_schedule"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_large"
android:layout_marginRight="@dimen/margin_double"
android:src="@drawable/ic_text_worktime"/>
<TextView

6
android/res/layout/place_page_website.xml
View file

@ -7,8 +7,8 @@
android:background="?attr/clickableBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="@dimen/margin_small"
android:paddingTop="@dimen/margin_small"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half"
android:tag="website"
android:visibility="gone">
@ -16,7 +16,7 @@
android:id="@+id/iv__place_website"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_large"
android:layout_marginRight="@dimen/margin_double"
android:src="@drawable/ic_text_link"/>
<TextView

6
android/res/layout/place_page_wifi.xml
View file

@ -7,15 +7,15 @@
android:background="?attr/clickableBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="@dimen/margin_small"
android:paddingTop="@dimen/margin_small"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half"
android:visibility="gone">
<ImageView
android:id="@+id/iv__place_wifi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_large"
android:layout_marginRight="@dimen/margin_double"
android:src="@drawable/ic_text_wifi"/>
<TextView

8
android/res/layout/search_box.xml
View file

@ -20,7 +20,7 @@
android:hint="@string/search"
android:imeOptions="actionSearch|flagNoExtractUi"
android:inputType="text"
android:padding="@dimen/margin_tiny"
android:padding="@dimen/margin_quarter"
android:singleLine="true"
android:textCursorDrawable="@drawable/cursor_drawable"/>
@ -29,7 +29,7 @@
style="@style/Widget.AppCompat.ProgressBar"
android:layout_width="@dimen/routing_progress_size"
android:layout_height="@dimen/routing_progress_size"
android:layout_marginRight="@dimen/margin_small"
android:layout_marginRight="@dimen/margin_half"
android:layout_weight="0"
android:background="@android:color/transparent"/>
@ -41,7 +41,7 @@
android:layout_weight="0"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@null"
android:padding="@dimen/margin_medium"
android:padding="@dimen/margin_base"
android:src="@drawable/ic_close_w"/>
<ImageView
@ -52,7 +52,7 @@
android:layout_weight="0"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@null"
android:padding="@dimen/margin_medium"
android:padding="@dimen/margin_base"
android:src="@drawable/ic_mic_white"
android:visibility="gone"/>

56
android/res/values/dimens.xml
View file

@ -3,54 +3,34 @@
<dimen name="track_circle_size">40dp</dimen>
<dimen name="margin_micro">2dp</dimen>
<dimen name="margin_tiny">4dp</dimen>
<dimen name="margin_tiny_and_half">6dp</dimen>
<dimen name="margin_small">8dp</dimen>
<dimen name="margin_small_and_half">12dp</dimen>
<dimen name="margin_medium">16dp</dimen>
<dimen name="margin_medium_and_half">24dp</dimen>
<dimen name="margin_large">32dp</dimen>
<dimen name="margin_large_and_half">48dp</dimen>
<dimen name="margin_extra_large">64dp</dimen>
<dimen name="margin_eighth">2dp</dimen>
<dimen name="margin_quarter">4dp</dimen>
<dimen name="margin_quarter_plus">6dp</dimen>
<dimen name="margin_half">8dp</dimen>
<dimen name="margin_half_plus">12dp</dimen>
<dimen name="margin_base">16dp</dimen>
<dimen name="margin_base_plus">24dp</dimen>
<dimen name="margin_double">32dp</dimen>
<dimen name="margin_double_plus">48dp</dimen>
<dimen name="margin_quadruple">64dp</dimen>
<dimen name="neg_margin_micro">-2dp</dimen>
<dimen name="neg_margin_tiny">-4dp</dimen>
<dimen name="neg_margin_tiny_and_half">-6dp</dimen>
<dimen name="neg_margin_small">-8dp</dimen>
<dimen name="neg_margin_small_and_half">-12dp</dimen>
<dimen name="neg_margin_medium">-16dp</dimen>
<dimen name="neg_margin_large">-32dp</dimen>
<!-- TODO remove all that dimens -->
<dimen name="dp_x_1">4dp</dimen>
<dimen name="dp_x_2">8dp</dimen>
<dimen name="dp_x_3">12dp</dimen>
<dimen name="dp_x_4">16dp</dimen>
<dimen name="dp_x_6">24dp</dimen>
<dimen name="dp_x_8">32dp</dimen>
<dimen name="dp_x_10">40dp</dimen>
<dimen name="dp_x_12">48dp</dimen>
<dimen name="dp_x_14">56dp</dimen>
<dimen name="dp_x_16">64dp</dimen>
<dimen name="dp_x_20">80dp</dimen>
<dimen name="neg_margin_eighth">-2dp</dimen>
<dimen name="neg_margin_quarter">-4dp</dimen>
<dimen name="neg_margin_quarter_plus">-6dp</dimen>
<dimen name="neg_margin_half">-8dp</dimen>
<dimen name="neg_margin_half_plus">-12dp</dimen>
<dimen name="neg_margin_base">-16dp</dimen>
<dimen name="neg_margin_double">-32dp</dimen>
<dimen name="dialog_max_height">320dp</dimen>
<dimen name="zoom_buttom_size">56dp</dimen>
<dimen name="search_item_height">56dp</dimen>
<dimen name="search_box_height">56dp</dimen>
<dimen name="place_page_buttons_height">56dp</dimen>
<dimen name="bottom_panel_height">46dp</dimen>
<dimen name="bottom_button_width">113dp</dimen>
<dimen name="bottom_item_height">46dp</dimen>
<dimen name="progress_wheel_width">48dp</dimen>
<dimen name="progress_wheel_height">40dp</dimen>
<dimen name="progress_wheel_width_neg">-48dp</dimen>
<dimen name="bg_downloader_radius">6dp</dimen>
<dimen name="bg_downloader_size">16dp</dimen>
<dimen name="routing_pp_height">55dp</dimen>
<dimen name="routing_button_height">51dp</dimen>
@ -70,7 +50,7 @@
<dimen name="margin_bottom_zoom_buttons">250dp</dimen>
<!-- map widgets -->
<dimen name="margin_bottom_compass">104dp</dimen>
<dimen name="margin_bottom_compass">120dp</dimen>
<dimen name="margin_bottom_ruler">10dp</dimen>
<dimen name="margin_left_compass">40dp</dimen>
<dimen name="margin_right_ruler">75dp</dimen>

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

@ -137,7 +137,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:maxWidth">200dp</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_marginRight">@dimen/margin_small</item>
<item name="android:layout_marginRight">@dimen/margin_half</item>
<item name="android:gravity">right</item>
<item name="android:textAllCaps">true</item>
</style>

18
android/res/values/styles_place_page.xml
View file

@ -6,10 +6,10 @@
<item name="android:layout_height">56dp</item>
<item name="android:gravity">center_vertical</item>
<item name="android:orientation">horizontal</item>
<item name="android:paddingBottom">@dimen/margin_small_and_half</item>
<item name="android:paddingLeft">@dimen/margin_medium_and_half</item>
<item name="android:paddingRight">@dimen/margin_medium_and_half</item>
<item name="android:paddingTop">@dimen/margin_medium_and_half</item>
<item name="android:paddingBottom">@dimen/margin_half_plus</item>
<item name="android:paddingLeft">@dimen/margin_base_plus</item>
<item name="android:paddingRight">@dimen/margin_base_plus</item>
<item name="android:paddingTop">@dimen/margin_base_plus</item>
</style>
<style name="PlacePageButtonText">
@ -17,7 +17,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:textAllCaps">true</item>
<item name="android:textColor">@color/text_place_page_buttons</item>
<item name="android:layout_marginTop">@dimen/margin_micro</item>
<item name="android:layout_marginTop">@dimen/margin_eighth</item>
<item name="android:textSize">10sp</item>
</style>
@ -25,8 +25,8 @@
<item name="android:layout_width">24dp</item>
<item name="android:layout_height">0dp</item>
<item name="android:layout_weight">1</item>
<item name="android:paddingTop">@dimen/margin_medium</item>
<item name="android:paddingBottom">@dimen/margin_medium</item>
<item name="android:paddingTop">@dimen/margin_base</item>
<item name="android:paddingBottom">@dimen/margin_base</item>
<item name="android:scaleType">center</item>
</style>
@ -36,9 +36,9 @@
<item name="android:layout_gravity">center_horizontal</item>
<item name="android:layout_weight">1</item>
<item name="android:orientation">vertical</item>
<item name="android:paddingTop">@dimen/margin_small</item>
<item name="android:paddingTop">@dimen/margin_half</item>
<item name="android:background">?attr/clickableBackground</item>
<item name="android:paddingBottom">@dimen/margin_small</item>
<item name="android:paddingBottom">@dimen/margin_half</item>
<item name="android:gravity">center_horizontal</item>
</style>
</resources>