codinguser#876 - Fix merge

JeanGarf · Mar 7, 2020 · 59d6b2d · 59d6b2d
1 parent d698d71
commit 59d6b2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/app/src/main/java/org/gnucash/android/ui/transaction/TransactionDetailActivity.java b/app/src/main/java/org/gnucash/android/ui/transaction/TransactionDetailActivity.java
@@ -63,6 +63,10 @@ public SplitAmountViewHolder(View view,
 
             accountName.setText(accountsDbAdapter.getAccountFullName(accountUID));
 
+            // Set color according to Account
+            AccountUtils.setAccountTextColor(accountName,
+                                             accountUID);
+
             // quantity (positive or negative number)
             Money    quantity    = split.getFormattedQuantity();
 

diff --git a/app/src/main/java/org/gnucash/android/ui/transaction/TransactionsActivity.java b/app/src/main/java/org/gnucash/android/ui/transaction/TransactionsActivity.java
@@ -18,6 +18,7 @@
 package org.gnucash.android.ui.transaction;
 
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.database.Cursor;
 import android.graphics.drawable.ColorDrawable;
@@ -60,6 +61,7 @@
 import org.gnucash.android.ui.common.Refreshable;
 import org.gnucash.android.ui.common.UxArgument;
 import org.gnucash.android.ui.util.AccountBalanceTask;
+import org.gnucash.android.ui.util.widget.TransactionTypeSwitch;
 import org.gnucash.android.ui.util.widget.searchablespinner.SearchableSpinnerView;
 import org.gnucash.android.util.QualifiedAccountNameCursorAdapter;
 import org.joda.time.LocalDate;