Skip to content

Commit

Permalink
Theme overhaul
Browse files Browse the repository at this point in the history
* Using Light.DarkActionBar now
* No more LDPI support (sorry to those getting left behind!)
* New icon :3
* The "GitHub blue" color has a larger presence

Signed-off-by: Eddie Ringle <eddie@eringle.net>
  • Loading branch information
EddieRingle committed Jun 23, 2012
1 parent a60c339 commit 52327bc
Show file tree
Hide file tree
Showing 102 changed files with 87 additions and 26 deletions.
20 changes: 20 additions & 0 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,26 @@
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
<uses-permission android:name="android.permission.USE_CREDENTIALS"/>

<!-- We support every density except LDPI -->
<compatible-screens>
<!-- Small screens -->
<screen android:screenSize="small" android:screenDensity="mdpi" />
<screen android:screenSize="small" android:screenDensity="hdpi" />
<screen android:screenSize="small" android:screenDensity="xhdpi" />
<!-- Normal screens -->
<screen android:screenSize="normal" android:screenDensity="mdpi" />
<screen android:screenSize="normal" android:screenDensity="hdpi" />
<screen android:screenSize="normal" android:screenDensity="xhdpi" />
<!-- Large screens -->
<screen android:screenSize="large" android:screenDensity="mdpi" />
<screen android:screenSize="large" android:screenDensity="hdpi" />
<screen android:screenSize="large" android:screenDensity="xhdpi" />
<!-- Very large screens -->
<screen android:screenSize="xlarge" android:screenDensity="mdpi" />
<screen android:screenSize="xlarge" android:screenDensity="hdpi" />
<screen android:screenSize="xlarge" android:screenDensity="xhdpi" />
</compatible-screens>

