From cba4e897c5799a087565256ace1ac8d8dc802b05 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Patel Date: Tue, 16 Feb 2021 08:02:11 +0530 Subject: [PATCH] Improve about page --- .../aurora/store/view/epoxy/views/preference/LinkView.kt | 9 ++++++--- .../java/com/aurora/store/view/ui/about/AboutActivity.kt | 9 +++++---- app/src/main/res/values/arrays.xml | 2 +- app/src/main/res/xml/preferences_ui.xml | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LinkView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LinkView.kt index 82e10949d..5bca62dfb 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LinkView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LinkView.kt @@ -28,6 +28,7 @@ import com.airbnb.epoxy.ModelView import com.aurora.store.R import com.aurora.store.data.model.Link import com.aurora.store.databinding.ViewLinkBinding +import com.aurora.store.util.extensions.hide import com.aurora.store.util.extensions.load import com.aurora.store.util.extensions.show import com.aurora.store.view.epoxy.views.BaseView @@ -65,12 +66,14 @@ class LinkView : RelativeLayout { fun link(link: Link) { B.line1.text = link.title B.line2.text = link.subtitle - if (!link.url.startsWith("http")) { - B.line3.show() - B.line3.text = link.url + + if (link.url.startsWith("http") || link.url.startsWith("upi")) { + B.line3.hide() } else { B.line3.show() + B.line3.text = link.url } + B.imgIcon.load(link.icon) } diff --git a/app/src/main/java/com/aurora/store/view/ui/about/AboutActivity.kt b/app/src/main/java/com/aurora/store/view/ui/about/AboutActivity.kt index e0ac61f97..8f2eebf83 100644 --- a/app/src/main/java/com/aurora/store/view/ui/about/AboutActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/about/AboutActivity.kt @@ -120,9 +120,10 @@ class AboutActivity : BaseActivity() { } private fun processUrl(url: String) { - if (url.startsWith("http")) - browse(url) - else - copyToClipBoard(url) + when { + url.startsWith("http") -> browse(url) + url.startsWith("upi") -> browse(url) + else -> copyToClipBoard(url) + } } } \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 4342215f2..9f451428f 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -123,7 +123,7 @@ "bc1qu7cy9fepjj309y4r2x3rymve7mw4ff39c8cpe0" "qpqus3qdlz8guf476vwz0fjl8s34fseukcmrl6eknl" "0x6977446933EC8b5964D921f7377950992337B1C6" - "whyorean@dbs" + "upi://pay?pa=whyorean@dbs&pn=whyorean&tn=AuroraOSS" "https://paypal.me/AuroraDev" "https://liberapay.com/on/gitlab/whyorean/ " "https://gitlab.com/AuroraOSS/AuroraStore" diff --git a/app/src/main/res/xml/preferences_ui.xml b/app/src/main/res/xml/preferences_ui.xml index bb37d8fdf..5dd254930 100644 --- a/app/src/main/res/xml/preferences_ui.xml +++ b/app/src/main/res/xml/preferences_ui.xml @@ -34,6 +34,6 @@ app:entryValues="@array/pref_accent_values" app:iconSpaceReserved="false" app:key="PREFERENCE_THEME_ACCENT" - app:title="@string/pref_ui_theme_title" + app:title="@string/pref_ui_accent_title" app:useSimpleSummaryProvider="true" />