summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2019-07-12 15:27:12 +0200
committercyBerta <cyberta@riseup.net>2019-07-12 15:27:12 +0200
commit189d7dd590bcd4b9428109ba6026e892514a48ff (patch)
tree0c68a0d7557d032780b7c82e2d7be65982a3315a
parentc147da67bfe751e1dbbb3d4483d7c38885cab01c (diff)
fix vpn start/stop button layout for tablets
-rw-r--r--app/src/main/res/drawable/cust_button_primary_black_pressed.xml2
-rw-r--r--app/src/main/res/drawable/cust_button_primary_black_released.xml4
-rw-r--r--app/src/main/res/layout-xlarge/f_eip.xml4
-rw-r--r--app/src/main/res/values-sw600dp/dimens.xml1
-rw-r--r--app/src/main/res/values-w820dp/dimens.xml2
-rw-r--r--app/src/main/res/values/dimens.xml1
6 files changed, 9 insertions, 5 deletions
diff --git a/app/src/main/res/drawable/cust_button_primary_black_pressed.xml b/app/src/main/res/drawable/cust_button_primary_black_pressed.xml
index 38c0aa36..b8040ec0 100644
--- a/app/src/main/res/drawable/cust_button_primary_black_pressed.xml
+++ b/app/src/main/res/drawable/cust_button_primary_black_pressed.xml
@@ -1,7 +1,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
- <corners android:radius="16dp"/>
+ <corners android:radius="@dimen/button_radius"/>
<solid android:color="@color/black800_secondary"/>
</shape>
</item>
diff --git a/app/src/main/res/drawable/cust_button_primary_black_released.xml b/app/src/main/res/drawable/cust_button_primary_black_released.xml
index 578e0424..8195c0c1 100644
--- a/app/src/main/res/drawable/cust_button_primary_black_released.xml
+++ b/app/src/main/res/drawable/cust_button_primary_black_released.xml
@@ -1,7 +1,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
- <corners android:radius="16dp"/>
+ <corners android:radius="@dimen/button_radius"/>
<solid android:color="@color/black800_transparent"/>
</shape>
</item>
@@ -10,7 +10,7 @@
android:bottom="@dimen/button_bevel"
>
<shape android:shape="rectangle">
- <corners android:radius="16dp"/>
+ <corners android:radius="@dimen/button_radius"/>
<solid android:color="@color/black800"/>
</shape>
</item>
diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml
index 4db7cc56..e1b4f595 100644
--- a/app/src/main/res/layout-xlarge/f_eip.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
@@ -82,8 +82,8 @@
<android.support.v7.widget.AppCompatButton
android:id="@+id/vpn_main_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="200dp"
+ android:layout_height="40dp"
android:layout_marginBottom="@dimen/stdpadding"
android:layout_marginEnd="@dimen/stdpadding"
android:layout_marginStart="@dimen/stdpadding"
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index ec877dc8..6dd93e3a 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -10,5 +10,6 @@
<dimen name="bitmask_logo_compact">56dp</dimen>
<dimen name="stdpadding">16dp</dimen>
<dimen name="compact_padding">6dp</dimen>
+ <dimen name="button_radius">20dp</dimen>
</resources> \ No newline at end of file
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index 654ea948..94bd0ff2 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -7,4 +7,6 @@
<dimen name="bitmask_logo_compact">56dp</dimen>
<dimen name="compact_padding">6dp</dimen>
<dimen name="stdpadding">16dp</dimen>
+ <dimen name="button_radius">20dp</dimen>
+
</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1595ff9b..3adf6cf6 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -42,4 +42,5 @@
<dimen name="toast_bottom_padding">20dp</dimen>
<dimen name="button_bevel">3dp</dimen>
+ <dimen name="button_radius">16dp</dimen>
</resources> \ No newline at end of file