moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-11 12:40:22 -05:00
Code Issues Releases Wiki Activity
3,550 Commits 36 Branches 329 Tags 887 MiB
d9ecd6170b
Commit Graph

928 Commits

Author SHA1 Message Date
ashley willis
d9ecd6170b Merge branch 'master' into issue-162-new 
Conflicts:
	res/menu/folder_list_option.xml
	res/menu/message_list_context.xml
	res/menu/message_list_option.xml
	res/menu/message_view_option.xml
	src/com/fsck/k9/Account.java
	src/com/fsck/k9/activity/ChooseFolder.java
	src/com/fsck/k9/activity/FolderList.java
	src/com/fsck/k9/activity/MessageList.java
	src/com/fsck/k9/activity/MessageView.java
	src/com/fsck/k9/activity/setup/AccountSettings.java
	src/com/fsck/k9/activity/setup/FolderSettings.java
	src/com/fsck/k9/controller/MessagingController.java
	src/com/fsck/k9/preferences/AccountSettings.java

FUCK YEAH. though this code needs some serious review, please.
also, it will usually FC when opening a message, but if one is
open then next/prev will work just fine.
 2012-09-11 08:28:56 -05:00
ashley willis
1e898da2f9 Merge commit '4.302' into issue-162-new 2012-09-11 02:00:39 -05:00
ashley willis
756847619b Merge commit '4.301' into issue-162-new 
Conflicts:
	AndroidManifest.xml
	res/values-fi/strings.xml
	res/values-it/strings.xml
	src/com/fsck/k9/activity/MessageList.java
 2012-09-11 02:00:27 -05:00
ashley willis
e938eefdd9 Merge commit '4.191' into issue-162-new 2012-09-11 01:51:16 -05:00
ashley willis
f57ee1181f Merge commit '4.121' into issue-162-new 
Conflicts:
	src/com/fsck/k9/mail/store/LocalStore.java
 2012-09-11 01:50:46 -05:00
ashley willis
d89db55995 Merge commit '4.120' into issue-162-new 2012-09-11 01:29:42 -05:00
ashley willis
b1fb8655da Merge commit '4.119' into issue-162-new 
Conflicts:
	build.xml
	res/values/strings.xml
	res/xml/global_preferences.xml
 2012-09-11 01:29:31 -05:00
ashley willis
fe0088bed3 Merge commit '4.118' into issue-162-new 
Conflicts:
	src/com/fsck/k9/K9.java

trivial conflict.

removed duplicate javadoc entry in build.xml
 2012-09-11 01:24:11 -05:00
ashley willis
83fb5b5c9a Merge commit '4.117' into issue-162-new 2012-09-11 01:20:56 -05:00
ashley willis
b9c83aefe6 Merge commit '4.116' into issue-162-new 
Conflicts:
	src/com/fsck/k9/activity/MessageView.java
	src/com/fsck/k9/activity/setup/FolderSettings.java
 2012-09-11 01:20:38 -05:00
ashley willis
5b772ef171 Merge commit '4.114' into issue-162-new 
Conflicts:
	src/com/fsck/k9/K9.java
	src/com/fsck/k9/activity/MessageView.java

enabled isCopyCapable in src/com/fsck/k9/controller/MessagingController.java
 2012-09-11 01:09:08 -05:00
ashley willis
a5d0e44711 Merge commit '4.113' into issue-162-new 
Conflicts:
	src/com/fsck/k9/activity/ChooseFolder.java
	src/com/fsck/k9/controller/MessagingController.java
	src/com/fsck/k9/mail/store/ImapStore.java
	src/com/fsck/k9/view/MessageHeader.java

I hacked on src/com/fsck/k9/controller/MessagingController.java and perhaps broke uidplus support,
but things run fine in my simple tests.
 2012-09-11 00:56:06 -05:00
ashley willis
47b6eee6df Merge commit '4.112' into issue-162-new 2012-09-10 23:40:39 -05:00
ashley willis
a62a5babca Merge commit '4.110' into issue-162-new 
Conflicts:
	src/com/fsck/k9/activity/FolderList.java
	src/com/fsck/k9/activity/MessageList.java
	src/com/fsck/k9/activity/MessageView.java
	src/com/fsck/k9/activity/setup/AccountSettings.java

Resolutions:
    controller/MessagingController.java:
        public boolean isMoveCapable(final Account account)
        public boolean isMoveCapable(Message message)

    activity/setup/AccountSettings.java:
        private boolean mIsMoveCapable = false; // ASH i seem to have removed this, or renamed it to mIsAppendCapable
 2012-09-10 23:38:13 -05:00