<application android:name=".ui.HubroidApplication"
android:label="@string/app_name"
android:icon="@drawable/ic_launcher"
Expand Down
Binary file modified res/drawable-hdpi/ab_bottom_solid_hubroid.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/ab_solid_hubroid.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/ab_stacked_solid_hubroid.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 added res/drawable-hdpi/ab_transparent_hubroid.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/ic_launcher.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 added res/drawable-hdpi/ic_launcher_black.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 added res/drawable-hdpi/ic_launcher_white.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/ic_menu_add.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/ic_menu_refresh.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 added res/drawable-hdpi/ic_menu_send_now.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 removed res/drawable-hdpi/ic_send_now.png
Binary file not shown.
Binary file added res/drawable-hdpi/list_focused_hubroid.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/menu_dropdown_panel_hubroid.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/menu_hardkey_panel_hubroid.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 added res/drawable-hdpi/progress_bg_hubroid.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 added res/drawable-hdpi/progress_primary_hubroid.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 added res/drawable-hdpi/progress_secondary_hubroid.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/spinner_ab_default_hubroid.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/spinner_ab_disabled_hubroid.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/tab_unselected_focused_hubroid.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/tab_unselected_pressed_hubroid.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/tags.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 removed res/drawable-ldpi/gravatar.png
Binary file not shown.
Binary file removed res/drawable-ldpi/ic_dash_events_normal.png
Binary file not shown.
Binary file removed res/drawable-ldpi/ic_dash_events_pressed.png
Binary file not shown.
Binary file removed res/drawable-ldpi/ic_dash_events_selected.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_gists_normal.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_gists_pressed.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_gists_selected.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_orgs_normal.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_orgs_pressed.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_orgs_selected.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_profile_normal.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_profile_pressed.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_profile_selected.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_repos_normal.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_repos_pressed.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_repos_selected.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_users_normal.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_users_pressed.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_dash_users_selected.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_launcher.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_menu_add.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_menu_refresh.png
Diff not rendered.
Binary file removed res/drawable-ldpi/ic_send_now.png
Diff not rendered.
Binary file removed res/drawable-ldpi/lock.png
Diff not rendered.
Binary file removed res/drawable-ldpi/open_lock.png
Diff not rendered.
Binary file removed res/drawable-ldpi/tags.png
Diff not rendered.
Binary file modified res/drawable-mdpi/ab_bottom_solid_hubroid.9.png
Binary file modified res/drawable-mdpi/ab_solid_hubroid.9.png
Binary file modified res/drawable-mdpi/ab_stacked_solid_hubroid.9.png
Binary file added res/drawable-mdpi/ab_transparent_hubroid.9.png
Binary file modified res/drawable-mdpi/ic_launcher.png
Binary file added res/drawable-mdpi/ic_launcher_black.png
Binary file added res/drawable-mdpi/ic_launcher_white.png
Binary file modified res/drawable-mdpi/ic_menu_add.png
Binary file modified res/drawable-mdpi/ic_menu_refresh.png
Binary file added res/drawable-mdpi/ic_menu_send_now.png
Binary file removed res/drawable-mdpi/ic_send_now.png
Diff not rendered.
Binary file added res/drawable-mdpi/list_focused_hubroid.9.png
Binary file modified res/drawable-mdpi/menu_dropdown_panel_hubroid.9.png
Binary file modified res/drawable-mdpi/menu_hardkey_panel_hubroid.9.png
Binary file added res/drawable-mdpi/progress_bg_hubroid.9.png
Binary file added res/drawable-mdpi/progress_primary_hubroid.9.png
Binary file added res/drawable-mdpi/progress_secondary_hubroid.9.png
Binary file modified res/drawable-mdpi/spinner_ab_default_hubroid.9.png
Binary file modified res/drawable-mdpi/spinner_ab_disabled_hubroid.9.png
Binary file modified res/drawable-mdpi/tab_unselected_focused_hubroid.9.png
Binary file modified res/drawable-mdpi/tab_unselected_pressed_hubroid.9.png
Binary file modified res/drawable-mdpi/tags.png
Binary file modified res/drawable-xhdpi/ab_bottom_solid_hubroid.9.png
Binary file modified res/drawable-xhdpi/ab_solid_hubroid.9.png
Binary file modified res/drawable-xhdpi/ab_stacked_solid_hubroid.9.png
Binary file added res/drawable-xhdpi/ab_transparent_hubroid.9.png
Binary file modified res/drawable-xhdpi/ic_launcher.png
Binary file added res/drawable-xhdpi/ic_launcher_black.png
Binary file added res/drawable-xhdpi/ic_launcher_white.png
Binary file modified res/drawable-xhdpi/ic_menu_add.png
Binary file modified res/drawable-xhdpi/ic_menu_refresh.png
Binary file added res/drawable-xhdpi/ic_menu_send_now.png
Binary file removed res/drawable-xhdpi/ic_send_now.png
Diff not rendered.
Binary file added res/drawable-xhdpi/list_focused_hubroid.9.png
Binary file modified res/drawable-xhdpi/menu_dropdown_panel_hubroid.9.png
Binary file modified res/drawable-xhdpi/menu_hardkey_panel_hubroid.9.png
Binary file added res/drawable-xhdpi/progress_bg_hubroid.9.png
Binary file added res/drawable-xhdpi/progress_primary_hubroid.9.png
Binary file added res/drawable-xhdpi/progress_secondary_hubroid.9.png
Binary file modified res/drawable-xhdpi/spinner_ab_default_hubroid.9.png
Binary file modified res/drawable-xhdpi/spinner_ab_disabled_hubroid.9.png
Binary file modified res/drawable-xhdpi/tab_unselected_focused_hubroid.9.png
Binary file modified res/drawable-xhdpi/tab_unselected_pressed_hubroid.9.png
Binary file modified res/drawable-xhdpi/tags.png
Binary file modified res/drawable/icon_512.png
34 changes: 34 additions & 0 deletions res/drawable/progress_horizontal_hubroid.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?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.
-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

<item android:id="@android:id/background"
android:drawable="@drawable/progress_bg_hubroid" />

<item android:id="@android:id/secondaryProgress">
<scale android:scaleWidth="100%"
android:drawable="@drawable/progress_secondary_hubroid" />
</item>

<item android:id="@android:id/progress">
<scale android:scaleWidth="100%"
android:drawable="@drawable/progress_primary_hubroid" />
</item>

