Style the header nav bar for the redesign

pull/14/head
Sam Bosley 13 years ago
parent 1a3f148306
commit fdc5775a8f

@ -17,8 +17,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/BFE_Active" android:text="@string/BFE_Active"
style="@style/TextAppearance.GEN_EditLabel" style="@style/TextAppearance.ActionBar_ListsHeader"/>
android:textSize="20dip"/>
<ImageView <ImageView
android:id="@+id/list_disclosure_arrow" android:id="@+id/list_disclosure_arrow"

@ -15,6 +15,7 @@
<attr name="asFilterCountColor" format="color"/> <attr name="asFilterCountColor" format="color"/>
<attr name="asMembersHeaderBackground" format="reference"/> <attr name="asMembersHeaderBackground" format="reference"/>
<attr name="asSeparatorBackground" format="color"/> <attr name="asSeparatorBackground" format="color"/>
<attr name="asAbTextColor" format="color"/>
<declare-styleable name="ContactsAutoComplete"> <declare-styleable name="ContactsAutoComplete">
<attr name="allowMultiple" format="boolean"/> <attr name="allowMultiple" format="boolean"/>

@ -23,6 +23,7 @@
<item name="abBackground">@drawable/header_background</item> <item name="abBackground">@drawable/header_background</item>
<item name="abDisplayOptions">useLogo|showHome|showTitle</item> <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
<item name="abLogo">@drawable/icon_48</item> <item name="abLogo">@drawable/icon_48</item>
<item name="asAbTextColor">@android:color/darker_gray</item>
</style> </style>
<style name="Theme.Transparent" parent="@style/Theme"> <style name="Theme.Transparent" parent="@style/Theme">
@ -59,9 +60,10 @@
<item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item> <item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
<item name="asMembersHeaderBackground">@drawable/ios_fabric_480</item> <item name="asMembersHeaderBackground">@drawable/ios_fabric_480</item>
<!-- actionbar-styling --> <!-- actionbar-styling -->
<item name="abBackground">@drawable/header_background_white</item> <item name="abBackground">@android:color/white</item>
<item name="abDisplayOptions">useLogo|showHome|showTitle</item> <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
<item name="abLogo">@drawable/icon_48</item> <item name="abLogo">@drawable/icon_48</item>
<item name="asAbTextColor">#d00000</item>
</style> </style>
<style name="Theme.TransparentWhite" parent="@style/Theme.White"> <style name="Theme.TransparentWhite" parent="@style/Theme.White">
@ -70,9 +72,10 @@
<item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item> <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
<item name="asMembersHeaderBackground">@android:color/transparent</item> <item name="asMembersHeaderBackground">@android:color/transparent</item>
<!-- actionbar-styling --> <!-- actionbar-styling -->
<item name="abBackground">@drawable/header_background_white</item> <item name="abBackground">@android:color/white</item>
<item name="abDisplayOptions">useLogo|showHome|showTitle</item> <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
<item name="abLogo">@drawable/icon_48</item> <item name="abLogo">@drawable/icon_48</item>
<item name="asAbTextColor">#d00000</item>
</style> </style>
<style name="Theme_Dialog" parent="@android:style/Theme.Dialog"> <style name="Theme_Dialog" parent="@android:style/Theme.Dialog">
@ -137,7 +140,18 @@
<style name="TextAppearance.GEN_EditLabel.DLG_EditLabel"> <style name="TextAppearance.GEN_EditLabel.DLG_EditLabel">
<!-- <item name="android:textColor">@android:color/white</item> --> <!-- <item name="android:textColor">@android:color/white</item> -->
</style> </style>
<style name="TextAppearance.ActionBar_ListsHeader">
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">?attr/asAbTextColor</item>
<item name="android:textSize">20dip</item>
<item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.ActionBar_ListsHeader.Selected">
<item name="android:textColor">@android:color/white</item>
</style>
<!--================================================== Custom Dialogs == --> <!--================================================== Custom Dialogs == -->
<style name="DialogTitle"> <style name="DialogTitle">

@ -1,6 +1,5 @@
package com.todoroo.astrid.activity; package com.todoroo.astrid.activity;
import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.ActionBar; import android.support.v4.app.ActionBar;
import android.view.View; import android.view.View;
@ -39,7 +38,7 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
private final OnClickListener popupMenuClickListener = new OnClickListener() { private final OnClickListener popupMenuClickListener = new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
listsNav.setBackgroundColor(Color.RED); setListsDropdownSelected(true);
popover.show(v); popover.show(v);
} }
}; };
@ -61,7 +60,7 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
popover.setOnDismissListener(new OnDismissListener() { popover.setOnDismissListener(new OnDismissListener() {
@Override @Override
public void onDismiss() { public void onDismiss() {
listsNav.setBackgroundColor(Color.TRANSPARENT); setListsDropdownSelected(false);
} }
}); });
@ -88,6 +87,13 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
} }
private void setListsDropdownSelected(boolean selected) {
int oldTextColor = lists.getTextColors().getDefaultColor();
int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected : R.style.TextAppearance_ActionBar_ListsHeader);
lists.setTextAppearance(this, textStyle);
listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent);
}
/* (non-Javadoc) /* (non-Javadoc)
* @see android.support.v4.app.FragmentActivity#onResume() * @see android.support.v4.app.FragmentActivity#onResume()
*/ */

Loading…
Cancel
Save