summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2019-07-12 16:34:46 +0200
committercyBerta <cyberta@riseup.net>2019-07-12 16:34:46 +0200
commitec90ce0a52d92ddea4bc9057a51bd76ada8e37a3 (patch)
tree2583adb57e2c823489325ea24d76b37bd8b427a8 /app/src/main
parent68cd77f862b88062da4e176dda95c975608f70a5 (diff)
allow start/stop vpn button to grow for long strings in different languages
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/res/layout-xlarge/f_eip.xml6
-rw-r--r--app/src/main/res/layout/f_eip.xml7
2 files changed, 11 insertions, 2 deletions
diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml
index e1b4f595..1c355d58 100644
--- a/app/src/main/res/layout-xlarge/f_eip.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
@@ -82,18 +82,22 @@
<android.support.v7.widget.AppCompatButton
android:id="@+id/vpn_main_button"
- android:layout_width="200dp"
+ android:layout_width="wrap_content"
android:layout_height="40dp"
+ android:minWidth="200dp"
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"
/>
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index dda4ad78..960c6fca 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -3,6 +3,7 @@
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">
<android.support.constraint.Guideline
@@ -83,18 +84,22 @@
<android.support.v7.widget.AppCompatButton
android:id="@+id/vpn_main_button"
- android:layout_width="150dp"
+ android:layout_width="wrap_content"
android:layout_height="32dp"
+ android:minWidth="150dp"
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"
/>