From f24408783f4a8fbab9ab79eb3e716353d7eaa854 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Fri, 22 Nov 2019 14:26:49 -0800 Subject: [PATCH 1/5] add credits file --- CREDITS | 1 + 1 file changed, 1 insertion(+) create mode 100644 CREDITS diff --git a/CREDITS b/CREDITS new file mode 100644 index 0000000..f42231f --- /dev/null +++ b/CREDITS @@ -0,0 +1 @@ +Duke Leto From c06f661f3622c32b59f3f60fb80e967660c6b9f0 Mon Sep 17 00:00:00 2001 From: gilardh Date: Sat, 23 Nov 2019 16:00:23 +0100 Subject: [PATCH 2/5] Update activity_about.xml - Add Twitter link - Add Discord link - Add website myhush.org link - Add credits link - Clean code - Reduction of spaces between lines - Make the page scrollable - Formatting the 'About' page --- app/src/main/res/layout/activity_about.xml | 233 ++++++++++++++++++--- 1 file changed, 201 insertions(+), 32 deletions(-) diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 2c5927c..c376813 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,5 +1,5 @@ - - + + + + + app:layout_constraintTop_toBottomOf="@id/divider1" /> + app:layout_constraintTop_toBottomOf="@+id/Discord" /> - tools:layout_editor_absoluteY="56dp" /> + app:layout_constraintTop_toBottomOf="@+id/DiscordText" /> + + + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/divider4" /> + app:layout_constraintTop_toBottomOf="@id/Credit" /> + app:layout_constraintTop_toBottomOf="@+id/CreditText" /> tools:layout_editor_absoluteY="56dp" /> + app:layout_constraintTop_toBottomOf="@id/divider5" /> - tools:layout_editor_absoluteY="56dp" /> + + + + + + + + + + + + + - + From bb7750e2df055712326d10eb85fdf49af494d1b3 Mon Sep 17 00:00:00 2001 From: gilardh Date: Sat, 23 Nov 2019 23:27:46 +0100 Subject: [PATCH 3/5] Transparent and shielded address are now complete in 'Receive' screen --- .../main/java/org/myhush/silentdragon/ReceiveActivity.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt b/app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt index 9684d06..5a584ee 100644 --- a/app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt +++ b/app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt @@ -70,14 +70,20 @@ class ReceiveActivity : AppCompatActivity() { val addrTxt = findViewById(R.id.addressTxt) - val numsplits = if (addr!!.length > 48) 8 else 4 + var numsplits = if (addr!!.length > 34) 8 else 6 val size = addr!!.length / numsplits var splitText = "" for (i in 0..(numsplits-1)) { splitText += addr?.substring(i * size, i * size + size) splitText += if (i % 2 == 0) " " else "\n" + + if (i == (numsplits-1)) + if(addr!!.length % numsplits != 0) { + splitText += addr?.substring((i + 1) * size, addr!!.length) + } } + addrTxt.text = splitText addrTxt.setOnClickListener { From fe6d8086d19dee6de58c38385ef9920e071ea7d9 Mon Sep 17 00:00:00 2001 From: gilardh Date: Sun, 24 Nov 2019 23:39:19 +0100 Subject: [PATCH 4/5] Not render the eye link link before the transaction is sent --- .../main/java/org/myhush/silentdragon/TxDetailsActivity.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt b/app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt index 55953b0..1ec0c74 100644 --- a/app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt +++ b/app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt @@ -39,6 +39,7 @@ class TxDetailsActivity : AppCompatActivity() { imgTypeColor.setImageResource(R.color.colorAccent) if (tx?.type == "confirm") { + txtType.text = "Confirm Transaction" txtDateTime.text = "" btnExternal.text = "Confirm and Send" @@ -119,6 +120,11 @@ class TxDetailsActivity : AppCompatActivity() { override fun onCreateOptionsMenu(menu: Menu?): Boolean { menuInflater.inflate(R.menu.menu_txdetails, menu) + + tx = Klaxon().parse(StringReader(intent.getStringExtra("EXTRA_TXDETAILS"))) + if (tx?.type == "confirm") { + menu!!.removeItem(R.id.action_view) + } return true } From af3864b0e562462c2bb15f6e66eecee4e2451b36 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Mon, 25 Nov 2019 07:25:33 -0800 Subject: [PATCH 5/5] bump --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index d3f60ac..d9cf046 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,7 +18,7 @@ android { minSdkVersion 19 targetSdkVersion 28 versionCode 1 - versionName "0.5.10" + versionName "0.5.11" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true }