Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified res/drawable-hdpi/ab_bottom_solid_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/drawable-hdpi/ab_solid_wordpress.9.png
Binary file not shown.
Binary file modified res/drawable-hdpi/ab_stacked_solid_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/ab_texture_tile_wordpress.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/ab_transparent_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/cab_background_top_wordpress.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/list_focused_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/menu_dropdown_panel_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/progress_bg_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified res/drawable-hdpi/progress_primary_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified res/drawable-hdpi/progress_secondary_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified res/drawable-hdpi/spinner_ab_default_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified res/drawable-hdpi/spinner_ab_disabled_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/spinner_ab_focused_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/spinner_ab_pressed_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/tab_selected_focused_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/tab_selected_pressed_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified res/drawable-hdpi/tab_selected_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/tab_unselected_focused_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/tab_unselected_pressed_wordpress.9.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/tab_unselected_wordpress.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-mdpi/ab_bottom_solid_wordpress.9.png
100644 → 100755
Binary file removed res/drawable-mdpi/ab_solid_wordpress.9.png
Diff not rendered.
Binary file modified res/drawable-mdpi/ab_stacked_solid_wordpress.9.png
100644 → 100755
Binary file added res/drawable-mdpi/ab_texture_tile_wordpress.png
Binary file modified res/drawable-mdpi/ab_transparent_wordpress.9.png
100644 → 100755
Binary file added res/drawable-mdpi/cab_background_top_wordpress.9.png
Binary file modified res/drawable-mdpi/list_focused_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-mdpi/menu_dropdown_panel_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-mdpi/progress_bg_wordpress.9.png
100644 → 100755
Empty file modified res/drawable-mdpi/progress_primary_wordpress.9.png
100644 → 100755
Empty file modified res/drawable-mdpi/progress_secondary_wordpress.9.png
100644 → 100755
Empty file modified res/drawable-mdpi/spinner_ab_default_wordpress.9.png
100644 → 100755
Empty file modified res/drawable-mdpi/spinner_ab_disabled_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-mdpi/spinner_ab_focused_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-mdpi/spinner_ab_pressed_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-mdpi/tab_selected_focused_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-mdpi/tab_selected_pressed_wordpress.9.png
100644 → 100755
Empty file modified res/drawable-mdpi/tab_selected_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-mdpi/tab_unselected_focused_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-mdpi/tab_unselected_pressed_wordpress.9.png
100644 → 100755
Binary file added res/drawable-mdpi/tab_unselected_wordpress.9.png
6 changes: 3 additions & 3 deletions res/drawable-v11/list_bg_selector.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

<item
android:state_pressed="true"
android:drawable="@color/list_row_selected" />
android:drawable="@color/blue_extra_light" />

<item
android:state_focused="true"
android:drawable="@color/list_row_selected" />
android:drawable="@color/blue_extra_light" />

<item
android:state_activated="true"
android:drawable="@color/list_row_selected" />
android:drawable="@color/blue_extra_light" />

<item
android:drawable="@android:color/transparent" />
Expand Down
Binary file modified res/drawable-xhdpi/ab_bottom_solid_wordpress.9.png
100644 → 100755
Binary file removed res/drawable-xhdpi/ab_solid_wordpress.9.png
Diff not rendered.
Binary file modified res/drawable-xhdpi/ab_stacked_solid_wordpress.9.png
100644 → 100755
Binary file added res/drawable-xhdpi/ab_texture_tile_wordpress.png
Binary file modified res/drawable-xhdpi/ab_transparent_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-xhdpi/list_focused_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-xhdpi/menu_dropdown_panel_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-xhdpi/progress_bg_wordpress.9.png
100644 → 100755
Empty file modified res/drawable-xhdpi/progress_primary_wordpress.9.png
100644 → 100755
Empty file modified res/drawable-xhdpi/progress_secondary_wordpress.9.png
100644 → 100755
Empty file modified res/drawable-xhdpi/spinner_ab_default_wordpress.9.png
100644 → 100755
Empty file modified res/drawable-xhdpi/spinner_ab_disabled_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-xhdpi/spinner_ab_focused_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-xhdpi/spinner_ab_pressed_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-xhdpi/tab_selected_focused_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-xhdpi/tab_selected_pressed_wordpress.9.png
100644 → 100755
Empty file modified res/drawable-xhdpi/tab_selected_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-xhdpi/tab_unselected_focused_wordpress.9.png
100644 → 100755
Binary file modified res/drawable-xhdpi/tab_unselected_pressed_wordpress.9.png
100644 → 100755
Binary file added res/drawable-xhdpi/tab_unselected_wordpress.9.png
21 changes: 21 additions & 0 deletions res/drawable/ab_background_textured_wordpress.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- File created by the Android Action Bar Style Generator

