diff --git a/README.md b/README.md index 8c0abec..12fcf53 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,10 @@ On Debian-based systems: sdkmanager "platform-tools" "platforms;android-28" gradle build +Make sure you have Gradle 5.4.x or higher, 5.4.1 is known to work: + + ./gradlew wrapper --gradle-version=5.4.1 + ## Release Build Process The first time you create a release build you'll need to create two files. The diff --git a/app/src/main/java/org/myhush/silentdragon/QrReaderActivity.kt b/app/src/main/java/org/myhush/silentdragon/QrReaderActivity.kt index 7d43a60..a0f5fa2 100644 --- a/app/src/main/java/org/myhush/silentdragon/QrReaderActivity.kt +++ b/app/src/main/java/org/myhush/silentdragon/QrReaderActivity.kt @@ -160,7 +160,7 @@ class QrReaderActivity : AppCompatActivity() { if (err.length > 48) { err = err.substring(0, 22) + "...." + err.substring(err.length - 22, err.length) } - lblErrorMsg.text = "\"$err\" is not a connection string" + lblErrorMsg.text = "\"$err\" is not a valid connection string!" return } @@ -172,7 +172,7 @@ class QrReaderActivity : AppCompatActivity() { if (err.length > 48) { err = err.substring(0, 22) + "...." + err.substring(err.length - 22, err.length) } - lblErrorMsg.text = "\"$err\" is not a valid address" + lblErrorMsg.text = "\"$err\" is not a valid HUSH address!" return } diff --git a/app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt b/app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt index 8a46118..97e9654 100644 --- a/app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt +++ b/app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt @@ -65,7 +65,7 @@ class ReceiveActivity : AppCompatActivity() { } if (addr.isNullOrBlank()) - addr = "(no address)" + addr = "No address!" val addrTxt = findViewById(R.id.addressTxt) @@ -95,7 +95,7 @@ class ReceiveActivity : AppCompatActivity() { fun setZAddr() { addr = DataModel.mainResponseData?.saplingAddress ?: "" - txtRcvAddrTitle.text = "Your Hush sapling address" + txtRcvAddrTitle.text = "Your Hush shielded address" setAddr() } diff --git a/app/src/main/java/org/myhush/silentdragon/SendActivity.kt b/app/src/main/java/org/myhush/silentdragon/SendActivity.kt index adb691a..7772bbe 100644 --- a/app/src/main/java/org/myhush/silentdragon/SendActivity.kt +++ b/app/src/main/java/org/myhush/silentdragon/SendActivity.kt @@ -166,7 +166,7 @@ class SendActivity : AppCompatActivity() { val alertDialog = AlertDialog.Builder(this@SendActivity) alertDialog.setTitle("Send from t-addr?") alertDialog.setMessage("${DataModel.mainResponseData?.tokenName} $parsedAmt is more than the balance in " + - "your sapling address. This Tx will have to be sent from a transparent address, and will" + + "your shielded address. This Tx will have to be sent from a transparent address, and will" + " not be private.\n\nAre you absolutely sure?") alertDialog.apply { setPositiveButton("Send Anyway") { dialog, id -> doConfirm() } diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 2e6743a..3d0aab4 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -55,7 +55,7 @@ android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp"/> - \ No newline at end of file + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 80f56b5..f818441 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,7 +2,7 @@ #292B2F #1D1F21 - #4CD0C3 + #FF0033 #2F3237 #E3E3E3 diff --git a/build.gradle b/build.gradle index 8d482e6..5ecd4ba 100644 --- a/build.gradle +++ b/build.gradle @@ -25,3 +25,8 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir } + +task lint { +// lintClassPath = "foo" +} +