gilardh
/
SilentDragonAndroid
forked from hush/SilentDragonAndroid-old
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

switch Hush currency symbol

duke
Denio 5 years ago
parent
a2a56e49b6
commit
97fbf8608f
8 changed files with 121 additions and 107 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. 7
      app/src/main/java/org/myhush/silentdragon/MainActivity.kt
  2. 24
      app/src/main/java/org/myhush/silentdragon/SendActivity.kt
  3. 3
      app/src/main/java/org/myhush/silentdragon/TransactionItemFragment.kt
  4. 6
      app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt
  5. 2
      app/src/main/java/org/myhush/silentdragon/UnconfirmedTxItemFragment.kt
  6. 50
      app/src/main/res/layout/content_main.xml
  7. 132
      app/src/main/res/layout/content_send.xml
  8. 4
      app/src/main/res/layout/content_tx_details.xml

7
app/src/main/java/org/myhush/silentdragon/MainActivity.kt
View File

@ -96,7 +96,7 @@ class MainActivity : AppCompatActivity(),
lblBalance.text = ""
txtMainBalanceUSD.text = ""
txtMainBalance.text = status
balanceSmall.text = ""
}
@SuppressLint("SetTextI18n")
@ -159,9 +159,8 @@ class MainActivity : AppCompatActivity(),
val balText = DecimalFormat("#0.00000000").format(bal)
lblBalance.text = "Balance"
txtMainBalance.text = "${DataModel.mainResponseData?.tokenName} " + balText.substring(0, balText.length - 4)
balanceSmall.text = balText.substring(balText.length - 4, balText.length)
txtMainBalanceUSD.text = "$ " + DecimalFormat("#,##0.00").format(bal * zPrice)
txtMainBalance.text = balText.substring(0, balText.length - 4) + " ${DataModel.mainResponseData?.tokenName} "
txtMainBalanceUSD.text = DecimalFormat("#,##0.00").format(bal * zPrice) + " $"
// Enable the send and recieve buttons
bottomNav.menu.findItem(R.id.action_recieve).isEnabled = true

24
app/src/main/java/org/myhush/silentdragon/SendActivity.kt
View File

