From 9307542132e3e0fb1a66107b92da11a028ca25e6 Mon Sep 17 00:00:00 2001 From: fekt Date: Sun, 4 Dec 2022 12:48:15 -0500 Subject: [PATCH] Socials --- .../ecc/android/ui/profile/ProfileFragment.kt | 68 ++++++++++- app/src/main/res/drawable/ic_mastodon.xml | 9 ++ app/src/main/res/drawable/ic_matrix.xml | 17 +++ app/src/main/res/drawable/ic_peertube.xml | 9 ++ app/src/main/res/drawable/ic_telegram.xml | 9 ++ app/src/main/res/drawable/ic_website.xml | 9 ++ app/src/main/res/layout/fragment_profile.xml | 108 +++++++++++++----- app/src/zcashmainnet/res/values/strings.xml | 9 +- 8 files changed, 203 insertions(+), 35 deletions(-) create mode 100644 app/src/main/res/drawable/ic_mastodon.xml create mode 100644 app/src/main/res/drawable/ic_matrix.xml create mode 100644 app/src/main/res/drawable/ic_peertube.xml create mode 100644 app/src/main/res/drawable/ic_telegram.xml create mode 100644 app/src/main/res/drawable/ic_website.xml diff --git a/app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt b/app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt index 58f9396..c44a100 100644 --- a/app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt +++ b/app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt @@ -55,6 +55,38 @@ class ProfileFragment : BaseFragment() { tapped(PROFILE_RESCAN) onRescanWallet() } + + // Website + binding.websiteButton.setOnClickListener { + openWebsiteLink() + } + + // Telegram + binding.telegramButton.setOnClickListener { + openTelegramLink() + } + + // Matrix + binding.matrixButton.setOnClickListener { + openMatrixLink() + } + + // Mastodon + binding.mastodonButton.setOnClickListener { + openMastodonLink() + } + + // PeerTube + binding.peertubeButton.setOnClickListener { + openPeerTubeLink() + } + + // SilentDragon Gitea + binding.textBannerMessage.setOnClickListener { + openGiteaLink() + } + + // Add build version binding.textVersion.text = BuildConfig.VERSION_NAME /* @@ -67,14 +99,40 @@ class ProfileFragment : BaseFragment() { onViewDevLogs() true }*/ - - binding.textBannerMessage.setOnClickListener { - openPlayStoreLink() + } + + private fun openGiteaLink() { + getString(R.string.gitea_url).takeUnless { it.isBlank() }?.let { url -> + mainActivity?.onLaunchUrl(url) + } + } + + private fun openMastodonLink() { + getString(R.string.mastodon_url).takeUnless { it.isBlank() }?.let { url -> + mainActivity?.onLaunchUrl(url) + } + } + + private fun openMatrixLink() { + getString(R.string.matrix_url).takeUnless { it.isBlank() }?.let { url -> + mainActivity?.onLaunchUrl(url) + } + } + + private fun openPeerTubeLink() { + getString(R.string.peertube_url).takeUnless { it.isBlank() }?.let { url -> + mainActivity?.onLaunchUrl(url) + } + } + + private fun openTelegramLink() { + getString(R.string.telegram_url).takeUnless { it.isBlank() }?.let { url -> + mainActivity?.onLaunchUrl(url) } } - private fun openPlayStoreLink() { - getString(R.string.play_store_url).takeUnless { it.isBlank() }?.let { url -> + private fun openWebsiteLink() { + getString(R.string.website_url).takeUnless { it.isBlank() }?.let { url -> mainActivity?.onLaunchUrl(url) } } diff --git a/app/src/main/res/drawable/ic_mastodon.xml b/app/src/main/res/drawable/ic_mastodon.xml new file mode 100644 index 0000000..aa3645c --- /dev/null +++ b/app/src/main/res/drawable/ic_mastodon.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_matrix.xml b/app/src/main/res/drawable/ic_matrix.xml new file mode 100644 index 0000000..a984f9f --- /dev/null +++ b/app/src/main/res/drawable/ic_matrix.xml @@ -0,0 +1,17 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_peertube.xml b/app/src/main/res/drawable/ic_peertube.xml new file mode 100644 index 0000000..2311e2e --- /dev/null +++ b/app/src/main/res/drawable/ic_peertube.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_telegram.xml b/app/src/main/res/drawable/ic_telegram.xml new file mode 100644 index 0000000..00337eb --- /dev/null +++ b/app/src/main/res/drawable/ic_telegram.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_website.xml b/app/src/main/res/drawable/ic_website.xml new file mode 100644 index 0000000..711c722 --- /dev/null +++ b/app/src/main/res/drawable/ic_website.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index 4f98669..63d2c2a 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -86,16 +86,16 @@ android:id="@+id/icon_profile" android:layout_width="0dp" android:layout_height="0dp" + android:contentDescription="@string/content_description_profile_zebra" android:elevation="6dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="H,1:1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.212" + app:layout_constraintVertical_bias="0.137" app:layout_constraintWidth_percent="0.4" - app:srcCompat="@drawable/ic_profile_zebra_01" - android:contentDescription="@string/content_description_profile_zebra" /> + app:srcCompat="@drawable/ic_profile_zebra_01" /> - - + app:layout_constraintTop_toBottomOf="@id/text_address" /> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/zcashmainnet/res/values/strings.xml b/app/src/zcashmainnet/res/values/strings.xml index 6745902..c8113d0 100644 --- a/app/src/zcashmainnet/res/values/strings.xml +++ b/app/src/zcashmainnet/res/values/strings.xml @@ -1,6 +1,11 @@ https://explorer.hush.is/tx/%1$s - HUSH - https://hush.is + https://git.hush.is/hush/SilentDragonAndroid/releases + https://hush.is/matrix + https://hush.is/mastodon + https://videos.hush.is/ https://hush.is/seedphrase + HUSH + https://t.me/hush_main + https://hush.is