Skip to content

Commit

Permalink
change post msg from html to plain
Browse files Browse the repository at this point in the history
  • Loading branch information
@kazuyayokoyama
kazuyayokoyama committed May 1, 2012
1 parent 4fe83ec commit d1bee3d
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 36 deletions.
2 changes: 2 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
View file
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding//src/mobisocial/bento/todo/util/UIUtils.java=UTF-8
8 changes: 4 additions & 4 deletions res/values/strings.xml
View file
Expand Up @@ -78,12 +78,12 @@

<!-- Update Feed Message -->
<string name="feed_msg_created"><xliff:g id="name">%1$s</xliff:g> just created new Bento. Add new todo!</string>
<string name="feed_msg_added"><xliff:g id="name">%1$s</xliff:g> just added\n \'<xliff:g id="todo">%2$s</xliff:g>\'.</string>
<string name="feed_msg_added_photo"><xliff:g id="name">%1$s</xliff:g> just added\n a photo todo!</string>
<string name="feed_msg_added"><xliff:g id="name">%1$s</xliff:g> just added \"<xliff:g id="todo">%2$s</xliff:g>\".</string>
<string name="feed_msg_added_photo"><xliff:g id="name">%1$s</xliff:g> just added a photo todo!</string>
<string name="feed_msg_updated"><xliff:g id="name">%1$s</xliff:g> updated some todo.</string>
<string name="feed_msg_done">Yay! <xliff:g id="name">%1$s</xliff:g> got \'<xliff:g id="todo">%2$s</xliff:g>\' done!</string>
<string name="feed_msg_done">Yay! <xliff:g id="name">%1$s</xliff:g> got \"<xliff:g id="todo">%2$s</xliff:g>\" done!</string>
<string name="feed_msg_done_notitle">Yay! <xliff:g id="name">%1$s</xliff:g> got a todo done!</string>
<string name="feed_msg_undone">Hmm. <xliff:g id="name">%1$s</xliff:g> returned \'<xliff:g id="todo">%2$s</xliff:g>\' to undone.</string>
<string name="feed_msg_undone">Hmm. <xliff:g id="name">%1$s</xliff:g> returned \"<xliff:g id="todo">%2$s</xliff:g>\" to undone.</string>
<string name="feed_msg_undone_notitle">Hmm. <xliff:g id="name">%1$s</xliff:g> returned a todo to undone.</string>
<string name="feed_msg_cleared"><xliff:g id="name">%1$s</xliff:g> cleared completed todo.</string>
<string name="feed_msg_sorted"><xliff:g id="name">%1$s</xliff:g> sorted some todo.</string>
Expand Down
36 changes: 18 additions & 18 deletions src/mobisocial/bento/todo/io/BentoManager.java
View file
Expand Up @@ -364,28 +364,28 @@ private void fetchMemberNames(long feedId) {
// ----------------------------------------------------------
// Update
// ----------------------------------------------------------
synchronized public void createBento(Bento bento, String htmlMsg) {
synchronized public void createBento(Bento bento, String msg) {
mBento = new BentoListItem();
mBento.bento = bento;
pushUpdate(htmlMsg, true);
pushUpdate(msg, true);
}

synchronized public void addTodo(TodoListItem item, Bitmap image, String htmlMsg) {
synchronized public void addTodo(TodoListItem item, Bitmap image, String msg) {
mBento.bento.todoList.add(0, item);

if (image == null) {
pushUpdate(htmlMsg);
pushUpdate(msg);
} else {
String data = Base64.encodeToString(BitmapHelper.bitmapToBytes(image), Base64.DEFAULT);
pushUpdate(htmlMsg, item.uuid, data, false);
pushUpdate(msg, item.uuid, data, false);
}
}

synchronized public void removeTodo(TodoListItem item, String htmlMsg) {
synchronized public void removeTodo(TodoListItem item, String msg) {
// not supported yet
}

synchronized public void updateTodo(TodoListItem updateItem, String htmlMsg) {
synchronized public void updateTodo(TodoListItem updateItem, String msg) {
for (int i=0; i<mBento.bento.todoList.size(); i++) {
TodoListItem item = mBento.bento.todoList.get(i);
if (item.uuid.equals(updateItem.uuid)) {
Expand All @@ -395,7 +395,7 @@ synchronized public void updateTodo(TodoListItem updateItem, String htmlMsg) {
}
}

pushUpdate(htmlMsg);
pushUpdate(msg);
}

synchronized public void sortTodoList(int positionFrom, int positionTo) {
Expand Down Expand Up @@ -428,11 +428,11 @@ synchronized public void sortTodoList(int positionFrom, int positionTo) {
}
}

synchronized public void sortTodoCompleted(String htmlMsg) {
pushUpdate(htmlMsg);
synchronized public void sortTodoCompleted(String msg) {
pushUpdate(msg);
}

synchronized public void clearTodoDone(String htmlMsg) {
synchronized public void clearTodoDone(String msg) {
int beforeCount = mBento.bento.todoList.size();
if (beforeCount == 0) {
return;
Expand All @@ -448,7 +448,7 @@ synchronized public void clearTodoDone(String htmlMsg) {

// if updated
if (beforeCount > mBento.bento.todoList.size()) {
pushUpdate(htmlMsg);
pushUpdate(msg);
}
}

Expand Down Expand Up @@ -478,15 +478,15 @@ public void setFeedUri(Uri feedUri) {
mMusubi.setFeed(mMusubi.getFeed(feedUri));
}

public void pushUpdate(String htmlMsg) {
pushUpdate(htmlMsg, null, null, false);
public void pushUpdate(String msg) {
pushUpdate(msg, null, null, false);
}

public void pushUpdate(String htmlMsg, boolean bFirst) {
pushUpdate(htmlMsg, null, null, bFirst);
public void pushUpdate(String msg, boolean bFirst) {
pushUpdate(msg, null, null, bFirst);
}

public void pushUpdate(String htmlMsg, String todoUuid, String data, boolean bFirst) {
public void pushUpdate(String msg, String todoUuid, String data, boolean bFirst) {
try {
JSONObject rootObj = new JSONObject();
rootObj.put(Obj.FIELD_RENDER_TYPE, Obj.RENDER_LATEST);
Expand All @@ -502,7 +502,7 @@ public void pushUpdate(String htmlMsg, String todoUuid, String data, boolean bFi
out.put(B64JPGTHUMB, data);
}

FeedRenderable renderable = FeedRenderable.fromHtml(htmlMsg);
FeedRenderable renderable = FeedRenderable.fromText(msg);
renderable.addToJson(out);
if (bFirst) {
Obj obj = new MemObj(TYPE_TODOBENTO, out, null);
Expand Down
4 changes: 2 additions & 2 deletions src/mobisocial/bento/todo/ui/BentoListActivity.java
View file
Expand Up @@ -146,9 +146,9 @@ public void onClick(DialogInterface dialog, int whichButton) {
// create
StringBuilder msg = new StringBuilder(
getString(R.string.feed_msg_created, mManager.getLocalName()));
String htmlMsg = UIUtils.getHtmlString(bentoName, msg.toString());
String plainMsg = UIUtils.getPlainString(bentoName, msg.toString());

mManager.createBento(bento, htmlMsg);
mManager.createBento(bento, plainMsg);

// return to home
Intent intent = new Intent();
Expand Down
4 changes: 2 additions & 2 deletions src/mobisocial/bento/todo/ui/TodoDetailFragment.java
View file
Expand Up @@ -127,9 +127,9 @@ public boolean onOptionsItemSelected(MenuItem item) {

StringBuilder msg = new StringBuilder(getResources()
.getString(R.string.feed_msg_updated, mManager.getLocalName()));
String htmlMsg = UIUtils.getHtmlString(mManager.getBentoListItem().bento.name, msg.toString());
String plainMsg = UIUtils.getPlainString(mManager.getBentoListItem().bento.name, msg.toString());

mManager.updateTodo(mTodoItem, htmlMsg);
mManager.updateTodo(mTodoItem, plainMsg);
}

// go back
Expand Down
16 changes: 8 additions & 8 deletions src/mobisocial/bento/todo/ui/TodoListFragment.java
View file
Expand Up @@ -90,9 +90,9 @@ public void drop(int from, int to) {
// sort
StringBuilder msg = new StringBuilder(
getString(R.string.feed_msg_sorted, mManager.getLocalName()));
String htmlMsg = UIUtils.getHtmlString(mManager.getBentoListItem().bento.name, msg.toString());
String plainMsg = UIUtils.getPlainString(mManager.getBentoListItem().bento.name, msg.toString());
mManager.sortTodoList(from, to);
mManager.sortTodoCompleted(htmlMsg);
mManager.sortTodoCompleted(plainMsg);

refreshView();
}
Expand Down Expand Up @@ -202,9 +202,9 @@ public void onClick(DialogInterface dialog, int whichButton) {
// add
StringBuilder msg = new StringBuilder(
getString(R.string.feed_msg_added, mManager.getLocalName(), item.title));
String htmlMsg = UIUtils.getHtmlString(mManager.getBentoListItem().bento.name, msg.toString());
String plainMsg = UIUtils.getPlainString(mManager.getBentoListItem().bento.name, msg.toString());

mManager.addTodo(item, null, htmlMsg);
mManager.addTodo(item, null, plainMsg);

// refresh list view
refreshView();
Expand Down Expand Up @@ -258,9 +258,9 @@ public void onClick(DialogInterface dialog, int whichButton) {
// clear
StringBuilder msg = new StringBuilder(
getString(R.string.feed_msg_cleared, mManager.getLocalName()));
String htmlMsg = UIUtils.getHtmlString(mManager.getBentoListItem().bento.name, msg.toString());
String plainMsg = UIUtils.getPlainString(mManager.getBentoListItem().bento.name, msg.toString());

mManager.clearTodoDone(htmlMsg);
mManager.clearTodoDone(plainMsg);

ImageCache.clearCache();

Expand Down Expand Up @@ -420,9 +420,9 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {

StringBuilder msg = new StringBuilder(
getString(R.string.feed_msg_added_photo, mManager.getLocalName()));
String htmlMsg = UIUtils.getHtmlString(mManager.getBentoListItem().bento.name, msg.toString());
String plainMsg = UIUtils.getPlainString(mManager.getBentoListItem().bento.name, msg.toString());

mManager.addTodo(item, bitmap, htmlMsg);
mManager.addTodo(item, bitmap, plainMsg);

refreshView();

Expand Down
4 changes: 2 additions & 2 deletions src/mobisocial/bento/todo/ui/TodoListItemAdapter.java
View file
Expand Up @@ -118,9 +118,9 @@ public void onClick(View view) {
}
}
StringBuilder msg = new StringBuilder(baseMsg);
String htmlMsg = UIUtils.getHtmlString(mManager.getBentoListItem().bento.name, msg.toString());
String plainMsg = UIUtils.getPlainString(mManager.getBentoListItem().bento.name, msg.toString());

mManager.updateTodo(item, htmlMsg);
mManager.updateTodo(item, plainMsg);
notifyDataSetChanged();
}
});
Expand Down
4 changes: 4 additions & 0 deletions src/mobisocial/bento/todo/util/UIUtils.java
View file
Expand Up @@ -51,4 +51,8 @@ public static String getHtmlString(String bentoName, String msg) {
html.append("</body></html>");
return html.toString();
}

public static String getPlainString(String bentoName, String msg) {
return "✔" + bentoName + "\n" + msg;
}
}

0 comments on commit d1bee3d

Please sign in to comment.