summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-08-15 13:23:59 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-08-18 13:13:31 +0000
commit60a8542cec68de83b7a76a5d44a1e97d7815199a (patch)
tree65231a385410e9137bad2a38b23b89ef78981bf6 /android/src
parent374f422ee6e245ecefc4e40f5e3fb4b84d524bf2 (diff)
downloadmullvadvpn-60a8542cec68de83b7a76a5d44a1e97d7815199a.tar.xz
mullvadvpn-60a8542cec68de83b7a76a5d44a1e97d7815199a.zip
Tweak Cell widget
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt8
-rw-r--r--android/src/main/res/values/dimensions.xml7
2 files changed, 8 insertions, 7 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt
index 6ee4f84158..cb87408251 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt
@@ -40,15 +40,15 @@ open class Cell : LinearLayout {
protected var cell: LinearLayout = this
set(value) {
field = value.apply {
+ val leftPadding = resources.getDimensionPixelSize(R.dimen.cell_left_padding)
+ val rightPadding = resources.getDimensionPixelSize(R.dimen.cell_right_padding)
+
isClickable = true
gravity = Gravity.CENTER
orientation = HORIZONTAL
setBackgroundResource(R.drawable.cell_button_background)
-
- resources.getDimensionPixelSize(R.dimen.cell_horizontal_padding).let { padding ->
- setPadding(padding, 0, padding, 0)
- }
+ setPadding(leftPadding, 0, rightPadding, 0)
addView(label)
diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml
index 3eee6fcdfa..5a5a06a74a 100644
--- a/android/src/main/res/values/dimensions.xml
+++ b/android/src/main/res/values/dimensions.xml
@@ -15,12 +15,13 @@
<dimen name="cell_switch_knob_max_translation">18dp</dimen>
<dimen name="cell_switch_knob_size">22dp</dimen>
<dimen name="settings_back_button_padding">12dp</dimen>
- <dimen name="cell_horizontal_padding">@dimen/side_margin</dimen>
+ <dimen name="cell_left_padding">@dimen/side_margin</dimen>
+ <dimen name="cell_right_padding">16dp</dimen>
<dimen name="cell_inner_spacing">8dp</dimen>
- <dimen name="cell_label_vertical_padding">17dp</dimen>
+ <dimen name="cell_label_vertical_padding">14dp</dimen>
<dimen name="cell_input_width">80dp</dimen>
<dimen name="cell_input_height">34dp</dimen>
- <dimen name="cell_footer_top_padding">8dp</dimen>
+ <dimen name="cell_footer_top_padding">6dp</dimen>
<dimen name="cell_footer_horizontal_padding">@dimen/side_margin</dimen>
<dimen name="chevron_width">14dp</dimen>
<dimen name="chevron_height">24dp</dimen>