diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-04 12:43:25 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-04 12:43:25 -0300 |
| commit | c89ba2bed81a1eaee244ee98252184c426143846 (patch) | |
| tree | 990349c3858a8559e323719e78ddbbbc0c8633ee | |
| parent | 52c0c9df9bfd75f78d6755bf0f401b163f9a9710 (diff) | |
| parent | 08de5a259632755093db6b5018b73b87601bd400 (diff) | |
| download | mullvadvpn-c89ba2bed81a1eaee244ee98252184c426143846.tar.xz mullvadvpn-c89ba2bed81a1eaee244ee98252184c426143846.zip | |
Merge branch 'fix-android-cell-widget-ui'
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt | 4 | ||||
| -rw-r--r-- | android/src/main/res/values/dimensions.xml | 1 |
2 files changed, 4 insertions, 1 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 a533b5e758..d65875696d 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 @@ -18,7 +18,7 @@ open class Cell : LinearLayout { setPadding(0, verticalPadding, rightPadding, verticalPadding) setTextColor(context.getColor(R.color.white)) - setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.text_medium)) + setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.text_medium_plus)) setTypeface(null, Typeface.BOLD) } @@ -40,6 +40,7 @@ open class Cell : LinearLayout { protected var cell: LinearLayout = this set(value) { field = value.apply { + val height = resources.getDimensionPixelSize(R.dimen.cell_height) val leftPadding = resources.getDimensionPixelSize(R.dimen.cell_left_padding) val rightPadding = resources.getDimensionPixelSize(R.dimen.cell_right_padding) @@ -47,6 +48,7 @@ open class Cell : LinearLayout { isClickable = true gravity = Gravity.CENTER orientation = HORIZONTAL + minimumHeight = height setBackgroundResource(R.drawable.cell_button_background) setPadding(leftPadding, 0, rightPadding, 0) diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml index 235c3d94b3..34c5c18eb3 100644 --- a/android/src/main/res/values/dimensions.xml +++ b/android/src/main/res/values/dimensions.xml @@ -10,6 +10,7 @@ <dimen name="account_history_entry_height">48dp</dimen> <dimen name="edit_text_corner_radius">4dp</dimen> <dimen name="button_height">44dp</dimen> + <dimen name="cell_height">52dp</dimen> <dimen name="cell_switch_border_radius">16dp</dimen> <dimen name="cell_switch_width">48dp</dimen> <dimen name="cell_switch_height">30dp</dimen> |