hush
/
SilentDragonAndroid
forked from fekt/hush-android-wallet
8
0
Fork 1
Code Issues 10 Pull Requests Projects Releases 5 Wiki Activity
Browse Source

Socials

pull/15/head
fekt 1 year ago
parent
0f5816a59a
commit
9307542132
8 changed files with 203 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt
  2. 9
      app/src/main/res/drawable/ic_mastodon.xml
  3. 17
      app/src/main/res/drawable/ic_matrix.xml
  4. 9
      app/src/main/res/drawable/ic_peertube.xml
  5. 9
      app/src/main/res/drawable/ic_telegram.xml
  6. 9
      app/src/main/res/drawable/ic_website.xml
  7. 108
      app/src/main/res/layout/fragment_profile.xml
  8. 9
      app/src/zcashmainnet/res/values/strings.xml

68
app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt
View File

@ -55,6 +55,38 @@ class ProfileFragment : BaseFragment<FragmentProfileBinding>() {
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<FragmentProfileBinding>() {
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)
}
}

9
app/src/main/res/drawable/ic_mastodon.xml
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
android:viewportWidth="448"
android:viewportHeight="512"
android:width="448dp"
android:height="512dp">
<path
android:pathData="M433 179.11c0 -97.2 -63.71 -125.7 -63.71 -125.7 -62.52 -28.7 -228.56 -28.4 -290.48 0 0 0 -63.72 28.5 -63.72 125.7 0 115.7 -6.6 259.4 105.63 289.1 40.51 10.7 75.32 13 103.33 11.4 50.81 -2.8 79.32 -18.1 79.32 -18.1l-1.7 -36.9s-36.31 11.4 -77.12 10.1c-40.41 -1.4 -83 -4.4 -89.63 -54a102.54 102.54 0 0 1 -0.9 -13.9c85.63 20.9 158.65 9.1 178.75 6.7 56.12 -6.7 105 -41.3 111.23 -72.9 9.8 -49.8 9 -121.5 9 -121.5zm-75.12 125.2h-46.63v-114.2c0 -49.7 -64 -51.6 -64 6.9v62.5h-46.33V197c0 -58.5 -64 -56.6 -64 -6.9v114.2H90.19c0 -122.1 -5.2 -147.9 18.41 -175 25.9 -28.9 79.82 -30.8 103.83 6.1l11.6 19.5 11.6 -19.5c24.11 -37.1 78.12 -34.8 103.83 -6.1 23.71 27.3 18.4 53 18.4 175z"
android:fillColor="#000000" />
</vector>

17
app/src/main/res/drawable/ic_matrix.xml
View File

