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

Merge pull request #18 from DenioD/master 

Change input currency to HUSH, switch format to "Amount HUSH", fix some layout issues
chat
Duke Leto 5 years ago
committed by GitHub
parent
08fe348136 79528a4d63
commit
dae1f759c9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 137 additions and 148 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. 65
      app/src/main/java/org/myhush/silentdragon/SendActivity.kt
  3. 3
      app/src/main/java/org/myhush/silentdragon/TransactionItemFragment.kt
  4. 4
      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. 148
      app/src/main/res/layout/content_send.xml
  8. 2
      app/src/main/res/layout/content_tx_details.xml
  9. 2
      app/src/main/res/layout/fragment_transaction_item.xml
  10. 2
      build.gradle

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

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

@ -43,7 +43,7 @@ class SendActivity : AppCompatActivity() {
sendAddress.setText(intent.getStringExtra("address"), TextView.BufferType.EDITABLE)
if (intent.getDoubleExtra("amount", -1.0) > 0)
setAmountUSD(intent.getDoubleExtra("amount", 0.0))
setAmountHUSH(intent.getDoubleExtra("amount", 0.0))
if (intent.getBooleanExtra("includeReplyTo", false))
chkIncludeReplyTo.isChecked = true
@ -87,26 +87,27 @@ class SendActivity : AppCompatActivity() {
}
})
amountUSD.addTextChangedListener(object : TextWatcher {
amountHUSH.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun afterTextChanged(s: Editable?) {}
@SuppressLint("SetTextI18n")
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
val usd = s.toString().toDoubleOrNull()
val hush = s.toString().toDoubleOrNull()
val zprice = DataModel.mainResponseData?.zecprice
if (usd == null) {
if (hush == null) {
txtSendCurrencySymbol.text = "" // Let the placeholder show the "$" sign
} else {
txtSendCurrencySymbol.text = "$"
}
txtSendCurrencySymbol.text = "HUSH"
if (usd == null || zprice == null)
amountHUSH.text = "${DataModel.mainResponseData?.tokenName} 0.0"
if (hush == null || zprice == null)
amountUSD.text = "$ 0.0"
else
amountHUSH.text =
"${DataModel.mainResponseData?.tokenName} " + DecimalFormat("#.########").format(usd / zprice)
amountUSD.text =
" $" + DecimalFormat("#.########").format(hush * zprice)
}
}
})
@ -146,10 +147,9 @@ class SendActivity : AppCompatActivity() {
// Then if the amount is valid
val amt = amountHUSH.text.toString()
val parsedAmt = amt.substring("${DataModel.mainResponseData?.tokenName} ".length, amt.length)
// amount=0 xtns are valid
if (parsedAmt.toDoubleOrNull() == null || parsedAmt.toDouble() < 0.0 ) {
if (amt.toDoubleOrNull() == null || amt.toDouble() < 0.0 ) {
showErrorDialog("Invalid amount!")
return
}
@ -158,12 +158,12 @@ class SendActivity : AppCompatActivity() {
// Check if this is more than the maxzspendable
if (DataModel.mainResponseData?.maxzspendable != null) {
if (parsedAmt.toDouble() > DataModel.mainResponseData?.maxzspendable!! &&
parsedAmt.toDouble() <= DataModel.mainResponseData?.maxspendable ?: Double.MAX_VALUE) {
if (amt.toDouble() > DataModel.mainResponseData?.maxzspendable!! &&
amt.toDouble() <= DataModel.mainResponseData?.maxspendable ?: Double.MAX_VALUE) {
val alertDialog = AlertDialog.Builder(this@SendActivity)
alertDialog.setTitle("Send from t-addr?")
alertDialog.setMessage("${DataModel.mainResponseData?.tokenName} $parsedAmt is more than the balance in " +
alertDialog.setMessage("${DataModel.mainResponseData?.tokenName} $amt is more than the balance in " +
"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 {
@ -177,7 +177,7 @@ class SendActivity : AppCompatActivity() {
}
// Warning if spending more than total
if (parsedAmt.toDouble() > DataModel.mainResponseData?.maxspendable ?: Double.MAX_VALUE) {
if (amt.toDouble() > DataModel.mainResponseData?.maxspendable ?: Double.MAX_VALUE) {
showErrorDialog("Can't spend more than ${DataModel.mainResponseData?.tokenName} " +
"${DataModel.mainResponseData?.maxspendable} in a single Tx")
return
@ -200,12 +200,11 @@ class SendActivity : AppCompatActivity() {
private fun doConfirm() {
val toAddr = sendAddress.text.toString()
val amt = amountHUSH.text.toString()
val parsedAmt = amt.substring("${DataModel.mainResponseData?.tokenName} ".length, amt.length)
val memo = txtSendMemo.text.toString() + getReplyToAddressIfChecked(toAddr)
val intent = Intent(this, TxDetailsActivity::class.java)
val tx = DataModel.TransactionItem(
"confirm", 0, parsedAmt, memo,
"confirm", 0, amt, memo,
toAddr, "", 0
)
intent.putExtra("EXTRA_TXDETAILS", Klaxon().toJsonString(tx))
@ -231,12 +230,12 @@ class SendActivity : AppCompatActivity() {
private fun Double.format(digits: Int): String? = java.lang.String.format("%.${digits}f", this)
private fun setAmountUSD(amt: Double) {
amountUSD.setText(amt.format(2))
setAmount(amt / (DataModel.mainResponseData?.zecprice ?: 0.0))
private fun setAmountHUSH(amt: Double) {
amountHUSH.setText((DecimalFormat("#.########").format(amt) + "${DataModel.mainResponseData?.tokenName}"))
setAmount(amt)
}
private fun setAmountHush(amt: Double?) {
private fun setAmountUSD(amt: Double?) {
if (amt == null) {
return;
}
@ -244,26 +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
amountUSD.setText( (zprice * amt).format(2))
amountHUSH.setText((DecimalFormat("#.########").format(amt) + "${DataModel.mainResponseData?.tokenName}"))
amountHUSH.text =
"${DataModel.mainResponseData?.tokenName} " + DecimalFormat("#.########").format(amt)
amountUSD.text =
"$" + DecimalFormat("#.########").format(amt)
}
private fun setAmount(amt: Double?) {
val zprice = DataModel.mainResponseData?.zecprice
if (amt == null) {
txtSendCurrencySymbol.text = "" // Let the placeholder show the "$" sign
} else {
txtSendCurrencySymbol.text = "$"
}
if (amt == null || zprice == null)
amountHUSH.text = "${DataModel.mainResponseData?.tokenName} 0.0"
amountUSD.text = "0.0 $"
else
amountHUSH.text =
"${DataModel.mainResponseData?.tokenName} " + DecimalFormat("#.########").format(amt)
amountUSD.text =
"$" + DecimalFormat("#.########").format(amt)
}
@ -281,7 +274,7 @@ class SendActivity : AppCompatActivity() {
amt = amt?.replace(",", ".")
if (amt != null) {
setAmountHush(amt.toDoubleOrNull())
setAmountUSD(amt.toDoubleOrNull())
}
val memo = data.data?.getQueryParameter("memo")
@ -292,7 +285,7 @@ class SendActivity : AppCompatActivity() {
sendAddress.setText(data?.dataString ?: "", TextView.BufferType.EDITABLE)
}
amountUSD.requestFocus()
amountHUSH.requestFocus()
val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY)
}

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)

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

@ -59,8 +59,8 @@ 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(
txtAmtHush.text = " $amtStr ${DataModel.mainResponseData?.tokenName}"
txtAmtUSD.text = "$" + DecimalFormat("#,##0.00").format(
(amt) * (DataModel.mainResponseData?.zecprice ?: 0.0))
if (tx?.memo.isNullOrBlank()) {

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"

148
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"
@ -96,33 +96,33 @@
app:layout_constraintTop_toBottomOf="@id/toLayout">
<EditText
android:id="@+id/amountUSD"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/amountHUSH"
android:layout_width="173dp"
android:layout_height="66dp"
android:layout_marginTop="16dp"
android:hint="$ 0.00"
android:hint="0.00 Hush"
android:inputType="numberDecimal"
android:maxLength="14"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textAlignment="center"
android:textColor="#FFFFFF"
android:textSize="36sp"
app:layout_constraintBottom_toTopOf="@+id/amountHUSH"
android:textSize="30sp"
app:layout_constraintBottom_toTopOf="@+id/amountUSD"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/amountHUSH"
android:id="@+id/amountUSD"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="HUSH 0.0"
android:text="$ 0.00"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/amountUSD" />
app:layout_constraintTop_toBottomOf="@+id/amountHUSH" />
<TextView
android:id="@+id/textView8"
@ -139,22 +139,22 @@
android:id="@+id/txtSendCurrencySymbol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="26dp"
android:text="$"
android:textColor="#FFFFFF"
android:textSize="36sp"
app:layout_constraintEnd_toStartOf="@+id/amountUSD"
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"
@ -186,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>

2
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"

2
app/src/main/res/layout/fragment_transaction_item.xml
View File

@ -5,7 +5,7 @@
android:id="@+id/outlineLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#867070"
android:background="#AFAFAF"
tools:context="org.myhush.silentdragon.TransactionItemFragment">
<!-- TODO: Update blank fragment layout -->

2
build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:3.5.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong

Write Preview
Loading…
Cancel
Save