codinguser#876 - Code quality

JeanGarf · Mar 7, 2020 · 8e04ba5 · 8e04ba5
1 parent bf49482
commit 8e04ba5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/app/src/main/java/org/gnucash/android/model/AccountType.java b/app/src/main/java/org/gnucash/android/model/AccountType.java
@@ -60,17 +60,16 @@ public enum AccountType {
     }
 
     // TODO TW C 2020-03-06 : Enlever le static
-
     /**
-     * Compute red/green color according to accountType and isCredit
+     * Compute red/green color according to accountType and isCreditAmount
      *
-     * @param isCredit
+     * @param isCreditAmount
      * @param accountType
      *
      * @return
      */
     @ColorInt
-    public static int getAmountColor(final boolean isCredit,
+    public static int getAmountColor(final boolean isCreditAmount,
                                      final AccountType accountType) {
 
         AccountType tmpAccountType = ((accountType != null)
@@ -79,18 +78,17 @@ public static int getAmountColor(final boolean isCredit,
 
         @ColorRes final int colorRes;
 
-        // TODO TW C 2020-03-06 : Trouver un meilleur nom
-        final boolean specialAccountType = tmpAccountType.isEquityAccount() || tmpAccountType.isResultAccount();
+        // Accounts for which
+        final boolean debitCreditInvertedColorAccountType = tmpAccountType.isExpenseOrIncomeAccount() || tmpAccountType.isEquityAccount();
 
-        if ((!specialAccountType && isCredit) || (specialAccountType && !isCredit)) {
-            // TODO TW C 2020-03-02 : commenter
-            // CREDIT
+        if ((isCreditAmount && !debitCreditInvertedColorAccountType) || (!isCreditAmount && debitCreditInvertedColorAccountType)) {
+            // Credit amount and account like Assets, Bank, Cash..., or Debit amount and account like Expense/Income
 
             // RED
             colorRes = R.color.debit_red;
 
         } else {
-            // DEBIT
+            // Credit amount and account like Expense/Income, or Debit amount and account like Assets, Bank, Cash...)
 
             // GREEN
             colorRes = R.color.credit_green;
@@ -125,8 +123,7 @@ public boolean isEquityAccount() {
         return EQUITY.equals(this);
     }
 
-    // TODO TW C 2020-03-03 : A renommer en anglais
-    public boolean isResultAccount() {
+    public boolean isExpenseOrIncomeAccount() {
 
         return EXPENSE.equals(this) || INCOME.equals(this);
     }

diff --git a/app/src/main/java/org/gnucash/android/ui/transaction/SplitEditorFragment.java b/app/src/main/java/org/gnucash/android/ui/transaction/SplitEditorFragment.java
@@ -454,7 +454,6 @@ private void initViews(final Split split) {
             splitTypeSwitch.setViewsToColorize(splitAmountEditText,
                                                splitCurrencyTextView);
 
-            // TODO TW C 2020-03-03 : A enlever ou mettre dans un else ?
             // Switch on/off according to amount signum
             splitTypeSwitch.setChecked(mBaseAmount.signum() > 0);