From c2f6bc4e2098265fb1fc8f671dbdecbb5917c6fc Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Tue, 29 Nov 2022 14:01:05 +0100
Subject: new EipFragment layout for Bitmask - portrait

---
 app/src/main/res/drawable-hdpi/bg_green.png       | Bin 0 -> 190405 bytes
 app/src/main/res/drawable-hdpi/bg_red.png         | Bin 0 -> 143331 bytes
 app/src/main/res/drawable-hdpi/bg_yellow.png      | Bin 0 -> 236571 bytes
 app/src/main/res/drawable-hdpi/green_mask.png     | Bin 0 -> 81235 bytes
 app/src/main/res/drawable-hdpi/red_mask.png       | Bin 0 -> 73514 bytes
 app/src/main/res/drawable-hdpi/yellow_mask.png    | Bin 0 -> 80386 bytes
 app/src/main/res/drawable-xhdpi/bg_green.png      | Bin 0 -> 319429 bytes
 app/src/main/res/drawable-xhdpi/bg_red.png        | Bin 0 -> 220676 bytes
 app/src/main/res/drawable-xhdpi/bg_yellow.png     | Bin 0 -> 400307 bytes
 app/src/main/res/drawable-xhdpi/green_mask.png    | Bin 0 -> 121655 bytes
 app/src/main/res/drawable-xhdpi/red_mask.png      | Bin 0 -> 116193 bytes
 app/src/main/res/drawable-xhdpi/yellow_mask.png   | Bin 0 -> 122701 bytes
 app/src/main/res/drawable-xxhdpi/bg_green.png     | Bin 0 -> 701727 bytes
 app/src/main/res/drawable-xxhdpi/bg_red.png       | Bin 0 -> 446155 bytes
 app/src/main/res/drawable-xxhdpi/bg_yellow.png    | Bin 0 -> 828368 bytes
 app/src/main/res/drawable-xxhdpi/green_mask.png   | Bin 0 -> 220730 bytes
 app/src/main/res/drawable-xxhdpi/red_mask.png     | Bin 0 -> 222370 bytes
 app/src/main/res/drawable-xxhdpi/yellow_mask.png  | Bin 0 -> 226345 bytes
 app/src/main/res/drawable-xxxhdpi/bg_green.png    | Bin 0 -> 1228810 bytes
 app/src/main/res/drawable-xxxhdpi/bg_red.png      | Bin 0 -> 745847 bytes
 app/src/main/res/drawable-xxxhdpi/bg_yellow.png   | Bin 0 -> 1489207 bytes
 app/src/main/res/drawable-xxxhdpi/green_mask.png  | Bin 0 -> 324196 bytes
 app/src/main/res/drawable-xxxhdpi/red_mask.png    | Bin 0 -> 362086 bytes
 app/src/main/res/drawable-xxxhdpi/yellow_mask.png | Bin 0 -> 334967 bytes
 app/src/main/res/drawable/bg_green.png            | Bin 0 -> 90299 bytes
 app/src/main/res/drawable/bg_red.png              | Bin 0 -> 143331 bytes
 app/src/main/res/drawable/bg_yellow.png           | Bin 0 -> 112042 bytes
 app/src/main/res/drawable/green_mask.png          | Bin 0 -> 47593 bytes
 app/src/main/res/drawable/red_mask.png            | Bin 0 -> 40172 bytes
 app/src/main/res/drawable/yellow_mask.png         | Bin 0 -> 47055 bytes
 app/src/main/res/layout/v_location_button.xml     |  33 +++++++++++-----------
 app/src/main/res/values/colors.xml                |   5 ++++
 app/src/main/res/values/strings.xml               |   3 ++
 33 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/bg_green.png
 create mode 100644 app/src/main/res/drawable-hdpi/bg_red.png
 create mode 100644 app/src/main/res/drawable-hdpi/bg_yellow.png
 create mode 100644 app/src/main/res/drawable-hdpi/green_mask.png
 create mode 100644 app/src/main/res/drawable-hdpi/red_mask.png
 create mode 100644 app/src/main/res/drawable-hdpi/yellow_mask.png
 create mode 100644 app/src/main/res/drawable-xhdpi/bg_green.png
 create mode 100644 app/src/main/res/drawable-xhdpi/bg_red.png
 create mode 100644 app/src/main/res/drawable-xhdpi/bg_yellow.png
 create mode 100644 app/src/main/res/drawable-xhdpi/green_mask.png
 create mode 100644 app/src/main/res/drawable-xhdpi/red_mask.png
 create mode 100644 app/src/main/res/drawable-xhdpi/yellow_mask.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/bg_green.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/bg_red.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/bg_yellow.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/green_mask.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/red_mask.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/yellow_mask.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/bg_green.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/bg_red.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/bg_yellow.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/green_mask.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/red_mask.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/yellow_mask.png
 create mode 100644 app/src/main/res/drawable/bg_green.png
 create mode 100644 app/src/main/res/drawable/bg_red.png
 create mode 100644 app/src/main/res/drawable/bg_yellow.png
 create mode 100644 app/src/main/res/drawable/green_mask.png
 create mode 100644 app/src/main/res/drawable/red_mask.png
 create mode 100644 app/src/main/res/drawable/yellow_mask.png

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

