From 905cf37dc3e5e7a3a3ffdd80b09cb4be3ccfc806 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Wed, 30 Nov 2022 16:01:52 +0100
Subject: add new drawables for riseupVPN

---
 app/src/custom/res/drawable-hdpi/bg_connected.png  | Bin 0 -> 147673 bytes
 app/src/custom/res/drawable-hdpi/bg_connecting.png | Bin 0 -> 237385 bytes
 .../custom/res/drawable-hdpi/bg_disconnected.png   | Bin 0 -> 123636 bytes
 app/src/custom/res/drawable-xhdpi/bg_connected.png | Bin 0 -> 228442 bytes
 .../custom/res/drawable-xhdpi/bg_connecting.png    | Bin 0 -> 402134 bytes
 .../custom/res/drawable-xhdpi/bg_disconnected.png  | Bin 0 -> 200573 bytes
 .../custom/res/drawable-xxhdpi/bg_connected.png    | Bin 0 -> 460545 bytes
 .../custom/res/drawable-xxhdpi/bg_connecting.png   | Bin 0 -> 831328 bytes
 .../custom/res/drawable-xxhdpi/bg_disconnected.png | Bin 0 -> 417997 bytes
 .../custom/res/drawable-xxxhdpi/bg_connected.png   | Bin 0 -> 765207 bytes
 .../custom/res/drawable-xxxhdpi/bg_connecting.png  | Bin 0 -> 1492820 bytes
 .../res/drawable-xxxhdpi/bg_disconnected.png       | Bin 0 -> 683759 bytes
 app/src/custom/res/drawable/bg_connected.png       | Bin 0 -> 77818 bytes
 app/src/custom/res/drawable/bg_connecting.png      | Bin 0 -> 112675 bytes
 app/src/custom/res/drawable/bg_disconnected.png    | Bin 0 -> 63491 bytes
 app/src/custom/res/drawable/state_connected.xml    |  15 +++
 app/src/custom/res/layout/v_location_button.xml    | 104 +++++++++++++++
 app/src/custom/res/layout/v_main_button.xml        | 142 +++++++++++++++++++++
 18 files changed, 261 insertions(+)
 create mode 100644 app/src/custom/res/drawable-hdpi/bg_connected.png
 create mode 100644 app/src/custom/res/drawable-hdpi/bg_connecting.png
 create mode 100644 app/src/custom/res/drawable-hdpi/bg_disconnected.png
 create mode 100644 app/src/custom/res/drawable-xhdpi/bg_connected.png
 create mode 100644 app/src/custom/res/drawable-xhdpi/bg_connecting.png
 create mode 100644 app/src/custom/res/drawable-xhdpi/bg_disconnected.png
 create mode 100644 app/src/custom/res/drawable-xxhdpi/bg_connected.png
 create mode 100644 app/src/custom/res/drawable-xxhdpi/bg_connecting.png
 create mode 100644 app/src/custom/res/drawable-xxhdpi/bg_disconnected.png
 create mode 100644 app/src/custom/res/drawable-xxxhdpi/bg_connected.png
 create mode 100644 app/src/custom/res/drawable-xxxhdpi/bg_connecting.png
 create mode 100644 app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png
 create mode 100644 app/src/custom/res/drawable/bg_connected.png
 create mode 100644 app/src/custom/res/drawable/bg_connecting.png
 create mode 100644 app/src/custom/res/drawable/bg_disconnected.png
 create mode 100644 app/src/custom/res/drawable/state_connected.xml
 create mode 100644 app/src/custom/res/layout/v_location_button.xml
 create mode 100644 app/src/custom/res/layout/v_main_button.xml

