From 5afe57ab868ee9e2e27f5b26b9b14de3519c0402 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Fri, 2 Dec 2022 02:08:55 +0100
Subject: rearranging assets, split them into normal and custom flavor

---
 app/src/normal/res/drawable-hdpi/bg_connected.png  | Bin 0 -> 190405 bytes
 app/src/normal/res/drawable-hdpi/bg_connecting.png | Bin 0 -> 236571 bytes
 .../normal/res/drawable-hdpi/bg_disconnected.png   | Bin 0 -> 143331 bytes
 .../res/drawable-hdpi/ic_splash_background.png     | Bin 39702 -> 0 bytes
 .../normal/res/drawable-hdpi/state_connected.png   | Bin 0 -> 81235 bytes
 .../normal/res/drawable-hdpi/state_connecting.png  | Bin 0 -> 80386 bytes
 .../res/drawable-hdpi/state_disconnected.png       | Bin 0 -> 73514 bytes
 app/src/normal/res/drawable-xhdpi/bg_connected.png | Bin 0 -> 319429 bytes
 .../normal/res/drawable-xhdpi/bg_connecting.png    | Bin 0 -> 400307 bytes
 .../normal/res/drawable-xhdpi/bg_disconnected.png  | Bin 0 -> 220676 bytes
 .../res/drawable-xhdpi/ic_splash_background.png    | Bin 64868 -> 0 bytes
 .../normal/res/drawable-xhdpi/state_connected.png  | Bin 0 -> 121655 bytes
 .../normal/res/drawable-xhdpi/state_connecting.png | Bin 0 -> 122701 bytes
 .../res/drawable-xhdpi/state_disconnected.png      | Bin 0 -> 116193 bytes
 .../normal/res/drawable-xxhdpi/bg_connected.png    | Bin 0 -> 701727 bytes
 .../normal/res/drawable-xxhdpi/bg_connecting.png   | Bin 0 -> 828368 bytes
 .../normal/res/drawable-xxhdpi/bg_disconnected.png | Bin 0 -> 446155 bytes
 .../normal/res/drawable-xxhdpi/state_connected.png | Bin 0 -> 220730 bytes
 .../res/drawable-xxhdpi/state_connecting.png       | Bin 0 -> 226345 bytes
 .../res/drawable-xxhdpi/state_disconnected.png     | Bin 0 -> 222370 bytes
 .../normal/res/drawable-xxxhdpi/bg_connected.png   | Bin 0 -> 1228810 bytes
 .../normal/res/drawable-xxxhdpi/bg_connecting.png  | Bin 0 -> 1489207 bytes
 .../res/drawable-xxxhdpi/bg_disconnected.png       | Bin 0 -> 745847 bytes
 .../res/drawable-xxxhdpi/ic_splash_background.png  | Bin 131879 -> 0 bytes
 .../res/drawable-xxxhdpi/state_connected.png       | Bin 0 -> 324196 bytes
 .../res/drawable-xxxhdpi/state_connecting.png      | Bin 0 -> 334967 bytes
 .../res/drawable-xxxhdpi/state_disconnected.png    | Bin 0 -> 362086 bytes
 app/src/normal/res/drawable/bg_connected.png       | Bin 0 -> 90299 bytes
 app/src/normal/res/drawable/bg_connecting.png      | Bin 0 -> 112042 bytes
 app/src/normal/res/drawable/bg_disconnected.png    | Bin 0 -> 143331 bytes
 .../normal/res/drawable/ic_splash_background.xml   |   4 +
 app/src/normal/res/drawable/state_connected.png    | Bin 0 -> 47593 bytes
 app/src/normal/res/drawable/state_connecting.png   | Bin 0 -> 47055 bytes
 app/src/normal/res/drawable/state_disconnected.png | Bin 0 -> 40172 bytes
 app/src/normal/res/layout-port/f_eip.xml           | 154 -------------------
 app/src/normal/res/layout-xlarge-port/f_eip.xml    | 162 --------------------
 app/src/normal/res/layout-xlarge/f_eip.xml         | 155 -------------------
 app/src/normal/res/layout/f_eip.xml                | 164 ---------------------
 app/src/normal/res/layout/v_location_button.xml    | 104 -------------
 app/src/normal/res/layout/v_main_button.xml        | 142 ------------------
 40 files changed, 4 insertions(+), 881 deletions(-)
 create mode 100644 app/src/normal/res/drawable-hdpi/bg_connected.png
 create mode 100644 app/src/normal/res/drawable-hdpi/bg_connecting.png
 create mode 100644 app/src/normal/res/drawable-hdpi/bg_disconnected.png
 delete mode 100644 app/src/normal/res/drawable-hdpi/ic_splash_background.png
 create mode 100644 app/src/normal/res/drawable-hdpi/state_connected.png
 create mode 100644 app/src/normal/res/drawable-hdpi/state_connecting.png
 create mode 100644 app/src/normal/res/drawable-hdpi/state_disconnected.png
 create mode 100644 app/src/normal/res/drawable-xhdpi/bg_connected.png
 create mode 100644 app/src/normal/res/drawable-xhdpi/bg_connecting.png
 create mode 100644 app/src/normal/res/drawable-xhdpi/bg_disconnected.png
 delete mode 100644 app/src/normal/res/drawable-xhdpi/ic_splash_background.png
 create mode 100644 app/src/normal/res/drawable-xhdpi/state_connected.png
 create mode 100644 app/src/normal/res/drawable-xhdpi/state_connecting.png
 create mode 100644 app/src/normal/res/drawable-xhdpi/state_disconnected.png
 create mode 100644 app/src/normal/res/drawable-xxhdpi/bg_connected.png
 create mode 100644 app/src/normal/res/drawable-xxhdpi/bg_connecting.png
 create mode 100644 app/src/normal/res/drawable-xxhdpi/bg_disconnected.png
 create mode 100644 app/src/normal/res/drawable-xxhdpi/state_connected.png
 create mode 100644 app/src/normal/res/drawable-xxhdpi/state_connecting.png
 create mode 100644 app/src/normal/res/drawable-xxhdpi/state_disconnected.png
 create mode 100644 app/src/normal/res/drawable-xxxhdpi/bg_connected.png
 create mode 100644 app/src/normal/res/drawable-xxxhdpi/bg_connecting.png
 create mode 100644 app/src/normal/res/drawable-xxxhdpi/bg_disconnected.png
 delete mode 100644 app/src/normal/res/drawable-xxxhdpi/ic_splash_background.png
 create mode 100644 app/src/normal/res/drawable-xxxhdpi/state_connected.png
 create mode 100644 app/src/normal/res/drawable-xxxhdpi/state_connecting.png
 create mode 100644 app/src/normal/res/drawable-xxxhdpi/state_disconnected.png
 create mode 100644 app/src/normal/res/drawable/bg_connected.png
 create mode 100644 app/src/normal/res/drawable/bg_connecting.png
 create mode 100644 app/src/normal/res/drawable/bg_disconnected.png
 create mode 100644 app/src/normal/res/drawable/ic_splash_background.xml
 create mode 100644 app/src/normal/res/drawable/state_connected.png
 create mode 100644 app/src/normal/res/drawable/state_connecting.png
 create mode 100644 app/src/normal/res/drawable/state_disconnected.png
 delete mode 100644 app/src/normal/res/layout-port/f_eip.xml
 delete mode 100644 app/src/normal/res/layout-xlarge-port/f_eip.xml
 delete mode 100644 app/src/normal/res/layout-xlarge/f_eip.xml
 delete mode 100644 app/src/normal/res/layout/f_eip.xml
 delete mode 100644 app/src/normal/res/layout/v_location_button.xml
 delete mode 100644 app/src/normal/res/layout/v_main_button.xml

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

