diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-10 17:23:32 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-11 20:57:50 +0000 |
| commit | 5fe2bcbe39975bf878249ae83479d11789cbf82e (patch) | |
| tree | fbafa9970f6cd46d3c529717b514e715978f3fd5 /android/src | |
| parent | ea62607e542497acbdda60f618480dc9ea3c40d9 (diff) | |
| download | mullvadvpn-5fe2bcbe39975bf878249ae83479d11789cbf82e.tar.xz mullvadvpn-5fe2bcbe39975bf878249ae83479d11789cbf82e.zip | |
Tweak Cell widget paddings
Diffstat (limited to 'android/src')
4 files changed, 8 insertions, 9 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountCell.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountCell.kt index 35278d99f2..c70233c8aa 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountCell.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountCell.kt @@ -22,7 +22,7 @@ class AccountCell : NavigateCell { layoutParams = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 0.0f) gravity = Gravity.RIGHT - resources.getDimensionPixelSize(R.dimen.cell_label_horizontal_padding).let { padding -> + resources.getDimensionPixelSize(R.dimen.cell_inner_spacing).let { padding -> setPadding(padding, 0, padding, 0) } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt index f1c454d4d8..7efe59f22b 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt @@ -16,8 +16,8 @@ class AppVersionCell : Cell { private val warningIcon = ImageView(context).apply { layoutParams = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 0.0f) - resources.getDimensionPixelSize(R.dimen.cell_label_horizontal_padding).let { padding -> - setPadding(padding, 0, 0, 0) + resources.getDimensionPixelSize(R.dimen.cell_inner_spacing).let { padding -> + setPadding(0, 0, padding, 0) } setImageResource(R.drawable.icon_alert) @@ -27,7 +27,7 @@ class AppVersionCell : Cell { layoutParams = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 0.0f) gravity = Gravity.RIGHT - resources.getDimensionPixelSize(R.dimen.cell_label_horizontal_padding).let { padding -> + resources.getDimensionPixelSize(R.dimen.cell_inner_spacing).let { padding -> setPadding(padding, 0, padding, 0) } 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 e73b86dc4c..6ee4f84158 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 @@ -11,12 +11,11 @@ import net.mullvad.mullvadvpn.R open class Cell : LinearLayout { private val label = TextView(context).apply { - val horizontalPadding = - resources.getDimensionPixelSize(R.dimen.cell_label_horizontal_padding) + val rightPadding = resources.getDimensionPixelSize(R.dimen.cell_inner_spacing) val verticalPadding = resources.getDimensionPixelSize(R.dimen.cell_label_vertical_padding) layoutParams = LayoutParams(0, LayoutParams.WRAP_CONTENT, 1.0f) - setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding) + setPadding(0, verticalPadding, rightPadding, verticalPadding) setTextColor(context.getColor(R.color.white)) setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.text_medium)) diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml index c131b08ca2..edf6716d50 100644 --- a/android/src/main/res/values/dimensions.xml +++ b/android/src/main/res/values/dimensions.xml @@ -15,8 +15,8 @@ <dimen name="cell_switch_knob_max_translation">20dp</dimen> <dimen name="cell_switch_knob_size">24dp</dimen> <dimen name="settings_back_button_padding">12dp</dimen> - <dimen name="cell_horizontal_padding">16dp</dimen> - <dimen name="cell_label_horizontal_padding">8dp</dimen> + <dimen name="cell_horizontal_padding">@dimen/side_margin</dimen> + <dimen name="cell_inner_spacing">8dp</dimen> <dimen name="cell_label_vertical_padding">17dp</dimen> <dimen name="cell_input_width">80dp</dimen> <dimen name="cell_input_height">34dp</dimen> |