From a6cd31ae8624f830454adc627ac3a6be323a5333 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 21 Nov 2021 19:36:46 +0100
Subject: implement new gateway selection UI, using same UX principles as for
 desktop

---
 .../bitmaskclient/base/views/SimpleCheckBox.java   | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 app/src/main/java/se/leap/bitmaskclient/base/views/SimpleCheckBox.java

(limited to 'app/src/main/java/se/leap/bitmaskclient/base/views/SimpleCheckBox.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/SimpleCheckBox.java b/app/src/main/java/se/leap/bitmaskclient/base/views/SimpleCheckBox.java
new file mode 100644
index 00000000..7cd790db
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/base/views/SimpleCheckBox.java
@@ -0,0 +1,50 @@
+package se.leap.bitmaskclient.base.views;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import androidx.appcompat.widget.AppCompatImageView;
+
+import se.leap.bitmaskclient.R;
+
+public class SimpleCheckBox extends RelativeLayout {
+
+    AppCompatImageView checkView;
+
+
+    public SimpleCheckBox(Context context) {
+        super(context);
+        initLayout(context);
+    }
+
+    public SimpleCheckBox(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initLayout(context);
+    }
+
+    public SimpleCheckBox(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initLayout(context);
+    }
+
+    @TargetApi(21)
+    public SimpleCheckBox(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        initLayout(context);
+    }
+
+    private void initLayout(Context context) {
+        LayoutInflater inflater = (LayoutInflater) context
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View rootview = inflater.inflate(R.layout.v_simple_checkbox, this, true);
+        this.checkView = rootview.findViewById(R.id.check_view);
+    }
+
+    public void setChecked(boolean checked) {
+        this.checkView.setVisibility(checked ? VISIBLE : INVISIBLE);
+    }
+}
-- 
cgit v1.2.3


From 638b2c53f00f552693cc8f425eaa862343e6cf20 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 23 Nov 2021 15:42:41 +0100
Subject: add OnCheckedChangedListener in SimpleCheckbox

---
 .../bitmaskclient/base/views/SimpleCheckBox.java   | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/base/views/SimpleCheckBox.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/SimpleCheckBox.java b/app/src/main/java/se/leap/bitmaskclient/base/views/SimpleCheckBox.java
index 7cd790db..09a9132e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/views/SimpleCheckBox.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/views/SimpleCheckBox.java
@@ -9,11 +9,19 @@ import android.widget.RelativeLayout;
 
 import androidx.appcompat.widget.AppCompatImageView;
 
+import java.lang.ref.WeakReference;
+
 import se.leap.bitmaskclient.R;
 
 public class SimpleCheckBox extends RelativeLayout {
 
     AppCompatImageView checkView;
+    private WeakReference<OnCheckedChangeListener> checkedChangeListener = new WeakReference<OnCheckedChangeListener>(null);
+    private boolean checked;
+
+    public interface OnCheckedChangeListener {
+        void onCheckedChanged(SimpleCheckBox simpleCheckBox, boolean isChecked);
+    }
 
 
     public SimpleCheckBox(Context context) {
@@ -45,6 +53,21 @@ public class SimpleCheckBox extends RelativeLayout {
     }
 
     public void setChecked(boolean checked) {
-        this.checkView.setVisibility(checked ? VISIBLE : INVISIBLE);
+        if (this.checked != checked) {
+            this.checkView.setVisibility(checked ? VISIBLE : INVISIBLE);
+            this.checked = checked;
+            OnCheckedChangeListener listener = checkedChangeListener.get();
+            if (listener != null) {
+                listener.onCheckedChanged(this, this.checked);
+            }
+        }
+    }
+
+    public void setOnCheckedChangeListener(OnCheckedChangeListener listener) {
+        checkedChangeListener = new WeakReference<>(listener);
+    }
+
+    public void toggle() {
+        setChecked(!this.checked);
     }
 }
-- 
cgit v1.2.3