From f264b2856e981ef1a61c3af80022ab22af87e0b3 Mon Sep 17 00:00:00 2001 From: Ryan Hansberry 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 @@ - - - - - - - - - - - - -