diff --git a/app/src/main/res/drawable-hdpi/bg_green.png b/app/src/main/res/drawable-hdpi/bg_green.png
new file mode 100644
index 00000000..0e98f705
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/bg_green.png differ
diff --git a/app/src/main/res/drawable-hdpi/bg_red.png b/app/src/main/res/drawable-hdpi/bg_red.png
new file mode 100644
index 00000000..de96be57
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/bg_red.png differ
diff --git a/app/src/main/res/drawable-hdpi/bg_yellow.png b/app/src/main/res/drawable-hdpi/bg_yellow.png
new file mode 100644
index 00000000..24632712
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/bg_yellow.png differ
diff --git a/app/src/main/res/drawable-hdpi/green_mask.png b/app/src/main/res/drawable-hdpi/green_mask.png
new file mode 100644
index 00000000..fccc060a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/green_mask.png differ
diff --git a/app/src/main/res/drawable-hdpi/red_mask.png b/app/src/main/res/drawable-hdpi/red_mask.png
new file mode 100644
index 00000000..d2ef7d99
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/red_mask.png differ
diff --git a/app/src/main/res/drawable-hdpi/yellow_mask.png b/app/src/main/res/drawable-hdpi/yellow_mask.png
new file mode 100644
index 00000000..72e3ae45
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/yellow_mask.png differ
diff --git a/app/src/main/res/drawable-xhdpi/bg_green.png b/app/src/main/res/drawable-xhdpi/bg_green.png
new file mode 100644
index 00000000..915dff95
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_green.png differ
diff --git a/app/src/main/res/drawable-xhdpi/bg_red.png b/app/src/main/res/drawable-xhdpi/bg_red.png
new file mode 100644
index 00000000..433c776f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_red.png differ
diff --git a/app/src/main/res/drawable-xhdpi/bg_yellow.png b/app/src/main/res/drawable-xhdpi/bg_yellow.png
new file mode 100644
index 00000000..be4469df
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_yellow.png differ
diff --git a/app/src/main/res/drawable-xhdpi/green_mask.png b/app/src/main/res/drawable-xhdpi/green_mask.png
new file mode 100644
index 00000000..c852459d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/green_mask.png differ
diff --git a/app/src/main/res/drawable-xhdpi/red_mask.png b/app/src/main/res/drawable-xhdpi/red_mask.png
new file mode 100644
index 00000000..c0d57a03
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/red_mask.png differ
diff --git a/app/src/main/res/drawable-xhdpi/yellow_mask.png b/app/src/main/res/drawable-xhdpi/yellow_mask.png
new file mode 100644
index 00000000..d81190fe
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/yellow_mask.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/bg_green.png b/app/src/main/res/drawable-xxhdpi/bg_green.png
new file mode 100644
index 00000000..cd78d865
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/bg_green.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/bg_red.png b/app/src/main/res/drawable-xxhdpi/bg_red.png
new file mode 100644
index 00000000..ffbcdb79
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/bg_red.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/bg_yellow.png b/app/src/main/res/drawable-xxhdpi/bg_yellow.png
new file mode 100644
index 00000000..718e102f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/bg_yellow.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/green_mask.png b/app/src/main/res/drawable-xxhdpi/green_mask.png
new file mode 100644
index 00000000..32286177
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/green_mask.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/red_mask.png b/app/src/main/res/drawable-xxhdpi/red_mask.png
new file mode 100644
index 00000000..ac560317
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/red_mask.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/yellow_mask.png b/app/src/main/res/drawable-xxhdpi/yellow_mask.png
new file mode 100644
index 00000000..75cf3782
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/yellow_mask.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/bg_green.png b/app/src/main/res/drawable-xxxhdpi/bg_green.png
new file mode 100644
index 00000000..3c9d97b4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/bg_green.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/bg_red.png b/app/src/main/res/drawable-xxxhdpi/bg_red.png
new file mode 100644
index 00000000..2503f135
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/bg_red.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/bg_yellow.png b/app/src/main/res/drawable-xxxhdpi/bg_yellow.png
new file mode 100644
index 00000000..bff2004c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/bg_yellow.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/green_mask.png b/app/src/main/res/drawable-xxxhdpi/green_mask.png
new file mode 100644
index 00000000..f5a5adaf
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/green_mask.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/red_mask.png b/app/src/main/res/drawable-xxxhdpi/red_mask.png
new file mode 100644
index 00000000..9e216955
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/red_mask.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/yellow_mask.png b/app/src/main/res/drawable-xxxhdpi/yellow_mask.png
new file mode 100644
index 00000000..806dcbf4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/yellow_mask.png differ
diff --git a/app/src/main/res/drawable/bg_green.png b/app/src/main/res/drawable/bg_green.png
new file mode 100644
index 00000000..6da7878d
Binary files /dev/null and b/app/src/main/res/drawable/bg_green.png differ
diff --git a/app/src/main/res/drawable/bg_red.png b/app/src/main/res/drawable/bg_red.png
new file mode 100644
index 00000000..de96be57
Binary files /dev/null and b/app/src/main/res/drawable/bg_red.png differ
diff --git a/app/src/main/res/drawable/bg_yellow.png b/app/src/main/res/drawable/bg_yellow.png
new file mode 100644
index 00000000..c371f3f0
Binary files /dev/null and b/app/src/main/res/drawable/bg_yellow.png differ
diff --git a/app/src/main/res/drawable/green_mask.png b/app/src/main/res/drawable/green_mask.png
new file mode 100644
index 00000000..e515f3f5
Binary files /dev/null and b/app/src/main/res/drawable/green_mask.png differ
diff --git a/app/src/main/res/drawable/red_mask.png b/app/src/main/res/drawable/red_mask.png
new file mode 100644
index 00000000..a4bd4a78
Binary files /dev/null and b/app/src/main/res/drawable/red_mask.png differ
diff --git a/app/src/main/res/drawable/yellow_mask.png b/app/src/main/res/drawable/yellow_mask.png
new file mode 100644
index 00000000..98dd7978
Binary files /dev/null and b/app/src/main/res/drawable/yellow_mask.png differ
diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index d304d429..44a4c67e 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -39,31 +39,30 @@
         android:visibility="gone"
         tools:visibility="visible"
         />
