moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-20 04:31:47 -05:00
Code Issues Releases Wiki Activity

Display concrete action instead of "Toggle (un)read" & "(Un)star"

Browse Source
This commit is contained in:
cketti 2012-09-18 03:33:37 +02:00
parent f22801e9d6
commit 7bb11c09b2
5 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
res/menu/message_list_item_context.xml
View File

@ -17,8 +17,12 @@
android:title="@string/delete_action" android:title="@string/delete_action"
/> />
<item <item
android:id="@+id/read_toggle" android:id="@+id/mark_as_read"
android:title="@string/read_toggle_action" android:title="@string/mark_as_read_action"
/>
<item
android:id="@+id/mark_as_unread"
android:title="@string/mark_as_unread_action"
/> />
<item <item
android:id="@+id/archive" android:id="@+id/archive"
@ -33,8 +37,12 @@
android:title="@string/copy_action" android:title="@string/copy_action"
/> />
<item <item
android:id="@+id/flag_toggle" android:id="@+id/flag"
android:title="@string/flag_toggle_action" android:title="@string/flag_action"
/>
<item
android:id="@+id/unflag"
android:title="@string/unflag_action"
/> />
<item <item
android:id="@+id/spam" android:id="@+id/spam"

2
res/menu/message_view_option.xml
View File

@ -64,7 +64,7 @@
<item <item
android:id="@+id/toggle_unread" android:id="@+id/toggle_unread"
android:alphabeticShortcut="u" android:alphabeticShortcut="u"
android:title="@string/read_toggle_action" android:title="@string/mark_as_unread_action"
android:showAsAction="never" android:showAsAction="never"
/> />
<item <item

2
res/values-fi/strings.xml
View File

@ -148,7 +148,6 @@ http://k9mail.googlecode.com/
<string name="accounts_action">Tilit</string> <string name="accounts_action">Tilit</string>
<string name="mark_as_read_action">Merkitse luetuksi</string> <string name="mark_as_read_action">Merkitse luetuksi</string>
<string name="read_toggle_action">Vaihda lukemattomaksi/luetuksi</string>
<string name="send_alternate_action">Jaa</string> <string name="send_alternate_action">Jaa</string>
<string name="send_alternate_chooser_title">Valitse lähettäjä</string> <string name="send_alternate_chooser_title">Valitse lähettäjä</string>
@ -157,7 +156,6 @@ http://k9mail.googlecode.com/
    viestit, jotka ovat kansioissa, joita ei näytetä K-9:ssä)</string>     viestit, jotka ovat kansioissa, joita ei näytetä K-9:ssä)</string>
<string name="flag_action">Lisää tähti</string> <string name="flag_action">Lisää tähti</string>
<string name="flag_toggle_action">Poista/lisää tähti</string>
<string name="unflag_action">Poista tähti</string> <string name="unflag_action">Poista tähti</string>
<string name="copy_action">Kopio</string> <string name="copy_action">Kopio</string>
<string name="show_full_header_action">Näytä täydet otsikkotiedot</string> <string name="show_full_header_action">Näytä täydet otsikkotiedot</string>

2
res/values/strings.xml
View File

@ -148,7 +148,6 @@ http://k9mail.googlecode.com/
<string name="accounts_action">Accounts</string> <string name="accounts_action">Accounts</string>
<string name="mark_as_read_action">Mark as read</string> <string name="mark_as_read_action">Mark as read</string>
<string name="read_toggle_action">Toggle (un)read</string>
<string name="send_alternate_action">Share</string> <string name="send_alternate_action">Share</string>
<string name="send_alternate_chooser_title">Choose sender</string> <string name="send_alternate_chooser_title">Choose sender</string>
@ -157,7 +156,6 @@ http://k9mail.googlecode.com/
messages in the folder that are not displayed in K-9)</string> messages in the folder that are not displayed in K-9)</string>
<string name="flag_action">Add star</string> <string name="flag_action">Add star</string>
<string name="flag_toggle_action">(Un)star</string>
<string name="unflag_action">Remove star</string> <string name="unflag_action">Remove star</string>
<string name="copy_action">Copy</string> <string name="copy_action">Copy</string>
<string name="show_full_header_action">Show full header</string> <string name="show_full_header_action">Show full header</string>

29
src/com/fsck/k9/activity/MessageList.java
View File

@ -1984,6 +1984,19 @@ public class MessageList extends K9ListActivity implements OnItemClickListener {
final MessageInfoHolder message = (MessageInfoHolder) getItem((Integer)v.getTag()); final MessageInfoHolder message = (MessageInfoHolder) getItem((Integer)v.getTag());
final MenuBuilder menu = new MenuBuilder(MessageList.this); final MenuBuilder menu = new MenuBuilder(MessageList.this);
getSupportMenuInflater().inflate(R.menu.message_list_item_context, menu); getSupportMenuInflater().inflate(R.menu.message_list_item_context, menu);
if (message.read) {
menu.findItem(R.id.mark_as_read).setVisible(false);
} else {
menu.findItem(R.id.mark_as_unread).setVisible(false);
}
if (message.flagged) {
menu.findItem(R.id.flag).setVisible(false);
} else {
menu.findItem(R.id.unflag).setVisible(false);
}
MenuPopup popup = new MenuPopup(MessageList.this, menu, v); MenuPopup popup = new MenuPopup(MessageList.this, menu, v);
popup.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { popup.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override @Override
@ -2016,12 +2029,20 @@ public class MessageList extends K9ListActivity implements OnItemClickListener {
onDelete(selection); onDelete(selection);
break; break;
} }
case R.id.read_toggle: { case R.id.mark_as_read: {
onToggleRead(selection); setFlag(selection, Flag.SEEN, true);
break; break;
} }
case R.id.flag_toggle: { case R.id.mark_as_unread: {
onToggleFlag(selection); setFlag(selection, Flag.SEEN, false);
break;
}
case R.id.flag: {
setFlag(selection, Flag.FLAGGED, true);
break;
}
case R.id.unflag: {
setFlag(selection, Flag.FLAGGED, false);
break; break;
} }