archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Restyled the add list button

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent baf2da5bda
commit 2d67c23b9e
10 changed files with 27 additions and 45 deletions
Show Stats Download Patch File Download Diff File

5
astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java
Unescape Escape View File

@ -216,10 +216,11 @@ public class GCalControlSet extends PopupControlSet {
calendar.setText(R.string.gcal_TEA_none_selected);
}
} else {
int index = calendars.defaultIndex + 1;
if (!TextUtils.isEmpty(model.getValue(Task.CALENDAR_URI))) {
calendar.setText(R.string.gcal_TEA_has_event);
} else if (calendars.defaultIndex + 1 != 0) {
calendar.setText(calendars.calendars[calendars.defaultIndex + 1]);
} else if (index != 0 && index < calendars.calendars.length) {
calendar.setText(calendars.calendars[index]);
} else {
calendar.setText(R.string.gcal_TEA_none_selected);
}

4
astrid/res/color/new_list_button_text.xml
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_pressed="true"
android:color="#444"/>
<item android:state_pressed="false"
android:color="#888"/>
<item android:state_pressed="false"
android:color="#fff"/>
</selector>

BIN
astrid/res/drawable-hdpi/filter_plus_button.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 827 B

BIN
astrid/res/drawable/filter_plus_button.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 827 B

BIN
astrid/res/drawable/welcome_walkthrough_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 92 KiB

14
astrid/res/layout-land/filter_list_activity.xml
Unescape Escape View File

@ -23,24 +23,20 @@
android:id="@+id/lists_footer"
android:layout_width="fill_parent"
android:layout_height="50dip"
android:padding="5dip"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_alignParentBottom="true">
<ImageView
android:layout_width="39dip"
android:layout_height="39dip"
android:layout_marginLeft="5dip"
android:layout_marginRight="8dip"
android:src="?attr/asAddButtonImg"
android:scaleType="fitCenter"/>
<TextView
android:id="@+id/new_list_button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="10dip"
android:gravity="left|center_vertical"
android:background="?attr/asThemeTextColor"
android:paddingLeft="12dip"
android:drawableLeft="@drawable/filter_plus_button"
android:drawablePadding="13dip"
android:text="@string/FLA_new_list"
style="@style/TextAppearance.FLA_Button"/>

14
astrid/res/layout/filter_list_activity.xml
Unescape Escape View File

@ -23,24 +23,20 @@
android:id="@+id/lists_footer"
android:layout_width="fill_parent"
android:layout_height="50dip"
android:padding="5dip"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_alignParentBottom="true">
<ImageView
android:layout_width="39dip"
android:layout_height="39dip"
android:layout_marginLeft="5dip"
android:layout_marginRight="8dip"
android:src="?attr/asAddButtonImg"
android:scaleType="fitCenter"/>
<TextView
android:id="@+id/new_list_button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="10dip"
android:gravity="left|center_vertical"
android:background="?attr/asThemeTextColor"
android:paddingLeft="12dip"
android:drawableLeft="@drawable/filter_plus_button"
android:drawablePadding="13dip"
android:text="@string/FLA_new_list"
style="@style/TextAppearance.FLA_Button"/>

31
astrid/res/layout/filter_list_activity_3pane.xml
Unescape Escape View File

@ -15,31 +15,20 @@
<include layout="@layout/fla_separator"/>
<LinearLayout
<TextView
android:id="@+id/new_list_button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_vertical">
<ImageView
android:layout_width="39dip"
android:layout_height="39dip"
android:layout_marginLeft="5dip"
android:layout_marginRight="8dip"
android:src="?attr/asAddButtonImg"
android:scaleType="fitCenter"/>
<TextView
android:id="@+id/new_list_button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingLeft="10dip"
android:gravity="left|center_vertical"
android:text="@string/FLA_new_list"
style="@style/TextAppearance.FLA_Button"/>
</LinearLayout>
android:layout_margin="6dip"
android:gravity="left|center_vertical"
android:background="?attr/asThemeTextColor"
android:paddingLeft="8dip"
android:drawableLeft="@drawable/filter_plus_button"
android:drawablePadding="13dip"
android:text="@string/FLA_new_list"
style="@style/TextAppearance.FLA_Button"/>
</LinearLayout>
<!-- List -->
<ListView android:id="@android:id/list"

2
astrid/res/values/strings-repeat.xml
Unescape Escape View File

@ -19,7 +19,7 @@
<!-- hint when opening repeat interval -->
<string name="repeat_interval_prompt">Repeat Interval</string>
<string name="repeat_never">Make Repeating</string>
<string name="repeat_never">Make Repeating?</string>
<string name="repeat_dont">Don\'t repeat</string>

2
astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
Unescape Escape View File

@ -161,7 +161,7 @@ public class FilterListFragment extends ListFragment {
getActivity().setDefaultKeyMode(Activity.DEFAULT_KEYS_SEARCH_LOCAL);
//ImageView backButton = (ImageView) getView().findViewById(R.id.back);
newListButton = getView().findViewById(R.id.lists_footer);
newListButton = getView().findViewById(R.id.new_list_button);
newListButton.setOnClickListener(new OnClickListener() {
@Override

Write Preview
Loading…
Cancel
Save