Copyright (C) 2012 readyState Software Ltd

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/ab_texture_tile_wordpress"
android:tileMode="repeat" />
27 changes: 27 additions & 0 deletions res/drawable/btn_cab_done_wordpress.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- File created by the Android Action Bar Style Generator

Copyright (C) 2011 The Android Open Source Project
Copyright (C) 2012 readyState Software Ltd

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/btn_cab_done_pressed_wordpress" />
<item android:state_focused="true" android:state_enabled="true"
android:drawable="@drawable/btn_cab_done_focused_wordpress" />
<item android:state_enabled="true"
android:drawable="@drawable/btn_cab_done_default_wordpress" />
</selector>
7 changes: 3 additions & 4 deletions res/drawable/comment_badge_background.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@

<item>
<shape android:shape="rectangle" >
<stroke
android:width="1dp"
android:color="@android:color/white" />
<solid android:color="@color/orange_medium" />

<solid android:color="@color/md__itemBackground" />
<corners android:bottomRightRadius="16dp" android:bottomLeftRadius="16dp"
android:topLeftRadius="16dp" android:topRightRadius="16dp"/>
</shape>
</item>

Expand Down
4 changes: 2 additions & 2 deletions res/drawable/list_bg_selector.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

<item
android:state_pressed="true"
android:drawable="@color/list_row_selected" />
android:drawable="@color/blue_extra_light" />

<item
android:state_focused="true"
android:drawable="@color/list_row_selected" />
android:drawable="@color/blue_extra_light" />

<item
android:drawable="@android:color/transparent" />
Expand Down
13 changes: 0 additions & 13 deletions res/drawable/menu_drawer_selected.xml

This file was deleted.

1 change: 1 addition & 0 deletions res/drawable/pressed_background_wordpress.xml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- File created by the Android Action Bar Style Generator

Copyright (C) 2011 The Android Open Source Project
Copyright (C) 2012 readyState Software Ltd

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
1 change: 1 addition & 0 deletions res/drawable/progress_horizontal_wordpress.xml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- File created by the Android Action Bar Style Generator

Copyright (C) 2011 The Android Open Source Project
Copyright (C) 2012 readyState Software Ltd

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
1 change: 1 addition & 0 deletions res/drawable/selectable_background_wordpress.xml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- File created by the Android Action Bar Style Generator

Copyright (C) 2011 The Android Open Source Project
Copyright (C) 2012 readyState Software Ltd

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
1 change: 1 addition & 0 deletions res/drawable/spinner_background_ab_wordpress.xml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- File created by the Android Action Bar Style Generator

Copyright (C) 2011 The Android Open Source Project
Copyright (C) 2012 readyState Software Ltd

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
1 change: 1 addition & 0 deletions res/drawable/tab_indicator_ab_wordpress.xml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- File created by the Android Action Bar Style Generator

Copyright (C) 2011 The Android Open Source Project
Copyright (C) 2012 readyState Software Ltd

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion res/layout-sw600dp/media_grid_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<org.wordpress.android.ui.CustomSpinner
android:id="@+id/media_filter_spinner"
style="@style/wordpress_DropDownNav"
style="@style/DropDownNav.WordPress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
Expand Down
2 changes: 1 addition & 1 deletion res/layout/blog_spinner.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<com.actionbarsherlock.internal.widget.IcsSpinner
android:id="@+id/blog_spinner"
style="@style/wordpress_DropDownNav"
style="@style/DropDownNav.WordPress"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:paddingLeft="0dp"
Expand Down
2 changes: 1 addition & 1 deletion res/layout/media_grid_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<org.wordpress.android.ui.CustomSpinner
android:id="@+id/media_filter_spinner"
style="@style/wordpress_DropDownNav"
style="@style/DropDownNav.WordPress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
Expand Down
2 changes: 2 additions & 0 deletions res/layout/menu_drawer_row.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
style="@style/MenuDrawer.CommentBadge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="32dp"
android:minHeight="32dp"
android:visibility="gone" />

</LinearLayout>
4 changes: 2 additions & 2 deletions res/layout/share_intent_receiver_dialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

<com.actionbarsherlock.internal.widget.IcsSpinner
android:id="@+id/blog_spinner"
style="@style/wordpress_DropDownNav"
style="@style/DropDownNav.WordPress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp" />
Expand All @@ -81,7 +81,7 @@

<com.actionbarsherlock.internal.widget.IcsSpinner
android:id="@+id/action_spinner"
style="@style/wordpress_DropDownNav"
style="@style/DropDownNav.WordPress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp" />
Expand Down
57 changes: 34 additions & 23 deletions res/values-v11/styles.xml
Original file line number Diff line number Diff line change
@@ -1,38 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android">

<style name="WordPress" parent="Theme.Sherlock.Light.DarkActionBar">

