From d7d890edeee2d6fc6cb6cc08fe29b5089ad7513b Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 31 Jul 2021 18:32:01 +0200
Subject: initial implementation of classic on-off push button

---
 app/src/main/res/drawable/ic_btn_on_connecting.xml | 22 ++++++++++++++++++++++
 app/src/main/res/drawable/ic_btn_on_disabled.xml   | 20 ++++++++++++++++++++
 .../main/res/drawable/ic_btn_on_primary_color.xml  | 22 ++++++++++++++++++++++
 app/src/main/res/layout/v_main_button.xml          | 14 +++++++++-----
 4 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_btn_on_connecting.xml
 create mode 100644 app/src/main/res/drawable/ic_btn_on_disabled.xml
 create mode 100644 app/src/main/res/drawable/ic_btn_on_primary_color.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/ic_btn_on_connecting.xml b/app/src/main/res/drawable/ic_btn_on_connecting.xml
new file mode 100644
index 00000000..4b3d1384
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_on_connecting.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,4.0089C13.0002,3.4567 12.5527,3.0088 12.0004,3.0085C11.4481,3.0083 11.0002,3.4559 11,4.0082L10.9968,12.0116C10.9966,12.5639 11.4442,13.0118 11.9965,13.012C12.5487,13.0122 12.9966,12.5647 12.9968,12.0124L13,4.0089Z"
+      android:strokeColor="@color/colorPrimary_transparent"
+      android:strokeLineCap="round"
+      android:strokeWidth="0.3"
+      android:strokeLineJoin="round"
+      android:fillAlpha="0.5"
+      android:fillColor="@color/colorPrimary"/>
+  <path
+      android:pathData="M4,12.9917C4,10.7826 4.8954,8.7826 6.3431,7.3349L7.7573,8.7491C6.6715,9.8349 6,11.3349 6,12.9917C6,16.3054 8.6863,18.9917 12,18.9917C15.3137,18.9917 18,16.3054 18,12.9917C18,11.3348 17.3284,9.8348 16.2426,8.749L17.6568,7.3348C19.1046,8.7825 20,10.7825 20,12.9917C20,17.41 16.4183,20.9917 12,20.9917C7.5817,20.9917 4,17.41 4,12.9917Z"
+      android:strokeColor="@color/colorPrimary_transparent"
+      android:strokeLineCap="round"
+      android:strokeWidth="0.3"
+      android:strokeLineJoin="round"
+      android:fillAlpha="0.5"
+      android:fillColor="@color/colorPrimary"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_btn_on_disabled.xml b/app/src/main/res/drawable/ic_btn_on_disabled.xml
new file mode 100644
index 00000000..9c83422d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_on_disabled.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,4.0089C13.0002,3.4567 12.5527,3.0088 12.0004,3.0085C11.4481,3.0083 11.0002,3.4559 11,4.0082L10.9968,12.0116C10.9966,12.5639 11.4442,13.0118 11.9965,13.012C12.5487,13.0122 12.9966,12.5647 12.9968,12.0124L13,4.0089Z"
+      android:strokeColor="@color/colorPrimary_transparent"
+      android:strokeWidth="0.3"
+      android:fillAlpha="0.5"
+      android:strokeLineJoin="round"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M4,12.9917C4,10.7826 4.8954,8.7826 6.3431,7.3349L7.7573,8.7491C6.6715,9.8349 6,11.3349 6,12.9917C6,16.3054 8.6863,18.9917 12,18.9917C15.3137,18.9917 18,16.3054 18,12.9917C18,11.3348 17.3284,9.8348 16.2426,8.749L17.6568,7.3348C19.1046,8.7825 20,10.7825 20,12.9917C20,17.41 16.4183,20.9917 12,20.9917C7.5817,20.9917 4,17.41 4,12.9917Z"
+      android:strokeColor="@color/colorPrimary_transparent"
+      android:fillAlpha="0.5"
+      android:strokeWidth="0.3"
+      android:strokeLineJoin="round"
+      android:fillColor="@color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_btn_on_primary_color.xml b/app/src/main/res/drawable/ic_btn_on_primary_color.xml
new file mode 100644
index 00000000..9f449299
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_on_primary_color.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,4.0089C13.0002,3.4567 12.5527,3.0088 12.0004,3.0085C11.4481,3.0083 11.0002,3.4559 11,4.0082L10.9968,12.0116C10.9966,12.5639 11.4442,13.0118 11.9965,13.012C12.5487,13.0122 12.9966,12.5647 12.9968,12.0124L13,4.0089Z"
+      android:strokeColor="@color/colorPrimary_transparent"
+      android:strokeLineCap="round"
+      android:strokeAlpha="0.8"
+      android:strokeWidth="0.3"
+      android:strokeLineJoin="round"
+      android:fillColor="@color/colorPrimary"/>
+  <path
+      android:pathData="M4,12.9917C4,10.7826 4.8954,8.7826 6.3431,7.3349L7.7573,8.7491C6.6715,9.8349 6,11.3349 6,12.9917C6,16.3054 8.6863,18.9917 12,18.9917C15.3137,18.9917 18,16.3054 18,12.9917C18,11.3348 17.3284,9.8348 16.2426,8.749L17.6568,7.3348C19.1046,8.7825 20,10.7825 20,12.9917C20,17.41 16.4183,20.9917 12,20.9917C7.5817,20.9917 4,17.41 4,12.9917Z"
+      android:strokeColor="@color/colorPrimary_transparent"
+      android:strokeLineCap="round"
+      android:strokeAlpha="0.8"
+      android:strokeWidth="0.3"
+      android:strokeLineJoin="round"
+      android:fillColor="@color/colorPrimary"/>
+</vector>
diff --git a/app/src/main/res/layout/v_main_button.xml b/app/src/main/res/layout/v_main_button.xml
index d8ae211c..741fc88f 100644
--- a/app/src/main/res/layout/v_main_button.xml
+++ b/app/src/main/res/layout/v_main_button.xml
@@ -102,6 +102,7 @@
         app:layout_constraintEnd_toEndOf="@id/border_guideline_right"
         app:layout_constraintStart_toStartOf="@id/border_guideline_left"
         app:layout_constraintTop_toTopOf="@id/border_guideline_top"
+        app:layout_constraintDimensionRatio="1:1"
         android:indeterminate="true"
         android:indeterminateDuration="800"
         android:indeterminateDrawable="@drawable/progressbar_circle"
@@ -117,16 +118,19 @@
         app:layout_constraintEnd_toStartOf="@+id/vpn_btn_guideline_right"
         app:layout_constraintStart_toStartOf="@+id/vpn_btn_guideline_left"
         app:layout_constraintTop_toTopOf="@+id/vpn_btn_guideline_top"
+        app:layout_constraintDimensionRatio="1:1"
         app:srcCompat="@drawable/black_circle" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/vpn_state_key"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/icn_guideline_bottom"
-        app:layout_constraintEnd_toStartOf="@id/icn_guideline_right"
-        app:layout_constraintStart_toStartOf="@id/icn_guideline_left"
-        app:layout_constraintTop_toTopOf="@id/icn_guideline_top"
-        app:srcCompat="@drawable/vpn_connected" />
+        app:layout_constraintBottom_toTopOf="@+id/icn_guideline_bottom"
+        app:layout_constraintEnd_toStartOf="@+id/icn_guideline_right"
+        app:layout_constraintStart_toStartOf="@+id/icn_guideline_left"
+        app:layout_constraintTop_toTopOf="@+id/icn_guideline_top"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintVertical_bias="0.35"
+        app:srcCompat="@drawable/ic_btn_on_disabled" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3