</layer-list>
8 changes: 4 additions & 4 deletions res/drawable/selectable_background_hubroid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android"
android:exitFadeDuration="@android:integer/config_mediumAnimTime" >
<item android:state_focused="true" android:drawable="@drawable/focused_background_hubroid" />
<item android:state_pressed="true" android:drawable="@drawable/pressed_background_hubroid" />
<item android:drawable="@android:color/transparent" />
android:exitFadeDuration="@android:integer/config_mediumAnimTime" >
<item android:state_pressed="false" android:state_focused="true" android:drawable="@drawable/list_focused_hubroid" />
<item android:state_pressed="true" android:drawable="@drawable/pressed_background_hubroid" />
<item android:drawable="@android:color/transparent" />
</selector>
6 changes: 3 additions & 3 deletions res/drawable/spinner_background_ab_hubroid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/spinner_ab_disabled_hubroid" />
android:drawable="@drawable/spinner_ab_disabled_hubroid" />
<item android:state_pressed="true"
android:drawable="@drawable/spinner_ab_pressed_hubroid" />
android:drawable="@drawable/spinner_ab_pressed_hubroid" />
<item android:state_pressed="false" android:state_focused="true"
android:drawable="@drawable/spinner_ab_focused_hubroid" />
android:drawable="@drawable/spinner_ab_focused_hubroid" />
<item android:drawable="@drawable/spinner_ab_default_hubroid" />
</selector>
2 changes: 1 addition & 1 deletion res/drawable/tab_indicator_ab_hubroid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/tab_unselected_hubroid" />
<item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@android:color/transparent" />
<item android:state_focused="false" android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/tab_selected_hubroid" />

<!-- Focused states -->
Expand Down
2 changes: 1 addition & 1 deletion res/layout/single_issue.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_send_now" />
android:src="@drawable/ic_menu_send_now" />
<ProgressBar android:id="@+id/pb_issue_comment_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
38 changes: 21 additions & 17 deletions res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!--
<style name="Widget.Styled.ActionBar" parent="Widget.Sherlock.ActionBar.Solid">
<item name="android:background">@color/abs__background_holo_light</item>
</style>
-->
<style name="stdLinearLayout">
<item name="android:orientation">vertical</item>
<item name="android:paddingTop">10dip</item>
Expand All @@ -51,50 +46,59 @@
<item name="selectedColor">@color/text_color</item>
<item name="selectedBold">true</item>
</style>
<style name="Theme.Hubroid" parent="@style/Theme.Sherlock.Light">
<!--
<item name="actionBarStyle">@style/Widget.Styled.ActionBar</item>
<item name="android:actionBarStyle">@style/Widget.Styled.ActionBar</item>
-->
<style name="Theme.Hubroid" parent="@style/Theme.Sherlock.Light.DarkActionBar">
<item name="android:buttonStyle">@style/stdButton</item>
<item name="android:textColor">@color/text_color</item>
<item name="vpiTitlePageIndicatorStyle">@style/CustomTitlePageIndicator</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>

