fix : closed filter functionality

app/src/main/java/org/mifos/mobilebanking/models/accounts/loan/Status.java

@@ -183,6 +183,13 @@ public Status withOverpaid(Boolean overpaid) {
         return this;
     }
 
+    public boolean isLoanTypeWithdrawn() {
+
+        return !(this.active || this.closed || this.pendingApproval || this.waitingForDisbursal
+                || this.closedObligationsMet || this.closedWrittenOff || this.closedRescheduled
+                || this.overpaid);
+    }
+
     @Override
     public String toString() {
         return "Status{" +

app/src/main/java/org/mifos/mobilebanking/models/accounts/loan/Timeline.java

@@ -60,6 +60,9 @@ public class Timeline implements Parcelable {
     @SerializedName("expectedMaturityDate")
     List<Integer> expectedMaturityDate;
 
+    @SerializedName("withdrawnOnDate")
+    List<Integer> withdrawnOnDate;
+
     public List<Integer> getSubmittedOnDate() {
         return submittedOnDate;
     }
@@ -180,6 +183,13 @@ public void setExpectedMaturityDate(List<Integer> expectedMaturityDate) {
         this.expectedMaturityDate = expectedMaturityDate;
     }
 
+    public List<Integer> getWithdrawnOnDate() {
+        return withdrawnOnDate;
+    }
+
+    public void setWithdrawnOnDate(List<Integer> withdrawnOnDate) {
+        this.withdrawnOnDate = withdrawnOnDate;
+    }
 
     @Override
     public int describeContents() {

app/src/main/java/org/mifos/mobilebanking/presenters/AccountsPresenter.java

@@ -281,6 +281,9 @@ public boolean test(LoanAccount account) {
                         } else if (status.getStatus().compareTo(context.getString(R.string.
                                 closed)) == 0 && account.getStatus().getClosed()) {
                             return true;
+                        } else if (status.getStatus().compareTo(context.getString(R.string.
+                                withdrawn)) == 0 && account.getStatus().isLoanTypeWithdrawn()) {
+                            return true;
                         }
                         return false;
                     }

app/src/main/java/org/mifos/mobilebanking/ui/adapters/LoanAccountsListAdapter.java

@@ -102,10 +102,17 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                         string_and_string, context.getString(R.string.disbursement), DateHelper
                         .getDateAsString(loanAccount.getTimeline().getActualDisbursementDate())));
 
-            } else {
+            } else if (loanAccount.getStatus().getClosed()) {
+
                 setLoanAccountsGeneralDetails(holder, R.color.black, context.getString(R.string.
                         string_and_string, context.getString(R.string.closed), DateHelper
                         .getDateAsString(loanAccount.getTimeline().getClosedOnDate())));
+
+            } else {
+                setLoanAccountsGeneralDetails(holder, R.color.gray_dark, context.getString(R.string.
+                            string_and_string, context.getString(R.string.withdrawn), DateHelper
+                        .getDateAsString(loanAccount.getTimeline().getWithdrawnOnDate())));
+
             }
         }
 

app/src/main/java/org/mifos/mobilebanking/utils/StatusUtils.java

@@ -44,6 +44,8 @@ public static List<CheckboxStatus> getLoanAccountStatusList(Context context) {
                 getColor(context, R.color.purple)));
         arrayList.add(new CheckboxStatus(context.getString(R.string.closed), ContextCompat.
                 getColor(context, R.color.black)));
+        arrayList.add(new CheckboxStatus(context.getString(R.string.withdrawn), ContextCompat.
+                getColor(context, R.color.gray_dark)));
 
         return arrayList;
     }

app/src/main/res/values/strings.xml

@@ -99,6 +99,7 @@
     <string name="savings_charges">Savings Charges</string>
     <string name="active">Active</string>
     <string name="closed">Closed</string>
+    <string name="withdrawn">Withdrawn</string>
     <string name="need_approval">Need Approval</string>
     <string name="pending">Pending</string>
     <string name="matured">Matured</string>