From d4c1626e228050cc02c4a92e0cda567ae31b6d8d Mon Sep 17 00:00:00 2001 From: Ryan Hansberry Date: Tue, 15 Sep 2015 09:42:34 -0700 Subject: Changed Settings options to use switches instead of checkboxes. Fixes #169. --- app/src/main/res/xml/preferences.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 70bdb5b..d04119f 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -20,21 +20,21 @@ - - - - - - - - - - - - - Date: Tue, 15 Sep 2015 13:45:26 -0700 Subject: Switched to using SwitchCompat instead of PreferenceSwitch in order to support pre-APIv14. Big thanks to: https://plus.sandbox.google.com/+ChristianGollner/posts/badausxo1J6 --- .../org/connectbot/SwitchCompatPreference.java | 51 ++++++++++++++++++++++ .../res/layout/switch_compat_preference_layout.xml | 30 +++++++++++++ app/src/main/res/values/styles.xml | 4 ++ app/src/main/res/xml/preferences.xml | 39 +++++++++++------ 4 files changed, 111 insertions(+), 13 deletions(-) create mode 100644 app/src/main/java/org/connectbot/SwitchCompatPreference.java create mode 100644 app/src/main/res/layout/switch_compat_preference_layout.xml diff --git a/app/src/main/java/org/connectbot/SwitchCompatPreference.java b/app/src/main/java/org/connectbot/SwitchCompatPreference.java new file mode 100644 index 0000000..b93dcab --- /dev/null +++ b/app/src/main/java/org/connectbot/SwitchCompatPreference.java @@ -0,0 +1,51 @@ +/* + * ConnectBot: simple, powerful, open-source SSH client for Android + * Copyright 2015 Kenny Root, Jeffrey Sharkey + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.connectbot; + +import android.annotation.TargetApi; +import android.content.Context; +import android.os.Build; +import android.preference.CheckBoxPreference; +import android.util.AttributeSet; + +public class SwitchCompatPreference extends CheckBoxPreference { + + public SwitchCompatPreference(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(); + } + + @TargetApi(Build.VERSION_CODES.LOLLIPOP) + public SwitchCompatPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + init(); + } + + public SwitchCompatPreference(Context context, AttributeSet attrs) { + super(context, attrs); + init(); + } + + public SwitchCompatPreference(Context context) { + super(context); + init(); + } + + private void init() { + setWidgetLayoutResource(R.layout.switch_compat_preference_layout); + } +} diff --git a/app/src/main/res/layout/switch_compat_preference_layout.xml b/app/src/main/res/layout/switch_compat_preference_layout.xml new file mode 100644 index 0000000..89deeb0 --- /dev/null +++ b/app/src/main/res/layout/switch_compat_preference_layout.xml @@ -0,0 +1,30 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 39dc628..b73a4a6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -69,4 +69,8 @@ + + diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index d04119f..ecddd71 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -20,21 +20,24 @@ - - - - - - - - - - - - - Date: Wed, 16 Sep 2015 10:05:15 -0700 Subject: Added SwitchCompat switches to Host Preferences. --- app/src/main/res/xml/host_prefs.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/res/xml/host_prefs.xml b/app/src/main/res/xml/host_prefs.xml index a2fc1a4..5e85d60 100644 --- a/app/src/main/res/xml/host_prefs.xml +++ b/app/src/main/res/xml/host_prefs.xml @@ -68,24 +68,28 @@ /> Date: Thu, 17 Sep 2015 11:48:30 -0700 Subject: Make APIv14 and above use SwitchPreference, and below use custom SwitchCompatPreference. Created API-v14-and-above preferences.xml and host_prefs.xml files (under xml-v14/) in order to do so. This unfortunately for the most part duplicates preferences.xml and host_prefs.xml. This method is an effective workaround for the visual glitch encountered earlier, as recorded here: https://github.com/connectbot/connectbot/pull/205#issuecomment-140547689 --- app/src/main/res/xml-v14/host_prefs.xml | 124 ++++++++++++++++++++ app/src/main/res/xml-v14/preferences.xml | 188 +++++++++++++++++++++++++++++++ app/src/main/res/xml/host_prefs.xml | 27 ++--- app/src/main/res/xml/preferences.xml | 39 +++---- 4 files changed, 333 insertions(+), 45 deletions(-) create mode 100644 app/src/main/res/xml-v14/host_prefs.xml create mode 100644 app/src/main/res/xml-v14/preferences.xml diff --git a/app/src/main/res/xml-v14/host_prefs.xml b/app/src/main/res/xml-v14/host_prefs.xml new file mode 100644 index 0000000..e0cd4f2 --- /dev/null +++ b/app/src/main/res/xml-v14/host_prefs.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml new file mode 100644 index 0000000..d04119f --- /dev/null +++ b/app/src/main/res/xml-v14/preferences.xml @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/xml/host_prefs.xml b/app/src/main/res/xml/host_prefs.xml index 5e85d60..c21f980 100644 --- a/app/src/main/res/xml/host_prefs.xml +++ b/app/src/main/res/xml/host_prefs.xml @@ -40,13 +40,6 @@ android:singleLine="true" /> - - - - - - - - - + - + - - - - - - - - - - - - - Date: Thu, 17 Sep 2015 13:33:30 -0700 Subject: Moved SwitchCompatPreference to util package for consistency with other custom Preferences. --- .../org/connectbot/SwitchCompatPreference.java | 51 --------------------- .../connectbot/util/SwitchCompatPreference.java | 53 ++++++++++++++++++++++ app/src/main/res/xml/host_prefs.xml | 8 ++-- app/src/main/res/xml/preferences.xml | 26 +++++------ 4 files changed, 70 insertions(+), 68 deletions(-) delete mode 100644 app/src/main/java/org/connectbot/SwitchCompatPreference.java create mode 100644 app/src/main/java/org/connectbot/util/SwitchCompatPreference.java diff --git a/app/src/main/java/org/connectbot/SwitchCompatPreference.java b/app/src/main/java/org/connectbot/SwitchCompatPreference.java deleted file mode 100644 index b93dcab..0000000 --- a/app/src/main/java/org/connectbot/SwitchCompatPreference.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * ConnectBot: simple, powerful, open-source SSH client for Android - * Copyright 2015 Kenny Root, Jeffrey Sharkey - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.connectbot; - -import android.annotation.TargetApi; -import android.content.Context; -import android.os.Build; -import android.preference.CheckBoxPreference; -import android.util.AttributeSet; - -public class SwitchCompatPreference extends CheckBoxPreference { - - public SwitchCompatPreference(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - init(); - } - - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - public SwitchCompatPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - init(); - } - - public SwitchCompatPreference(Context context, AttributeSet attrs) { - super(context, attrs); - init(); - } - - public SwitchCompatPreference(Context context) { - super(context); - init(); - } - - private void init() { - setWidgetLayoutResource(R.layout.switch_compat_preference_layout); - } -} diff --git a/app/src/main/java/org/connectbot/util/SwitchCompatPreference.java b/app/src/main/java/org/connectbot/util/SwitchCompatPreference.java new file mode 100644 index 0000000..0e551b5 --- /dev/null +++ b/app/src/main/java/org/connectbot/util/SwitchCompatPreference.java @@ -0,0 +1,53 @@ +/* + * ConnectBot: simple, powerful, open-source SSH client for Android + * Copyright 2015 Kenny Root, Jeffrey Sharkey + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.connectbot.util; + +import org.connectbot.R; + +import android.annotation.TargetApi; +import android.content.Context; +import android.os.Build; +import android.preference.CheckBoxPreference; +import android.util.AttributeSet; + +public class SwitchCompatPreference extends CheckBoxPreference { + + public SwitchCompatPreference(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(); + } + + @TargetApi(Build.VERSION_CODES.LOLLIPOP) + public SwitchCompatPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + init(); + } + + public SwitchCompatPreference(Context context, AttributeSet attrs) { + super(context, attrs); + init(); + } + + public SwitchCompatPreference(Context context) { + super(context); + init(); + } + + private void init() { + setWidgetLayoutResource(R.layout.switch_compat_preference_layout); + } +} diff --git a/app/src/main/res/xml/host_prefs.xml b/app/src/main/res/xml/host_prefs.xml index c21f980..c6e5b4b 100644 --- a/app/src/main/res/xml/host_prefs.xml +++ b/app/src/main/res/xml/host_prefs.xml @@ -60,25 +60,25 @@ android:summary="@string/hostpref_postlogin_summary" /> - - - - - - - - - - - - - - - - -