Jesse Vincent
7ac34b185c better layout when you don't show the checkboxes 2012-09-10 18:32:20 -04:00
cketti
20a608e1a0 Removed "Manage back button" setting 2012-09-10 17:54:27 +02:00
Jesse Vincent
8d928d20fa get rid of the non-touchable version of the message list items. (The real difference was the capability to show previews) 2012-09-10 11:52:00 -04:00
cketti
047b5287b3 Got rid of icons in sub-menus 2012-09-10 16:48:55 +02:00
cketti
4f86e5ed3e Got rid of the "Advanced" submenu in the Folders activity 2012-09-10 16:48:55 +02:00
cketti
04796106f6 Made "Settings" the last menu item in each activity 2012-09-10 16:48:54 +02:00
cketti
078e5dd867 Formatting cleanup. No functional changes. 2012-09-10 16:48:54 +02:00
Jesse Vincent
78cf804aca first pass of converting chips to colored circles 2012-09-10 10:40:20 -04:00
Jesse Vincent
4718dd56ba remove the old optimized-for-g1 message_list_item 2012-09-10 09:42:25 -04:00
Jesse Vincent
46edd8f793 Revert "Context actionbar for the account screen." 
We're not ready for this sort of living in the futre yet.

This reverts commit 0f51eb54c1.

Conflicts:
	res/drawable-hdpi/ic_action_settings_light.png
	res/drawable-ldpi/ic_action_settings_light.png
	res/drawable-mdpi/ic_action_settings_light.png
	res/drawable-xhdpi/ic_action_settings_light.png
	res/menu/accounts_context.xml
	res/values/strings.xml
	src/com/fsck/k9/activity/Accounts.java
 2012-09-10 07:56:35 -04:00
Jesse Vincent
297e859b90 Revert "Add context action bar on FolderList activity." - We are not ready for this 
sort of future yet ;)

This reverts commit a5b8ce8064.

Conflicts:
	res/drawable-hdpi/ic_action_read_light.png
	res/drawable-ldpi/ic_action_read_light.png
	res/drawable-mdpi/ic_action_read_light.png
	res/drawable-xhdpi/ic_action_read_light.png
	res/menu/folder_context.xml
 2012-09-10 07:41:37 -04:00
Jesse Vincent
20e3335bc1 Remove "flag" as a meessage view menu option (duplicates tapping on the star) 2012-09-09 13:45:34 -07:00
Jesse Vincent
87e437b388 Move "move" and "copy" out of a submenu 2012-09-09 13:45:33 -07:00
Andrew Chen
9fbb2b4836 Show the subject line in the MessageHeader if the ActionBar title was truncated. 2012-09-09 13:45:33 -07:00
Sander Bogaert
20b155ec8b Add icons for the dark theme and make them active. 2012-09-09 13:45:32 -07:00
Andrew Chen
4a416f7acd Hide subject line in MessageView since it's now displayed in the actionbar. 
Now that the subject line is gone, the right side of the header is now the tallest part of the header.
Put date and time on the same line to keep the header compact.
 2012-09-09 13:41:49 -07:00
Jesse Vincent
8314b65e72 cleanup; actually use the newly extracted icons 2012-09-09 13:39:14 -07:00
Jesse Vincent
f80318d98a More extracting of icons 2012-09-09 13:39:14 -07:00
Jesse Vincent
9fe0a299d1 Initial example of theme-specific icons. 2012-09-09 13:39:13 -07:00
Sander Bogaert
595f591245 Make selection text a bit more generic. 2012-09-09 13:39:12 -07:00
Sander Bogaert
a5b8ce8064 Add context action bar on FolderList activity. 2012-09-09 13:39:11 -07:00
Sander Bogaert
0f51eb54c1 Context actionbar for the account screen. 2012-09-09 13:37:13 -07:00
Sander Bogaert
5392b8c331 Removed some unused files. 2012-09-09 13:37:12 -07:00
Sander Bogaert
bc9bc29097 Show unread count on special accounts too. 2012-09-09 13:37:11 -07:00
Sander Bogaert
85b8f2df8c Move 'share' to message options in the MessageView. 2012-09-09 13:24:27 -07:00
cketti
1cdb1c4fc5 Changed look of action bar in MessageList 
* (Temporarily) removed spinner because it wasn't doing anything useful
* Created custom view that also displays the unread count
 2012-09-09 13:24:27 -07:00
cketti
9301e94e73 Show as much of the folder name as possible in the navigation spinner 2012-09-09 13:18:10 -07:00
Sander Bogaert
df6611b2de Better sort action icon. 2012-09-09 13:13:44 -07:00
Sander Bogaert
13dc96eca9 Have the cc/bbc and attachment action on top with nice icons. 2012-09-09 13:13:43 -07:00
Sander Bogaert
cfc12ba8f2 Changed order of actions on the bar as suggested. Compose on the right now. 2012-09-09 13:13:42 -07:00
Sander Bogaert
29b6d046d3 Separate the welcome message in it's own activity. Cleaner solution and it prevents it from having the same actionbar as the Accounts activity. 2012-09-09 13:13:42 -07:00
Sander Bogaert
c31c8923c2 Add an actionbar to the MessageView activity. 2012-09-09 13:13:40 -07:00
Sander Bogaert
7a035a73b0 Moved context actionbar options around a bit to make more sense. 2012-09-09 13:13:40 -07:00
Sander Bogaert
592aeb0b03 Add forward, reply, reply all, same sender back in the MessageList context actionbar. 2012-09-09 13:13:39 -07:00
Sander Bogaert
6daa8a3c0c Add refresh to actionbar for Accounts activity. 2012-09-08 22:26:31 -07:00
Sander Bogaert
0b89cdd0fc Add send button to compose activity and use new icon for it. 2012-09-08 22:23:39 -07:00