Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'r2.0' of github.com:osmandapp/Osmand into r2.0

Browse source
This commit is contained in:
Victor Shcherb 2015-05-31 18:55:16 +02:00
commit 24a7543840
5 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/layout/preference_activity.xml
View file

@ -18,7 +18,8 @@
android:id="@+id/spinner_nav" android:id="@+id/spinner_nav"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"/> android:layout_gravity="center_horizontal"
android:popupBackground="?attr/spinnerListBackground"/>
<ProgressBar android:id="@+id/ProgressBar" <ProgressBar android:id="@+id/ProgressBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"

16
OsmAnd/res/layout/spinner_dropdown_item.xml
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1" android:id="@android:id/text1"
android:singleLine="true" android:singleLine="true"
android:background="?attr/expandable_list_background" android:textColor="?attr/spinnerItemTextColor"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp" android:padding="10dp"
android:ellipsize="marquee"/> android:ellipsize="marquee"/>

1
OsmAnd/res/values/attrs.xml
View file

@ -12,6 +12,7 @@
<attr name="btn_flat_bg" format="reference" /> <attr name="btn_flat_bg" format="reference" />
<attr name="card_bg_color" format="reference" /> <attr name="card_bg_color" format="reference" />
<attr name="spinnerItemTextColor" format="reference" /> <attr name="spinnerItemTextColor" format="reference" />
<attr name="spinnerListBackground" format="color|reference" />
<attr name="dashboard_divider" format="reference" /> <attr name="dashboard_divider" format="reference" />
<attr name="dashboard_button" format="reference" /> <attr name="dashboard_button" format="reference" />
<attr name="search_background" format="reference" /> <attr name="search_background" format="reference" />

3
OsmAnd/res/values/colors.xml
View file

@ -151,4 +151,7 @@
<color name="plugin_details_install_header_bg_light">#dbdbdb</color> <color name="plugin_details_install_header_bg_light">#dbdbdb</color>
<color name="plugin_details_install_header_bg_dark">#2d3438</color> <color name="plugin_details_install_header_bg_dark">#2d3438</color>
<color name="spinner_list_background_light">#eeeeee</color>
<color name="spinner_list_background_dark">#303030</color>
</resources> </resources>

4
OsmAnd/res/values/styles.xml
View file

@ -86,7 +86,8 @@
<item name="dashboard_general_button_text_color">@color/dashboard_general_button_text_light</item> <item name="dashboard_general_button_text_color">@color/dashboard_general_button_text_light</item>
<item name="android:listChoiceIndicatorMultiple">@drawable/check_light</item> <item name="android:listChoiceIndicatorMultiple">@drawable/check_light</item>
<item name="android:textColorPrimary">@color/color_black</item> <item name="android:textColorPrimary">@color/color_black</item>
<item name="spinnerItemTextColor">@color/color_white</item> <item name="spinnerItemTextColor">@color/color_black</item>
<item name="spinnerListBackground">@color/spinner_list_background_light</item>
<item name="android:actionModeBackground">@color/actionbar_light_color</item> <item name="android:actionModeBackground">@color/actionbar_light_color</item>
<item name="android:actionBarStyle">@style/Widget.Styled.ActionBarLight</item> <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
@ -128,6 +129,7 @@
<item name="android:listChoiceIndicatorMultiple">@drawable/check_dark</item> <item name="android:listChoiceIndicatorMultiple">@drawable/check_dark</item>
<item name="android:textColorPrimary">@color/color_white</item> <item name="android:textColorPrimary">@color/color_white</item>
<item name="spinnerItemTextColor">@color/color_white</item> <item name="spinnerItemTextColor">@color/color_white</item>
<item name="spinnerListBackground">@color/spinner_list_background_dark</item>
<item name="android:actionModeBackground">@color/actionbar_dark_color</item> <item name="android:actionModeBackground">@color/actionbar_dark_color</item>