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

Merge pull request #152 from todoroo/120222_as_ui_fixes

Browse Source 
Added new widget 9 patch and fixed timer activity not showing up
pull/14/head
Tim Su 14 years ago
parent e68e59b227 79c720996a
commit 3728c3d93c
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File

6
astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
Unescape Escape View File

@ -413,7 +413,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
} }
private void addComment() { private void addComment() {
addComment(commentField.getText().toString(), "task_comment", true); //$NON-NLS-1$ addComment(commentField.getText().toString(), UpdateAdapter.UPDATE_TASK_COMMENT, true);
} }
@ -527,7 +527,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
addComment(String.format("%s %s", //$NON-NLS-1$ addComment(String.format("%s %s", //$NON-NLS-1$
getContext().getString(R.string.TEA_timer_comment_started), getContext().getString(R.string.TEA_timer_comment_started),
DateUtilities.getTimeString(getContext(), new Date())), DateUtilities.getTimeString(getContext(), new Date())),
"task_started", //$NON-NLS-1$ UpdateAdapter.UPDATE_TASK_COMMENT,
false); false);
} }
@ -538,7 +538,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
getContext().getString(R.string.TEA_timer_comment_stopped), getContext().getString(R.string.TEA_timer_comment_stopped),
DateUtilities.getTimeString(getContext(), new Date()), DateUtilities.getTimeString(getContext(), new Date()),
getContext().getString(R.string.TEA_timer_comment_spent), getContext().getString(R.string.TEA_timer_comment_spent),
elapsedTime), "task_stopped", false); //$NON-NLS-1$ elapsedTime), UpdateAdapter.UPDATE_TASK_COMMENT, false);
} }
/* /*

BIN
astrid/res/drawable-land/widget_frame.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

2
astrid/res/layout-land/widget_initialized.xml
Unescape Escape View File

@ -16,7 +16,7 @@
<TextView <TextView
android:id="@+id/widget_title" android:id="@+id/widget_title"
android:layout_gravity="left" android:layout_gravity="left"
android:layout_width="128dp" android:layout_width="163dp"
android:layout_height="47dp" android:layout_height="47dp"
android:textColor="#ffffff" android:textColor="#ffffff"
android:textSize="14sp" android:textSize="14sp"

2
astrid/res/layout-xlarge-land/widget_initialized.xml
Unescape Escape View File

@ -16,7 +16,7 @@
<TextView <TextView
android:id="@+id/widget_title" android:id="@+id/widget_title"
android:layout_gravity="left" android:layout_gravity="left"
android:layout_width="128dp" android:layout_width="163dp"
android:layout_height="40dp" android:layout_height="40dp"
android:textColor="#ffffff" android:textColor="#ffffff"
android:textSize="14sp" android:textSize="14sp"

2
astrid/res/layout/widget_initialized.xml
Unescape Escape View File

@ -16,7 +16,7 @@
<TextView <TextView
android:id="@+id/widget_title" android:id="@+id/widget_title"
android:layout_width="82dp" android:layout_width="100dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_gravity="left" android:layout_gravity="left"
android:textColor="#ffffff" android:textColor="#ffffff"

15
astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
Unescape Escape View File

@ -1,7 +1,5 @@
package com.todoroo.astrid.adapter; package com.todoroo.astrid.adapter;
import com.todoroo.astrid.helper.AsyncImageView;
import java.io.IOException; import java.io.IOException;
import org.json.JSONException; import org.json.JSONException;
@ -33,6 +31,7 @@ import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
import com.todoroo.astrid.data.Update; import com.todoroo.astrid.data.Update;
import com.todoroo.astrid.helper.AsyncImageView;
import com.todoroo.astrid.helper.ImageDiskCache; import com.todoroo.astrid.helper.ImageDiskCache;
/** /**
@ -60,12 +59,12 @@ public class UpdateAdapter extends CursorAdapter {
private static final String UPDATE_TASK_COMPLETED = "task_completed"; //$NON-NLS-1$ private static final String UPDATE_TASK_COMPLETED = "task_completed"; //$NON-NLS-1$
private static final String UPDATE_TASK_UNCOMPLETED = "task_uncompleted"; //$NON-NLS-1$ private static final String UPDATE_TASK_UNCOMPLETED = "task_uncompleted"; //$NON-NLS-1$
private static final String UPDATE_TASK_TAGGED = "task_tagged"; //$NON-NLS-1$ private static final String UPDATE_TASK_TAGGED = "task_tagged"; //$NON-NLS-1$
private static final String UPDATE_TASK_ASSIGNED = "task_assigned"; private static final String UPDATE_TASK_ASSIGNED = "task_assigned"; //$NON-NLS-1$
private static final String UPDATE_TASK_COMMENT = "task_comment"; public static final String UPDATE_TASK_COMMENT = "task_comment"; //$NON-NLS-1$
private static final String UPDATE_TAG_COMMENT = "tag_comment"; private static final String UPDATE_TAG_COMMENT = "tag_comment"; //$NON-NLS-1$
public static final String FROM_TAG_VIEW = "from_tag"; public static final String FROM_TAG_VIEW = "from_tag"; //$NON-NLS-1$
public static final String FROM_TASK_VIEW = "from_task"; public static final String FROM_TASK_VIEW = "from_task"; //$NON-NLS-1$
public static final String FROM_RECENT_ACTIVITY_VIEW = "from_recent_activity"; public static final String FROM_RECENT_ACTIVITY_VIEW = "from_recent_activity"; //$NON-NLS-1$
/** /**
* Constructor * Constructor
* *

Write Preview
Loading…
Cancel
Save