first implementation of the gateway button, started to remove labels from EipFragment, implement method to get the avearage load of a location as an enum value

1 files changed, 6 insertions, 40 deletions

diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index 3309eb5d..8dc1e33b 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -82,54 +82,20 @@
         app:layout_constraintDimensionRatio="1:1"
         />
 
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/vpn_main_button"
-        android:layout_width="wrap_content"
-        android:layout_height="32dp"
-        android:minWidth="150dp"
+    <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"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
         app:layout_constraintBottom_toBottomOf="@+id/background"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:text="@string/vpn.button.turn.on"
-        tools:text="Turn on in another language"
-        style="@style/BitmaskButtonBlack"
-        />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/routed_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:paddingTop="@dimen/stdpadding"
-        android:text="@string/vpn_securely_routed"
-        android:gravity="center"
-        android:visibility="visible"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/eipLabel" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/vpn_route"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:gravity="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/routed_text" />
+        tools:text="SEATTLE"
+        android:gravity="center_vertical" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>