@ -0,0 +1,17 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
android:viewportWidth="64"
android:viewportHeight="64"
android:width="64dp"
android:height="64dp">
<path
android:pathData="M49.46 42.2h-5.32c-0.178 0 -0.323 -0.145 -0.323 -0.323V30.91l-0.074 -1.808c-0.047 -0.53 -0.173 -0.992 -0.376 -1.376 -0.194 -0.367 -0.487 -0.664 -0.868 -0.883s-0.93 -0.332 -1.62 -0.332 -1.238 0.13 -1.647 0.382 -0.743 0.597 -0.976 1.01a4.21 4.21 0 0 0 -0.486 1.462c-0.085 0.567 -0.128 1.15 -0.128 1.732v10.79c0 0.178 -0.145 0.323 -0.323 0.323H32c-0.178 0 -0.323 -0.145 -0.323 -0.323V31.02l-0.037 -1.69c-0.024 -0.524 -0.124 -1.013 -0.297 -1.45 -0.164 -0.415 -0.43 -0.74 -0.814 -0.992s-0.972 -0.378 -1.752 -0.378c-0.22 0 -0.527 0.053 -0.908 0.157 -0.368 0.1 -0.732 0.294 -1.08 0.577s-0.65 0.694 -0.904 1.235 -0.382 1.27 -0.382 2.167v11.24c0 0.178 -0.144 0.323 -0.323 0.323h-5.32c-0.178 0 -0.323 -0.145 -0.323 -0.323V22.515c0 -0.178 0.145 -0.322 0.323 -0.322h5.02c0.178 0 0.323 0.145 0.323 0.322V24.3c0.618 -0.726 1.33 -1.315 2.125 -1.757 1.032 -0.574 2.225 -0.865 3.548 -0.865 1.265 0 2.44 0.25 3.5 0.743 0.934 0.44 1.68 1.17 2.224 2.18 0.556 -0.703 1.263 -1.34 2.108 -1.895 1.036 -0.682 2.274 -1.028 3.68 -1.028 1.048 0 2.036 0.13 2.937 0.387 0.917 0.263 1.715 0.69 2.373 1.267s1.18 1.348 1.548 2.278c0.363 0.922 0.547 2.04 0.547 3.323v12.964c0 0.178 -0.145 0.323 -0.323 0.323z"
android:fillColor="#FFFFFF"
android:fillAlpha="0.5" />
<path
android:pathData="M24.88 22.515v2.623h0.075c0.7 -0.998 1.542 -1.774 2.53 -2.323s2.117 -0.824 3.39 -0.824c1.224 0 2.342 0.238 3.353 0.712s1.78 1.31 2.305 2.51c0.574 -0.85 1.355 -1.6 2.342 -2.248s2.154 -0.974 3.504 -0.974c1.024 0 1.973 0.125 2.848 0.375s1.623 0.65 2.248 1.2 1.11 1.268 1.462 2.154 0.525 1.955 0.525 3.204v12.964h-5.32V30.91l-0.075 -1.836c-0.05 -0.574 -0.187 -1.073 -0.412 -1.5s-0.556 -0.762 -0.993 -1.012 -1.03 -0.374 -1.78 -0.374 -1.355 0.145 -1.817 0.43 -0.824 0.663 -1.087 1.124 -0.437 0.987 -0.524 1.574a12 12 0 0 0 -0.131 1.78v10.79H32V31.022l-0.037 -1.705c-0.025 -0.562 -0.13 -1.08 -0.32 -1.556s-0.5 -0.855 -0.937 -1.143 -1.08 -0.43 -1.93 -0.43c-0.25 0 -0.58 0.056 -0.993 0.17a3.3 3.3 0 0 0 -1.199 0.637c-0.388 0.313 -0.718 0.762 -0.993 1.35s-0.412 1.355 -0.412 2.304v11.24h-5.32V22.515z"
android:fillColor="#FFFFFF"
android:fillAlpha="0.5" />
<path
android:pathData="M1.432 6.084v51.833h3.73v1.244H0V4.84h5.162v1.243zm20.788 16.43v2.623h0.075c0.7 -0.998 1.542 -1.774 2.53 -2.323s2.117 -0.824 3.4 -0.824c1.224 0 2.342 0.238 3.353 0.712s1.78 1.3 2.305 2.5c0.574 -0.85 1.355 -1.6 2.342 -2.248s2.154 -0.974 3.504 -0.974c1.024 0 1.973 0.125 2.848 0.375s1.623 0.65 2.248 1.2 1.1 1.268 1.462 2.154 0.525 1.955 0.525 3.204v12.964h-5.32V30.9l-0.075 -1.836c-0.05 -0.574 -0.187 -1.073 -0.412 -1.5s-0.556 -0.762 -0.993 -1.012 -1.03 -0.374 -1.78 -0.374 -1.355 0.145 -1.817 0.43a3.12 3.12 0 0 0 -1.087 1.124c-0.263 0.46 -0.437 0.987 -0.524 1.574a12 12 0 0 0 -0.131 1.78v10.8h-5.32V31.022l-0.037 -1.705c-0.025 -0.562 -0.13 -1.08 -0.32 -1.556s-0.5 -0.855 -0.937 -1.143 -1.08 -0.43 -1.93 -0.43c-0.25 0 -0.58 0.056 -0.993 0.17a3.3 3.3 0 0 0 -1.199 0.637c-0.388 0.313 -0.718 0.762 -0.993 1.35s-0.412 1.355 -0.412 2.304v11.24H17.2V22.515zm40.348 35.402V6.084h-3.73V4.84H64v54.32h-5.162v-1.244z"
android:fillColor="#000000" />
</vector>

