diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-08 22:08:04 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-12 17:32:45 +0000 |
| commit | 3059c8af7a85bb4920351538fa393515212b19c5 (patch) | |
| tree | 9ff7996f42569832236d8a085ee8c517c731c6d8 /android/src | |
| parent | ae4bc29d63367f56d14ff501ba25bfe9b5fe2c19 (diff) | |
| download | mullvadvpn-3059c8af7a85bb4920351538fa393515212b19c5.tar.xz mullvadvpn-3059c8af7a85bb4920351538fa393515212b19c5.zip | |
Implement support for custom red buttons
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt | 5 | ||||
| -rw-r--r-- | android/src/main/res/values/attrs.xml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt index ac510d0735..0dbed7eb19 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt @@ -13,13 +13,15 @@ import net.mullvad.mullvadvpn.util.JobTracker open class Button : FrameLayout { enum class ButtonColor { Blue, - Green; + Green, + Red; companion object { internal fun fromCode(code: Int): ButtonColor { when (code) { 0 -> return Blue 1 -> return Green + 2 -> return Red else -> throw Exception("Invalid buttonColor attribute value") } } @@ -49,6 +51,7 @@ open class Button : FrameLayout { val backgroundResource = when (value) { ButtonColor.Blue -> R.drawable.blue_button_background ButtonColor.Green -> R.drawable.green_button_background + ButtonColor.Red -> R.drawable.red_button_background } button.setBackgroundResource(backgroundResource) diff --git a/android/src/main/res/values/attrs.xml b/android/src/main/res/values/attrs.xml index 362af43680..449db0efd7 100644 --- a/android/src/main/res/values/attrs.xml +++ b/android/src/main/res/values/attrs.xml @@ -6,6 +6,8 @@ value="0" /> <enum name="green" value="1" /> + <enum name="red" + value="2" /> </attr> <attr name="detailImage" format="reference" /> |