<item name="actionBarItemBackground">@drawable/selectable_background_wordpress</item>
<item name="android:popupMenuStyle">@style/PopupMenu.WordPress</item>
<item name="android:dropDownListViewStyle">@style/DropDownListView.WordPress</item>
<item name="android:actionBarTabStyle">@style/ActionBarTabStyle.WordPress</item>
<item name="android:actionDropDownStyle">@style/DropDownNav.WordPress</item>
<item name="android:actionBarStyle">@style/ActionBar.Solid.WordPress</item>
<item name="android:actionModeBackground">@drawable/cab_background_top_wordpress</item>
<item name="actionModeSplitBackground">@drawable/cab_background_bottom_wordpress</item>
<item name="android:actionModeCloseButtonStyle">@style/ActionButton.CloseMode.WordPress</item>

<!-- Light.DarkActionBar specific -->
<item name="actionBarWidgetTheme">@style/Theme.WordPress.Widget</item>

<item name="android:textViewStyle">@style/WordPressTextAppearance</item>
<item name="android:buttonStyle">@style/WordPressButtonAppearance</item>
<item name="android:editTextStyle">@style/WordPressEditTextStyle</item>
<item name="android:checkboxStyle">@style/WordPressCheckBoxStyle</item>

<item name="android:popupMenuStyle">@style/wordpress_PopupMenu</item>
<item name="popupMenuStyle">@style/wordpress_PopupMenu</item>

<item name="android:dropDownListViewStyle">@style/wordpress_DropDownListView</item>
<item name="dropDownListViewStyle">@style/wordpress_DropDownListView</item>

<item name="android:actionBarTabStyle">@style/wordpress_ActionBarTabStyle</item>
<item name="actionBarTabStyle">@style/wordpress_ActionBarTabStyle</item>

<item name="android:actionDropDownStyle">@style/wordpress_DropDownNav</item>
<item name="actionDropDownStyle">@style/wordpress_DropDownNav</item>

<item name="android:actionBarStyle">@style/wordpress_solid_ActionBar</item>
<item name="actionBarStyle">@style/wordpress_solid_ActionBar</item>

<item name="android:panelBackground">@drawable/menu_hardkey_panel_wordpress</item>

<item name="menuDrawerStyle">@style/MenuDrawer</item>

<item name="android:activatedBackgroundIndicator">@drawable/list_bg_selector</item>
<item name="activatedBackgroundIndicator">@drawable/list_bg_selector</item>
</style>

<style name="WordPress.Dialog" parent="@android:style/Theme.Holo.Light.Dialog"></style>

<style name="WordPressButtonAppearance" parent="@android:style/Widget.Holo.Light.Button">
<item name="android:textColor">#FF464646</item>

<style name="ActionBar.Solid.WordPress" parent="@style/Widget.Sherlock.Light.ActionBar.Solid.Inverse">
<item name="android:icon">@drawable/ab_icon_wp</item>
<item name="android:background">@color/blue_new_kid</item>
<item name="backgroundStacked">@drawable/ab_stacked_solid_wordpress</item>
<item name="backgroundSplit">@drawable/ab_bottom_solid_wordpress</item>
<item name="android:progressBarStyle">@style/ProgressBar.WordPress</item>
</style>

<style name="ActionBar.Transparent.WordPress" parent="@style/Widget.Sherlock.ActionBar">
<item name="android:background">@drawable/ab_transparent_wordpress</item>
<item name="android:progressBarStyle">@style/ProgressBar.WordPress</item>
</style>

<!-- this style is only referenced in a Light.DarkActionBar based theme -->
<style name="Theme.WordPress.Widget" parent="@style/Theme.Sherlock">
<item name="android:popupMenuStyle">@style/PopupMenu.WordPress</item>
<item name="android:dropDownListViewStyle">@style/DropDownListView.WordPress</item>
</style>

</resources>
64 changes: 29 additions & 35 deletions res/values-v14/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,47 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">

<style name="WordPress" parent="Theme.Sherlock.Light.DarkActionBar">

<item name="android:actionBarItemBackground">@drawable/selectable_background_wordpress</item>
<item name="android:popupMenuStyle">@style/PopupMenu.WordPress</item>
<item name="android:dropDownListViewStyle">@style/DropDownListView.WordPress</item>
<item name="android:actionBarTabStyle">@style/ActionBarTabStyle.WordPress</item>
<item name="android:actionDropDownStyle">@style/DropDownNav.WordPress</item>
<item name="android:actionBarStyle">@style/ActionBar.Solid.WordPress</item>
<item name="android:actionModeBackground">@drawable/cab_background_top_wordpress</item>
<item name="android:actionModeSplitBackground">@drawable/cab_background_bottom_wordpress</item>
<item name="android:actionModeCloseButtonStyle">@style/ActionButton.CloseMode.WordPress</item>

