From 4fbb455175d7cb4a28cf9ef6767b25dc0ba3a7e2 Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Sun, 9 Jun 2013 02:36:47 +0200 Subject: [PATCH 1/4] multiline support for checkbox preferences (see #358) --- .../iitc_mobile/IITC_PluginPreference.java | 34 +++++++++++++++++++ .../iitc_mobile/IITC_SettingsFragment.java | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java b/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java new file mode 100644 index 00000000..fecc46e4 --- /dev/null +++ b/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java @@ -0,0 +1,34 @@ +package com.cradle.iitc_mobile; + +import android.content.Context; +import android.preference.CheckBoxPreference; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +// multiline checkbox preference +public class IITC_PluginPreference extends CheckBoxPreference { + + public IITC_PluginPreference(Context context) { + super(context); + } + + protected void onBindView( View view) { + super.onBindView(view); + makeMultiline(view); + } + + protected void makeMultiline( View view) { + if ( view instanceof ViewGroup) { + ViewGroup grp=(ViewGroup)view; + for ( int index = 0; index < grp.getChildCount(); index++) { + makeMultiline(grp.getChildAt(index)); + } + } else if (view instanceof TextView) { + TextView t = (TextView)view; + t.setSingleLine(false); + t.setEllipsize(null); + } + } +} diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_SettingsFragment.java b/mobile/src/com/cradle/iitc_mobile/IITC_SettingsFragment.java index 354af173..0eb33ec8 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_SettingsFragment.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_SettingsFragment.java @@ -175,7 +175,7 @@ public class IITC_SettingsFragment extends PreferenceFragment { } // now build a new checkable preference for the plugin - CheckBoxPreference plugin_pref = new CheckBoxPreference(pref_screen.getContext()); + IITC_PluginPreference plugin_pref = new IITC_PluginPreference(pref_screen.getContext()); plugin_pref.setKey(plugin_key); plugin_pref.setTitle(plugin_name); plugin_pref.setSummary(plugin_desc); From b4e87cc38d8b7f84aa50dd00f7b21390654070a4 Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Sun, 9 Jun 2013 02:38:00 +0200 Subject: [PATCH 2/4] removed not used imports and fixed whitespaces --- .../src/com/cradle/iitc_mobile/IITC_PluginPreference.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java b/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java index fecc46e4..3c4c13d8 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java @@ -2,7 +2,6 @@ package com.cradle.iitc_mobile; import android.content.Context; import android.preference.CheckBoxPreference; -import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; @@ -14,12 +13,12 @@ public class IITC_PluginPreference extends CheckBoxPreference { super(context); } - protected void onBindView( View view) { + protected void onBindView(View view) { super.onBindView(view); makeMultiline(view); } - protected void makeMultiline( View view) { + protected void makeMultiline(View view) { if ( view instanceof ViewGroup) { ViewGroup grp=(ViewGroup)view; for ( int index = 0; index < grp.getChildCount(); index++) { @@ -31,4 +30,5 @@ public class IITC_PluginPreference extends CheckBoxPreference { t.setEllipsize(null); } } + } From c0058f55807efcc8f75340f4785a3e80d218eb26 Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Sun, 9 Jun 2013 02:41:59 +0200 Subject: [PATCH 3/4] fixed typo --- website/page/code/desktop-download.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/page/code/desktop-download.php b/website/page/code/desktop-download.php index 3637d2eb..4065f4dc 100644 --- a/website/page/code/desktop-download.php +++ b/website/page/code/desktop-download.php @@ -20,7 +20,7 @@ function iitcDesktopPluginDownloadTable ( $build ) 'Info' => "", 'Keys' => "Key management", 'Controls' => "Map controls", - 'Highlighter' => "Portal highliters", + 'Highlighter' => "Portal highlighters", 'Layer' => "Additional map layers", 'Map Tiles' => "Alternative map layers", 'Tweaks' => "Adjust IITC settings", From 391a8770d806fdc8602f3ec8dbf11697a07c369c Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Sun, 9 Jun 2013 02:53:03 +0200 Subject: [PATCH 4/4] some more code formatting --- .../src/com/cradle/iitc_mobile/IITC_PluginPreference.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java b/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java index 3c4c13d8..32d6541b 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java @@ -19,13 +19,13 @@ public class IITC_PluginPreference extends CheckBoxPreference { } protected void makeMultiline(View view) { - if ( view instanceof ViewGroup) { - ViewGroup grp=(ViewGroup)view; - for ( int index = 0; index < grp.getChildCount(); index++) { + if (view instanceof ViewGroup) { + ViewGroup grp = (ViewGroup) view; + for (int index = 0; index < grp.getChildCount(); index++) { makeMultiline(grp.getChildAt(index)); } } else if (view instanceof TextView) { - TextView t = (TextView)view; + TextView t = (TextView) view; t.setSingleLine(false); t.setEllipsize(null); }