diff --git a/app/src/normal/res/drawable-hdpi/bg_connected.png b/app/src/normal/res/drawable-hdpi/bg_connected.png
new file mode 100644
index 00000000..0e98f705
Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/bg_connected.png differ
diff --git a/app/src/normal/res/drawable-hdpi/bg_connecting.png b/app/src/normal/res/drawable-hdpi/bg_connecting.png
new file mode 100644
index 00000000..24632712
Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/bg_connecting.png differ
diff --git a/app/src/normal/res/drawable-hdpi/bg_disconnected.png b/app/src/normal/res/drawable-hdpi/bg_disconnected.png
new file mode 100644
index 00000000..de96be57
Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/bg_disconnected.png differ
diff --git a/app/src/normal/res/drawable-hdpi/ic_splash_background.png b/app/src/normal/res/drawable-hdpi/ic_splash_background.png
deleted file mode 100644
index 3e5f7871..00000000
Binary files a/app/src/normal/res/drawable-hdpi/ic_splash_background.png and /dev/null differ
diff --git a/app/src/normal/res/drawable-hdpi/state_connected.png b/app/src/normal/res/drawable-hdpi/state_connected.png
new file mode 100644
index 00000000..fccc060a
Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/state_connected.png differ
diff --git a/app/src/normal/res/drawable-hdpi/state_connecting.png b/app/src/normal/res/drawable-hdpi/state_connecting.png
new file mode 100644
index 00000000..72e3ae45
Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/state_connecting.png differ
diff --git a/app/src/normal/res/drawable-hdpi/state_disconnected.png b/app/src/normal/res/drawable-hdpi/state_disconnected.png
new file mode 100644
index 00000000..d2ef7d99
Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/state_disconnected.png differ
diff --git a/app/src/normal/res/drawable-xhdpi/bg_connected.png b/app/src/normal/res/drawable-xhdpi/bg_connected.png
new file mode 100644
index 00000000..915dff95
Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/bg_connected.png differ
diff --git a/app/src/normal/res/drawable-xhdpi/bg_connecting.png b/app/src/normal/res/drawable-xhdpi/bg_connecting.png
new file mode 100644
index 00000000..be4469df
Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/bg_connecting.png differ
diff --git a/app/src/normal/res/drawable-xhdpi/bg_disconnected.png b/app/src/normal/res/drawable-xhdpi/bg_disconnected.png
new file mode 100644
index 00000000..433c776f
Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/bg_disconnected.png differ
diff --git a/app/src/normal/res/drawable-xhdpi/ic_splash_background.png b/app/src/normal/res/drawable-xhdpi/ic_splash_background.png
deleted file mode 100644
index c2135c04..00000000
Binary files a/app/src/normal/res/drawable-xhdpi/ic_splash_background.png and /dev/null differ
diff --git a/app/src/normal/res/drawable-xhdpi/state_connected.png b/app/src/normal/res/drawable-xhdpi/state_connected.png
new file mode 100644
index 00000000..c852459d
Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/state_connected.png differ
diff --git a/app/src/normal/res/drawable-xhdpi/state_connecting.png b/app/src/normal/res/drawable-xhdpi/state_connecting.png
new file mode 100644
index 00000000..d81190fe
Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/state_connecting.png differ
diff --git a/app/src/normal/res/drawable-xhdpi/state_disconnected.png b/app/src/normal/res/drawable-xhdpi/state_disconnected.png
new file mode 100644
index 00000000..c0d57a03
Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/state_disconnected.png differ
diff --git a/app/src/normal/res/drawable-xxhdpi/bg_connected.png b/app/src/normal/res/drawable-xxhdpi/bg_connected.png
new file mode 100644
index 00000000..cd78d865
Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/bg_connected.png differ
diff --git a/app/src/normal/res/drawable-xxhdpi/bg_connecting.png b/app/src/normal/res/drawable-xxhdpi/bg_connecting.png
new file mode 100644
index 00000000..718e102f
Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/bg_connecting.png differ
diff --git a/app/src/normal/res/drawable-xxhdpi/bg_disconnected.png b/app/src/normal/res/drawable-xxhdpi/bg_disconnected.png
new file mode 100644
index 00000000..ffbcdb79
Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/bg_disconnected.png differ
diff --git a/app/src/normal/res/drawable-xxhdpi/state_connected.png b/app/src/normal/res/drawable-xxhdpi/state_connected.png
new file mode 100644
index 00000000..32286177
Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/state_connected.png differ
diff --git a/app/src/normal/res/drawable-xxhdpi/state_connecting.png b/app/src/normal/res/drawable-xxhdpi/state_connecting.png
new file mode 100644
index 00000000..75cf3782
Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/state_connecting.png differ
diff --git a/app/src/normal/res/drawable-xxhdpi/state_disconnected.png b/app/src/normal/res/drawable-xxhdpi/state_disconnected.png
new file mode 100644
index 00000000..ac560317
Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/state_disconnected.png differ
diff --git a/app/src/normal/res/drawable-xxxhdpi/bg_connected.png b/app/src/normal/res/drawable-xxxhdpi/bg_connected.png
new file mode 100644
index 00000000..3c9d97b4
Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/bg_connected.png differ
diff --git a/app/src/normal/res/drawable-xxxhdpi/bg_connecting.png b/app/src/normal/res/drawable-xxxhdpi/bg_connecting.png
new file mode 100644
index 00000000..bff2004c
Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/bg_connecting.png differ
diff --git a/app/src/normal/res/drawable-xxxhdpi/bg_disconnected.png b/app/src/normal/res/drawable-xxxhdpi/bg_disconnected.png
new file mode 100644
index 00000000..2503f135
Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/bg_disconnected.png differ
diff --git a/app/src/normal/res/drawable-xxxhdpi/ic_splash_background.png b/app/src/normal/res/drawable-xxxhdpi/ic_splash_background.png
deleted file mode 100644
index 1b8046fa..00000000
Binary files a/app/src/normal/res/drawable-xxxhdpi/ic_splash_background.png and /dev/null differ
diff --git a/app/src/normal/res/drawable-xxxhdpi/state_connected.png b/app/src/normal/res/drawable-xxxhdpi/state_connected.png
new file mode 100644
index 00000000..f5a5adaf
Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/state_connected.png differ
diff --git a/app/src/normal/res/drawable-xxxhdpi/state_connecting.png b/app/src/normal/res/drawable-xxxhdpi/state_connecting.png
new file mode 100644
index 00000000..806dcbf4
Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/state_connecting.png differ
diff --git a/app/src/normal/res/drawable-xxxhdpi/state_disconnected.png b/app/src/normal/res/drawable-xxxhdpi/state_disconnected.png
new file mode 100644
index 00000000..9e216955
Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/state_disconnected.png differ
diff --git a/app/src/normal/res/drawable/bg_connected.png b/app/src/normal/res/drawable/bg_connected.png
new file mode 100644
index 00000000..6da7878d
Binary files /dev/null and b/app/src/normal/res/drawable/bg_connected.png differ
diff --git a/app/src/normal/res/drawable/bg_connecting.png b/app/src/normal/res/drawable/bg_connecting.png
new file mode 100644
index 00000000..c371f3f0
Binary files /dev/null and b/app/src/normal/res/drawable/bg_connecting.png differ
diff --git a/app/src/normal/res/drawable/bg_disconnected.png b/app/src/normal/res/drawable/bg_disconnected.png
new file mode 100644
index 00000000..de96be57
Binary files /dev/null and b/app/src/normal/res/drawable/bg_disconnected.png differ
diff --git a/app/src/normal/res/drawable/ic_splash_background.xml b/app/src/normal/res/drawable/ic_splash_background.xml
new file mode 100644
index 00000000..aa2618c1
--- /dev/null
+++ b/app/src/normal/res/drawable/ic_splash_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/background_main"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/state_connected.png b/app/src/normal/res/drawable/state_connected.png
new file mode 100644
index 00000000..e515f3f5
Binary files /dev/null and b/app/src/normal/res/drawable/state_connected.png differ
diff --git a/app/src/normal/res/drawable/state_connecting.png b/app/src/normal/res/drawable/state_connecting.png
new file mode 100644
index 00000000..98dd7978
Binary files /dev/null and b/app/src/normal/res/drawable/state_connecting.png differ
diff --git a/app/src/normal/res/drawable/state_disconnected.png b/app/src/normal/res/drawable/state_disconnected.png
new file mode 100644
index 00000000..a4bd4a78
Binary files /dev/null and b/app/src/normal/res/drawable/state_disconnected.png differ
diff --git a/app/src/normal/res/layout-port/f_eip.xml b/app/src/normal/res/layout-port/f_eip.xml
deleted file mode 100644
index eed5fde6..00000000
--- a/app/src/normal/res/layout-port/f_eip.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/eipServiceFragment"
-    >
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_vertical_left"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.3"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_center"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.175"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_vertical_outer_left"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintGuide_percent="0.125"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_vertical_outer_right"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.875"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_bottom"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.66"
-        />
-
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_vertical_right"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.7"
-        />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/background"
-        android:layout_width="match_parent"
-        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"
-
-        />
-
-
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/main_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/sub_description"
-        android:padding="@dimen/activity_margin"
-        android:layout_marginTop="@dimen/activity_margin"
-        android:textAppearance="@android:style/TextAppearance.Large"
-        android:textStyle="bold"
-        android:textSize="34sp"
-        android:autoSizeMinTextSize="28sp"
-        android:autoSizeTextType="uniform"
-        android:textColor="@color/colorEipFragmentFont"
-        app:layout_constraintDimensionRatio="1:1"
-        tools:text="Connection secure"
-        android:gravity="center"
-        android:maxLines="1"
-        />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/sub_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/main_description"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:padding="@dimen/activity_margin"
-        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
-        android:textStyle="bold"
-        android:textColor="@color/colorEipFragmentFont"
-        app:layout_constraintDimensionRatio="1:1"
-        tools:text="A LONG TEXT WITH SEVERAL THINGS BLABLkk \n kdjfkj \n kjdfkjdf"
-        android:gravity="center"
-        android:maxLines="3"
-        android:ellipsize="end"
-        />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/state_view"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/guideline_horizontal_bottom"
-        app:layout_constraintTop_toTopOf="@id/guideline_horizontal_center"
-        app:layout_constraintLeft_toLeftOf="@id/guideline_vertical_outer_left"
-        app:layout_constraintRight_toRightOf="@id/guideline_vertical_outer_right"
-        app:layout_constraintVertical_bias="1"
-        app:srcCompat="@drawable/red_mask"
-        />
-    <se.leap.bitmaskclient.base.views.MainButton
-        android:id="@+id/main_button"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="@dimen/stdpadding"
-        app:layout_constraintTop_toBottomOf="@+id/guideline_horizontal_bottom"
-        app:layout_constraintBottom_toTopOf="@id/gateway_location_button"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right"
-        app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left"
-        />
-
-    <se.leap.bitmaskclient.base.views.LocationButton
-        android:id="@+id/gateway_location_button"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginBottom="@dimen/stdpadding"
-        android:layout_marginEnd="@dimen/stdpadding"
-        android:layout_marginStart="@dimen/stdpadding"
-        android:layout_marginTop="@dimen/stdpadding"
-        android:layout_marginLeft="@dimen/stdpadding"
-        android:layout_marginRight="@dimen/stdpadding"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:text="SEATTLE"
-        android:gravity="center_vertical" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/normal/res/layout-xlarge-port/f_eip.xml b/app/src/normal/res/layout-xlarge-port/f_eip.xml
deleted file mode 100644
index ae548c82..00000000
--- a/app/src/normal/res/layout-xlarge-port/f_eip.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/eipServiceFragment"
-    >
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_vertical_left"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.3"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_top"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.025"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_center"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.175"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_vertical_outer_left"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintGuide_percent="0.15"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_vertical_outer_right"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.85"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_bottom"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.66"
-        />
-
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_vertical_right"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.7"
-        />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/background"
-        android:layout_width="match_parent"
-        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"
-
-        />
-
-
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/main_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@id/guideline_horizontal_top"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/sub_description"
-        android:padding="@dimen/activity_margin"
-        android:layout_marginTop="@dimen/activity_margin"
-        android:textAppearance="@android:style/TextAppearance.Large"
-        android:textSize="45sp"
-        android:textStyle="bold"
-        android:autoSizeMinTextSize="38sp"
-        android:autoSizeTextType="uniform"
-        android:textColor="@color/colorEipFragmentFont"
-        app:layout_constraintDimensionRatio="1:1"
-        tools:text="Connection secure"
-        android:gravity="center"
-        android:maxLines="1"
-        />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/sub_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/main_description"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:padding="@dimen/activity_margin"
-        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
-        android:textStyle="bold"
-        android:textColor="@color/colorEipFragmentFont"
-        app:layout_constraintDimensionRatio="1:1"
-        tools:text="A LONG TEXT WITH SEVERAL THINGS BLABLkk \n kdjfkj \n kjdfkjdf"
-        android:gravity="center"
-        android:maxLines="2"
-        android:ellipsize="end"
-        />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/state_view"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/guideline_horizontal_bottom"
-        app:layout_constraintTop_toTopOf="@id/guideline_horizontal_center"
-        app:layout_constraintLeft_toLeftOf="@id/guideline_vertical_outer_left"
-        app:layout_constraintRight_toRightOf="@id/guideline_vertical_outer_right"
-        app:layout_constraintVertical_bias="1"
-        app:srcCompat="@drawable/red_mask"
-        />
-    <se.leap.bitmaskclient.base.views.MainButton
-        android:id="@+id/main_button"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="@dimen/stdpadding"
-        app:layout_constraintTop_toBottomOf="@+id/guideline_horizontal_bottom"
-        app:layout_constraintBottom_toTopOf="@id/gateway_location_button"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right"
-        app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left"
-        />
-
-    <se.leap.bitmaskclient.base.views.LocationButton
-        android:id="@+id/gateway_location_button"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginBottom="@dimen/stdpadding"
-        android:layout_marginEnd="@dimen/stdpadding"
-        android:layout_marginStart="@dimen/stdpadding"
-        android:layout_marginTop="@dimen/stdpadding"
-        android:layout_marginLeft="@dimen/stdpadding"
-        android:layout_marginRight="@dimen/stdpadding"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:text="SEATTLE"
-        android:gravity="center_vertical" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/normal/res/layout-xlarge/f_eip.xml b/app/src/normal/res/layout-xlarge/f_eip.xml
deleted file mode 100644
index a4d94394..00000000
--- a/app/src/normal/res/layout-xlarge/f_eip.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This is the layout for extra large landscape, extra large portrait
-    can be found in layout-xlarge-port
--->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/eipServiceFragment"
-    >
-
-
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_center"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.25"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_vertical_left"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.3" />
-
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_bottom"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.55" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_button_top"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.875"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_button_bottom"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.98"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_vertical_right"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintGuide_percent="0.7" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/background"
-        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" />
-
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/main_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/sub_description"
-        android:padding="@dimen/stdpadding"
-        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
-        android:textSize="45sp"
-        android:textStyle="bold"
-        android:textColor="@color/colorEipFragmentFont"
-        app:layout_constraintDimensionRatio="1:1"
-        tools:text="Connection secure"
-        />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/sub_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/main_description"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_center"
-        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
-        android:textStyle="bold"
-        android:textColor="@color/colorEipFragmentFont"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:paddingBottom="@dimen/stdpadding"
-        app:layout_constraintDimensionRatio="1:1"
-        tools:text="Your traffic is securly routed through \n another"
-        android:maxLines="2"
-        android:gravity="center"
-        />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/state_view"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/guideline_horizontal_bottom"
-        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_center"
-        app:layout_constraintLeft_toLeftOf="@id/guideline_vertical_left"
-        app:layout_constraintRight_toRightOf="@id/guideline_vertical_right"
-        app:layout_constraintVertical_bias="1"
-        app:srcCompat="@drawable/red_mask"
-        />
-
-    <se.leap.bitmaskclient.base.views.MainButton
-        android:id="@+id/main_button"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="@dimen/stdpadding"
-        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_bottom"
-        app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_button_top"
-        app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right"
-        app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left"
-        app:layout_constraintDimensionRatio="1:1"
-        />
-
-
-    <se.leap.bitmaskclient.base.views.LocationButton
-        android:id="@+id/gateway_location_button"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginEnd="@dimen/stdpadding"
-        android:layout_marginStart="@dimen/stdpadding"
-
-        android:layout_marginLeft="@dimen/stdpadding"
-        android:layout_marginRight="@dimen/stdpadding"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_button_top"
-        app:layout_constraintBottom_toBottomOf="@+id/guideline_horizontal_button_bottom"
-        tools:text="SEATTLE"
-        android:gravity="center_vertical" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/normal/res/layout/f_eip.xml b/app/src/normal/res/layout/f_eip.xml
deleted file mode 100644
index 9c921721..00000000
--- a/app/src/normal/res/layout/f_eip.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This is the default layout for landscape, portrait can be found
-    in layout-port
--->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/eipServiceFragment"
-    >
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_top"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.1"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_center"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.25"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_vertical_left"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.3" />
-
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_bottom"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.45" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_button_top"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.8"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_button_bottom"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.98"
-        />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_vertical_right"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintGuide_percent="0.7" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/background"
-        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" />
-
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/main_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/sub_description"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
-        android:textSize="26sp"
-        android:textStyle="bold"
-        android:textColor="@color/colorEipFragmentFont"
-        app:layout_constraintDimensionRatio="1:1"
-        tools:text="Connection secure"
-        />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/sub_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/main_description"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_center"
-        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
-        android:textStyle="bold"
-        android:textColor="@color/colorEipFragmentFont"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:paddingBottom="@dimen/stdpadding"
-        app:layout_constraintDimensionRatio="1:1"
-        tools:text="Your traffic is securly routed through \n another"
-        android:maxLines="2"
-        android:gravity="center"
-        />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/state_view"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/guideline_horizontal_bottom"
-        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_center"
-        app:layout_constraintLeft_toLeftOf="@id/guideline_vertical_left"
-        app:layout_constraintRight_toRightOf="@id/guideline_vertical_right"
-        app:layout_constraintVertical_bias="1"
-        app:srcCompat="@drawable/red_mask"
-        />
-
-    <se.leap.bitmaskclient.base.views.MainButton
-        android:id="@+id/main_button"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="@dimen/stdpadding"
-        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_bottom"
-        app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_button_top"
-        app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right"
-        app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left"
-        app:layout_constraintDimensionRatio="1:1"
-        />
-
-
-    <se.leap.bitmaskclient.base.views.LocationButton
-        android:id="@+id/gateway_location_button"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginEnd="@dimen/stdpadding"
-        android:layout_marginStart="@dimen/stdpadding"
-
-        android:layout_marginLeft="@dimen/stdpadding"
-        android:layout_marginRight="@dimen/stdpadding"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_button_top"
-        app:layout_constraintBottom_toBottomOf="@+id/guideline_horizontal_button_bottom"
-        tools:text="SEATTLE"
-        android:gravity="center_vertical" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/normal/res/layout/v_location_button.xml b/app/src/normal/res/layout/v_location_button.xml
deleted file mode 100644
index 8aaf4978..00000000
--- a/app/src/normal/res/layout/v_location_button.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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/normal/res/layout/v_main_button.xml b/app/src/normal/res/layout/v_main_button.xml
deleted file mode 100644
index e3f96693..00000000
--- a/app/src/normal/res/layout/v_main_button.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?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