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

Lots of styling and new images, fixed a few task edit bugs

Browse Source
pull/14/head
Sam Bosley 14 years ago
parent 63a4b7e2d8
commit cc2a9474aa
19 changed files with 109 additions and 127 deletions
Show Stats Download Patch File Download Diff File

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

60
astrid/res/layout-large-land/task_list_activity.xml
Unescape Escape View File

@ -1,60 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- See the file "LICENSE" for the full license governing this code. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/taskListParent"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
style="@style/Content"
android:orientation="vertical">
<!-- Body goes here -->
<!-- Footer -->
<LinearLayout
android:id="@+id/taskListFooter"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="47dip"
android:layout_weight="1"
android:background="@drawable/footer_background"
android:padding="3dip"
android:orientation="horizontal">
<!-- Voice Add Button -->
<ImageButton android:id="@+id/voiceAddButton"
android:layout_width="wrap_content"
android:layout_height="39dip"
android:layout_gravity="top"
android:layout_marginRight="3dip"
android:layout_weight="1"
android:visibility="gone"
android:background="@drawable/footer_button"
android:src="@drawable/ic_footer_mic"
android:scaleType="center"/>
<!-- Quick Add Task -->
<EditText android:id="@+id/quickAddText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3dip"
android:layout_weight="100"
android:background="@drawable/footer_edittext"
android:hint="@string/TLA_quick_add_hint"
android:textSize="16sp"
android:autoText="true"
android:capitalize="sentences"/>
<!-- Extended Add Button -->
<ImageButton android:id="@+id/quickAddButton"
android:layout_width="wrap_content"
android:layout_height="39dip"
android:layout_gravity="top"
android:layout_marginRight="3dip"
android:layout_weight="1"
android:background="@drawable/footer_button"
android:src="@drawable/ic_footer_add"
android:scaleType="center"/>
</LinearLayout>
</LinearLayout>

70
astrid/res/layout/header_nav_views.xml
Unescape Escape View File

@ -1,34 +1,50 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/lists_nav"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" android:orientation="horizontal">
android:layout_marginLeft="5dip"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:paddingRight="5dip"
android:paddingLeft="5dip"
android:gravity="center_vertical">
<TextView
android:id="@+id/list_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@string/BFE_Active"
android:singleLine="true"
android:ellipsize="end"
style="@style/TextAppearance.ActionBar_ListsHeader"/>
<ImageView <ImageView
android:id="@+id/list_disclosure_arrow" android:id="@+id/main_menu"
android:layout_width="12dip" android:layout_width="51dip"
android:layout_height="12dip" android:padding="10dip"
android:layout_marginLeft="10dip" android:layout_height="fill_parent"
android:layout_toRightOf="@id/list_title" android:layout_marginLeft="3dip"
android:layout_alignBottom="@id/list_title" android:src="@drawable/menu"
android:src="@drawable/list_disclosure"
android:scaleType="fitCenter"/> android:scaleType="fitCenter"/>
<RelativeLayout
android:id="@+id/lists_nav"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="5dip"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:paddingRight="5dip"
android:paddingLeft="5dip"
android:gravity="center_vertical">
<TextView
android:id="@+id/list_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@string/BFE_Active"
android:singleLine="true"
android:ellipsize="end"
style="@style/TextAppearance.ActionBar_ListsHeader"/>
<ImageView
android:id="@+id/list_disclosure_arrow"
android:layout_width="12dip"
android:layout_height="12dip"
android:layout_marginLeft="10dip"
android:layout_toRightOf="@id/list_title"
android:layout_alignBottom="@id/list_title"
android:src="?attr/asListsDisclosure"
android:scaleType="fitCenter"/>
</RelativeLayout>
</RelativeLayout> </LinearLayout>

40
astrid/res/layout/task_edit_activity.xml
Unescape Escape View File

@ -117,13 +117,14 @@
<LinearLayout <LinearLayout
android:id="@+id/updatesFooter" android:id="@+id/updatesFooter"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/footer_background"
android:minHeight="47dip" android:minHeight="47dip"
android:layout_weight="1"
android:padding="3dip"
android:layout_marginBottom="5dip"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="3dip" > style="@style/Content">
<!-- Voice Add Button --> <!-- Voice Add Button -->
@ -132,41 +133,40 @@
android:layout_width="39dip" android:layout_width="39dip"
android:layout_height="39dip" android:layout_height="39dip"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginLeft="5dip"
android:layout_marginRight="3dip" android:layout_marginRight="3dip"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/footer_button" android:background="?attr/asCameraButtonImg"
android:paddingBottom="2dip" android:scaleType="fitCenter"/>
android:paddingLeft="7dip"
android:paddingRight="7dip"
android:scaleType="fitCenter"
android:src="@drawable/icn_camera" />
<!-- Quick Add Task --> <!-- Quick Add Task -->
<EditText <EditText
android:id="@+id/commentField" android:id="@+id/commentField"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="39dip"
android:layout_marginRight="3dip" android:layout_marginRight="8dip"
android:layout_marginLeft="5dip"
android:layout_weight="100" android:layout_weight="100"
android:paddingLeft="5dip"
android:background="@drawable/edit_title_background"
android:textSize="16sp"
android:autoText="true" android:autoText="true"
android:background="@drawable/footer_edittext" android:textColor="@android:color/black"
android:capitalize="sentences"
android:hint="@string/TVA_add_comment" android:hint="@string/TVA_add_comment"
android:textSize="16sp" /> android:capitalize="sentences"/>
<!-- Extended Add Button --> <!-- Extended Add Button -->
<ImageButton <ImageButton
android:id="@+id/commentButton" android:id="@+id/commentButton"
android:layout_width="wrap_content" android:layout_width="39dip"
android:layout_height="39dip" android:layout_height="39dip"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginRight="3dip" android:layout_marginRight="5dip"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/footer_button" android:background="?attr/asAddButtonImg"
android:scaleType="center" android:scaleType="center"/>
android:src="@drawable/ic_footer_add" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

