summaryrefslogtreecommitdiffhomepage
path: root/android/src/main/kotlin
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-02-08 21:07:00 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-02-11 17:51:24 +0000
commitc73f57d03f7b0afc8ea49b86ccb04c2673a80fa7 (patch)
treeaa5e38557c53d536181ef6935a70efb8e569a178 /android/src/main/kotlin
parentbbd5bca10ad09eae3789b505ab25aa168be80e55 (diff)
downloadmullvadvpn-c73f57d03f7b0afc8ea49b86ccb04c2673a80fa7.tar.xz
mullvadvpn-c73f57d03f7b0afc8ea49b86ccb04c2673a80fa7.zip
Create separate `Url` styleable attribute
Diffstat (limited to 'android/src/main/kotlin')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt11
1 files changed, 8 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt
index 36b77ce134..ddef67c634 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt
@@ -78,11 +78,16 @@ open class UrlButton : Button {
}
private fun loadAttributes(attributes: AttributeSet) {
- val styleableId = R.styleable.UrlButton
+ context.theme.obtainStyledAttributes(attributes, R.styleable.Url, 0, 0).apply {
+ try {
+ url = getString(R.styleable.Url_url)
+ } finally {
+ recycle()
+ }
+ }
- context.theme.obtainStyledAttributes(attributes, styleableId, 0, 0).apply {
+ context.theme.obtainStyledAttributes(attributes, R.styleable.UrlButton, 0, 0).apply {
try {
- url = getString(R.styleable.UrlButton_url)
withToken = getBoolean(R.styleable.UrlButton_withToken, false)
} finally {
recycle()