moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into content_provider

This commit is contained in:
cketti 2012-11-08 20:32:12 +01:00
parent d209c0cce3 246ed6990c
commit 9814833008
11 changed files with 1086 additions and 1237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="17011"
android:versionName="4.310" package="com.fsck.k9"
android:versionCode="17012"
android:versionName="4.311" package="com.fsck.k9"
>
<uses-sdk
android:minSdkVersion="7"

70
res/layout/accounts_folders_icons.xml Normal file
View File

@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/active_icons"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:paddingTop="2dip"
android:paddingBottom="0dip"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:layout_alignParentRight="true"
android:clickable="true" >
<LinearLayout
android:id="@+id/flagged_message_count_wrapper"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:gravity="center_vertical"
android:paddingTop="6dip"
android:paddingBottom="4dip"
android:paddingLeft="10dip"
android:paddingRight="10dip"
>
<View
android:id="@+id/flagged_message_count_icon"
android:layout_width="32dp"
android:layout_height="32dp"
/>
<TextView
android:id="@+id/flagged_message_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceLarge"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/new_message_count_wrapper"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/flagged_message_count_wrapper"
android:clickable="true"
android:gravity="center_vertical"
android:paddingTop="6dip"
android:paddingBottom="4dip"
android:paddingLeft="10dip"
android:paddingRight="10dip"
>
<View
android:id="@+id/new_message_count_icon"
android:layout_width="32dp"
android:layout_height="32dp"
/>
<TextView
android:id="@+id/new_message_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceLarge"
/>
</LinearLayout>
</RelativeLayout>

54
res/layout/accounts_item.xml
View File

@ -68,57 +68,5 @@
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/active_icons"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:paddingTop="2dip"
android:paddingBottom="0dip"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:layout_alignParentRight="true"
android:clickable="true" >
<TextView
android:id="@+id/flagged_message_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_gravity="top"
android:paddingTop="6dip"
android:paddingBottom="4dip"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000000"
android:background="@drawable/btn_star_big_buttonless_on"
android:clickable="true" />
<TextView
android:id="@+id/new_message_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:layout_alignParentTop="true"
android:layout_toRightOf="@id/flagged_message_count"
android:paddingTop="4dip"
android:paddingBottom="4dip"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:gravity="right"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#ffffff"
android:textStyle="bold"
android:background="@drawable/envelope"
android:clickable="true" />
</RelativeLayout>
<include layout="@layout/accounts_folders_icons" />
</LinearLayout>

54
res/layout/folder_list_item.xml
View File

@ -49,57 +49,5 @@
</LinearLayout>
<RelativeLayout
android:id="@+id/active_icons"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:paddingTop="2dip"
android:paddingBottom="0dip"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:gravity="right"
android:clickable="true" >
<TextView
android:id="@+id/folder_flagged_message_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_alignParentTop="true"
android:layout_marginBottom="1dip"
android:paddingTop="6dip"
android:paddingBottom="4dip"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:gravity="right"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000000"
android:background="@drawable/btn_star_big_buttonless_on"
android:clickable="true" />
<TextView
android:id="@+id/folder_unread_message_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:layout_alignParentTop="true"
android:layout_toRightOf="@id/folder_flagged_message_count"
android:paddingTop="4dip"
android:paddingBottom="4dip"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:gravity="right"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#ffffff"
android:textStyle="bold"
android:background="@drawable/envelope"
android:clickable="true" />
</RelativeLayout>
<include layout="@layout/accounts_folders_icons" />
</LinearLayout>

4
res/layout/message_list_item.xml
View File

@ -2,8 +2,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingBottom="2dip"
android:paddingRight="3dip"
android:paddingBottom="6dip"
android:paddingRight="4dip"
android:paddingTop="5dip" >
<RelativeLayout

45
res/values-ja/strings.xml
View File