@ -37,6 +37,7 @@ class SendActivity : AppCompatActivity() {
// Clear the valid address prompt
txtValidAddress.text = ""
txtSendCurrencySymbol.text = ""
if (intent.getStringExtra("address") != null)
sendAddress.setText(intent.getStringExtra("address"), TextView.BufferType.EDITABLE)
@ -95,11 +96,18 @@ class SendActivity : AppCompatActivity() {
val hush = s.toString().toDoubleOrNull()
val zprice = DataModel.mainResponseData?.zecprice
if (hush == null || zprice == null)
if (hush == null) {
txtSendCurrencySymbol.text = "" // Let the placeholder show the "$" sign
} else {
txtSendCurrencySymbol.text = "HUSH"
if (hush == null || zprice == null)
amountUSD.text = "0.0 $"
else
amountUSD.text =
DecimalFormat("#.########").format(hush * zprice) + "$"
DecimalFormat("#.########").format(hush * zprice) + " $"
}
}
})
@ -223,8 +231,8 @@ class SendActivity : AppCompatActivity() {
private fun Double.format(digits: Int): String? = java.lang.String.format("%.${digits}f", this)
private fun setAmountHUSH(amt: Double) {
amountHUSH.setText(amt.format(2))
setAmount(amt * (DataModel.mainResponseData?.zecprice ?: 0.0))
amountHUSH.setText((DecimalFormat("#.########").format(amt) + "${DataModel.mainResponseData?.tokenName}"))
setAmount(amt)
}
private fun setAmountUSD(amt: Double?) {
@ -235,20 +243,20 @@ class SendActivity : AppCompatActivity() {
// Since there is a text-change listner on the USD field, we set the USD first, then override the
// HUSH field manually.
val zprice = DataModel.mainResponseData?.zecprice ?: 0.0
amountHUSH.setText( (zprice / amt).format(2))
amountHUSH.setText((DecimalFormat("#.########").format(amt) + "${DataModel.mainResponseData?.tokenName}"))
amountUSD.text =
DecimalFormat("#.########").format(amt) + "${DataModel.mainResponseData?.tokenName} "
DecimalFormat("#.########").format(amt) + "$"
}
private fun setAmount(amt: Double?) {
val zprice = DataModel.mainResponseData?.zecprice
if (amt == null || zprice == null)
amountUSD.text = "${DataModel.mainResponseData?.tokenName} 0.0"
amountUSD.text = "0.0 $"
else
amountUSD.text =
DecimalFormat("#.########").format(amt) + "${DataModel.mainResponseData?.tokenName} "
DecimalFormat("#.########").format(amt) + "$"
}

3
app/src/main/java/org/myhush/silentdragon/TransactionItemFragment.kt
View File

@ -68,8 +68,7 @@ class TransactionItemFragment : Fragment() {
val col = view.findViewById<ImageView>(R.id.typeColor)
val amt = view.findViewById<TextView>(R.id.txamt)
val amtzec = tx?.amount?.toDoubleOrNull() ?: 0.0
amt.text = DataModel.mainResponseData?.tokenName + " " +
(if (tx?.type == "send") "" else "+") + DecimalFormat("#0.00########").format(amtzec)
amt.text = (if (tx?.type == "send") "" else "+") + DecimalFormat("#0.00########").format(amtzec) + " " + DataModel.mainResponseData?.tokenName
if (tx?.type == "send") {
col.setImageResource(R.color.colorAccent)

6
app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt
View File

@ -59,9 +59,9 @@ class TxDetailsActivity : AppCompatActivity() {
val amt = kotlin.math.abs(tx?.amount?.toDoubleOrNull() ?: 0.0)
val amtStr = DecimalFormat("#0.0000####").format(amt)
txtAmtHush.text = "${DataModel.mainResponseData?.tokenName} $amtStr"
txtAmtUSD.text = "$ " + DecimalFormat("#,##0.00").format(
(amt) * (DataModel.mainResponseData?.zecprice ?: 0.0))
txtAmtHush.text = " $amtStr ${DataModel.mainResponseData?.tokenName}"
txtAmtUSD.text = DecimalFormat("#,##0.00").format(
(amt) * (DataModel.mainResponseData?.zecprice ?: 0.0)) + "$"
if (tx?.memo.isNullOrBlank()) {
layoutMemo.visibility = ConstraintLayout.GONE

2
app/src/main/java/org/myhush/silentdragon/UnconfirmedTxItemFragment.kt
View File

@ -56,7 +56,7 @@ class UnconfirmedTxItemFragment : Fragment() {
val txt = view.findViewById<TextView>(R.id.txtUnconfirmedTx)
txt.text = (if (tx?.type == "send") "Sending" else "Receiving") +
" ${DataModel.mainResponseData?.tokenName} " + DecimalFormat("#0.00########").format(kotlin.math.abs(tx?.amount?.toDoubleOrNull() ?: 0.0))
DecimalFormat("#0.00########").format(kotlin.math.abs(tx?.amount?.toDoubleOrNull() ?: 0.0)) + " ${DataModel.mainResponseData?.tokenName} "
return view
}

50
app/src/main/res/layout/content_main.xml
View File

@ -25,34 +25,32 @@
android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="16dp"
app:layout_constraintBottom_toTopOf="@+id/txtMainBalance" android:textColor="@color/light_grey"/>
<TextView
android:text="HUSH 0.0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:id="@+id/txtMainBalance"
app:layout_constraintBottom_toTopOf="@+id/txtMainBalanceUSD"
android:textSize="30sp"
app:layout_constraintTop_toBottomOf="@+id/lblBalance" android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="21dp"
android:id="@+id/balanceSmall"
android:text="0000"
android:textSize="14sp" android:textColor="@android:color/white"
app:layout_constraintBaseline_toBaselineOf="@+id/txtMainBalance"
app:layout_constraintStart_toEndOf="@+id/txtMainBalance"
android:layout_marginStart="2dp"/>
android:id="@+id/txtMainBalance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0.0 Hush"
android:textColor="@android:color/white"
android:textSize="30sp"
app:layout_constraintBottom_toTopOf="@+id/txtMainBalanceUSD"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/lblBalance" />
<TextView
android:text="$ 0.0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/txtMainBalanceUSD"
app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="154dp"
app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="154dp"
app:layout_constraintTop_toBottomOf="@+id/txtMainBalance"
android:textColor="@color/light_grey" app:layout_constraintBottom_toBottomOf="@+id/imageView2"
android:layout_marginBottom="32dp"/>
android:id="@+id/txtMainBalanceUSD"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="154dp"
android:layout_marginEnd="154dp"
android:layout_marginBottom="32dp"
android:text="0.0 $"
android:textColor="@color/light_grey"
app:layout_constraintBottom_toBottomOf="@+id/imageView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtMainBalance" />
<ImageView
android:id="@+id/imageView3"

132
app/src/main/res/layout/content_send.xml
View File

@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_send"
tools:context="org.myhush.silentdragon.SendActivity">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_send"
tools:context="org.myhush.silentdragon.SendActivity">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.constraint.ConstraintLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" android:id="@+id/linearLayout3">
android:layout_height="wrap_content"
android:orientation="vertical" android:id="@+id/linearLayout3">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/toLayout"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="16dp" android:layout_marginStart="16dp"
app:layout_constraintBottom_toTopOf="@id/AmountLayout"
android:layout_marginBottom="8dp" app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="16dp"
>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/toLayout"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="16dp" android:layout_marginStart="16dp"
app:layout_constraintBottom_toTopOf="@id/AmountLayout"
android:layout_marginBottom="8dp" app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="16dp"
>
<TextView
android:id="@+id/textView7"
@ -61,14 +61,14 @@
tools:layout_conversion_absoluteHeight="45dp"
tools:layout_conversion_absoluteWidth="0dp" />
<ImageButton
android:layout_width="37dp"
android:layout_height="41dp" app:srcCompat="@android:drawable/ic_menu_camera"
android:id="@+id/imageButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView7"
tools:layout_conversion_absoluteHeight="51dp"
tools:layout_conversion_absoluteWidth="56dp" android:layout_marginTop="16dp"
android:background="@android:color/transparent"/>
android:layout_width="37dp"
android:layout_height="41dp" app:srcCompat="@android:drawable/ic_menu_camera"
android:id="@+id/imageButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView7"
tools:layout_conversion_absoluteHeight="51dp"
tools:layout_conversion_absoluteWidth="56dp" android:layout_marginTop="16dp"
android:background="@android:color/transparent"/>
<TextView
android:id="@+id/txtValidAddress"
@ -100,7 +100,7 @@
android:layout_width="173dp"
android:layout_height="66dp"
android:layout_marginTop="16dp"
android:hint="0.00 HUSH"
android:hint="0.00 Hush"
android:inputType="numberDecimal"
android:maxLength="14"
android:selectAllOnFocus="true"
@ -135,16 +135,26 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/txtSendCurrencySymbol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
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"
android:layout_height="218dp"
android:id="@+id/MemoLayout" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@id/AmountLayout" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toTopOf="@+id/btnSend">
android:layout_width="match_parent"
android:layout_height="218dp"
android:id="@+id/MemoLayout" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@id/AmountLayout" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toTopOf="@+id/btnSend">
<EditText
android:id="@+id/txtSendMemo"
@ -176,32 +186,32 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:text="0 / 512"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/txtMemoSize" android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBaseline_toBaselineOf="@+id/txtSendMemoTitle"/>
android:text="0 / 512"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/txtMemoSize" android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBaseline_toBaselineOf="@+id/txtSendMemoTitle"/>
</android.support.constraint.ConstraintLayout>
<Button
android:text="Send"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:id="@+id/btnSend"
android:background="@color/colorAccent"
android:textColor="@android:color/white" tools:layout_conversion_absoluteHeight="48dp"
tools:layout_conversion_absoluteWidth="88dp"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintTop_toBottomOf="@+id/chkIncludeReplyTo" android:layout_marginTop="8dp"/>
android:text="Send"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:id="@+id/btnSend"
android:background="@color/colorAccent"
android:textColor="@android:color/white" tools:layout_conversion_absoluteHeight="48dp"
tools:layout_conversion_absoluteWidth="88dp"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintTop_toBottomOf="@+id/chkIncludeReplyTo" android:layout_marginTop="8dp"/>
<CheckBox
android:text="Include ReplyTo Address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/chkIncludeReplyTo"
app:layout_constraintTop_toBottomOf="@+id/MemoLayout"
app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="16dp"
app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="16dp"/>
android:text="Include ReplyTo Address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/chkIncludeReplyTo"
app:layout_constraintTop_toBottomOf="@+id/MemoLayout"
app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="16dp"
app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="16dp"/>
</android.support.constraint.ConstraintLayout>
</ScrollView>
</android.support.constraint.ConstraintLayout>

4
app/src/main/res/layout/content_tx_details.xml
View File

@ -113,7 +113,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:text="HUSH 2.1234"
android:text="2.1234 HUSH"
android:textAlignment="textEnd"
android:textAllCaps="false"
android:textSize="24sp"
@ -122,7 +122,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView6" />
<TextView
android:text="$ 45.23"
android:text="45.23 $"
android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/txtAmtUSD"
android:layout_marginTop="8dp"

Write Preview
Loading…
Cancel
Save