Browse Source

move currency symbol, fix double HUSH symbol

duke
Denio 5 years ago
parent
commit
2277291aea
  1. 4
      app/build.gradle
  2. 8
      app/src/main/java/org/myhush/silentdragon/SendActivity.kt
  3. 15
      app/src/main/res/layout/content_send.xml

4
app/build.gradle

@ -22,7 +22,7 @@ android {
vectorDrawables.useSupportLibrary = true
}
signingConfigs {
/*signingConfigs {
release {
storeFile file(secretProperties["store_file_location"])
keyAlias secretProperties["key_alias"]
@ -37,7 +37,7 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}*/
}
dependencies {

8
app/src/main/java/org/myhush/silentdragon/SendActivity.kt

@ -96,10 +96,10 @@ class SendActivity : AppCompatActivity() {
val zprice = DataModel.mainResponseData?.zecprice
if (hush == null || zprice == null)
amountUSD.text = "$ 0.0"
amountUSD.text = "0.0 $"
else
amountUSD.text =
"$ " + DecimalFormat("#.########").format(hush * zprice)
DecimalFormat("#.########").format(hush * zprice) + "$"
}
})
@ -238,7 +238,7 @@ class SendActivity : AppCompatActivity() {
amountHUSH.setText( (zprice / amt).format(2))
amountUSD.text =
"${DataModel.mainResponseData?.tokenName} " + DecimalFormat("#.########").format(amt)
DecimalFormat("#.########").format(amt) + "${DataModel.mainResponseData?.tokenName} "
}
private fun setAmount(amt: Double?) {
@ -248,7 +248,7 @@ class SendActivity : AppCompatActivity() {
amountUSD.text = "${DataModel.mainResponseData?.tokenName} 0.0"
else
amountUSD.text =
"${DataModel.mainResponseData?.tokenName} " + DecimalFormat("#.########").format(amt)
DecimalFormat("#.########").format(amt) + "${DataModel.mainResponseData?.tokenName} "
}

15
app/src/main/res/layout/content_send.xml

@ -100,7 +100,7 @@
android:layout_width="173dp"
android:layout_height="66dp"
android:layout_marginTop="16dp"
android:hint="HUSH 0.00"
android:hint="0.00 HUSH"
android:inputType="numberDecimal"
android:maxLength="14"
android:selectAllOnFocus="true"
@ -118,7 +118,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="$ 0.00"
android:text="0.00 $"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -135,17 +135,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="30dp"
android:text="HUSH"
android:textSize="27sp"
app:layout_constraintStart_toEndOf="@+id/amountHUSH"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"

Loading…
Cancel
Save