From e4562f07a492ff74e1dc0925f6ee62c931ff3680 Mon Sep 17 00:00:00 2001
From: m2049r <30435443+m2049r@users.noreply.github.com>
Date: Tue, 29 Aug 2017 08:43:56 +0200
Subject: [PATCH] balance colour + tx ordering

---
 .../layout/TransactionInfoAdapter.java        | 27 +++++++++----------
 app/src/main/res/layout/wallet_fragment.xml   |  4 +--
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java b/app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java
index 5643625..83db9c6 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java
@@ -91,16 +91,15 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
             Collections.sort(data, new Comparator<TransactionInfo>() {
                 @Override
                 public int compare(TransactionInfo o1, TransactionInfo o2) {
-                    if ((o1.isPending) && (o2.isPending)) {
-                        long b1 = o1.timestamp;
-                        long b2 = o2.timestamp;
-                        return (b1 > b2) ? -1 : (b1 < b2) ? 1 : 0;
+                    long b1 = o1.timestamp;
+                    long b2 = o2.timestamp;
+                    if (b1>b2) {
+                        return -1;
+                    } else if (b1<b2) {
+                        return 1;
+                    } else {
+                        return o1.hash.compareTo(o2.hash);
                     }
-                    if (o1.isPending) return -1;
-                    if (o2.isPending) return 1;
-                    long b1 = o1.blockheight;
-                    long b2 = o2.blockheight;
-                    return (b1 > b2) ? -1 : (b1 < b2) ? 1 : 0;
                 }
             });
             this.infoItems.addAll(data);
@@ -150,15 +149,15 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
 
             this.tvAmount.setText(amountParts[0]);
             this.tvAmountDecimal.setText(amountParts[1]);
-            if (infoItem.isPending) {
+            if (infoItem.isFailed) {
+                this.tvAmount.setText('(' + amountParts[0]);
+                this.tvAmountDecimal.setText(amountParts[1] + ')');
+                setTxColour(TX_FAILED);
+            } else if (infoItem.isPending) {
                 setTxColour(TX_PENDING);
                 if (infoItem.direction == TransactionInfo.Direction.Direction_Out) {
                     this.tvAmount.setText('-' + amountParts[0]);
                 }
-            } else if (infoItem.isFailed) {
-                this.tvAmount.setText('(' + amountParts[0]);
-                this.tvAmountDecimal.setText(amountParts[1] + ')');
-                setTxColour(TX_FAILED);
             } else if (infoItem.direction == TransactionInfo.Direction.Direction_In) {
                 setTxColour(TX_GREEN);
             } else {
diff --git a/app/src/main/res/layout/wallet_fragment.xml b/app/src/main/res/layout/wallet_fragment.xml
index 8d4d4a5..c867c0b 100644
--- a/app/src/main/res/layout/wallet_fragment.xml
+++ b/app/src/main/res/layout/wallet_fragment.xml
@@ -69,7 +69,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="00000000.000000000000"
-                android:textColor="@color/moneroOrange"
+                android:textColor="@color/tx_green"
                 android:textSize="24sp" />
 
             <TextView
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4sp"
                 android:text="@string/label_xmr"
-                android:textColor="@color/moneroOrange"
+                android:textColor="@color/tx_green"
                 android:textSize="24sp" />
         </LinearLayout>