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

Styles and layouts changes.

Browse source
This commit is contained in:
Dmitry Yunitsky 2014-07-10 18:24:58 +02:00 • committed by Alex Zolotarev
parent 08c67cd62d
commit 58160c87c7
10 changed files with 49 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/flavors/lite/res/layout/map_bottom_vertical_toolbar.xml
View file

@ -15,7 +15,7 @@
android:paddingLeft="10dp"/>
<View
style="@style/drawerSeparator"/>
style="@style/drawerSeparatorMediumPadded"/>
<TextView
android:id="@+id/btn_download_maps"
@ -29,7 +29,7 @@
android:textColor="@android:color/white"/>
<View
style="@style/drawerSeparator"/>
style="@style/drawerSeparatorMediumPadded"/>
<TextView
android:id="@+id/btn_share"
@ -43,7 +43,7 @@
android:textColor="@android:color/white"/>
<View
style="@style/drawerSeparator"/>
style="@style/drawerSeparatorMediumPadded"/>
<TextView
android:id="@+id/btn_more_apps"
@ -57,7 +57,7 @@
android:textColor="@android:color/white"/>
<View
style="@style/drawerSeparator"/>
style="@style/drawerSeparatorMediumPadded"/>
<TextView
android:id="@+id/btn_settings"

10
android/res/drawable/separator_medium_padded.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:left="@dimen/margin_medium"
android:right="@dimen/margin_medium">
<shape>
<solid android:color="@color/semitransparent_white"/>
</shape>
</item>
</layer-list>

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

@ -24,7 +24,7 @@
android:textColor="@android:color/white"/>
<View
style="@style/drawerSeparator"/>
style="@style/drawerSeparatorMediumPadded"/>
<TextView
android:id="@+id/btn_share"
@ -38,7 +38,7 @@
android:textColor="@android:color/white"/>
<View
style="@style/drawerSeparator"/>
style="@style/drawerSeparatorMediumPadded"/>
<TextView
android:id="@+id/btn_more_apps"
@ -52,7 +52,7 @@
android:textColor="@android:color/white"/>
<View
style="@style/drawerSeparator"/>
style="@style/drawerSeparatorMediumPadded"/>
<TextView
android:id="@+id/btn_settings"

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

@ -47,10 +47,10 @@
android:fontFamily="@string/robotoRegular"
android:imeOptions="actionDone"
android:inputType="text"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp"
android:paddingBottom="@dimen/dp_x_1"
android:paddingLeft="@dimen/dp_x_2"
android:paddingRight="@dimen/dp_x_2"
android:paddingTop="@dimen/dp_x_2"
android:singleLine="true"
android:textColor="@android:color/white"/>

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

@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/search_item_height"
android:background="@drawable/bg_toolbar_button_selector"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/margin_medium">
android:paddingLeft="@dimen/margin_medium"
android:paddingRight="@dimen/margin_medium">
<ImageView
android:id="@+id/iv_search_category"

22
android/res/layout/search_item.xml
View file

@ -3,16 +3,15 @@
android:id="@+id/LinearLayout1"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/search_item_height"
android:background="@drawable/bg_toolbar_button_selector"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="4dp">
android:paddingLeft="@dimen/margin_medium"
android:paddingRight="@dimen/margin_medium">
<ImageView
android:id="@+id/iv_search_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_menu_about"/>
@ -21,16 +20,17 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="@dimen/margin_small"
android:gravity="left|center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/tv_search_item_title"
android:layout_width="match_parent"
android:textColor="@color/text_search_item"
android:layout_height="wrap_content"
android:fontFamily="@string/robotoLight"
android:textAppearance="@style/Holo.TextAppearance.Medium.Light"/>
android:textAppearance="@style/Holo.TextAppearance.Medium.Light"
android:textColor="@color/text_search_item"/>
<TextView
android:id="@+id/tv_search_item_subtitle"
@ -53,18 +53,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@string/robotoRegular"
android:textSize="12sp"
android:textAppearance="@style/Holo.TextAppearance.Medium.Light"
android:textColor="@color/text_search_item"/>
android:textColor="@color/text_search_item"
android:textSize="12sp"/>
<TextView
android:id="@+id/tv_search_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:fontFamily="@string/robotoRegular"
android:textAppearance="@style/Holo.TextAppearance.Medium.Light"
android:textColor="@color/text_search_item"/>
android:textColor="@color/text_search_item"
android:textSize="16sp"/>
</LinearLayout>

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

@ -17,8 +17,8 @@
android:layout_height="match_parent"
android:animationCache="false"
android:background="@color/bg_bottom_toolbar"
android:divider="@drawable/horizontal_two_px_separator"
android:dividerHeight="1dp"
android:divider="@drawable/separator_medium_padded"
android:dividerHeight="1px"
android:scrollbarStyle="outsideOverlay"
android:scrollingCache="false"/>

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

@ -1,14 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/search_item_height"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="8dp">
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"

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

@ -37,4 +37,5 @@
<dimen name="zoom_margin_right">4dp</dimen>
<dimen name="map_controls_margin">7dp</dimen>
<dimen name="bottom_panel_height">46dp</dimen>
<dimen name="search_item_height">@dimen/dp_x_14</dimen>
</resources>

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

@ -74,6 +74,7 @@
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation</item>
<item name="android:divider">@drawable/separator_medium_padded</item>
</style>
<!-- Dialog Holo.Light theme for Activity -->
@ -97,11 +98,17 @@
</style>
<style name="drawerSeparator">
<item name="android:layout_height">1dp</item>
<item name="android:layout_height">1px</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_marginRight">@dimen/dp_x_2</item>
<item name="android:layout_marginLeft">@dimen/dp_x_2</item>
<item name="android:background">@color/semitransparent_white</item>
<item name="android:background">@color/ui_20_background_grey</item>
</style>
<style name="drawerSeparatorMediumPadded" parent="drawerSeparator">
<item name="android:layout_marginRight">0dp</item>
<item name="android:layout_marginLeft">0dp</item>
<item name="android:background">@drawable/separator_medium_padded</item>
</style>
<style name="Widget.MapButtonDrawer">