9
app/src/main/res/drawable/ic_peertube.xml
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
android:viewportWidth="24"
android:viewportHeight="24"
android:width="24dp"
android:height="24dp">
<path
android:pathData="M12 6.545v10.91L20.727 12M3.273 12v12L12 17.455M3.273 0v12L12 6.545"
android:fillColor="#000000" />
</vector>

9
app/src/main/res/drawable/ic_telegram.xml
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
android:viewportWidth="496"
android:viewportHeight="512"
android:width="496dp"
android:height="512dp">
<path
android:pathData="M248 8C111.033 8 0 119.033 0 256S111.033 504 248 504 496 392.967 496 256 384.967 8 248 8ZM362.952 176.66c-3.732 39.215 -19.881 134.378 -28.1 178.3 -3.476 18.584 -10.322 24.816 -16.948 25.425 -14.4 1.326 -25.338 -9.517 -39.287 -18.661 -21.827 -14.308 -34.158 -23.215 -55.346 -37.177 -24.485 -16.135 -8.612 -25 5.342 -39.5 3.652 -3.793 67.107 -61.51 68.335 -66.746 0.153 -0.655 0.3 -3.1 -1.154 -4.384s-3.59 -0.849 -5.135 -0.5q-3.283 0.746 -104.608 69.142 -14.845 10.194 -26.894 9.934c-8.855 -0.191 -25.888 -5.006 -38.551 -9.123 -15.531 -5.048 -27.875 -7.717 -26.8 -16.291q0.84 -6.7 18.45 -13.7 108.446 -47.248 144.628 -62.3c68.872 -28.647 83.183 -33.623 92.511 -33.789 2.052 -0.034 6.639 0.474 9.61 2.885a10.452 10.452 0 0 1 3.53 6.716A43.765 43.765 0 0 1 362.952 176.66Z"
android:fillColor="#000000" />
</vector>

9
app/src/main/res/drawable/ic_website.xml
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
android:viewportWidth="512"
android:viewportHeight="512"
android:width="512dp"
android:height="512dp">
<path
android:pathData="M352 256c0 22.2 -1.2 43.6 -3.3 64H163.3c-2.2 -20.4 -3.3 -41.8 -3.3 -64s1.2 -43.6 3.3 -64H348.7c2.2 20.4 3.3 41.8 3.3 64zm28.8 -64H503.9c5.3 20.5 8.1 41.9 8.1 64s-2.8 43.5 -8.1 64H380.8c2.1 -20.6 3.2 -42 3.2 -64s-1.1 -43.4 -3.2 -64zm112.6 -32H376.7c-10 -63.9 -29.8 -117.4 -55.3 -151.6c78.3 20.7 142 77.5 171.9 151.6zm-149.1 0H167.7c6.1 -36.4 15.5 -68.6 27 -94.7c10.5 -23.6 22.2 -40.7 33.5 -51.5C239.4 3.2 248.7 0 256 0s16.6 3.2 27.8 13.8c11.3 10.8 23 27.9 33.5 51.5c11.6 26 21 58.2 27 94.7zm-209 0H18.6C48.6 85.9 112.2 29.1 190.6 8.4C165.1 42.6 145.3 96.1 135.3 160zM8.1 192H131.2c-2.1 20.6 -3.2 42 -3.2 64s1.1 43.4 3.2 64H8.1C2.8 299.5 0 278.1 0 256s2.8 -43.5 8.1 -64zM194.7 446.6c-11.6 -26 -20.9 -58.2 -27 -94.6H344.3c-6.1 36.4 -15.5 68.6 -27 94.6c-10.5 23.6 -22.2 40.7 -33.5 51.5C272.6 508.8 263.3 512 256 512s-16.6 -3.2 -27.8 -13.8c-11.3 -10.8 -23 -27.9 -33.5 -51.5zM135.3 352c10 63.9 29.8 117.4 55.3 151.6C112.2 482.9 48.6 426.1 18.6 352H135.3zm358.1 0c-30 74.1 -93.6 130.9 -171.9 151.6c25.5 -34.2 45.2 -87.7 55.3 -151.6H493.4z"
android:fillColor="#000000" />
</vector>

108
app/src/main/res/layout/fragment_profile.xml
View File