<!-- Light.DarkActionBar specific -->
<item name="android:actionBarWidgetTheme">@style/Theme.WordPress.Widget</item>

<item name="android:textViewStyle">@style/WordPressTextAppearance</item>
<item name="android:buttonStyle">@style/WordPressButtonAppearance</item>
<item name="android:editTextStyle">@style/WordPressEditTextStyle</item>
<item name="android:checkboxStyle">@style/WordPressCheckBoxStyle</item>

<item name="android:actionBarItemBackground">@drawable/selectable_background_wordpress</item>
<item name="actionBarItemBackground">@drawable/selectable_background_wordpress</item>

<item name="android:popupMenuStyle">@style/wordpress_PopupMenu</item>
<item name="popupMenuStyle">@style/wordpress_PopupMenu</item>

<item name="android:dropDownListViewStyle">@style/wordpress_DropDownListView</item>
<item name="dropDownListViewStyle">@style/wordpress_DropDownListView</item>

<item name="android:actionBarTabStyle">@style/wordpress_ActionBarTabStyle</item>
<item name="actionBarTabStyle">@style/wordpress_ActionBarTabStyle</item>

<item name="android:actionDropDownStyle">@style/wordpress_DropDownNav</item>
<item name="actionDropDownStyle">@style/wordpress_DropDownNav</item>

<item name="android:actionBarStyle">@style/wordpress_solid_ActionBar</item>
<item name="actionBarStyle">@style/wordpress_solid_ActionBar</item>

<!-- Light.DarkActionBar specific -->
<item name="android:actionBarWidgetTheme">@style/Theme.wordpress.widget</item>
<item name="actionBarWidgetTheme">@style/Theme.wordpress.widget</item>

<item name="menuDrawerStyle">@style/MenuDrawer</item>

<item name="android:activatedBackgroundIndicator">@drawable/list_bg_selector</item>
<item name="activatedBackgroundIndicator">@drawable/list_bg_selector</item>
</style>
<style name="wordpress_solid_ActionBar" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">

<style name="ActionBar.Solid.WordPress" parent="@style/Widget.Sherlock.Light.ActionBar.Solid.Inverse">
<item name="android:icon">@drawable/ab_icon_wp</item>
<item name="icon">@drawable/ab_icon_wp</item>
<item name="android:background">@drawable/ab_solid_wordpress</item>
<item name="background">@drawable/ab_solid_wordpress</item>

<item name="android:background">@color/blue_new_kid</item>
<item name="android:backgroundStacked">@drawable/ab_stacked_solid_wordpress</item>
<item name="backgroundStacked">@drawable/ab_stacked_solid_wordpress</item>

<item name="android:backgroundSplit">@drawable/ab_bottom_solid_wordpress</item>
<item name="backgroundSplit">@drawable/ab_bottom_solid_wordpress</item>

<item name="android:progressBarStyle">@style/wordpress_ProgressBar</item>
<item name="progressBarStyle">@style/wordpress_ProgressBar</item>
<item name="android:progressBarStyle">@style/ProgressBar.WordPress</item>
</style>

<style name="ActionBar.Transparent.WordPress" parent="@style/Widget.Sherlock.ActionBar">
<item name="android:background">@drawable/ab_transparent_wordpress</item>
<item name="android:progressBarStyle">@style/ProgressBar.WordPress</item>
</style>

<!-- this style is only referenced in a Light.DarkActionBar based theme -->
<style name="Theme.WordPress.Widget" parent="@style/Theme.Sherlock">
<item name="android:popupMenuStyle">@style/PopupMenu.WordPress</item>
<item name="android:dropDownListViewStyle">@style/DropDownListView.WordPress</item>
</style>

</resources>
4 changes: 3 additions & 1 deletion res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@

<color name="image_options_label">#CCCCCC</color>
<color name="image_options_text">#FFFFFF</color>
<color name="pressed_wordpress">#CC2EA2CC</color>
<color name="pressed_wordpress">#CC78C8E6</color>
<color name="list_row_bg">#FFFFFF</color>
<color name="list_row_selected">#78c8e6</color>

<!-- Colors for menu drawer. -->
<color name="md__defaultBackground">#222222</color>
<color name="md__itemBackground">#CC2EA2CC</color>
<color name="md__iconTintColor">#DDFFFFFF</color>
<color name="md__shadowColor">#99000000</color>
Expand Down Expand Up @@ -60,6 +61,7 @@
-->
<color name="blue_extra_light">#c8eefc</color>
<color name="blue_light">#78c8e6</color>
<color name="blue_new_kid">#2EA2CC</color>
<color name="blue_medium">#1e8cbe</color>
<color name="blue_dark">#0074a2</color>
<color name="blue_extra_dark">#005684</color>
Expand Down
Loading