diff --git a/app/src/custom/res/drawable-hdpi/bg_connected.png b/app/src/custom/res/drawable-hdpi/bg_connected.png
new file mode 100644
index 00000000..53648c23
Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/bg_connected.png differ
diff --git a/app/src/custom/res/drawable-hdpi/bg_connecting.png b/app/src/custom/res/drawable-hdpi/bg_connecting.png
new file mode 100644
index 00000000..a62d308c
Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/bg_connecting.png differ
diff --git a/app/src/custom/res/drawable-hdpi/bg_disconnected.png b/app/src/custom/res/drawable-hdpi/bg_disconnected.png
new file mode 100644
index 00000000..c2e031df
Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/bg_disconnected.png differ
diff --git a/app/src/custom/res/drawable-xhdpi/bg_connected.png b/app/src/custom/res/drawable-xhdpi/bg_connected.png
new file mode 100644
index 00000000..4491692a
Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/bg_connected.png differ
diff --git a/app/src/custom/res/drawable-xhdpi/bg_connecting.png b/app/src/custom/res/drawable-xhdpi/bg_connecting.png
new file mode 100644
index 00000000..703a77c4
Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/bg_connecting.png differ
diff --git a/app/src/custom/res/drawable-xhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xhdpi/bg_disconnected.png
new file mode 100644
index 00000000..4e05614e
Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/bg_disconnected.png differ
diff --git a/app/src/custom/res/drawable-xxhdpi/bg_connected.png b/app/src/custom/res/drawable-xxhdpi/bg_connected.png
new file mode 100644
index 00000000..29bd3a05
Binary files /dev/null and b/app/src/custom/res/drawable-xxhdpi/bg_connected.png differ
diff --git a/app/src/custom/res/drawable-xxhdpi/bg_connecting.png b/app/src/custom/res/drawable-xxhdpi/bg_connecting.png
new file mode 100644
index 00000000..9b91293c
Binary files /dev/null and b/app/src/custom/res/drawable-xxhdpi/bg_connecting.png differ
diff --git a/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png
new file mode 100644
index 00000000..c4a09aa7
Binary files /dev/null and b/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png differ
diff --git a/app/src/custom/res/drawable-xxxhdpi/bg_connected.png b/app/src/custom/res/drawable-xxxhdpi/bg_connected.png
new file mode 100644
index 00000000..d1e95fb6
Binary files /dev/null and b/app/src/custom/res/drawable-xxxhdpi/bg_connected.png differ
diff --git a/app/src/custom/res/drawable-xxxhdpi/bg_connecting.png b/app/src/custom/res/drawable-xxxhdpi/bg_connecting.png
new file mode 100644
index 00000000..e6d36eb0
Binary files /dev/null and b/app/src/custom/res/drawable-xxxhdpi/bg_connecting.png differ
diff --git a/app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png
new file mode 100644
index 00000000..df597f2f
Binary files /dev/null and b/app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png differ
diff --git a/app/src/custom/res/drawable/bg_connected.png b/app/src/custom/res/drawable/bg_connected.png
new file mode 100644
index 00000000..a375181d
Binary files /dev/null and b/app/src/custom/res/drawable/bg_connected.png differ
diff --git a/app/src/custom/res/drawable/bg_connecting.png b/app/src/custom/res/drawable/bg_connecting.png
new file mode 100644
index 00000000..eccf184b
Binary files /dev/null and b/app/src/custom/res/drawable/bg_connecting.png differ
diff --git a/app/src/custom/res/drawable/bg_disconnected.png b/app/src/custom/res/drawable/bg_disconnected.png
new file mode 100644
index 00000000..cc3ead9a
Binary files /dev/null and b/app/src/custom/res/drawable/bg_disconnected.png differ
diff --git a/app/src/custom/res/drawable/state_connected.xml b/app/src/custom/res/drawable/state_connected.xml
new file mode 100644
index 00000000..c9854d69
--- /dev/null
+++ b/app/src/custom/res/drawable/state_connected.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="166"
+    android:viewportHeight="220"
+    android:width="166dp"
+    android:height="220dp">
+    <path
+        android:pathData="M75.7916 211.927C37.7611 190.779 9.33369 157.386 2.89166 126.295C1.07036 117.505 0.998811 115.374 1.00089 69.9755L1.0025 26.6083L4.76437 24.1851C20.6619 13.9449 37.4788 7.09821 54.6105 3.64229C89.5868 -3.41322 125.875 3.66238 158.333 24.8539L161 26.5952V70.1783C161 115.754 160.927 117.944 159.119 126.65C152.713 157.49 128.092 187.572 91.7515 208.96C81.1937 215.174 81.5205 215.113 75.7916 211.927Z"
+        android:fillColor="#739B4C" />
+    <path
+        android:pathData="M81.0089 1.00082C72.1811 0.99767 63.3554 1.87831 54.6114 3.64218C37.4796 7.09809 20.6622 13.9447 4.76468 24.185L1.00318 26.608L1.00002 69.9756C0.998421 115.374 1.06949 117.505 2.89058 126.295C9.3326 157.386 37.76 190.778 75.7905 211.927H75.7913C78.2626 213.301 79.6075 214.092 81.1849 214.051V1.00327C81.1259 1.00314 81.0673 1 81.008 1L81.0089 1.00082Z"
+        android:fillColor="#81A55D" />
+    <path
+        android:pathData="M84.9756 57.0972C84.9756 57.0972 82.861 53.0004 82.72 52.4353C82.5789 51.87 81.4512 46.0784 81.4512 46.0784L82.861 43.5356L85.9625 38.8737L90.4738 35.3421L91.6016 34.9182L102.457 30.8212L103.444 29.8325L102.316 28.1374L100.765 27.2897L97.9194 26.5591L90.79 25.8286L85.2576 25.8754L81.4512 26.7231L78.0677 25.4516L73.8383 24.8863L67.6353 24.745L64.5337 24.6038L59.3176 26.5814L51.4227 35.7638L50.4359 39.2954L49.872 42.4034L47.1934 48.1953L45.5016 53.7047L44.6558 59.638V60.9094L40.5674 67.1251L38.3118 71.787V78.4266L39.0166 92.1295L40.2854 97.0739L42.8231 101.595L46.0656 104.561L47.4753 110.353L52.8325 122.219L59.1766 129.847L59.5993 130.271L61.855 141.713L54.1012 155.841L51.667 157.727L49.8423 159.204L46.7131 159.118L44.9676 160.019L42.8502 160.109L41.5709 161.384L38.8317 160.972L36.1229 160.841L34.0333 162.489L33.7324 164.937L35.1214 163.365L37.4581 162.685L37.7028 164.932L41.3952 163.678L43.5126 163.588L47.2482 164.035C47.2482 164.035 50.4869 163.823 51.0475 163.762C51.6081 163.702 55.0481 164.037 55.0481 164.037L57.5708 163.763L58.9086 164.328L60.7 163.849L62.6442 164.774L65.4473 164.469L65.809 162.583L65.7021 161.6L67.6158 162.244L69.1701 163.496L70.1791 164.949L70.1202 163.108L68.8947 160.968C68.8947 160.968 68.0564 159.78 67.4958 159.841C66.9352 159.901 64.7565 159.428 64.7565 159.428L63.2607 160.018L61.6273 159.342L60.022 160.228L58.5439 159.678L57.8307 158.335L56.8037 158.02L57.9073 155.142L60.4449 151.601L63.8284 145.95L66.7889 142.419L67.9168 141.006C67.9168 141.006 69.3266 138.887 69.3266 138.322C69.3266 137.757 69.6087 131.824 69.6087 131.824L67.7759 128.01L66.9301 124.902L83.2836 128.857H84.2705L98.2274 138.887L100.201 141.43L100.906 151.459L100.624 153.719L99.6369 155.556L98.9312 156.686L98.3216 158.272L97.9054 159.332L95.3151 160.135L92.6822 159.66L91.0867 159.463L88.1568 159.887L86.9236 161.207L86.4491 162.847L86.8317 164.504L87.446 162.845L88.2809 161.725L89.0979 161.465L89.1609 162.883L90.2591 163.58L92.5297 162.538L93.6459 162.376L94.0082 163.894L97.4175 163.827L99.7285 163.063L101.623 163.36L104.375 163.675L105.332 163.396L106.088 162.715L107.31 165.25L107.326 162.393L106.143 159.139L104.425 158.103L104.715 157.252L103.446 154.851L103.587 145.669L110.636 154.004L119.941 161.35C119.941 161.35 126.285 163.611 126.849 163.611C127.413 163.611 131.783 163.045 131.783 163.045L134.603 158.384L132.488 152.027L133.334 149.907L128.823 143.974L119.266 134.244L116.98 126.599L117.121 121.371L115.007 115.862L112.61 111.483L114.02 107.104L112.892 100.747L108.084 89.9253L109.86 89.6253L106.88 84.4656L108.816 83.8508L105.412 78.3017L106.844 77.5296L104.292 73.3405L105.124 72.8745L102.037 70.3735L103.165 69.7875L95.1288 64.1577L84.9756 57.0972Z"
+        android:fillColor="#000000" />
+</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/layout/v_location_button.xml b/app/src/custom/res/layout/v_location_button.xml
new file mode 100644
index 00000000..8aaf4978
--- /dev/null
+++ b/app/src/custom/res/layout/v_location_button.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_gravity="center_vertical"
+    android:layout_height="match_parent"
+    android:padding="@dimen/stdpadding"
+    android:background="@drawable/cust_button_light_rect"
+    >
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/world_icn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/text_location"
+        android:layout_alignBottom="@+id/text_location"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_web"
+        android:layout_gravity="center"
+        app:tint="@color/colorLocationButtonTint"
+        />
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/recommended_icn"
+        android:scaleType="fitCenter"
+        android:layout_marginRight="-13dp"
+        android:layout_marginEnd="-13dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/text_location"
+        android:layout_alignBottom="@+id/text_location"
+        android:layout_toEndOf="@id/world_icn"
+        android:layout_toRightOf="@id/world_icn"
+        android:src="@drawable/ic_lightning_bolt"
+        app:tint="@color/colorLocationButtonTint"
+
+        android:visibility="gone"
+        tools:visibility="visible"
+        />
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/text_location"
+        android:paddingStart="@dimen/stdpadding"
+        android:paddingLeft="@dimen/stdpadding"
+        android:paddingEnd="@dimen/stdpadding"
+        android:paddingRight="@dimen/stdpadding"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        app:autoSizeTextType="uniform"
+        android:gravity="center_vertical"
+        app:autoSizeMinTextSize="15sp"
+        app:autoSizeMaxTextSize="24sp"
+        android:layout_toEndOf="@id/recommended_icn"
+        android:layout_toRightOf="@+id/recommended_icn"
+        android:layout_toLeftOf="@+id/bridge_icn"
+        android:layout_toStartOf="@+id/bridge_icn"
+        android:layout_gravity="center_vertical"
+        android:layout_centerInParent="true"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:textStyle="bold"
+        android:textColor="@color/white"
+        tools:text="Seattle along message"
+        />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/bridge_icn"
+
+        android:paddingStart="@dimen/compact_padding"
+        android:paddingLeft="@dimen/compact_padding"
+        android:paddingRight="@dimen/compact_padding"
+        android:paddingEnd="@dimen/compact_padding"
+        android:scaleType="fitCenter"
+        android:layout_width="48dp"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/text_location"
+        android:layout_alignBottom="@+id/text_location"
+        android:layout_toStartOf="@id/load_indicator"
+        android:layout_toLeftOf="@id/load_indicator"
+        android:src="@drawable/ic_bridge_36"
+        android:visibility="gone"
+        tools:visibility="visible"
+        app:tint="@color/colorLocationButtonTint"
+        />
+
+    <se.leap.bitmaskclient.base.views.LocationIndicator
+        android:id="@+id/load_indicator"
+        android:layout_marginBottom="4dp"
+        android:layout_width="48dp"
+        android:layout_height="40dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:paddingTop="@dimen/stdpadding"
+        android:paddingBottom="@dimen/stdpadding"
+        android:visibility="visible"
+        android:layout_gravity="center_vertical"
+        app:tint="@color/colorLocationButtonTintTransparent"
+        />
+
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/custom/res/layout/v_main_button.xml b/app/src/custom/res/layout/v_main_button.xml
new file mode 100644
index 00000000..e3f96693
--- /dev/null
+++ b/app/src/custom/res/layout/v_main_button.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/vpn_btn_guideline_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.125" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/vpn_btn_guideline_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.875" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/vpn_btn_guideline_top"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.125" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/vpn_btn_guideline_bottom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.875" />
+
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/icn_guideline_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.2" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/icn_guideline_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.8" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/icn_guideline_top"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.2" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/icn_guideline_bottom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.8" />
+
+   <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/border_guideline_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.025" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/border_guideline_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.975" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/border_guideline_top"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.025" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/border_guideline_bottom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.975" />
+
+
+   <!-- <ProgressBar
+        android:id="@+id/progressBar"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="@id/border_guideline_bottom"
+        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"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:indeterminateBehavior="cycle"
+        />-->
+
+    <!--<androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/progress_circular"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:scaleType="fitXY"
+
+        app:layout_constraintTop_toTopOf="@+id/button"
+        app:layout_constraintBottom_toBottomOf="@+id/button"
+        app:layout_constraintLeft_toLeftOf="@+id/button"
+        app:layout_constraintRight_toRightOf="@+id/button"
+        app:layout_constraintDimensionRatio="1:1"
+        android:src="@drawable/rainbow_circle" />-->
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/button"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/vpn_btn_guideline_bottom"
+        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/button_circle_start"
+        />
+
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3