@ -76,6 +76,8 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
<string name="accounts_title">アカウント一覧</string>
<string name="welcome_message_title">K-9 Mailへようこそ!</string>
<string name="folders_title">フォルダ一覧</string>
<string name="advanced">拡張機能</string>
<string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
@ -96,6 +98,8 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="status_next_poll">次回受信 @ <xliff:g id="nexttime">%s</xliff:g></string>
<string name="status_syncing_off">同期停止</string>
<string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g>件選択しました</string>
<string name="actionbar_string_selected"><xliff:g id="selection_count">\"%s\"</xliff:g>を選択しました</string>
<!-- Actions will be used as buttons and in menu items -->
<string name="next_action">次へ</string>
<string name="previous_action">前へ</string> <!-- Used as part of a multi-step process -->
@ -113,6 +117,8 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="delete_all_action">フォルダクリア</string>
<string name="forward_action">転送</string>
<string name="move_action">移動</string>
<string name="move_or_copy_action">移動またはコピー</string>
<string name="single_message_options_action">メッセージ操作</string>
<string name="continue_action">継続</string>
<string name="back_action">戻る</string>
<string name="done_action">完了</string>
@ -153,6 +159,9 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="hide_full_header_action">ヘッダを隠す</string>
<string name="select_text_action">テキストを選択</string>
<string name="message_view_theme_action_dark">ダークテーマに切り替え</string>
<string name="message_view_theme_action_light">ライトテーマに切り替え</string>
<string name="mark_as_unread_action">未読にする</string>
<string name="add_cc_bcc_action">Cc/Bcc追加</string>
<string name="read_receipt">開封確認</string>
@ -300,6 +309,10 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="global_settings_preview_lines_label">メッセージプレビューの行数</string>
<string name="global_settings_show_correspondent_names_label">名前を表示</string>
<string name="global_settings_show_correspondent_names_summary">E-mailアドレスではなく名前を表示する</string>
<string name="global_settings_sender_above_subject_label">件名の上に名前を表示</string>
<string name="global_settings_sender_above_subject_summary">件名の上に相手の名前を表示する</string>
<string name="global_settings_show_contact_name_label">連絡先の名前を表示</string>
<string name="global_settings_show_contact_name_summary">連絡先に登録されている名前を表示する</string>
<string name="global_settings_registered_name_color_label">連絡先の名前に色を付ける</string>
@ -803,8 +816,8 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="account_settings_signature__location_label">署名挿入場所</string>
<string name="account_settings_signature__location_before_quoted_text">引用テキストの前に挿入</string>
<string name="account_settings_signature__location_after_quoted_text">引用テキストの後に挿入</string>
<string name="setting_theme_dark">白字／黒背景</string>
<string name="setting_theme_light">黒字／白背景</string>
<string name="setting_theme_dark">ダークテーマ(白字／黒背景)</string>
<string name="setting_theme_light">ライトテーマ(黒字／白背景)</string>
<string name="display_preferences">表示設定</string>
<string name="global_preferences">グローバル設定</string>
<string name="debug_preferences">デバッグ</string>
@ -1095,4 +1108,32 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="image_saved_as">\"<xliff:g id="filename">%s</xliff:g>\"に保存しました</string>
<string name="image_saving_failed">画像の保存に失敗しました</string>
<string name="account_settings_remote_search_num_results_entries_all">すべて</string>
<string name="account_settings_remote_search_num_results_entries_10">10</string>
<string name="account_settings_remote_search_num_results_entries_25">25</string>
<string name="account_settings_remote_search_num_results_entries_50">50</string>
<string name="account_settings_remote_search_num_results_entries_100">100</string>
<string name="account_settings_remote_search_num_results_entries_250">250</string>
<string name="account_settings_remote_search_num_results_entries_500">500</string>
<string name="account_settings_remote_search_num_results_entries_1000">1000</string>
<string name="account_settings_remote_search_num_label">サーバ検索結果の上限</string>
<string name="account_settings_remote_search_num_summary"><xliff:g id="num_results">%s</xliff:g>件検索した後に停止する</string>
<string name="account_settings_remote_search">リモートフォルダの検索</string>
<string name="account_settings_remote_search_full_text">メッセージの内容もサーバ検索の対象に含める</string>
<string name="account_settings_remote_search_full_text_summary">メッセージの内容も検索すると遅くなる可能性がある</string>
<string name="remote_search_sending_query">サーバにて検索中</string>
<string name="remote_search_downloading">%d件の結果を取得中</string>
<string name="remote_search_downloading_limited">%2$d件中%1$d件の結果を取得した</string>
<string name="account_settings_search">検索</string>
<string name="account_settings_remote_search_enabled">サーバでの検索を有効にする</string>
<string name="account_settings_remote_search_enabled_summary">デバイス内での検索に加え、サーバでメッセージを検索する</string>
<string name="action_remote_search">サーバでメッセージを検索する</string>
<string name="pull_to_refresh_remote_search_from_local_search_pull">Pull to search server…</string>
<string name="pull_to_refresh_remote_search_from_local_search_release">Release to search server…</string>
<string name="remote_search_unavailable_no_network">ネットワーク接続せずにサーバでの検索はできない</string>
<string name="global_settings_background_as_unread_indicator_label">背景色で未読を示す</string>
<string name="global_settings_background_as_unread_indicator_summary">背景色の違いでメッセージの既読／未読を表す</string>
</resources>

