diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-02-08 21:07:00 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-02-11 17:51:24 +0000 |
| commit | c73f57d03f7b0afc8ea49b86ccb04c2673a80fa7 (patch) | |
| tree | aa5e38557c53d536181ef6935a70efb8e569a178 /android/src/main | |
| parent | bbd5bca10ad09eae3789b505ab25aa168be80e55 (diff) | |
| download | mullvadvpn-c73f57d03f7b0afc8ea49b86ccb04c2673a80fa7.tar.xz mullvadvpn-c73f57d03f7b0afc8ea49b86ccb04c2673a80fa7.zip | |
Create separate `Url` styleable attribute
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt | 11 | ||||
| -rw-r--r-- | android/src/main/res/values/attrs.xml | 4 |
2 files changed, 11 insertions, 4 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() diff --git a/android/src/main/res/values/attrs.xml b/android/src/main/res/values/attrs.xml index f0f573d138..21db41e41c 100644 --- a/android/src/main/res/values/attrs.xml +++ b/android/src/main/res/values/attrs.xml @@ -47,9 +47,11 @@ <attr name="text" format="reference|string" /> </declare-styleable> - <declare-styleable name="UrlButton"> + <declare-styleable name="Url"> <attr name="url" format="reference|string" /> + </declare-styleable> + <declare-styleable name="UrlButton"> <attr name="withToken" format="boolean" /> </declare-styleable> |