From 4c0869393e2d8f52b9bcf312286dca8ced2e1900 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Tue, 26 Dec 2017 14:12:57 -0600 Subject: Rename package widgets -> widget Signed-off-by: Samuel Holland --- .../android/databinding/BindingAdapters.java | 2 +- .../com/wireguard/android/widget/ToggleSwitch.java | 72 ++++++++++++++++++++++ .../wireguard/android/widgets/ToggleSwitch.java | 72 ---------------------- app/src/main/res/layout/config_detail_fragment.xml | 2 +- app/src/main/res/layout/config_list_item.xml | 2 +- 5 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 app/src/main/java/com/wireguard/android/widget/ToggleSwitch.java delete mode 100644 app/src/main/java/com/wireguard/android/widgets/ToggleSwitch.java diff --git a/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java b/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java index 3e7a9270..5dfc2d19 100644 --- a/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java +++ b/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java @@ -10,7 +10,7 @@ import android.widget.ListView; import android.widget.TextView; import com.wireguard.android.R; -import com.wireguard.android.widgets.ToggleSwitch; +import com.wireguard.android.widget.ToggleSwitch; /** * Static methods for use by generated code in the Android data binding library. diff --git a/app/src/main/java/com/wireguard/android/widget/ToggleSwitch.java b/app/src/main/java/com/wireguard/android/widget/ToggleSwitch.java new file mode 100644 index 00000000..c8f9ab2d --- /dev/null +++ b/app/src/main/java/com/wireguard/android/widget/ToggleSwitch.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * 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 com.wireguard.android.widget; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.Switch; + +public class ToggleSwitch extends Switch { + private boolean hasPendingStateChange; + private OnBeforeCheckedChangeListener listener; + + public interface OnBeforeCheckedChangeListener { + void onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked); + } + + public ToggleSwitch(final Context context) { + super(context); + } + + public ToggleSwitch(final Context context, final AttributeSet attrs) { + super(context, attrs); + } + + public ToggleSwitch(final Context context, final AttributeSet attrs, final int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + public ToggleSwitch(final Context context, final AttributeSet attrs, final int defStyleAttr, + final int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + public void setOnBeforeCheckedChangeListener(final OnBeforeCheckedChangeListener listener) { + this.listener = listener; + } + + @Override + public void setChecked(final boolean checked) { + if (listener != null) { + if (!isEnabled()) + return; + setEnabled(false); + hasPendingStateChange = true; + listener.onBeforeCheckedChanged(this, checked); + } else { + super.setChecked(checked); + } + } + + public void setCheckedInternal(final boolean checked) { + if (hasPendingStateChange) { + setEnabled(true); + hasPendingStateChange = false; + } + super.setChecked(checked); + } +} diff --git a/app/src/main/java/com/wireguard/android/widgets/ToggleSwitch.java b/app/src/main/java/com/wireguard/android/widgets/ToggleSwitch.java deleted file mode 100644 index 667cfe53..00000000 --- a/app/src/main/java/com/wireguard/android/widgets/ToggleSwitch.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * 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 com.wireguard.android.widgets; - -import android.content.Context; -import android.util.AttributeSet; -import android.widget.Switch; - -public class ToggleSwitch extends Switch { - private boolean hasPendingStateChange; - private OnBeforeCheckedChangeListener listener; - - public interface OnBeforeCheckedChangeListener { - void onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked); - } - - public ToggleSwitch(final Context context) { - super(context); - } - - public ToggleSwitch(final Context context, final AttributeSet attrs) { - super(context, attrs); - } - - public ToggleSwitch(final Context context, final AttributeSet attrs, final int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public ToggleSwitch(final Context context, final AttributeSet attrs, final int defStyleAttr, - final int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - public void setOnBeforeCheckedChangeListener(final OnBeforeCheckedChangeListener listener) { - this.listener = listener; - } - - @Override - public void setChecked(final boolean checked) { - if (listener != null) { - if (!isEnabled()) - return; - setEnabled(false); - hasPendingStateChange = true; - listener.onBeforeCheckedChanged(this, checked); - } else { - super.setChecked(checked); - } - } - - public void setCheckedInternal(final boolean checked) { - if (hasPendingStateChange) { - setEnabled(true); - hasPendingStateChange = false; - } - super.setChecked(checked); - } -} diff --git a/app/src/main/res/layout/config_detail_fragment.xml b/app/src/main/res/layout/config_detail_fragment.xml index f5cd2acb..cf6fdaaf 100644 --- a/app/src/main/res/layout/config_detail_fragment.xml +++ b/app/src/main/res/layout/config_detail_fragment.xml @@ -44,7 +44,7 @@ android:layout_toStartOf="@+id/config_switch" android:text="@string/status" /> - -