7
res/values-zh-rTW/plurals.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<plurals name="dialog_confirm_spam_message">
<item quantity="other">確定要將選取的 %1$d 封郵件移至垃圾桶嗎？</item>
<item quantity="one">確定要將郵件移至垃圾桶嗎？</item>
</plurals>
</resources>

2021
res/values-zh-rTW/strings.xml
View File

File diff suppressed because it is too large Load Diff

31
src/com/fsck/k9/activity/Accounts.java
View File

@ -1647,6 +1647,10 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
holder.email = (TextView) view.findViewById(R.id.email);
holder.newMessageCount = (TextView) view.findViewById(R.id.new_message_count);
holder.flaggedMessageCount = (TextView) view.findViewById(R.id.flagged_message_count);
holder.newMessageCountWrapper = (View) view.findViewById(R.id.new_message_count_wrapper);
holder.flaggedMessageCountWrapper = (View) view.findViewById(R.id.flagged_message_count_wrapper);
holder.newMessageCountIcon = (View) view.findViewById(R.id.new_message_count_icon);
holder.flaggedMessageCountIcon = (View) view.findViewById(R.id.flagged_message_count_icon);
holder.activeIcons = (RelativeLayout) view.findViewById(R.id.active_icons);
holder.chip = view.findViewById(R.id.chip);
@ -1680,13 +1684,13 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
if (stats != null) {
unreadMessageCount = stats.unreadMessageCount;
holder.newMessageCount.setText(Integer.toString(unreadMessageCount));
holder.newMessageCount.setVisibility(unreadMessageCount > 0 ? View.VISIBLE : View.GONE);
holder.newMessageCountWrapper.setVisibility(unreadMessageCount > 0 ? View.VISIBLE : View.GONE);
holder.flaggedMessageCount.setText(Integer.toString(stats.flaggedMessageCount));
holder.flaggedMessageCount.setVisibility(stats.flaggedMessageCount > 0 ? View.VISIBLE : View.GONE);
holder.flaggedMessageCountWrapper.setVisibility(stats.flaggedMessageCount > 0 ? View.VISIBLE : View.GONE);
holder.flaggedMessageCount.setOnClickListener(new AccountClickListener(account, SearchModifier.FLAGGED));
holder.newMessageCount.setOnClickListener(new AccountClickListener(account, SearchModifier.UNREAD));
holder.flaggedMessageCountWrapper.setOnClickListener(new AccountClickListener(account, SearchModifier.FLAGGED));
holder.newMessageCountWrapper.setOnClickListener(new AccountClickListener(account, SearchModifier.UNREAD));
view.getBackground().setAlpha(stats.available ? 0 : 127);
@ -1699,8 +1703,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
);
} else {
holder.newMessageCount.setVisibility(View.GONE);
holder.flaggedMessageCount.setVisibility(View.GONE);
holder.newMessageCountWrapper.setVisibility(View.GONE);
holder.flaggedMessageCountWrapper.setVisibility(View.GONE);
view.getBackground().setAlpha(0);
}
if (account instanceof Account) {
@ -1708,15 +1712,20 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
holder.chip.setBackgroundDrawable(realAccount.generateColorChip().drawable());
if (unreadMessageCount == null) {
holder.chip.getBackground().setAlpha(0);
holder.chip.setBackgroundDrawable(realAccount.generateColorChip().drawable());
} else if (unreadMessageCount == 0) {
holder.chip.getBackground().setAlpha(127);
holder.chip.setBackgroundDrawable(realAccount.generateColorChip(true, false, false, false, false).drawable());
} else {
holder.chip.getBackground().setAlpha(255);
holder.chip.setBackgroundDrawable(realAccount.generateColorChip(false, false, false, false, false).drawable());
}
holder.flaggedMessageCountIcon.setBackgroundDrawable( realAccount.generateColorChip(false, false, false, false,true).drawable() );
holder.newMessageCountIcon.setBackgroundDrawable( realAccount.generateColorChip(false, false, false, false, false).drawable() );
} else {
holder.chip.setBackgroundDrawable(new ColorChip(0xff999999, false, ColorChip.CIRCULAR).drawable());
holder.newMessageCountIcon.setBackgroundDrawable( new ColorChip(0xff999999, false, ColorChip.CIRCULAR).drawable() );
holder.flaggedMessageCountIcon.setBackgroundDrawable(new ColorChip(0xff999999, false, ColorChip.STAR).drawable());
}
@ -1743,6 +1752,10 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
public TextView email;
public TextView newMessageCount;
public TextView flaggedMessageCount;
public View newMessageCountIcon;
public View flaggedMessageCountIcon;
public View newMessageCountWrapper;
public View flaggedMessageCountWrapper;
public RelativeLayout activeIcons;
public View chip;
public ImageButton folders;

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