+
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text_location"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center_vertical"
+        android:layout_toStartOf="@+id/bridge_icn"
+        android:layout_toLeftOf="@+id/bridge_icn"
+        android:layout_toEndOf="@id/recommended_icn"
+        android:layout_toRightOf="@+id/recommended_icn"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:maxLines="1"
         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"
-        />
+        app:autoSizeMaxTextSize="24sp"
+        app:autoSizeMinTextSize="15sp"
+        app:autoSizeTextType="uniform"
+        tools:text="Seattle along message" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/bridge_icn"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dbc7326f..7ec2e81a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -52,5 +52,10 @@
     <color name="btn_yellow_dark">#C78F00</color>
     <color name="btn_green">#9FC17F</color>
     <color name="btn_green_dark">#709152</color>
+    <color name="btn_white_transparent">#CCFFFEFE</color>
+    <color name="btn_white_transparent_dark">#CCCCCBCB</color>
+    <color name="bg_red_1">#EC6767</color>
+    <color name="bg_red_2">#DB6F66</color>
+    <color name="bg_red_3">#D05D59</color>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 92229e44..722f10ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -67,6 +67,9 @@
   <string name="authentication_failed_message">Authentication failed</string>
   <string name="registration_failed_message">Registration failed</string>
   <string name="eip_status_start_pending">Initiating connection</string>
+  <string name="eip_status_connecting">Connecting VPN</string>
+  <string name="eip_status_unsecured">Unsecured Connection</string>
+  <string name="eip_status_secured">Secured Connection</string>
   <string name="eip_cancel_connect_title">Cancel connection?</string>
   <string name="eip_cancel_connect_text">There is a connection attempt in progress.  Do you wish to cancel it?</string>
   <string name="eip.warning.browser_inconsistency">Turn off VPN connection? When the VPN is off, you may leak personal information to your Internet provider or local network.</string>
-- 
cgit v1.2.3