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

Merge pull request #143 from todoroo/20120217_as_tablet_activity

Browse Source 
New activity update view
pull/14/head
Tim Su 14 years ago
parent 44958e8df8 fbd3c90a21
commit 992b6a51ac
10 changed files with 284 additions and 97 deletions
Show Stats Download Patch File Download Diff File

10
api/src/com/todoroo/astrid/data/Update.java
Unescape Escape View File

@ -67,6 +67,14 @@ public class Update extends RemoteModel {
public static final StringProperty USER = new StringProperty( public static final StringProperty USER = new StringProperty(
TABLE, USER_JSON_PROPERTY_NAME); TABLE, USER_JSON_PROPERTY_NAME);
/** Other user id */
public static final LongProperty OTHER_USER_ID = new LongProperty(
TABLE, "other_user_id");
/** Other User Object (JSON) */
public static final StringProperty OTHER_USER = new StringProperty(
TABLE, "other_user");
/** Action text */ /** Action text */
public static final StringProperty ACTION = new StringProperty( public static final StringProperty ACTION = new StringProperty(
TABLE, "action"); TABLE, "action");
@ -116,6 +124,8 @@ public class Update extends RemoteModel {
defaultValues.put(TAGS_LOCAL.name, 0); defaultValues.put(TAGS_LOCAL.name, 0);
defaultValues.put(USER_ID.name, 0); defaultValues.put(USER_ID.name, 0);
defaultValues.put(USER.name, ""); defaultValues.put(USER.name, "");
defaultValues.put(OTHER_USER_ID.name, 0);
defaultValues.put(OTHER_USER.name, "");
defaultValues.put(ACTION.name, ""); defaultValues.put(ACTION.name, "");
defaultValues.put(ACTION_CODE.name, ""); defaultValues.put(ACTION_CODE.name, "");
defaultValues.put(MESSAGE.name, ""); defaultValues.put(MESSAGE.name, "");

25
astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
Unescape Escape View File

@ -1,9 +1,11 @@
package com.todoroo.astrid.actfm; package com.todoroo.astrid.actfm;
import greendroid.widget.AsyncImageView;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.Bitmap; import android.graphics.Bitmap;
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.support.v4.app.ListFragment; import android.support.v4.app.ListFragment;
@ -30,6 +32,7 @@ import com.timsu.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback; import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
@ -47,6 +50,7 @@ import com.todoroo.astrid.helper.ProgressBarSyncResultCallback;
import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsConstants;
import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.StatisticsService;
import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.TagDataService;
import com.todoroo.astrid.tags.TagService;
import com.todoroo.astrid.utility.Flags; import com.todoroo.astrid.utility.Flags;
public class TagUpdatesFragment extends ListFragment { public class TagUpdatesFragment extends ListFragment {
@ -126,6 +130,24 @@ public class TagUpdatesFragment extends ListFragment {
String title = (tagData == null) ? getString(R.string.TLA_all_activity) : getString(R.string.tag_updates_title, tagData.getValue(TagData.NAME)); String title = (tagData == null) ? getString(R.string.TLA_all_activity) : getString(R.string.tag_updates_title, tagData.getValue(TagData.NAME));
((TextView) ab.getCustomView().findViewById(R.id.title)).setText(title); ((TextView) ab.getCustomView().findViewById(R.id.title)).setText(title);
} }
if (AndroidUtilities.isTabletSized(getActivity()) && tagData != null) {
getView().setBackgroundColor(Color.rgb(200, 200, 200));
TextView tagTitle = (TextView) getView().findViewById(R.id.tag_title);
String tagName = tagData.getValue(TagData.NAME);
tagTitle.setText(tagName);
TextView descriptionTitle = (TextView) getView().findViewById(R.id.tag_description);
descriptionTitle.setText(tagData.getValue(TagData.TAG_DESCRIPTION));
AsyncImageView imageView = (AsyncImageView) getView().findViewById(R.id.tag_picture);
imageView.setDefaultImageResource(TagService.getDefaultImageIDForTag(tagName));
imageView.setUrl(tagData.getValue(TagData.PICTURE));
}
else {
getView().findViewById(R.id.tag_header).setVisibility(View.GONE);
getView().findViewById(R.id.activity_header).setVisibility(View.GONE);
}
final ImageButton commentButton = (ImageButton) getView().findViewById(R.id.commentButton); final ImageButton commentButton = (ImageButton) getView().findViewById(R.id.commentButton);
addCommentField = (EditText) getView().findViewById(R.id.commentField); addCommentField = (EditText) getView().findViewById(R.id.commentField);
addCommentField.setOnEditorActionListener(new OnEditorActionListener() { addCommentField.setOnEditorActionListener(new OnEditorActionListener() {
@ -190,9 +212,10 @@ public class TagUpdatesFragment extends ListFragment {
if(updateAdapter == null) { if(updateAdapter == null) {
TodorooCursor<Update> currentCursor = tagDataService.getUpdates(tagData); TodorooCursor<Update> currentCursor = tagDataService.getUpdates(tagData);
getActivity().startManagingCursor(currentCursor); getActivity().startManagingCursor(currentCursor);
String fromUpdateClass = (tagData == null) ? UpdateAdapter.FROM_RECENT_ACTIVITY_VIEW : UpdateAdapter.FROM_TAG_VIEW;
updateAdapter = new UpdateAdapter(this, R.layout.update_adapter_row, updateAdapter = new UpdateAdapter(this, R.layout.update_adapter_row,
currentCursor, false, null); currentCursor, false, null, fromUpdateClass);
((ListView) getView().findViewById(android.R.id.list)).setAdapter(updateAdapter); ((ListView) getView().findViewById(android.R.id.list)).setAdapter(updateAdapter);
} else { } else {
Cursor cursor = updateAdapter.getCursor(); Cursor cursor = updateAdapter.getCursor();

3
astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
Unescape Escape View File

@ -1116,6 +1116,9 @@ public final class ActFmSyncService {
public static void updateFromJson(JSONObject json, Update model) throws JSONException { public static void updateFromJson(JSONObject json, Update model) throws JSONException {
model.setValue(Update.REMOTE_ID, json.getLong("id")); model.setValue(Update.REMOTE_ID, json.getLong("id"));
readUser(json.getJSONObject("user"), model, Update.USER_ID, Update.USER); readUser(json.getJSONObject("user"), model, Update.USER_ID, Update.USER);
if (json.has("other_user")) {
readUser(json.getJSONObject("other_user"), model, Update.OTHER_USER_ID, Update.OTHER_USER);
}
model.setValue(Update.ACTION, json.getString("action")); model.setValue(Update.ACTION, json.getString("action"));
model.setValue(Update.ACTION_CODE, json.getString("action_code")); model.setValue(Update.ACTION_CODE, json.getString("action_code"));
model.setValue(Update.TARGET_NAME, json.getString("target_name")); model.setValue(Update.TARGET_NAME, json.getString("target_name"));

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

@ -18,6 +18,8 @@ import android.graphics.Bitmap;
import android.graphics.Color; import android.graphics.Color;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.text.Editable; import android.text.Editable;
import android.text.Html;
import android.text.Spanned;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.text.format.DateUtils; import android.text.format.DateUtils;
@ -49,6 +51,7 @@ import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
import com.todoroo.astrid.actfm.ActFmCameraModule.ClearImageCallback; import com.todoroo.astrid.actfm.ActFmCameraModule.ClearImageCallback;
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
import com.todoroo.astrid.actfm.sync.ActFmSyncService; import com.todoroo.astrid.actfm.sync.ActFmSyncService;
import com.todoroo.astrid.adapter.UpdateAdapter;
import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.core.PluginServices;
import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
import com.todoroo.astrid.dao.UpdateDao; import com.todoroo.astrid.dao.UpdateDao;
@ -91,6 +94,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
private final Fragment fragment; private final Fragment fragment;
private final ImageDiskCache imageCache; private final ImageDiskCache imageCache;
private final int cameraButton; private final int cameraButton;
private final String linkColor;
private final List<UpdatesChangedListener> listeners = new LinkedList<UpdatesChangedListener>(); private final List<UpdatesChangedListener> listeners = new LinkedList<UpdatesChangedListener>();
@ -105,6 +109,8 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
imageCache = ImageDiskCache.getInstance(); imageCache = ImageDiskCache.getInstance();
this.fragment = fragment; this.fragment = fragment;
linkColor = UpdateAdapter.getLinkColor(fragment);
cameraButton = getDefaultCameraButton(); cameraButton = getDefaultCameraButton();
DependencyInjectionService.getInstance().inject(this); DependencyInjectionService.getInstance().inject(this);
@ -267,7 +273,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
Update update = new Update(); Update update = new Update();
for(updates.moveToFirst(); !updates.isAfterLast(); updates.moveToNext()) { for(updates.moveToFirst(); !updates.isAfterLast(); updates.moveToNext()) {
update.readFromCursor(updates); update.readFromCursor(updates);
NoteOrUpdate noa = NoteOrUpdate.fromUpdate(update); NoteOrUpdate noa = NoteOrUpdate.fromUpdate(update, linkColor);
if(noa != null) if(noa != null)
items.add(noa); items.add(noa);
} }
@ -343,18 +349,8 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
// name // name
final TextView nameView = (TextView)view.findViewById(R.id.title); { final TextView nameView = (TextView)view.findViewById(R.id.title); {
if (TextUtils.isEmpty(item.title)) { nameView.setText(item.title);
nameView.setText(fragment.getActivity().getString(R.string.ENA_no_user)); Linkify.addLinks(nameView, Linkify.ALL);
}
else {
nameView.setText(item.title);
}
}
// description
final TextView descriptionView = (TextView)view.findViewById(R.id.description); {
descriptionView.setText(item.body);
Linkify.addLinks(descriptionView, Linkify.ALL);
} }
// date // date
@ -433,8 +429,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
private String getPictureHashForUpdate(Update u) { private String getPictureHashForUpdate(Update u) {
String s = u.getValue(Update.TASK) + "" + u.getValue(Update.CREATION_DATE); return String.format("%s%s", u.getValue(Update.TASK), u.getValue(Update.CREATION_DATE)); //$NON-NLS-1$
return s;
} }
private void addComment(String message, String actionCode, boolean usePicture) { private void addComment(String message, String actionCode, boolean usePicture) {
// Allow for users to just add picture // Allow for users to just add picture
@ -491,17 +486,15 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
private static class NoteOrUpdate { private static class NoteOrUpdate {
private final String picture; private final String picture;
private final String title; private final Spanned title;
private final String body;
private final String commentPicture; private final String commentPicture;
private final long createdAt; private final long createdAt;
public NoteOrUpdate(String picture, String title, String body, String commentPicture, public NoteOrUpdate(String picture, Spanned title, String commentPicture,
long createdAt) { long createdAt) {
super(); super();
this.picture = picture; this.picture = picture;
this.title = title; this.title = title;
this.body = body;
this.commentPicture = commentPicture; this.commentPicture = commentPicture;
this.createdAt = createdAt; this.createdAt = createdAt;
} }
@ -511,43 +504,26 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
m.setValue(NoteMetadata.THUMBNAIL, ""); //$NON-NLS-1$ m.setValue(NoteMetadata.THUMBNAIL, ""); //$NON-NLS-1$
if(!m.containsNonNullValue(NoteMetadata.COMMENT_PICTURE)) if(!m.containsNonNullValue(NoteMetadata.COMMENT_PICTURE))
m.setValue(NoteMetadata.COMMENT_PICTURE, ""); //$NON-NLS-1$ m.setValue(NoteMetadata.COMMENT_PICTURE, ""); //$NON-NLS-1$
Spanned title = Html.fromHtml(String.format("%s\n%s", m.getValue(NoteMetadata.TITLE), m.getValue(NoteMetadata.BODY))); //$NON-NLS-1$
return new NoteOrUpdate(m.getValue(NoteMetadata.THUMBNAIL), return new NoteOrUpdate(m.getValue(NoteMetadata.THUMBNAIL),
m.getValue(NoteMetadata.TITLE), title,
m.getValue(NoteMetadata.BODY),
m.getValue(NoteMetadata.COMMENT_PICTURE), m.getValue(NoteMetadata.COMMENT_PICTURE),
m.getValue(Metadata.CREATION_DATE)); m.getValue(Metadata.CREATION_DATE));
} }
@SuppressWarnings("nls") @SuppressWarnings("nls")
public static NoteOrUpdate fromUpdate(Update u) { public static NoteOrUpdate fromUpdate(Update u, String linkColor) {
JSONObject user = ActFmPreferenceService.userFromModel(u); JSONObject user = ActFmPreferenceService.userFromModel(u);
String description = u.getValue(Update.ACTION);
String message = u.getValue(Update.MESSAGE);
if(u.getValue(Update.ACTION_CODE).equals("task_comment"))
description = message;
else if(!TextUtils.isEmpty(message) && !TextUtils.isEmpty(description))
description += " " + message;
else
description += message;
if(TextUtils.isEmpty(description))
return null;
String commentPicture = u.getValue(Update.PICTURE); String commentPicture = u.getValue(Update.PICTURE);
Spanned title = UpdateAdapter.getUpdateComment(u, user, linkColor, UpdateAdapter.FROM_TASK_VIEW);
return new NoteOrUpdate(user.optString("picture"), return new NoteOrUpdate(user.optString("picture"),
user.optString("name", ""), title,
description,
commentPicture, commentPicture,
u.getValue(Update.CREATION_DATE)); u.getValue(Update.CREATION_DATE));
} }
@Override
public String toString() {
return title + ": " + body; //$NON-NLS-1$
}
} }
public void addListener(UpdatesChangedListener listener) { public void addListener(UpdatesChangedListener listener) {

4
astrid/res/layout-land/task_list_wrapper_activity_3pane.xml
Unescape Escape View File

@ -23,7 +23,7 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="33" android:layout_weight="30"
android:id="@+id/tasklist_fragment_container" /> android:id="@+id/tasklist_fragment_container" />
<View <View
@ -35,7 +35,7 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="33" android:layout_weight="35"
android:id="@+id/taskedit_fragment_container" android:id="@+id/taskedit_fragment_container"
android:visibility="invisible" /> android:visibility="invisible" />

75
astrid/res/layout/tag_updates_fragment.xml
Unescape Escape View File

@ -1,10 +1,71 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
style="@style/Content" style="@style/Content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout
android:id="@+id/tag_header"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dip" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<greendroid.widget.AsyncImageView
android:id="@+id/tag_picture"
android:layout_width="80dip"
android:layout_height="80dip"
astrid:defaultSrc="@android:drawable/ic_menu_gallery"
android:paddingRight="10dip"
android:scaleType="fitCenter" />
<TextView
android:id="@+id/tag_title"
style="@style/TextAppearance.GEN_EditLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/actfm_TVA_tag_description_label"
android:textSize="25dip" />
</LinearLayout>
<TextView
android:id="@+id/tag_description"
style="@style/TextAppearance.TAd_ItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:textColor="#666" />
</LinearLayout>
<LinearLayout
android:id="@+id/activity_header"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
style="@style/TextAppearance.TAd_ItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dip"
android:layout_marginTop="5dip"
android:text="@string/TEA_tab_activity"
android:textColor="#888" />
<View
android:id="@+id/TEA_Separator"
style="@style/TEA_Separator"
android:layout_width="fill_parent"
android:layout_height="1px" />
</LinearLayout>
<ProgressBar <ProgressBar
android:id="@+id/comments_progressBar" android:id="@+id/comments_progressBar"
style="@android:style/Widget.ProgressBar.Horizontal" style="@android:style/Widget.ProgressBar.Horizontal"
@ -27,11 +88,11 @@
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:layout_weight="1"
android:minHeight="50dip"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="50dip"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="3dip" android:padding="3dip"
android:paddingBottom="5dip"> android:paddingBottom="5dip" >
<!-- Voice Add Button --> <!-- Voice Add Button -->
@ -42,9 +103,9 @@
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginRight="3dip" android:layout_marginRight="3dip"
android:layout_weight="1" android:layout_weight="1"
android:background="@android:color/transparent"
android:paddingBottom="2dip" android:paddingBottom="2dip"
android:scaleType="centerInside" android:scaleType="centerInside"
android:background="@android:color/transparent"
android:src="@drawable/camera_button" /> android:src="@drawable/camera_button" />
<!-- Quick Add Task --> <!-- Quick Add Task -->
@ -53,16 +114,16 @@
android:id="@+id/commentField" android:id="@+id/commentField"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="39dip" android:layout_height="39dip"
android:layout_marginBottom="2dip"
android:layout_marginLeft="1dip" android:layout_marginLeft="1dip"
android:layout_marginRight="1dip" android:layout_marginRight="1dip"
android:layout_marginBottom="2dip"
android:layout_weight="100" android:layout_weight="100"
android:autoText="true" android:autoText="true"
android:background="@drawable/footer_comment_edittext" android:background="@drawable/footer_comment_edittext"
android:capitalize="sentences" android:capitalize="sentences"
android:hint="@string/TVA_add_comment" android:hint="@string/TVA_add_comment"
android:textColor="@android:color/black"
android:paddingLeft="10dip" android:paddingLeft="10dip"
android:textColor="@android:color/black"
android:textSize="16sp" /> android:textSize="16sp" />
<!-- Extended Add Button --> <!-- Extended Add Button -->
@ -75,7 +136,7 @@
android:layout_marginLeft="3dip" android:layout_marginLeft="3dip"
android:layout_weight="1" android:layout_weight="1"
android:background="?attr/asAddButtonImg" android:background="?attr/asAddButtonImg"
android:scaleType="center"/> android:scaleType="center" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

37
astrid/res/layout/update_adapter_row.xml
Unescape Escape View File

@ -37,40 +37,31 @@
android:textSize="16sp"/> android:textSize="16sp"/>
<!-- action description --> <!-- activity date -->
<TextView android:id="@+id/description" <TextView android:id="@+id/date"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/title" android:layout_below="@id/title"
android:layout_alignParentLeft="true" android:layout_marginLeft="50dip"
style="@style/TextAppearance.TAd_ItemDetails" android:paddingTop="3dip"
android:paddingLeft="50dip" style="@style/TextAppearance.TAd_ItemDueDate"
android:textSize="14sp" /> android:gravity="left"
android:ellipsize="end"
android:textSize="12sp"
android:singleLine="true"/>
<!-- picture --> <!-- picture -->
<greendroid.widget.AsyncImageView android:id="@+id/comment_picture" <greendroid.widget.AsyncImageView android:id="@+id/comment_picture"
android:layout_width="100dip" android:layout_width="100dip"
android:layout_height="100dip" android:layout_height="100dip"
android:layout_below="@id/description" android:layout_below="@id/date"
android:paddingTop="5dip" android:paddingTop="5dip"
astrid:defaultSrc="@drawable/icn_default_person_image" astrid:defaultSrc="@drawable/icn_default_person_image"
android:scaleType="fitCenter" android:scaleType="fitStart"
android:layout_marginLeft="50dip" android:layout_marginLeft="50dip"
android:visibility="gone" /> android:visibility="gone" />
<!-- activity date -->
<TextView android:id="@+id/date"
android:layout_width="75dip"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:paddingTop="3dip"
style="@style/TextAppearance.TAd_ItemDueDate"
android:gravity="right"
android:ellipsize="end"
android:textSize="12sp"
android:singleLine="true"/>
</RelativeLayout> </RelativeLayout>

23
astrid/res/values/strings-updates.xml
Unescape Escape View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- See the file "LICENSE" for the full license governing this code. -->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Activity Codes (do not translate) -->
<!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
<string name="update_string_friends">%1$s is now friends with %2$s</string>
<string name="update_string_request_friendship">%1$s wants to be friends with you</string>
<string name="update_string_confirmed_friendship">%1$s has confirmed your friendship request</string>
<string name="update_string_task_created">%1$s created this task</string>
<string name="update_string_task_created_on_list">%1$s added %2$s to this list</string>
<string name="update_string_task_completed">%1$s completed %2$s. Huzzah!</string>
<string name="update_string_task_uncompleted">%1$s un-completed %2$s.</string>
<string name="update_string_task_tagged">%1$s added %4$s to %2$s</string>
<string name="update_string_task_tagged_list">%1$s added %4$s to this list</string>
<string name="update_string_task_assigned">%1$s assigned %4$s to %2$s</string>
<string name="update_string_default_comment">%1$s commented: %3$s</string>
<string name="update_string_task_comment">%1$s Re: %2$s: %3$s</string>
<string name="update_string_tag_comment">%1$s Re: %2$s: %3$s</string>
</resources>

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

@ -4,6 +4,7 @@ import greendroid.widget.AsyncImageView;
import java.io.IOException; import java.io.IOException;
import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import android.app.AlertDialog; import android.app.AlertDialog;
@ -12,8 +13,11 @@ import android.content.DialogInterface;
import android.content.res.Resources; import android.content.res.Resources;
import android.database.Cursor; import android.database.Cursor;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.text.Html;
import android.text.Spanned;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.TypedValue;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -24,6 +28,7 @@ import android.widget.TextView;
import com.timsu.astrid.R; import com.timsu.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService; 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;
@ -45,7 +50,23 @@ public class UpdateAdapter extends CursorAdapter {
private final int resource; private final int resource;
private final LayoutInflater inflater; private final LayoutInflater inflater;
private final ImageDiskCache imageCache; private final ImageDiskCache imageCache;
private final String linkColor;
private final String fromView;
private static final String UPDATE_FRIENDS = "friends"; //$NON-NLS-1$
private static final String UPDATE_REQUEST_FRIENDSHIP = "request_friendship"; //$NON-NLS-1$
private static final String UPDATE_CONFIRMED_FRIENDSHIP = "confirmed_friendship"; //$NON-NLS-1$
private static final String UPDATE_TASK_CREATED = "task_created";
private static final String UPDATE_TASK_COMPLETED = "task_completed";
private static final String UPDATE_TASK_UNCOMPLETED = "task_uncompleted";
private static final String UPDATE_TASK_TAGGED = "task_tagged";
private static final String UPDATE_TASK_ASSIGNED = "task_assigned";
private static final String UPDATE_TASK_COMMENT = "task_comment";
private static final String UPDATE_TAG_COMMENT = "tag_comment";
public static final String FROM_TAG_VIEW = "from_tag";
public static final String FROM_TASK_VIEW = "from_task";
public static final String FROM_RECENT_ACTIVITY_VIEW = "from_recent_activity";
/** /**
* Constructor * Constructor
* *
@ -61,16 +82,26 @@ public class UpdateAdapter extends CursorAdapter {
*/ */
public UpdateAdapter(Fragment fragment, int resource, public UpdateAdapter(Fragment fragment, int resource,
Cursor c, boolean autoRequery, Cursor c, boolean autoRequery,
OnCompletedTaskListener onCompletedTaskListener) { OnCompletedTaskListener onCompletedTaskListener, String fromView) {
super(fragment.getActivity(), c, autoRequery); super(fragment.getActivity(), c, autoRequery);
DependencyInjectionService.getInstance().inject(this); DependencyInjectionService.getInstance().inject(this);
linkColor = getLinkColor(fragment);
inflater = (LayoutInflater) fragment.getActivity().getSystemService( inflater = (LayoutInflater) fragment.getActivity().getSystemService(
Context.LAYOUT_INFLATER_SERVICE); Context.LAYOUT_INFLATER_SERVICE);
imageCache = ImageDiskCache.getInstance(); imageCache = ImageDiskCache.getInstance();
this.fromView = fromView;
this.resource = resource; this.resource = resource;
this.fragment = fragment; this.fragment = fragment;
}
public static String getLinkColor(Fragment f) {
TypedValue colorType = new TypedValue();
f.getActivity().getTheme().resolveAttribute(R.attr.asDetailsColor, colorType, false);
return "#" + Integer.toHexString(colorType.data).substring(2);
} }
/* ====================================================================== /* ======================================================================
@ -158,29 +189,9 @@ public class UpdateAdapter extends CursorAdapter {
// name // name
final TextView nameView = (TextView)view.findViewById(R.id.title); { final TextView nameView = (TextView)view.findViewById(R.id.title); {
String nameValue = user.optString("name"); nameView.setText(getUpdateComment(update, user, linkColor, fromView));
if(update.getValue(Update.ACTION_CODE).equals("task_comment"))
nameValue = r.getString(R.string.UAd_title_comment, nameValue,
update.getValue(Update.TARGET_NAME));
if(TextUtils.isEmpty(nameValue)){
nameView.setText(fragment.getActivity().getString(R.string.ENA_no_user));
}
else {
nameView.setText(nameValue);
}
} }
// description
final TextView descriptionView = (TextView)view.findViewById(R.id.description); {
String description = update.getValue(Update.ACTION);
String message = update.getValue(Update.MESSAGE);
if(update.getValue(Update.ACTION_CODE).equals("task_comment") ||
update.getValue(Update.ACTION_CODE).equals("tag_comment"))
description = message;
else if(!TextUtils.isEmpty(message))
description += " " + message;
descriptionView.setText(description);
}
// date // date
final TextView date = (TextView)view.findViewById(R.id.date); { final TextView date = (TextView)view.findViewById(R.id.date); {
@ -192,4 +203,84 @@ public class UpdateAdapter extends CursorAdapter {
} }
public static String linkify (String string, String linkColor) {
return String.format("<font color=%s>%s</font>", linkColor, string); //$NON-NLS-1$
}
public static Spanned getUpdateComment (Update update, JSONObject user, String linkColor, String fromView) {
if (user == null) {
user = ActFmPreferenceService.userFromModel(update);
}
JSONObject otherUser = null;
try {
otherUser = new JSONObject(update.getValue(Update.OTHER_USER));
} catch (JSONException e) {
otherUser = new JSONObject();
}
return getUpdateComment(update.getValue(Update.ACTION_CODE), user.optString("name"), update.getValue(Update.TARGET_NAME), update.getValue(Update.MESSAGE),
otherUser.optString("name"), update.getValue(Update.ACTION), linkColor, fromView);
}
public static Spanned getUpdateComment (String actionCode, String user, String targetName, String message, String otherUser, String action, String linkColor, String fromView) {
if (TextUtils.isEmpty(user)) {
user = ContextManager.getString(R.string.ENA_no_user);
}
String userLink = linkify(user, linkColor);
String targetNameLink = linkify(targetName, linkColor);
String otherUserLink = linkify(otherUser, linkColor);
int commentResource = 0;
if (actionCode.equals(UPDATE_FRIENDS)) {
commentResource = R.string.update_string_friends;
}
else if (actionCode.equals(UPDATE_REQUEST_FRIENDSHIP)) {
commentResource = R.string.update_string_request_friendship;
}
else if (actionCode.equals(UPDATE_CONFIRMED_FRIENDSHIP)) {
commentResource = R.string.update_string_confirmed_friendship;
}
else if (actionCode.equals(UPDATE_TASK_CREATED)) {
if (fromView.equals(FROM_TAG_VIEW))
commentResource = R.string.update_string_task_created_on_list;
else
commentResource = R.string.update_string_task_created;
}
else if (actionCode.equals(UPDATE_TASK_COMPLETED)) {
commentResource = R.string.update_string_task_completed;
}
else if (actionCode.equals(UPDATE_TASK_UNCOMPLETED)) {
commentResource = R.string.update_string_task_uncompleted;
}
else if (actionCode.equals(UPDATE_TASK_TAGGED) && !TextUtils.isEmpty(otherUser)) {
if (fromView.equals(FROM_TAG_VIEW))
commentResource = R.string.update_string_task_tagged_list;
else
commentResource = R.string.update_string_task_tagged;
}
else if (actionCode.equals(UPDATE_TASK_ASSIGNED) && !TextUtils.isEmpty(otherUser)) {
commentResource = R.string.update_string_task_assigned;
}
else if (actionCode.equals(UPDATE_TASK_COMMENT)) {
if (fromView.equals(FROM_TASK_VIEW))
commentResource = R.string.update_string_default_comment;
else
commentResource = R.string.update_string_task_comment;
}
else if (actionCode.equals(UPDATE_TAG_COMMENT)) {
if (fromView.equals(FROM_TAG_VIEW))
commentResource = R.string.update_string_default_comment;
else
commentResource = R.string.update_string_tag_comment;
}
if (commentResource == 0) {
return Html.fromHtml(String.format("%s %s", userLink, action)); //$NON-NLS-1$
}
return Html.fromHtml(ContextManager.getString(commentResource, userLink, targetNameLink, message, otherUserLink));
}
} }

11
astrid/src/com/todoroo/astrid/dao/Database.java
Unescape Escape View File

@ -37,7 +37,7 @@ public class Database extends AbstractDatabase {
* Database version number. This variable must be updated when database * Database version number. This variable must be updated when database
* tables are updated, as it determines whether a database needs updating. * tables are updated, as it determines whether a database needs updating.
*/ */
public static final int VERSION = 21; public static final int VERSION = 22;
/** /**
* Database name (must be unique) * Database name (must be unique)
@ -293,6 +293,15 @@ public class Database extends AbstractDatabase {
} catch (SQLiteException e) { } catch (SQLiteException e) {
Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
} }
case 21: try {
for(Property<?> property : new Property<?>[] { Update.OTHER_USER_ID, Update.OTHER_USER })
database.execSQL("ALTER TABLE " + Update.TABLE.name + " ADD " +
property.accept(visitor, null));
}
catch (SQLiteException e) {
Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
}
return true; return true;
} }

Write Preview
Loading…
Cancel
Save