Revert to darker lists background on tablets

pull/14/head
Sam Bosley 13 years ago
parent 1a67204d7e
commit 7f43c9e2c1

@ -3,7 +3,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="?attr/asListTabletBg"> android:background="@color/tablet_list_bg">
<!-- Footer --> <!-- Footer -->
<LinearLayout <LinearLayout

@ -9,7 +9,7 @@
android:id="@+id/content" android:id="@+id/content"
android:layout_width="280dip" android:layout_width="280dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/list_popover_bg" android:background="?attr/asListPopoverBg"
android:orientation="vertical" android:orientation="vertical"
android:layout_below="@+id/gdi_arrow_up"/> android:layout_below="@+id/gdi_arrow_up"/>
@ -20,7 +20,7 @@
android:layout_marginLeft="-10dip" android:layout_marginLeft="-10dip"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:layout_marginBottom="-8dip" android:layout_marginBottom="-8dip"
android:src="@drawable/list_arrow_up" /> android:src="?attr/asListArrowUp" />
<ImageView <ImageView
android:id="@+id/gdi_arrow_down" android:id="@+id/gdi_arrow_down"
@ -28,7 +28,6 @@
android:layout_height="27dip" android:layout_height="27dip"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:layout_marginBottom="-8dip" android:layout_marginBottom="-8dip"
android:layout_below="@android:id/list" android:layout_below="@android:id/list"/>
android:src="@drawable/list_arrow_down" />
</RelativeLayout> </RelativeLayout>

@ -30,7 +30,6 @@
<attr name="asMainMenu" format="reference" /> <attr name="asMainMenu" format="reference" />
<attr name="asAbBackgroundColor" format="color"/> <attr name="asAbBackgroundColor" format="color"/>
<attr name="asListPopoverBg" format="reference"/> <attr name="asListPopoverBg" format="reference"/>
<attr name="asListTabletBg" format="color"/>
<attr name="asListArrowUp" format="reference"/> <attr name="asListArrowUp" format="reference"/>
<declare-styleable name="ContactsAutoComplete"> <declare-styleable name="ContactsAutoComplete">

@ -30,8 +30,7 @@
<color name="red_theme_color">#d90000</color> <color name="red_theme_color">#d90000</color>
<color name="dark_blue_theme_color">#1f78b4</color> <color name="dark_blue_theme_color">#1f78b4</color>
<color name="tablet_list_bg">#292929</color> <color name="tablet_list_bg">#292929</color>
<color name="tablet_list_bg_white">#eee6e6e6</color> <color name="tablet_list_selected">#000000</color>
<color name="tablet_list_selected">#cccccc</color>
<color name="reminder_background">#262626</color> <color name="reminder_background">#262626</color>
</resources> </resources>

@ -33,7 +33,6 @@
<item name="asRepeatIcon">@drawable/icn_edit_repeats_blue</item> <item name="asRepeatIcon">@drawable/icn_edit_repeats_blue</item>
<item name="asListPopoverBg">@drawable/list_popover_bg_white</item> <item name="asListPopoverBg">@drawable/list_popover_bg_white</item>
<item name="asListArrowUp">@drawable/list_arrow_up_white</item> <item name="asListArrowUp">@drawable/list_arrow_up_white</item>
<item name="asListTabletBg">@color/tablet_list_bg_white</item>
<!-- actionbar-styling --> <!-- actionbar-styling -->
<item name="abBackground">@drawable/header_blue</item> <item name="abBackground">@drawable/header_blue</item>
@ -78,7 +77,6 @@
<item name="asRepeatIcon">@drawable/icn_edit_repeats_red</item> <item name="asRepeatIcon">@drawable/icn_edit_repeats_red</item>
<item name="asAbBackgroundColor">#ffffff</item> <item name="asAbBackgroundColor">#ffffff</item>
<item name="asListPopoverBg">@drawable/list_popover_bg</item> <item name="asListPopoverBg">@drawable/list_popover_bg</item>
<item name="asListTabletBg">@color/tablet_list_bg</item>
<item name="asListArrowUp">@drawable/list_arrow_up</item> <item name="asListArrowUp">@drawable/list_arrow_up</item>
<!-- actionbar-styling --> <!-- actionbar-styling -->
@ -346,6 +344,10 @@
<item name="android:textColor">?attr/asTextColorInverse</item> <item name="android:textColor">?attr/asTextColorInverse</item>
</style> </style>
<style name="TextAppearance.FLA_Filter_Tablet" parent="TextAppearance.FLA_Filter">
<item name="android:textColor">@android:color/white</item>
</style>
<style name="TextAppearance.FLA_Button" parent="TextAppearance.FLA_Filter"> <style name="TextAppearance.FLA_Button" parent="TextAppearance.FLA_Filter">
<item name="android:textColor">@color/new_list_button_text</item> <item name="android:textColor">@color/new_list_button_text</item>
</style> </style>

@ -39,6 +39,7 @@ import com.timsu.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.astrid.activity.AstridActivity;
import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.activity.FilterListFragment;
import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.AstridFilterExposer; import com.todoroo.astrid.api.AstridFilterExposer;
@ -116,6 +117,9 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
this.skipIntentFilters = skipIntentFilters; this.skipIntentFilters = skipIntentFilters;
this.selectable = selectable; this.selectable = selectable;
if (((AstridActivity) activity).getFragmentLayout() != AstridActivity.LAYOUT_SINGLE)
filterStyle = R.style.TextAppearance_FLA_Filter_Tablet;
inflater = (LayoutInflater) activity.getSystemService( inflater = (LayoutInflater) activity.getSystemService(
Context.LAYOUT_INFLATER_SERVICE); Context.LAYOUT_INFLATER_SERVICE);

Loading…
Cancel
Save