@ -1069,8 +1069,13 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
if (holder == null) {
holder = new FolderViewHolder();
holder.folderName = (TextView) view.findViewById(R.id.folder_name);
holder.newMessageCount = (TextView) view.findViewById(R.id.folder_unread_message_count);
holder.flaggedMessageCount = (TextView) view.findViewById(R.id.folder_flagged_message_count);
holder.newMessageCount = (TextView) view.findViewById(R.id.new_message_count);
holder.flaggedMessageCount = (TextView) view.findViewById(R.id.flagged_message_count);
holder.newMessageCountWrapper = (View) view.findViewById(R.id.new_message_count_wrapper);
holder.flaggedMessageCountWrapper = (View) view.findViewById(R.id.flagged_message_count_wrapper);
holder.newMessageCountIcon = (View) view.findViewById(R.id.new_message_count_icon);
holder.flaggedMessageCountIcon = (View) view.findViewById(R.id.flagged_message_count_icon);
holder.folderStatus = (TextView) view.findViewById(R.id.folder_status);
holder.activeIcons = (RelativeLayout) view.findViewById(R.id.active_icons);
holder.chip = view.findViewById(R.id.chip);
@ -1113,19 +1118,21 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
if (folder.unreadMessageCount != 0) {
holder.newMessageCount.setText(Integer
.toString(folder.unreadMessageCount));
holder.newMessageCount.setOnClickListener(new FolderClickListener(mAccount, folder.name, folder.displayName, SearchModifier.UNREAD));
holder.newMessageCount.setVisibility(View.VISIBLE);
holder.newMessageCountWrapper.setOnClickListener(new FolderClickListener(mAccount, folder.name, folder.displayName, SearchModifier.UNREAD));
holder.newMessageCountWrapper.setVisibility(View.VISIBLE);
holder.newMessageCountIcon.setBackgroundDrawable( mAccount.generateColorChip(false, false, false, false, false).drawable() );
} else {
holder.newMessageCount.setVisibility(View.GONE);
holder.newMessageCountWrapper.setVisibility(View.GONE);
}
if (folder.flaggedMessageCount > 0) {
holder.flaggedMessageCount.setText(Integer
.toString(folder.flaggedMessageCount));
holder.flaggedMessageCount.setOnClickListener(new FolderClickListener(mAccount, folder.name, folder.displayName, SearchModifier.FLAGGED));
holder.flaggedMessageCount.setVisibility(View.VISIBLE);
holder.flaggedMessageCountWrapper.setOnClickListener(new FolderClickListener(mAccount, folder.name, folder.displayName, SearchModifier.FLAGGED));
holder.flaggedMessageCountWrapper.setVisibility(View.VISIBLE);
holder.flaggedMessageCountIcon.setBackgroundDrawable( mAccount.generateColorChip(false, false, false, false,true).drawable() );
} else {
holder.flaggedMessageCount.setVisibility(View.GONE);
holder.flaggedMessageCountWrapper.setVisibility(View.GONE);
}
holder.activeIcons.setOnClickListener(new OnClickListener() {
@ -1136,8 +1143,7 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
}
);
holder.chip.setBackgroundDrawable(mAccount.generateColorChip().drawable());
holder.chip.getBackground().setAlpha(folder.unreadMessageCount == 0 ? 127 : 255);
holder.chip.setBackgroundDrawable(mAccount.generateColorChip((folder.unreadMessageCount == 0 ? true : false ), false, false, false,false).drawable());
holder.folderName.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getFolderName());
holder.folderStatus.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getFolderStatus());
@ -1241,6 +1247,10 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
public TextView newMessageCount;
public TextView flaggedMessageCount;
public View newMessageCountIcon;
public View flaggedMessageCountIcon;
public View newMessageCountWrapper;
public View flaggedMessageCountWrapper;
public RelativeLayout activeIcons;
public String rawFolderName;

3
src/com/fsck/k9/fragment/MessageListFragment.java
View File

@ -440,11 +440,10 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
}
public void updateFooter(final String message, final boolean showProgress) {
//TODO: use message
post(new Runnable() {
@Override
public void run() {
updateFooter(message, showProgress);
MessageListFragment.this.updateFooter(message, showProgress);
}
});
}