@ -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" />
<View
android:id="@+id/hit_area_settings"
@ -148,45 +148,28 @@
android:id="@+id/hit_area_address"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="16dp"
android:onClick="copyAddress"
app:layout_constraintBottom_toTopOf="@id/button_feedback"
app:layout_constraintBottom_toTopOf="@id/button_backup"
app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
app:layout_constraintStart_toStartOf="@id/text_address"
app:layout_constraintTop_toTopOf="@id/text_username"
tools:background="@color/spacer" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_feedback"
style="@style/Zcash.Button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="12dp"
android:text="@string/profile_send_feedback"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textColor="#000000"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
app:layout_constraintStart_toStartOf="@id/guideline_content_start"
app:layout_constraintTop_toBottomOf="@id/text_address"
app:layout_constraintVertical_bias="0.1"
tools:visibility="invisible" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_backup"
style="@style/Zcash.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
style="@style/Zcash.Button.OutlinedButton"
android:layout_marginTop="24dp"
android:gravity="center"
android:padding="12dp"
android:text="@string/profile_backup_wallet"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textColor="@color/text_light"
app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@id/guideline_content_start"
app:layout_constraintTop_toBottomOf="@id/button_feedback" />
app:layout_constraintTop_toBottomOf="@id/text_address" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_rescan"
@ -210,7 +193,7 @@
android:id="@+id/text_banner_message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="102dp"
android:layout_marginBottom="128dp"
android:background="@drawable/background_banner"
android:elevation="6dp"
android:paddingStart="16dp"
@ -219,10 +202,10 @@
android:text="@string/profile_ecc_wallet"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textColor="@color/selector_button_text_light"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@id/guideline_content_start"
app:layout_constraintBottom_toBottomOf="parent"
tools:ignore="RtlSymmetry" />
<TextView
@ -237,4 +220,73 @@
app:layout_constraintEnd_toEndOf="@id/text_banner_message"
tools:text="v1.0.0-alpha05" />
<TextView
android:id="@+id/textView2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="© 2016-2022 The Hush Developers\nAll rights reserved. Licensed under GPLv3"
android:textAlignment="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_banner_message" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="57dp"
android:layout_marginTop="1dp"
android:layout_marginEnd="1dp"
android:orientation="horizontal"
android:textAlignment="center"
app:layout_constraintBottom_toTopOf="@+id/text_banner_message"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_rescan">
<ImageButton
android:id="@+id/websiteButton"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_weight="1"
android:scaleType="fitCenter"
app:tint="#333333"
app:srcCompat="@drawable/ic_website" />
<ImageButton
android:id="@+id/telegramButton"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_weight="1"
android:scaleType="fitCenter"
app:tint="#333333"
app:srcCompat="@drawable/ic_telegram" />
<ImageButton
android:id="@+id/matrixButton"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_weight="1"
android:scaleType="fitCenter"
app:tint="#333333"
app:srcCompat="@drawable/ic_matrix" />
<ImageButton
android:id="@+id/mastodonButton"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_weight="1"
android:scaleType="fitCenter"
app:tint="#333333"
app:srcCompat="@drawable/ic_mastodon" />
<ImageButton
android:id="@+id/peertubeButton"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_weight="1"
android:scaleType="fitCenter"
app:tint="#333333"
app:srcCompat="@drawable/ic_peertube" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

9
app/src/zcashmainnet/res/values/strings.xml
View File

@ -1,6 +1,11 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="api_block_explorer">https://explorer.hush.is/tx/%1$s</string>
<string name="symbol" translatable="false">HUSH</string>
<string name="play_store_url" translatable="false">https://hush.is</string>
<string name="gitea_url" translatable="false">https://git.hush.is/hush/SilentDragonAndroid/releases</string>
<string name="matrix_url" translatable="false">https://hush.is/matrix</string>
<string name="mastodon_url" translatable="false">https://hush.is/mastodon</string>
<string name="peertube_url" translatable="false">https://videos.hush.is/</string>
<string name="seedphrase_more_info_url">https://hush.is/seedphrase</string>
<string name="symbol" translatable="false">HUSH</string>
<string name="telegram_url" translatable="false">https://t.me/hush_main</string>
<string name="website_url" translatable="false">https://hush.is</string>
</resources>

Write Preview
Loading…
Cancel
Save