26
astrid/res/layout/task_list_activity.xml
Unescape Escape View File

@ -24,29 +24,32 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="47dip" android:minHeight="47dip"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/footer_background"
android:padding="3dip" android:padding="3dip"
android:orientation="horizontal"> android:layout_marginBottom="5dip"
android:orientation="horizontal"
style="@style/Content">
<!-- Voice Add Button --> <!-- Voice Add Button -->
<ImageButton android:id="@+id/voiceAddButton" <ImageButton android:id="@+id/voiceAddButton"
android:layout_width="wrap_content" android:layout_width="39dip"
android:layout_height="39dip" android:layout_height="39dip"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginLeft="5dip"
android:layout_marginRight="3dip" android:layout_marginRight="3dip"
android:layout_weight="1" android:layout_weight="1"
android:visibility="gone" android:visibility="gone"
android:background="@drawable/footer_button" android:background="?attr/asMicButtonImg"
android:src="@drawable/ic_footer_mic"
android:scaleType="center"/> android:scaleType="center"/>
<!-- Quick Add Task --> <!-- Quick Add Task -->
<EditText android:id="@+id/quickAddText" <EditText android:id="@+id/quickAddText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="39dip"
android:layout_marginRight="3dip" android:layout_marginRight="8dip"
android:layout_marginLeft="5dip"
android:layout_weight="100" android:layout_weight="100"
android:background="@drawable/footer_edittext" android:paddingLeft="5dip"
android:background="@drawable/edit_title_background"
android:hint="@string/TLA_quick_add_hint" android:hint="@string/TLA_quick_add_hint"
android:textSize="16sp" android:textSize="16sp"
android:autoText="true" android:autoText="true"
@ -55,13 +58,12 @@
<!-- Extended Add Button --> <!-- Extended Add Button -->
<ImageButton android:id="@+id/quickAddButton" <ImageButton android:id="@+id/quickAddButton"
android:layout_width="wrap_content" android:layout_width="39dip"
android:layout_height="39dip" android:layout_height="39dip"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginRight="3dip" android:layout_marginRight="5dip"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/footer_button" android:background="?attr/asAddButtonImg"
android:src="@drawable/ic_footer_add"
android:scaleType="center"/> android:scaleType="center"/>
</LinearLayout> </LinearLayout>

5
astrid/res/values/attrs.xml
Unescape Escape View File

@ -16,6 +16,11 @@
<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"/> <attr name="asAbTextColor" format="color"/>
<attr name="asAddButtonImg" format="reference" />
<attr name="asMicButtonImg" format="reference" />
<attr name="asCameraButtonImg" format="reference" />
<attr name="asListsDisclosure" format="reference" />
<declare-styleable name="ContactsAutoComplete"> <declare-styleable name="ContactsAutoComplete">
<attr name="allowMultiple" format="boolean"/> <attr name="allowMultiple" format="boolean"/>

8
astrid/res/values/styles.xml
Unescape Escape View File

@ -19,6 +19,10 @@
<item name="asFilterHeaderBackground">@drawable/edit_titlebar</item> <item name="asFilterHeaderBackground">@drawable/edit_titlebar</item>
<item name="asMembersHeaderBackground">@drawable/ios_fabric_480_dark</item> <item name="asMembersHeaderBackground">@drawable/ios_fabric_480_dark</item>
<item name="asSeparatorBackground">#888888</item> <item name="asSeparatorBackground">#888888</item>
<item name="asAddButtonImg">@drawable/plus_button_gray</item>
<item name="asMicButtonImg">@drawable/mic_button_gray</item>
<item name="asCameraButtonImg">@drawable/camera_button_gray</item>
<item name="asListsDisclosure">@drawable/lists_disclosure_gray</item>
<!-- actionbar-styling --> <!-- actionbar-styling -->
<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>
@ -61,6 +65,10 @@
<item name="asFilterHeaderColor">#ffffff</item> <item name="asFilterHeaderColor">#ffffff</item>
<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>
<item name="asAddButtonImg">@drawable/plus_button_red</item>
<item name="asMicButtonImg">@drawable/mic_button_red</item>
<item name="asCameraButtonImg">@drawable/camera_button_red</item>
<item name="asListsDisclosure">@drawable/lists_disclosure_red</item>
<!-- actionbar-styling --> <!-- actionbar-styling -->
<item name="abBackground">@android:color/white</item> <item name="abBackground">@android:color/white</item>
<item name="abDisplayOptions">useLogo|showHome|showTitle</item> <item name="abDisplayOptions">useLogo|showHome|showTitle</item>

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