<item name="actionBarItemBackground">@drawable/selectable_background_hubroid</item>
<item name="popupMenuStyle">@style/Hubroid_PopupMenu</item>
<item name="dropDownListViewStyle">@style/Hubroid_DropDownListView</item>
<item name="actionBarTabStyle">@style/Hubroid_ActionBarTabStyle</item>
<item name="actionDropDownStyle">@style/Hubroid_DropDownNav</item>
<item name="actionBarStyle">@style/Hubroid_ActionBar</item>
<item name="actionBarStyle">@style/Hubroid_Solid_ActionBar</item>
<item name="android:selectableItemBackground">@drawable/selectable_background_hubroid</item>
<item name="android:popupMenuStyle">@style/Hubroid_PopupMenu</item>
<item name="android:dropDownListViewStyle">@style/Hubroid_DropDownListView</item>
<item name="android:actionBarTabStyle">@style/Hubroid_ActionBarTabStyle</item>
<item name="android:actionDropDownStyle">@style/Hubroid_DropDownNav</item>
<item name="android:actionBarStyle">@style/Hubroid_ActionBar</item>
<item name="android:actionBarStyle">@style/Hubroid_Solid_ActionBar</item>
<item name="android:panelBackground">@drawable/menu_hardkey_panel_hubroid</item>
<item name="android:listViewStyle">@style/Hubroid_DropDownListView</item>
</style>
<style name="Hubroid_ActionBar" parent="@style/Widget.Sherlock.Light.ActionBar">
<style name="Hubroid_Solid_ActionBar" parent="@style/Widget.Sherlock.Light.ActionBar.Solid.Inverse">
<item name="background">@drawable/ab_solid_hubroid</item>
<item name="backgroundStacked">@drawable/ab_stacked_solid_hubroid</item>
<item name="backgroundSplit">@drawable/ab_bottom_solid_hubroid</item>
<item name="progressBarStyle">@style/Hubroid_ProgressBar</item>
<item name="android:background">@drawable/ab_solid_hubroid</item>
<item name="android:backgroundStacked">@drawable/ab_stacked_solid_hubroid</item>
<item name="android:backgroundSplit">@drawable/ab_bottom_solid_hubroid</item>
</style>
<style name="Hubroid_Transparent_ActionBar" parent="@style/Widget.Sherlock.ActionBar">
<item name="background">@drawable/ab_transparent_hubroid</item>
<item name="progressBarStyle">@style/Hubroid_ProgressBar</item>

<item name="android:background">@drawable/ab_transparent_hubroid</item>
<item name="android:progressBarStyle">@style/Hubroid_ProgressBar</item>
</style>
<style name="Hubroid_PopupMenu" parent="@android:style/Widget.Holo.Light.ListPopupWindow">
<item name="android:popupBackground">@drawable/menu_dropdown_panel_hubroid</item>
</style>
<style name="Hubroid_DropDownListView" parent="@style/Widget.Sherlock.ListView.DropDown">
<style name="Hubroid_DropDownListView" parent="@style/Widget.Sherlock.Light.ListView.DropDown">
<item name="android:listSelector">@drawable/selectable_background_hubroid</item>
</style>
<style name="Hubroid_ActionBarTabStyle" parent="@style/Widget.Sherlock.Light.ActionBar.TabView">
<item name="background">@drawable/tab_indicator_ab_hubroid</item>
<item name="android:background">@drawable/tab_indicator_ab_hubroid</item>
</style>
<style name="Hubroid_DropDownNav" parent="@android:style/Widget.Holo.Light.Spinner">
<style name="Hubroid_DropDownNav" parent="@style/Widget.Sherlock.Light.Spinner.DropDown.ActionBar">
<item name="background">@drawable/spinner_background_ab_hubroid</item>
<item name="android:background">@drawable/spinner_background_ab_hubroid</item>
<item name="android:popupBackground">@drawable/menu_dropdown_panel_hubroid</item>
<item name="android:dropDownSelector">@drawable/selectable_background_hubroid</item>
</style>
</resources>
<style name="Hubroid_ProgressBar" parent="@style/Widget.Sherlock.Light.ProgressBar.Horizontal">
<item name="android:progressDrawable">@drawable/progress_horizontal_hubroid</item>
</style>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ void onCreateActionBar(ActionBar bar)
bar.setTitle("");
bar.setDisplayShowHomeEnabled(true);
bar.setDisplayHomeAsUpEnabled(false);
bar.setIcon(R.drawable.ic_launcher_white);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

package net.idlesoft.android.apps.github.ui.adapters;

import android.graphics.Color;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
Expand Down Expand Up @@ -70,6 +71,7 @@ View doGetView(int position, View convertView, ViewGroup parent, boolean dropdow
final AQuery aq = new AQuery(convertView);
aq.id(holder.gravatar).image(user.getAvatarUrl(), true, true, 200, R.drawable.gravatar, null, AQuery.FADE_IN_NETWORK, 1.0f);

holder.login.setTextColor(Color.WHITE);
holder.login.setText(login);

return convertView;
Expand Down

0 comments on commit 52327bc

Please sign in to comment.