From e8625b3fb29285d73033efb3aab96263528e270a Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Sun, 4 Dec 2022 02:07:49 +0100
Subject: replace connected state background pngs for RiseupVPN with vector
 graphics

---
 app/src/main/res/color/main_button_state_color.xml | 5 -----
 app/src/main/res/layout-port/f_eip.xml             | 5 -----
 app/src/main/res/layout-xlarge-port/f_eip.xml      | 6 +-----
 app/src/main/res/layout-xlarge/f_eip.xml           | 6 +-----
 app/src/main/res/layout/f_eip.xml                  | 6 +-----
 app/src/main/res/values/colors.xml                 | 5 +++++
 6 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 app/src/main/res/color/main_button_state_color.xml

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

diff --git a/app/src/main/res/color/main_button_state_color.xml b/app/src/main/res/color/main_button_state_color.xml
deleted file mode 100644
index 9650b033..00000000
--- a/app/src/main/res/color/main_button_state_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorPrimaryDark" android:state_pressed="true"/>
-    <item android:color="@color/colorPrimary"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml
index 6d24f5ce..83aabcde 100644
--- a/app/src/main/res/layout-port/f_eip.xml
+++ b/app/src/main/res/layout-port/f_eip.xml
@@ -62,11 +62,6 @@
         android:layout_height="match_parent"
         app:srcCompat="@drawable/bg_disconnected"
         android:scaleType="fitXY"
-        android:layout_marginTop="-300dp"
-        android:layout_marginBottom="-300dp"
-        android:layout_marginLeft="-300dp"
-        android:layout_marginRight="-300dp"
-
         />
 
 
diff --git a/app/src/main/res/layout-xlarge-port/f_eip.xml b/app/src/main/res/layout-xlarge-port/f_eip.xml
index 9617b679..ee0fbac9 100644
--- a/app/src/main/res/layout-xlarge-port/f_eip.xml
+++ b/app/src/main/res/layout-xlarge-port/f_eip.xml
@@ -34,7 +34,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.55" />
+        app:layout_constraintGuide_percent="0.65" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_horizontal_button_top"
@@ -65,10 +65,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitXY"
-        android:layout_marginLeft="-300dp"
-        android:layout_marginRight="-300dp"
-        android:layout_marginTop="-300dp"
-        android:layout_marginBottom="-300dp"
         app:srcCompat="@drawable/bg_disconnected" />
 
 
diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml
index b2b8915d..e413319a 100644
--- a/app/src/main/res/layout-xlarge/f_eip.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
@@ -34,7 +34,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.55" />
+        app:layout_constraintGuide_percent="0.6" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_horizontal_button_top"
@@ -65,10 +65,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitXY"
-        android:layout_marginLeft="-300dp"
-        android:layout_marginRight="-300dp"
-        android:layout_marginTop="-300dp"
-        android:layout_marginBottom="-300dp"
         app:srcCompat="@drawable/bg_disconnected" />
 
 
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index 7fb2d2d4..1e1f8e41 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -40,7 +40,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.45" />
+        app:layout_constraintGuide_percent="0.50" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_horizontal_button_top"
@@ -71,10 +71,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitXY"
-        android:layout_marginLeft="-300dp"
-        android:layout_marginRight="-300dp"
-        android:layout_marginTop="-300dp"
-        android:layout_marginBottom="-300dp"
         app:srcCompat="@drawable/bg_disconnected" />
 
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4bf2cb93..35e49370 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -57,6 +57,11 @@
     <color name="btn_light_transparent">#CCFFFEFE</color>
     <color name="btn_light_transparent_dark">#CCCCCBCB</color>
 
+    <!-- main UI background colors -->
+    <color name="bg_disconnected">#DC6F6B</color>
+    <color name="bg_connecting">#FADD85</color>
+    <color name="bg_running">#CCDCB8</color>
+
     <!-- actionbar and status bar colors for different connection states -->
     <color name="bg_disconnected_top">#EC6767</color>
     <color name="bg_disconnected_top_light_transparent">#CCff9895</color>
-- 
cgit v1.2.3