kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Bottom menu text fix.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-06-03 13:45:16 +03:00 • committed by Alex Zolotarev
parent 342b3ae30c
commit f4eac73b52
4 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
android/res/layout/map_bottom_buttons.xml
View file

@ -18,12 +18,9 @@
<TextView
android:id="@+id/tv__bookmarks"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_small"
style="@style/MwmWidget.TextView.BottomMenu"
android:text="@string/bookmarks"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1.Light.Clickable"/>
android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
<ImageView
android:id="@+id/btn__bookmarks"
@ -46,12 +43,9 @@
<TextView
android:id="@+id/tv__download_maps"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_small"
style="@style/MwmWidget.TextView.BottomMenu"
android:text="@string/download_maps"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1.Light.Clickable"/>
android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
<ImageView
android:id="@+id/btn__download_maps"
@ -74,12 +68,9 @@
<TextView
android:id="@+id/tv__settings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_small"
style="@style/MwmWidget.TextView.BottomMenu"
android:text="@string/settings"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1.Light.Clickable"/>
android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
<ImageView
android:id="@+id/btn__settings"
@ -102,12 +93,9 @@
<TextView
android:id="@+id/tv__share"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_small"
style="@style/MwmWidget.TextView.BottomMenu"
android:text="@string/share_my_location"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1.Light.Clickable"/>
android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
<ImageView
android:id="@+id/btn__share"
@ -129,12 +117,9 @@
<TextView
android:id="@+id/tv__search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_small"
style="@style/MwmWidget.TextView.BottomMenu"
android:text="@string/search"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1.Light.Clickable"/>
android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
<ImageView
android:id="@+id/btn__search"

2
android/res/values-land/dimens.xml
View file

@ -3,6 +3,6 @@
<dimen name="zoom_plus_top_margin">-10dp</dimen>
<dimen name="drawer_top_padding">12dp</dimen>
<dimen name="margin_bottom_zoom_buttons">180dp</dimen>
<dimen name="margin_bottom_zoom_buttons">150dp</dimen>
</resources>

1
android/res/values-sw600dp-land/dimens.xml
View file

@ -3,5 +3,6 @@
<dimen name="bottom_panel_height">70dp</dimen>
<dimen name="bottom_button_width">60dp</dimen>
<dimen name="zoom_plus_top_margin">50dp</dimen>
<dimen name="margin_bottom_zoom_buttons">250dp</dimen>
</resources>

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

@ -107,6 +107,18 @@
<item name="android:textSize">@dimen/text_size_headline</item>
</style>
<style name="MwmWidget.TextView.BottomMenu">
<item name="android:maxLines">2</item>
<item name="android:textColor">@color/color_menu_text</item>
<item name="android:layout_width">0dp</item>
<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:gravity">right</item>
<item name="android:textAllCaps">true</item>
</style>
<style name="MwmWidget.FrameLayout"/>
<style name="MwmWidget.FrameLayout.Elevation">
@ -186,10 +198,6 @@
<item name="android:textColor">@color/text_light</item>
</style>
<style name="MwmTextAppearance.Body1.Light.Clickable">
<item name="android:textColor">@color/color_menu_text</item>
</style>
<style name="MwmTextAppearance.Body2">
<item name="android:textSize">@dimen/text_size_body_2</item>
<item name="android:textColor">@color/text_dark_subtitle</item>