From 7459f1c6b504d936d41aa30bb25dc4ec585acd50 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Tue, 15 May 2012 11:26:28 -0400
Subject: [PATCH 1/5] Issue 1911:  Permit folder names to wrap on multiple
 lines in folder list view so users can see the entire name.

Reduce the default font size used in folder list view to a reasonable size so that long folder paths wrap to fewer lines.
---
 res/layout/folder_list_item.xml | 2 --
 src/com/fsck/k9/FontSizes.java  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 1050de2a9..8cd6d580d 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -33,8 +33,6 @@
             android:id="@+id/folder_name"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="start"
             android:textColor="?android:attr/textColorPrimary"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
diff --git a/src/com/fsck/k9/FontSizes.java b/src/com/fsck/k9/FontSizes.java
index 5a1ae2a41..b48474d5c 100644
--- a/src/com/fsck/k9/FontSizes.java
+++ b/src/com/fsck/k9/FontSizes.java
@@ -136,7 +136,7 @@ public class FontSizes {
         accountName = MEDIUM;
         accountDescription = SMALL;
 
-        folderName = LARGE;
+        folderName = FONT_16SP;
         folderStatus = SMALL;
 
         messageListSubject = FONT_16SP;

From 26fe9b7757880e190fc0639f921abde4ccd0d984 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Mon, 26 Nov 2012 17:50:43 -0500
Subject: [PATCH 2/5] Create new preference option for wrapping folder names in
 folder list view.

Revert to using an ellipsized folder name as the default.
---
 res/layout/folder_list_item.xml                 |  2 ++
 res/values/strings.xml                          |  3 +++
 res/xml/global_preferences.xml                  | 12 ++++++++++++
 src/com/fsck/k9/K9.java                         | 10 ++++++++++
 src/com/fsck/k9/activity/FolderList.java        |  4 ++++
 src/com/fsck/k9/activity/setup/Prefs.java       |  6 ++++++
 src/com/fsck/k9/preferences/GlobalSettings.java |  3 +++
 7 files changed, 40 insertions(+)

diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 8cd6d580d..1050de2a9 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -33,6 +33,8 @@
             android:id="@+id/folder_name"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="start"
             android:textColor="?android:attr/textColorPrimary"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 44e80e7ad..5339db35f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -322,6 +322,8 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="global_settings_registered_name_color_label">Colorize contacts</string>
     <string name="global_settings_registered_name_color_default">Don\'t colorize names in your contact list</string>
     <string name="global_settings_registered_name_color_changed">Colorize names in your contact list</string>
+    <string name="global_settings_folderlist_wrap_folder_names_label">Wrap folder names</string>
+    <string name="global_settings_folderlist_wrap_folder_names_summary">Show complete folder name wrapped on multiple lines rather than a partial name on a single line</string>
 
     <string name="global_settings_messageview_fixedwidth_label">Fixed-width fonts</string>
     <string name="global_settings_messageview_fixedwidth_summary">Use a fixed-width font when showing plain-text messages</string>
@@ -812,6 +814,7 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="accountlist_preferences">Account list</string>
     <string name="messagelist_preferences">Message lists</string>
     <string name="messageview_preferences">Messages</string>
+    <string name="folderlist_preferences">Folder lists</string>
     <string name="settings_theme_label">Theme</string>
     <string name="settings_language_label">Language</string>
 
diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml
index 75efa5598..cb90924ea 100644
--- a/res/xml/global_preferences.xml
+++ b/res/xml/global_preferences.xml
@@ -176,6 +176,18 @@
 
         </PreferenceCategory>
 
+        <PreferenceCategory
+            android:key="folderlist_preferences"
+            android:title="@string/folderlist_preferences">
+
+            <CheckBoxPreference
+                android:persistent="false"
+                android:key="folderlist_wrap_folder_name"
+                android:title="@string/global_settings_folderlist_wrap_folder_names_label"
+                android:summary="@string/global_settings_folderlist_wrap_folder_names_summary" />
+
+        </PreferenceCategory>
+
     </PreferenceScreen>
 
     <PreferenceScreen
diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java
index 7fa0885eb..b1ed09c4a 100644
--- a/src/com/fsck/k9/K9.java
+++ b/src/com/fsck/k9/K9.java
@@ -234,6 +234,7 @@ public class K9 extends Application {
     private static String mQuietTimeStarts = null;
     private static String mQuietTimeEnds = null;
     private static String mAttachmentDefaultPath = "";
+    private static boolean mWrapFolderNames = false;
 
     private static boolean mBatchButtonsMarkRead = true;
     private static boolean mBatchButtonsDelete = true;
@@ -499,6 +500,7 @@ public class K9 extends Application {
         editor.putBoolean("messageViewFixedWidthFont", mMessageViewFixedWidthFont);
         editor.putBoolean("messageViewReturnToList", mMessageViewReturnToList);
         editor.putBoolean("messageViewShowNext", mMessageViewShowNext);
+        editor.putBoolean("wrapFolderNames", mWrapFolderNames);
 
         editor.putBoolean("batchButtonsMarkRead", mBatchButtonsMarkRead);
         editor.putBoolean("batchButtonsDelete", mBatchButtonsDelete);
@@ -692,6 +694,7 @@ public class K9 extends Application {
         mMessageViewFixedWidthFont = sprefs.getBoolean("messageViewFixedWidthFont", false);
         mMessageViewReturnToList = sprefs.getBoolean("messageViewReturnToList", false);
         mMessageViewShowNext = sprefs.getBoolean("messageViewShowNext", false);
+        mWrapFolderNames = sprefs.getBoolean("wrapFolderNames", false);
 
         mBatchButtonsMarkRead = sprefs.getBoolean("batchButtonsMarkRead", true);
         mBatchButtonsDelete = sprefs.getBoolean("batchButtonsDelete", true);
@@ -1212,6 +1215,13 @@ public class K9 extends Application {
         }
     }
 
+    public static boolean wrapFolderNames() {
+    	return mWrapFolderNames;
+    }
+    public static void setWrapFolderNames(final boolean state) {
+    	mWrapFolderNames = state;
+    }
+
     public static String getAttachmentDefaultPath() {
         return mAttachmentDefaultPath;
     }
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index a17376281..7e11be28f 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -1160,6 +1160,10 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
             holder.chip.setBackgroundDrawable(mAccount.generateColorChip((folder.unreadMessageCount == 0 ? true : false ), false, false, false,false).drawable());
 
             holder.folderName.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getFolderName());
+            if (K9.wrapFolderNames()) {
+                holder.folderName.setEllipsize(null);
+                holder.folderName.setSingleLine(false);
+            }
             holder.folderStatus.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getFolderStatus());
 
 
diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java
index 8a760e3dc..f7200fba3 100644
--- a/src/com/fsck/k9/activity/setup/Prefs.java
+++ b/src/com/fsck/k9/activity/setup/Prefs.java
@@ -92,6 +92,7 @@ public class Prefs extends K9PreferenceActivity {
     private static final String PREFERENCE_ATTACHMENT_DEF_PATH = "attachment_default_path";
     private static final String PREFERENCE_BACKGROUND_AS_UNREAD_INDICATOR = "messagelist_background_as_unread_indicator";
     private static final String PREFERENCE_THREADED_VIEW = "threaded_view";
+    private static final String PREFERENCE_FOLDERLIST_WRAP_NAME = "folderlist_wrap_folder_name";
 
     private static final int ACTIVITY_CHOOSE_FOLDER = 1;
 
@@ -122,6 +123,7 @@ public class Prefs extends K9PreferenceActivity {
     private CheckBoxPreference mUseGalleryBugWorkaround;
     private CheckBoxPreference mDebugLogging;
     private CheckBoxPreference mSensitiveLogging;
+    private CheckBoxPreference mWrapFolderNames;
 
     private CheckBoxPreference mQuietTimeEnabled;
     private com.fsck.k9.preferences.TimePickerPreference mQuietTimeStarts;
@@ -394,6 +396,9 @@ public class Prefs extends K9PreferenceActivity {
                 }
             };
         });
