Added check icons and updated style for download button

This commit is contained in:
Denis 2015-01-30 14:40:33 +02:00
parent f7a7e7842e
commit 783ba4d182
40 changed files with 42 additions and 10 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 948 B

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 651 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 749 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:drawable="@drawable/ic_check_box_dark" />
<item android:drawable="@drawable/ic_check_box_outline_dark" />
</selector>

View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:drawable="@drawable/ic_check_box_light" />
<item android:drawable="@drawable/ic_check_box_outline_light" />
</selector>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@color/download_pressed_dark"/>
<item android:state_pressed="true" android:drawable="@color/download_pressed_dark"/>
<item android:drawable="@color/actionbar_dark_color"/>
</selector>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@color/download_pressed_light"/>
<item android:state_pressed="true" android:drawable="@color/download_pressed_light"/>
<item android:drawable="@color/tool_bar_color_light"/>
</selector>

View file

@ -94,6 +94,8 @@
android:id="@+id/DownloadButton" android:id="@+id/DownloadButton"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/downloadButtonBackground"
android:textColor="?attr/pstsTextColor"
android:gravity="center" android:gravity="center"
android:text="@string/download_files" android:text="@string/download_files"
android:visibility="gone"/> android:visibility="gone"/>

View file

@ -7,6 +7,7 @@
<attr name="expandable_category_color" format="reference"/> <attr name="expandable_category_color" format="reference"/>
<attr name="reset_image" format="reference"/> <attr name="reset_image" format="reference"/>
<attr name="bottomToolBarColor" format="color" /> <attr name="bottomToolBarColor" format="color" />
<attr name="downloadButtonBackground" format="reference" />
</declare-styleable> </declare-styleable>
<declare-styleable name="PagerSlidingTabStrip"> <declare-styleable name="PagerSlidingTabStrip">

View file

@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="actionbar_dark_color">#39464d</color> <color name="actionbar_dark_color">#39464d</color>
<color name="tool_bar_dark_color">#CC080B0D</color> <color name="tool_bar_color_dark">#CC080B0D</color>
<color name="actionbar_light_color">#ff8f00</color> <color name="actionbar_light_color">#ff8f00</color>
<color name="tool_bar_light_color">#b4ff8f00</color> <color name="tool_bar_color_light">#b4ff8f00</color>
<color name="download_pressed_light">#8cff8f00</color>
<color name="download_pressed_dark">#be39464d</color>
<color name="dashboard_descr_colol">#727272</color> <color name="dashboard_descr_colol">#727272</color>
<color name="dashboard_background">#eaeaea</color> <color name="dashboard_background">#eaeaea</color>

View file

@ -67,11 +67,12 @@
<style name="OsmandLightTheme" parent="Theme.AppCompat.Light"> <style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
<item name="expandable_category_color">@color/group_background</item> <item name="expandable_category_color">@color/group_background</item>
<item name="android:actionDropDownStyle">@style/Widget.LightSpinner</item> <!--<item name="android:actionDropDownStyle">@style/Widget.LightSpinner</item>-->
<item name="actionDropDownStyle">@style/Widget.LightSpinner</item> <!--<item name="actionDropDownStyle">@style/Widget.LightSpinner</item>-->
<item name="reset_image">@drawable/ic_action_delete_light</item> <!-- @drawable/a_1_navigation_cancel_light --> <item name="reset_image">@drawable/ic_action_delete_light</item> <!-- @drawable/a_1_navigation_cancel_light -->
<item name="windowActionBarOverlay">true</item> <item name="windowActionBarOverlay">true</item>
<item name="bottomToolBarColor">@color/tool_bar_light_color</item> <item name="bottomToolBarColor">@color/tool_bar_color_light</item>
<item name="downloadButtonBackground">@drawable/download_light</item>
<item name="pstsTabBackground">@color/actionbar_light_color</item> <item name="pstsTabBackground">@color/actionbar_light_color</item>
<item name="pstsUnderlineColor">@color/actionbar_light_color</item> <item name="pstsUnderlineColor">@color/actionbar_light_color</item>
<item name="pstsIndicatorColor">@color/color_white</item> <item name="pstsIndicatorColor">@color/color_white</item>
@ -86,16 +87,17 @@
<item name="android:actionMenuTextColor">@color/color_white</item> <item name="android:actionMenuTextColor">@color/color_white</item>
<item name="actionMenuTextColor">@color/color_white</item> <item name="actionMenuTextColor">@color/color_white</item>
<item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item> <item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
<item name="android:listChoiceIndicatorMultiple">@drawable/check_light</item>
</style> </style>
<style name="OsmandDarkTheme" parent="Theme.AppCompat"> <style name="OsmandDarkTheme" parent="Theme.AppCompat">
<item name="reset_image">@drawable/ic_action_delete_dark</item> <!-- @drawable/a_1_navigation_cancel_dark --> <item name="reset_image">@drawable/ic_action_delete_dark</item> <!-- @drawable/a_1_navigation_cancel_dark -->
<item name="android:actionDropDownStyle">@style/Widget.DarkActionSpinner</item> <!--<item name="android:actionDropDownStyle">@style/Widget.DarkActionSpinner</item>-->
<item name="actionDropDownStyle">@style/Widget.DarkActionSpinner</item> <!--<item name="actionDropDownStyle">@style/Widget.DarkActionSpinner</item>-->
<item name="expandable_category_color">?android:attr/colorBackground</item> <item name="expandable_category_color">?android:attr/colorBackground</item>
<item name="android:spinnerStyle">@style/Widget.DarkSpinner</item>
<item name="windowActionBarOverlay">true</item> <item name="windowActionBarOverlay">true</item>
<item name="bottomToolBarColor">@color/tool_bar_dark_color</item> <item name="bottomToolBarColor">@color/tool_bar_color_dark</item>
<item name="downloadButtonBackground">@drawable/download_dark</item>
<item name="pstsTabBackground">@color/actionbar_dark_color</item> <item name="pstsTabBackground">@color/actionbar_dark_color</item>
<item name="pstsUnderlineColor">@color/actionbar_dark_color</item> <item name="pstsUnderlineColor">@color/actionbar_dark_color</item>
<item name="pstsIndicatorColor">@color/actionbar_light_color</item> <item name="pstsIndicatorColor">@color/actionbar_light_color</item>
@ -104,12 +106,13 @@
<item name="actionModeBackground">@color/actionbar_dark_color</item> <item name="actionModeBackground">@color/actionbar_dark_color</item>
<item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item> <item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
<item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item> <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
<item name="android:listChoiceIndicatorMultiple">@drawable/check_dark</item>
</style> </style>
<style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="reset_image">@drawable/ic_action_delete_light</item> <!-- @drawable/a_1_navigation_cancel_light --> <item name="reset_image">@drawable/ic_action_delete_light</item> <!-- @drawable/a_1_navigation_cancel_light -->
<item name="expandable_category_color">@color/group_background</item> <item name="expandable_category_color">@color/group_background</item>
<item name="bottomToolBarColor">@color/tool_bar_dark_color</item> <item name="bottomToolBarColor">@color/tool_bar_color_dark</item>
<item name="pstsTabBackground">@color/actionbar_dark_color</item> <item name="pstsTabBackground">@color/actionbar_dark_color</item>
<item name="pstsIndicatorColor">@color/actionbar_light_color</item> <item name="pstsIndicatorColor">@color/actionbar_light_color</item>
<item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item> <item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>