From 1da539ddf8c0f651dd9dd363641fd7641b5b13be Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 13 Feb 2018 04:41:00 +0100
Subject: #8831 add a progress animation to EipFragment and don't start
 blocking vpn when user triggered vpn start from UI

---
 .../res/layout-xlarge/eip_service_fragment.xml     | 33 +++-------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

(limited to 'app/src/main/res/layout-xlarge')

diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
index 497d2c0b..b7af5797 100644
--- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml
+++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
@@ -69,41 +69,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
-    <android.support.v7.widget.AppCompatImageView
-        android:id="@+id/cirle"
+    <se.leap.bitmaskclient.views.VpnStateImage
+        android:id="@+id/vpn_state_image"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        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"
+        android:layout_margin="@dimen/stdpadding"
         app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_bottom"
         app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right"
-        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left"
         app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_top"
-        app:layout_constraintVertical_bias="0.0"
-        app:srcCompat="@drawable/black_circle" />
-
-    <android.support.v7.widget.AppCompatImageView
-        android:id="@+id/key"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        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="@+id/cirle"
-        app:layout_constraintEnd_toEndOf="@+id/cirle"
-        app:layout_constraintStart_toStartOf="@+id/cirle"
-        app:layout_constraintTop_toTopOf="@+id/cirle"
-        app:srcCompat="@drawable/vpn_connected" />
-
+        app:layout_constraintDimensionRatio="1:1" />
 
     <android.support.v7.widget.AppCompatButton
         android:id="@+id/vpn_main_button"
-- 
cgit v1.2.3