+        
+        mWrapFolderNames = (CheckBoxPreference)findPreference(PREFERENCE_FOLDERLIST_WRAP_NAME);
+        mWrapFolderNames.setChecked(K9.wrapFolderNames());
 
         mBatchButtonsMarkRead = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_MARK_READ);
         mBatchButtonsDelete = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_DELETE);
@@ -468,6 +473,7 @@ public class Prefs extends K9PreferenceActivity {
 
         K9.setQuietTimeStarts(mQuietTimeStarts.getTime());
         K9.setQuietTimeEnds(mQuietTimeEnds.getTime());
+        K9.setWrapFolderNames(mWrapFolderNames.isChecked());
 
         if (mNotificationQuickDelete != null) {
             K9.setNotificationQuickDeleteBehaviour(
diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index 190b46765..fd3b7f00b 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -197,6 +197,9 @@ public class GlobalSettings {
         s.put("useVolumeKeysForNavigation", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));
+        s.put("wrapFolderNames", Settings.versions(
+                new V(21, new BooleanSetting(false))
+            ));
         s.put("batchButtonsMarkRead", Settings.versions(
                 new V(8, new BooleanSetting(true))
             ));

From 2c20413af6d5568499288e254959de27964b13e7 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Sun, 30 Sep 2012 23:05:32 -0400
Subject: [PATCH 3/5] Permit the folder list item to expand vertically.

Prior to this, in cases where the folder name wraps to mulitiple lines,
it could overflow its box and the overflow was hidden.
---
 res/layout/folder_list_item.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 1050de2a9..89f7f769d 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -23,7 +23,7 @@
 
     <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
         android:orientation="vertical"
         android:gravity="center_vertical"

From d5a2c6b5c73462b4ac3b145a5e3464f0ec12a251 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Tue, 2 Oct 2012 16:03:59 -0400
Subject: [PATCH 4/5] Control wrapping of folder names programmatically only

This removes the default settings (ellipsized, single line) from the layout
xml file and implements them programmatically.  This fixes the problem where:
You are viewing a folder list while wrapping is currently on, then you go into settings
and turn wrapping off, after which you are back at the folder list, but the
list is still wrapped.
---
 res/layout/folder_list_item.xml          | 2 --
 src/com/fsck/k9/activity/FolderList.java | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 89f7f769d..bbc885428 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -33,8 +33,6 @@
             android:id="@+id/folder_name"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="start"
             android:textColor="?android:attr/textColorPrimary"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 7e11be28f..e0192c62a 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -16,6 +16,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
 import android.text.Editable;
+import android.text.TextUtils.TruncateAt;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.util.TypedValue;
@@ -1164,6 +1165,10 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
                 holder.folderName.setEllipsize(null);
                 holder.folderName.setSingleLine(false);
             }
+            else {
+                holder.folderName.setEllipsize(TruncateAt.START);
+                holder.folderName.setSingleLine(true);
+            }
             holder.folderStatus.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getFolderStatus());
 
 

From 9b851f20e3e93f557c60bf8d03399928ec60a8c3 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Sat, 22 Dec 2012 23:31:23 -0500
Subject: [PATCH 5/5] Readjust settings version number based on current master

---
 src/com/fsck/k9/preferences/GlobalSettings.java | 2 +-
 src/com/fsck/k9/preferences/Settings.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index fd3b7f00b..8fb83f3bf 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -198,7 +198,7 @@ public class GlobalSettings {
                 new V(1, new BooleanSetting(false))
             ));
         s.put("wrapFolderNames", Settings.versions(
-                new V(21, new BooleanSetting(false))
+                new V(22, new BooleanSetting(false))
             ));
         s.put("batchButtonsMarkRead", Settings.versions(
                 new V(8, new BooleanSetting(true))
diff --git a/src/com/fsck/k9/preferences/Settings.java b/src/com/fsck/k9/preferences/Settings.java
index d7f521d4b..39431cb28 100644
--- a/src/com/fsck/k9/preferences/Settings.java
+++ b/src/com/fsck/k9/preferences/Settings.java
@@ -35,7 +35,7 @@ public class Settings {
      *
      * @see SettingsExporter
      */
-    public static final int VERSION = 21;
+    public static final int VERSION = 22;
 
     public static Map<String, Object> validate(int version, Map<String,
             TreeMap<Integer, SettingsDescription>> settings,