@ -989,7 +989,7 @@ public final class TaskEditActivity extends Fragment implements
MenuItem item; MenuItem item;
AstridWrapperActivity activity = (AstridWrapperActivity) getActivity(); AstridWrapperActivity activity = (AstridWrapperActivity) getActivity();
if (activity instanceof TaskListWrapperActivity && activity.fragmentLayout != AstridWrapperActivity.LAYOUT_DOUBLE) { if (activity instanceof TaskListWrapperActivity && activity.fragmentLayout != AstridWrapperActivity.LAYOUT_DOUBLE || activity instanceof TaskEditWrapperActivity) {
item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard); item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
item.setIcon(android.R.drawable.ic_menu_close_clear_cancel); item.setIcon(android.R.drawable.ic_menu_close_clear_cancel);
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);

25
astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
Unescape Escape View File

@ -6,12 +6,14 @@ import android.os.Bundle;
import android.support.v4.app.ActionBar; import android.support.v4.app.ActionBar;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.View.OnTouchListener; import android.view.View.OnTouchListener;
import android.view.ViewGroup.LayoutParams; import android.view.ViewGroup.LayoutParams;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.PopupWindow.OnDismissListener; import android.widget.PopupWindow.OnDismissListener;
import android.widget.TextView; import android.widget.TextView;
@ -27,12 +29,13 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
public static final String TOKEN_SELECTED_FILTER = "selectedFilter"; public static final String TOKEN_SELECTED_FILTER = "selectedFilter";
private View listsNav; private View listsNav;
private ImageView listsNavDisclosure;
private TextView lists; private TextView lists;
private FragmentPopover listsPopover; private FragmentPopover listsPopover;
private FragmentPopover editPopover; private FragmentPopover editPopover;
private boolean suppressTaskSave = false; private boolean fromTaskEdit = false;
private final OnClickListener popupMenuClickListener = new OnClickListener() { private final OnClickListener popupMenuClickListener = new OnClickListener() {
@Override @Override
@ -48,9 +51,9 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
TaskEditActivity tea = getTaskEditFragment(); TaskEditActivity tea = getTaskEditFragment();
if (tea != null) { if (tea != null) {
try { try {
if (!suppressTaskSave) if (!fromTaskEdit)
tea.save(false); tea.save(false);
suppressTaskSave = false; fromTaskEdit = false;
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
// Save during pause, ignore it // Save during pause, ignore it
} }
@ -73,6 +76,7 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
actionBar.setCustomView(R.layout.header_nav_views); actionBar.setCustomView(R.layout.header_nav_views);
listsNav = actionBar.getCustomView().findViewById(R.id.lists_nav); listsNav = actionBar.getCustomView().findViewById(R.id.lists_nav);
listsNavDisclosure = (ImageView) actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow);
lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title); lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title);
initializeFragments(actionBar); initializeFragments(actionBar);
@ -176,6 +180,9 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected : R.style.TextAppearance_ActionBar_ListsHeader); int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected : R.style.TextAppearance_ActionBar_ListsHeader);
lists.setTextAppearance(this, textStyle); lists.setTextAppearance(this, textStyle);
listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent); listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent);
TypedValue tv = new TypedValue();
getTheme().resolveAttribute(R.attr.asListsDisclosure, tv, false);
listsNavDisclosure.setImageResource(selected ? R.drawable.lists_disclosure_white : tv.data);
} }
@Override @Override
@ -187,9 +194,12 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
if (savedFilter != null) if (savedFilter != null)
lists.setText(savedFilter.title); lists.setText(savedFilter.title);
TaskEditActivity tea = getTaskEditFragment(); if (!fromTaskEdit) {
if (tea != null) TaskEditActivity tea = getTaskEditFragment();
onBackPressed(); if (tea != null)
onBackPressed();
}
fromTaskEdit = false;
} }
@Override @Override
@ -216,10 +226,11 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
} else { } else {
findViewById(R.id.taskedit_fragment_container).setVisibility(View.INVISIBLE); findViewById(R.id.taskedit_fragment_container).setVisibility(View.INVISIBLE);
} }
fromTaskEdit = true;
onPostResume(); onPostResume();
} else { } else {
if (editPopover != null && editPopover.isShowing()) { if (editPopover != null && editPopover.isShowing()) {
suppressTaskSave = true; fromTaskEdit = true;
editPopover.dismiss(); editPopover.dismiss();
} }
} }

Write Preview
Loading…
Cancel
Save