diff options
author | cyBerta <cyberta@riseup.net> | 2021-07-22 15:31:08 +0200 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2021-11-15 16:13:41 +0100 |
commit | 551ee22aafae99c1f0802ec48f43d448cc77db37 (patch) | |
tree | 50756228638aaf55ea17a4baf9285a363cba8760 /app/src/main/res/layout-xlarge | |
parent | 9b2b57d8617e60c0b69713e1e5f14dbb8e57c70a (diff) |
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
Diffstat (limited to 'app/src/main/res/layout-xlarge')
-rw-r--r-- | app/src/main/res/layout-xlarge/f_eip.xml | 46 |
1 files changed, 7 insertions, 39 deletions
diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml index d4a51b8d..bef2d635 100644 --- a/app/src/main/res/layout-xlarge/f_eip.xml +++ b/app/src/main/res/layout-xlarge/f_eip.xml @@ -80,53 +80,21 @@ app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_top" app:layout_constraintDimensionRatio="1:1" /> - <androidx.appcompat.widget.AppCompatButton - android:id="@+id/vpn_main_button" - android:layout_width="wrap_content" - android:layout_height="40dp" - android:minWidth="200dp" + + <se.leap.bitmaskclient.base.views.LocationButton + android:id="@+id/gateway_location_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" 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: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> |