moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-25 23:21:50 -05:00
Code Issues Releases Wiki Activity

Generalize ActionBarNavigationSpinner creation.

Browse Source
This commit is contained in:
Sander Bogaert 2012-07-16 15:14:27 -04:00 committed by Andrew Chen
parent 4de06915ea
commit 18748499af
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/fsck/k9/activity/FolderList.java
View File

@ -106,6 +106,7 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
private Context context; private Context context;
private MenuItem mRefreshMenuItem; private MenuItem mRefreshMenuItem;
private View mActionBarProgressView; private View mActionBarProgressView;
private ActionBarNavigationSpinner mNavigationSpinner;
class FolderListHandler extends Handler { class FolderListHandler extends Handler {
@ -311,13 +312,8 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
actionBar.setDisplayShowTitleEnabled(false); actionBar.setDisplayShowTitleEnabled(false);
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
actionBar.setListNavigationCallbacks( mNavigationSpinner = ActionBarNavigationSpinner.getDefaultSpinner(this);
new ActionBarNavigationSpinner(this, actionBar.setListNavigationCallbacks(mNavigationSpinner, this);
new String[] {"Inbox", "Folders", "Accounts"},
new Long[] {ActionBarNavigationSpinner.AB_NAVIGATION_INBOX,
ActionBarNavigationSpinner.AB_NAVIGATION_FOLDERS,
ActionBarNavigationSpinner.AB_NAVIGATION_ACCOUNTS }),
this);
actionBar.setSelectedNavigationItem(1); actionBar.setSelectedNavigationItem(1);
} }

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

@ -537,7 +537,7 @@ public class MessageList
} }
String dispString = mAdapter.mListener.formatHeader(MessageList.this, getString(R.string.message_list_title, mAccount.getDescription(), displayName), mUnreadMessageCount, getTimeFormat()); String dispString = mAdapter.mListener.formatHeader(MessageList.this, getString(R.string.message_list_title, mAccount.getDescription(), displayName), mUnreadMessageCount, getTimeFormat());
//setTitle(dispString);
mNavigationSpinner.setTitle(mFolderName); mNavigationSpinner.setTitle(mFolderName);
mNavigationSpinner.setSubTitle(mAccount.getEmail()); mNavigationSpinner.setSubTitle(mAccount.getEmail());
} else if (mQueryString != null) { } else if (mQueryString != null) {
@ -907,11 +907,7 @@ public class MessageList
ActionBar.DISPLAY_SHOW_CUSTOM); ActionBar.DISPLAY_SHOW_CUSTOM);
actionBar.setDisplayShowTitleEnabled(false); actionBar.setDisplayShowTitleEnabled(false);
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
mNavigationSpinner = new ActionBarNavigationSpinner(this, mNavigationSpinner = ActionBarNavigationSpinner.getDefaultSpinner(this);
new String[] {"Inbox", "Folders", "Accounts"},
new Long[] {ActionBarNavigationSpinner.AB_NAVIGATION_INBOX,
ActionBarNavigationSpinner.AB_NAVIGATION_FOLDERS,
ActionBarNavigationSpinner.AB_NAVIGATION_ACCOUNTS });
actionBar.setListNavigationCallbacks(mNavigationSpinner, this); actionBar.setListNavigationCallbacks(mNavigationSpinner, this);
} }

10
src/com/fsck/k9/helper/ActionBarNavigationSpinner.java
View File

@ -82,4 +82,14 @@ public class ActionBarNavigationSpinner extends ArrayAdapter<String> implements
public long getItemId(int position) { public long getItemId(int position) {
return mIds[position]; return mIds[position];
} }
public static ActionBarNavigationSpinner getDefaultSpinner(Context context) {
return new ActionBarNavigationSpinner(context,
new String[] {context.getString(R.string.special_mailbox_name_inbox),
context.getString(R.string.folder_list_display_mode_label),
context.getString(R.string.special_mailbox_name_inbox)},
new Long[] {ActionBarNavigationSpinner.AB_NAVIGATION_INBOX,
ActionBarNavigationSpinner.AB_NAVIGATION_FOLDERS,
ActionBarNavigationSpinner.AB_NAVIGATION_ACCOUNTS });
}
} }