From dac1469367b30ceb6942377e4b30fa436de2bdee Mon Sep 17 00:00:00 2001
From: Danish Jamal <danishjamal@gmail.com>
Date: Fri, 4 Dec 2020 20:28:41 +0530
Subject: [PATCH 01/25] onCheckChangedListener added in searchFragment

mifosng-android/local.properties deleted
---
 .../mifos/mifosxdroid/online/search/SearchFragment.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
index f73b04988e6..8def39cfacc 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
@@ -16,6 +16,7 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.Toast;
@@ -106,6 +107,12 @@ public void showUserInterface() {
         rv_search.addOnItemTouchListener(new RecyclerItemClickListener(getActivity(), this));
         rv_search.setHasFixedSize(true);
         rv_search.setAdapter(searchAdapter);
+        cb_exactMatch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                onClickSearch();
+            }
+        });
     }
 
 

From 36206de31969a14f36e45f751df4ca3c6aa65e6f Mon Sep 17 00:00:00 2001
From: danishjamal104 <danishjamal.104@gmail.com>
Date: Mon, 28 Dec 2020 01:41:28 +0530
Subject: [PATCH 02/25] Paginated the report result in ReportDetailFragment

---
 .../runreports/report/ReportFragment.java     | 42 ++++++++++++++++---
 .../views/scrollview/CustomScrollView.java    | 36 ++++++++++++++++
 .../scrollview/ScrollChangeListener.java      |  5 +++
 .../res/layout/fragment_client_report.xml     | 27 ++++++------
 4 files changed, 92 insertions(+), 18 deletions(-)
 create mode 100644 mifosng-android/src/main/java/com/mifos/mifosxdroid/views/scrollview/CustomScrollView.java
 create mode 100644 mifosng-android/src/main/java/com/mifos/mifosxdroid/views/scrollview/ScrollChangeListener.java

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/report/ReportFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/report/ReportFragment.java
index b897444b1da..f85da81e80c 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/report/ReportFragment.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/report/ReportFragment.java
@@ -14,17 +14,17 @@
 import android.widget.TableRow;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.mifos.mifosxdroid.R;
 import com.mifos.mifosxdroid.core.MifosBaseActivity;
 import com.mifos.mifosxdroid.core.MifosBaseFragment;
+import com.mifos.mifosxdroid.views.scrollview.CustomScrollView;
+import com.mifos.mifosxdroid.views.scrollview.ScrollChangeListener;
 import com.mifos.objects.runreports.ColumnHeader;
 import com.mifos.objects.runreports.DataRow;
 import com.mifos.objects.runreports.FullParameterListResponse;
 import com.mifos.utils.Constants;
-
+import java.util.Date;
 import javax.inject.Inject;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
@@ -32,17 +32,24 @@
  * Created by Tarun on 05-08-17.
  */
 
-public class ReportFragment extends MifosBaseFragment implements ReportMvpView {
+public class ReportFragment extends MifosBaseFragment implements ReportMvpView,
+        ScrollChangeListener {
 
     @BindView(R.id.table_report)
     TableLayout tableReport;
 
+    @BindView(R.id.sv_horizontal)
+    CustomScrollView scrollView;
+
     @Inject
     ReportPresenter presenter;
 
     private View rootView;
     private FullParameterListResponse report;
 
+    private int page = 0;
+    private int bottom = 0;
+
     public ReportFragment() {
     }
 
@@ -67,7 +74,7 @@ public View onCreateView(LayoutInflater inflater,
         ButterKnife.bind(this, rootView);
         presenter.attachView(this);
 
-        setHasOptionsMenu(true);
+        long time = new Date().getTime();
         report = getArguments().getParcelable(Constants.REPORT_NAME);
         setUpUi();
 
@@ -77,8 +84,13 @@ public View onCreateView(LayoutInflater inflater,
     private void setUpUi() {
         showProgressbar(true);
         setUpHeading();
+
+        scrollView.setScrollChangeListener(this);
+
+
         if (report.getData().size() > 0) {
             setUpValues();
+
         } else {
             Toast.makeText(getActivity(), getString(R.string.msg_report_empty), Toast.LENGTH_SHORT)
                     .show();
@@ -112,8 +124,10 @@ private void setUpValues() {
 
         // For each dataRow, the item in the index i refers to the column
         // i of the columnHeader list.
+        int ll = page * 100;
+        int ul = Math.min(ll + 100, report.getData().size());
 
-        for (DataRow dataRow : report.getData()) {
+        for (DataRow dataRow : report.getData().subList(ll, ul)) {
             TableRow row = new TableRow(getContext());
             TableRow.LayoutParams rowParams = new TableRow.LayoutParams(
                     ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -165,4 +179,20 @@ public void showProgressbar(boolean b) {
             hideMifosProgressDialog();
         }
     }
+
+    @Override
+    public void onScrollChanged(int x, int y, int oldx, int oldy) {
+        View view = scrollView.getChildAt(scrollView.getChildCount() - 1);
+        int diff = (view.getBottom() - (scrollView.getHeight() + scrollView.getScrollY()));
+        if (diff == 0) {
+            if (bottom >= 2) {
+                bottom = 0;
+                page++;
+                Toast.makeText(getContext(), "Loading more", Toast.LENGTH_SHORT).show();
+                setUpValues();
+            } else {
+                bottom++;
+            }
+        }
+    }
 }
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/scrollview/CustomScrollView.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/scrollview/CustomScrollView.java
new file mode 100644
index 00000000000..ca9684dfa3b
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/scrollview/CustomScrollView.java
@@ -0,0 +1,36 @@
+package com.mifos.mifosxdroid.views.scrollview;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+public class CustomScrollView extends ScrollView {
+
+    private ScrollChangeListener scrollChangeListener;
+
+
+    @Override
+    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+        super.onScrollChanged(l, t, oldl, oldt);
+        if (scrollChangeListener != null) {
+            scrollChangeListener.onScrollChanged(l, t, oldl, oldt);
+        }
+    }
+
+    public void setScrollChangeListener(ScrollChangeListener scrollChangeListener) {
+        this.scrollChangeListener = scrollChangeListener;
+    }
+
+    public CustomScrollView(Context context) {
+        super(context);
+    }
+
+    public CustomScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CustomScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+}
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/scrollview/ScrollChangeListener.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/scrollview/ScrollChangeListener.java
new file mode 100644
index 00000000000..9a72c5a0d1d
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/scrollview/ScrollChangeListener.java
@@ -0,0 +1,5 @@
+package com.mifos.mifosxdroid.views.scrollview;
+
+public interface ScrollChangeListener {
+    void onScrollChanged(int x, int y, int oldx, int oldy);
+}
diff --git a/mifosng-android/src/main/res/layout/fragment_client_report.xml b/mifosng-android/src/main/res/layout/fragment_client_report.xml
index adc582242a9..70bda4df285 100644
--- a/mifosng-android/src/main/res/layout/fragment_client_report.xml
+++ b/mifosng-android/src/main/res/layout/fragment_client_report.xml
@@ -2,19 +2,22 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
-<ScrollView
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:orientation="vertical">
+
+    <com.mifos.mifosxdroid.views.scrollview.CustomScrollView
+        android:id="@+id/sv_horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-    <HorizontalScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-        <TableLayout
+        <HorizontalScrollView
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/table_report"/>
-    </HorizontalScrollView>
+            android:layout_height="wrap_content">
+
+            <TableLayout
+                android:id="@+id/table_report"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </HorizontalScrollView>
 
-</ScrollView>
+    </com.mifos.mifosxdroid.views.scrollview.CustomScrollView>
 </LinearLayout>
\ No newline at end of file

From 4277de96d6b1558e99a3a7de92c28c8abcffde8d Mon Sep 17 00:00:00 2001
From: danishjamal104 <danishjamal.104@gmail.com>
Date: Thu, 31 Dec 2020 11:59:19 +0530
Subject: [PATCH 03/25] Date formatted in readable format in client charges
 list item

---
 .../mifos/mifosxdroid/adapters/ChargeNameListAdapter.java   | 2 +-
 .../src/main/java/com/mifos/objects/client/Charges.java     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/ChargeNameListAdapter.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/ChargeNameListAdapter.java
index 0140c88af91..88e3bb8c7c2 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/ChargeNameListAdapter.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/ChargeNameListAdapter.java
@@ -59,7 +59,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
             ((ViewHolder) holder).tv_charge_amount
                     .setText(pageItems.get(position).getAmount().toString());
             ((ViewHolder) holder).tv_charge_duedate
-                    .setText(pageItems.get(position).getDueDate().toString());
+                    .setText(pageItems.get(position).getFormattedDueDate());
         }
     }
 
diff --git a/mifosng-android/src/main/java/com/mifos/objects/client/Charges.java b/mifosng-android/src/main/java/com/mifos/objects/client/Charges.java
index 4993e621bba..7dedb12d880 100755
--- a/mifosng-android/src/main/java/com/mifos/objects/client/Charges.java
+++ b/mifosng-android/src/main/java/com/mifos/objects/client/Charges.java
@@ -172,6 +172,12 @@ public List<Integer> getDueDate() {
         return dueDate;
     }
 
+    public String getFormattedDueDate() {
+        String pattern = "%s-%s-%s";
+        return String.format(pattern,
+                dueDate.get(0), dueDate.get(1), dueDate.get(2));
+    }
+
     public void setDueDate(List<Integer> dueDate) {
         this.dueDate = dueDate;
     }

From 3bf46e77653c9b693c8d708f56dbf83e797d16b5 Mon Sep 17 00:00:00 2001
From: Nikunj Garg <nikunjgarg2000@gmail.com>
Date: Sat, 30 Jan 2021 14:38:21 +0530
Subject: [PATCH 04/25] Snackbar added to Search Fragment

---
 .../com/mifos/mifosxdroid/online/search/SearchFragment.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
index f73b04988e6..cf06a03b34f 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
@@ -131,8 +131,9 @@ public void showSearchedResources(List<SearchedEntity> searchedEntities) {
 
     @Override
     public void showNoResultFound() {
-        showAlertDialog(getString(R.string.dialog_message),
-                getString(R.string.no_search_result_found));
+        searchedEntities.clear();
+        searchAdapter.notifyDataSetChanged();
+        Toaster.show(et_search, getString(R.string.no_search_result_found));
     }
 
     @Override

From 86fc8cef7413d18d77d31c6278b659ce5286d251 Mon Sep 17 00:00:00 2001
From: danishjamal104 <danishjamal.104@gmail.com>
Date: Sun, 20 Dec 2020 02:29:12 +0530
Subject: [PATCH 05/25] UI redesign of client identifier list item

---
 .../adapters/IdentifierListAdapter.java       |  17 +-
 .../main/res/layout/row_identifier_list.xml   | 203 ++++++++++--------
 2 files changed, 129 insertions(+), 91 deletions(-)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/IdentifierListAdapter.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/IdentifierListAdapter.java
index 386a1c29721..6f69703c664 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/IdentifierListAdapter.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/IdentifierListAdapter.java
@@ -12,6 +12,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.mifos.App;
 import com.mifos.mifosxdroid.R;
 import com.mifos.objects.noncore.Identifier;
 
@@ -49,8 +50,19 @@ public void onBindViewHolder(final IdentifierListAdapter.ViewHolder holder, int
         final Identifier identifier = identifiers.get(position);
 
         holder.tv_identifier_id.setText(String.valueOf(identifier.getDocumentKey()));
-        holder.tv_identifier_description.setText(identifier.getDescription());
+        String description = identifier.getDescription();
+        if (description == null) {
+            description = "-";
+        }
+        holder.tv_identifier_description.setText(description);
         holder.tv_identifier_type.setText(identifier.getDocumentType().getName());
+        int color;
+        if (identifier.getStatus().contains("inactive")) {
+            color = App.getContext().getColor(R.color.red_light);
+        } else {
+            color = App.getContext().getColor(R.color.green_light);
+        }
+        holder.v_status.setBackgroundColor(color);
     }
 
     public void setIdentifiers(List<Identifier> identifiers) {
@@ -86,6 +98,9 @@ public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickL
         @BindView(R.id.iv_identifier_options)
         ImageView iv_identifier_options;
 
+        @BindView(R.id.v_status)
+        View v_status;
+
         public ViewHolder(View view) {
             super(view);
             ButterKnife.bind(this, view);
diff --git a/mifosng-android/src/main/res/layout/row_identifier_list.xml b/mifosng-android/src/main/res/layout/row_identifier_list.xml
index 5571bf3eab1..6ab77209fbb 100755
--- a/mifosng-android/src/main/res/layout/row_identifier_list.xml
+++ b/mifosng-android/src/main/res/layout/row_identifier_list.xml
@@ -7,106 +7,129 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/item_offset">
+    android:paddingLeft="@dimen/default_vertical_padding"
+    android:paddingRight="@dimen/default_vertical_padding"
+    android:paddingTop="@dimen/default_vertical_padding">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/card_view"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="2dp"
-        android:layout_marginLeft="2dp"
-        android:layout_marginRight="2dp"
-        android:layout_marginTop="2dp"
-        app:cardCornerRadius="2dp"
-        app:cardElevation="2dp"
+        app:cardCornerRadius="10dp"
+        app:cardElevation="0dp"
         app:cardPreventCornerOverlap="false"
-        app:contentPadding="0dp">
+        app:contentPadding="0dp"
+        app:cardBackgroundColor="@color/gray_light">
 
-        <TableLayout
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:padding="4dp"
-            android:id="@+id/tableLayout">
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-
-                <TextView
-                    android:id="@+id/textView2"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/id" />
-
-                <TextView
-                    android:id="@+id/tv_identifier_id"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.86"
-                    android:gravity="left"
-                    android:text="" />
-
-                <ImageView
-                    android:id="@+id/iv_identifier_options"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:srcCompat="@drawable/ic_more_vert_black_24dp"/>
-
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/tableRow"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-
-                <TextView
-                    android:id="@+id/textView6"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/type" />
-
-                <TextView
-                    android:id="@+id/tv_identifier_type"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="left"
-                    android:text="" />
-
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/tableRow2"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-
-                <TextView
-                    android:id="@+id/textView4"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/description" />
-
-                <TextView
-                    android:id="@+id/tv_identifier_description"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="left"
-                    android:text="" />
-
-            </TableRow>
-
-        </TableLayout>
-
+            android:layout_height="104dp">
+
+
+            <ImageView
+                android:id="@+id/iv_identifier_options"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/ic_more_vert_black_24dp"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:padding="8dp"/>
+
+            <View
+                android:id="@+id/v_status"
+                android:layout_width="@dimen/layout_padding_16dp"
+                android:layout_height="match_parent"
+                android:background="@color/green_light"/>
+
+            <TextView
+                android:id="@+id/textView2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/id"
+                android:paddingStart="8dp"
+                android:paddingLeft="8dp"
+                android:paddingTop="8dp"
+                android:layout_toEndOf="@id/v_status"
+                android:layout_toRightOf="@id/v_status"
+                tools:ignore="RtlSymmetry"
+                android:maxLines="1"/>
+
+            <TextView
+                android:id="@+id/textView6"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/type"
+                android:paddingStart="8dp"
+                android:paddingLeft="8dp"
+                android:paddingTop="8dp"
+                android:layout_toEndOf="@id/v_status"
+                android:layout_toRightOf="@id/v_status"
+                android:layout_below="@id/textView2"
+                tools:ignore="RtlSymmetry"
+                android:maxLines="1"/>
+
+            <TextView
+                android:id="@+id/textView4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/description"
+                android:paddingStart="8dp"
+                android:paddingLeft="8dp"
+                android:paddingTop="8dp"
+                android:layout_toEndOf="@id/v_status"
+                android:layout_toRightOf="@id/v_status"
+                android:layout_below="@id/textView6"
+                tools:ignore="RtlSymmetry"
+                android:maxLines="1"/>
+
+            <TextView
+                android:id="@+id/tv_identifier_id"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="@string/id"
+                android:paddingStart="@dimen/dimension_32_dp"
+                android:paddingLeft="8dp"
+                android:paddingTop="8dp"
+                android:layout_toEndOf="@id/textView4"
+                android:layout_toRightOf="@id/textView4"
+                android:layout_toLeftOf="@id/iv_identifier_options"
+                android:layout_toStartOf="@id/iv_identifier_options"
+                tools:ignore="RtlSymmetry"
+                android:maxLines="1"/>
+
+            <TextView
+                android:id="@+id/tv_identifier_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="@string/type"
+                android:paddingStart="@dimen/dimension_32_dp"
+                android:paddingLeft="8dp"
+                android:paddingTop="8dp"
+                android:layout_toEndOf="@id/textView4"
+                android:layout_toRightOf="@id/textView4"
+                android:layout_below="@id/textView2"
+                tools:ignore="RtlSymmetry"
+                android:maxLines="1"/>
+
+            <TextView
+                android:id="@+id/tv_identifier_description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="@string/description"
+                android:paddingStart="@dimen/dimension_32_dp"
+                android:paddingLeft="8dp"
+                android:paddingTop="8dp"
+                android:layout_toEndOf="@id/textView4"
+                android:layout_toRightOf="@id/textView4"
+                android:layout_below="@id/textView6"
+                tools:ignore="RtlSymmetry"
+                android:maxLines="1"/>
+
+        </RelativeLayout>
     </androidx.cardview.widget.CardView>
 
 </FrameLayout>
\ No newline at end of file

From bcfdc5ad6cbeb2bd30a1f8d1278dbb86ff0f05c7 Mon Sep 17 00:00:00 2001
From: Danish Jamal <danishjamal.104@gmail.com>
Date: Thu, 19 Nov 2020 17:02:13 +0530
Subject: [PATCH 06/25] ui changes in client_details fragment.

---
 .../main/res/drawable/table_row_round_bg.xml  |  7 ++
 .../res/layout/fragment_client_details.xml    | 80 ++++++++++++-------
 .../layout/view_account_accordion_section.xml | 13 ++-
 .../src/main/res/values-ca/strings.xml        |  3 +
 .../src/main/res/values-en/strings.xml        |  1 +
 .../src/main/res/values-es/strings.xml        |  3 +
 .../src/main/res/values-fr/strings.xml        |  2 +
 .../src/main/res/values-hi/strings.xml        |  1 +
 .../src/main/res/values-kn/strings.xml        |  3 +
 .../src/main/res/values-sw/strings.xml        |  1 +
 .../src/main/res/values-zh/strings.xml        |  1 +
 .../src/main/res/values/strings.xml           | 20 ++---
 .../src/main/res/values/styles_linear.xml     |  1 +
 .../src/main/res/values/styles_table.xml      |  4 +-
 .../src/main/res/values/styles_text.xml       | 10 ++-
 15 files changed, 104 insertions(+), 46 deletions(-)
 create mode 100644 mifosng-android/src/main/res/drawable/table_row_round_bg.xml
 mode change 100755 => 100644 mifosng-android/src/main/res/layout/fragment_client_details.xml

diff --git a/mifosng-android/src/main/res/drawable/table_row_round_bg.xml b/mifosng-android/src/main/res/drawable/table_row_round_bg.xml
new file mode 100644
index 00000000000..c3923a0b734
--- /dev/null
+++ b/mifosng-android/src/main/res/drawable/table_row_round_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape= "rectangle">
+    <stroke android:width="1dp" android:color="@color/primary_dark"/>
+    <corners android:radius="2dp"/>
+</shape>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/layout/fragment_client_details.xml b/mifosng-android/src/main/res/layout/fragment_client_details.xml
old mode 100755
new mode 100644
index 036973b0fa7..7877d2b74f9
--- a/mifosng-android/src/main/res/layout/fragment_client_details.xml
+++ b/mifosng-android/src/main/res/layout/fragment_client_details.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_marginStart="@dimen/default_padding"
     android:layout_marginEnd="@dimen/default_padding"
     android:id="@+id/rl_client">
@@ -20,10 +20,12 @@
                     android:layout_marginTop="@dimen/marginItemsInSectionSmall"
                     android:layout_gravity="center">
 
+
                     <com.mifos.mifosxdroid.views.CircularImageView
                         android:id="@+id/iv_clientImage"
                         style="@style/ClientImage"
-                        android:layout_gravity="center"/>
+                        android:layout_gravity="center"
+                        tools:src="@drawable/ic_launcher"/>
 
                     <ProgressBar
                         android:id="@+id/pb_imageProgressBar"
@@ -31,16 +33,12 @@
                         android:layout_gravity="center"/>
 
                 </FrameLayout>
-
-                <TextView
-                    android:id="@+id/tv_fullName"
-                    style="@style/TextView.Client"
-                    android:layout_marginBottom="@dimen/marginItemsInSectionSmall"
-                    android:layout_marginTop="@dimen/marginItemsInSectionSmall"
-                    android:layout_gravity="center"/>
-
             </LinearLayout>
 
+            <TextView
+                android:id="@+id/tv_fullName"
+                style="@style/TextView.Client"
+                tools:text="Client Name" />
 
             <TableLayout
                 android:id="@+id/tbl_clientDetails"
@@ -56,7 +54,8 @@
 
                     <TextView
                         android:id="@+id/tv_accountNumber"
-                        style="@style/TextView.Row.Value"/>
+                        style="@style/TextView.Row.Value"
+                        tools:text="000000325"/>
                 </TableRow>
 
                 <TableRow
@@ -69,7 +68,8 @@
 
                     <TextView
                         android:id="@+id/tv_externalId"
-                        style="@style/TextView.Row.Value"/>
+                        style="@style/TextView.Row.Value"
+                        tools:text="ID-123"/>
                 </TableRow>
 
                 <TableRow
@@ -82,7 +82,8 @@
 
                     <TextView
                         android:id="@+id/tv_activationDate"
-                        style="@style/TextView.Row.Value"/>
+                        style="@style/TextView.Row.Value"
+                        tools:text="Nov 16, 2016"/>
                 </TableRow>
 
                 <TableRow
@@ -95,7 +96,8 @@
 
                     <TextView
                         android:id="@+id/tv_office"
-                        style="@style/TextView.Row.Value"/>
+                        style="@style/TextView.Row.Value"
+                        tools:text="GROUP AD"/>
                 </TableRow>
 
                 <TableRow
@@ -108,7 +110,8 @@
 
                     <TextView
                         android:id="@+id/tv_mobile_no"
-                        style="@style/TextView.Row.Value"/>
+                        style="@style/TextView.Row.Value"
+                        tools:text="1234567890"/>
                 </TableRow>
 
                 <TableRow
@@ -121,7 +124,8 @@
 
                     <TextView
                         android:id="@+id/tv_group"
-                        style="@style/TextView.Row.Value"/>
+                        style="@style/TextView.Row.Value"
+                        tools:text="foodies"/>
                 </TableRow>
 
                 <TableRow
@@ -158,24 +162,44 @@
 
             </TableLayout>
 
+            <LinearLayout style="@style/LinearLayout.Width"
+                android:layout_marginTop="22dp"
+                android:layout_marginBottom="12dp">
+                <TextView
+                    android:id="@+id/tv_accountHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/accounts"
+                    android:textStyle="bold"
+                    />
+                <View
+                    android:id="@+id/line2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="2dp"
+                    android:background="@color/primary"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="6dp"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginTop="2dp"/>
+            </LinearLayout>
+
             <include
                 android:id="@+id/account_accordion_section_loans"
                 layout="@layout/view_account_accordion_section"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"/>
+                android:layout_height="wrap_content" />
 
             <include
                 android:id="@+id/account_accordion_section_savings"
                 layout="@layout/view_account_accordion_section"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
             <include
                 android:id="@+id/account_accordion_section_recurring"
                 layout="@layout/view_account_accordion_section"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
         </LinearLayout>
     </ScrollView>
@@ -188,12 +212,12 @@
         android:visibility="gone"
         android:orientation="horizontal">
 
-       <Button
-           android:id="@+id/btn_activate_client"
-           android:layout_width="match_parent"
-           android:layout_height="50dp"
-           android:text="@string/activate_client"
-           android:background="@color/accent" />
+        <Button
+            android:id="@+id/btn_activate_client"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:text="@string/activate_client"
+            android:background="@color/accent" />
     </LinearLayout>
 
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/layout/view_account_accordion_section.xml b/mifosng-android/src/main/res/layout/view_account_accordion_section.xml
index 4b5ba37eabe..745d6ce008a 100755
--- a/mifosng-android/src/main/res/layout/view_account_accordion_section.xml
+++ b/mifosng-android/src/main/res/layout/view_account_accordion_section.xml
@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="10dp">
+    android:layout_marginTop="10dp"
+    android:paddingBottom="12dp">
 
     <com.joanzapata.iconify.widget.IconTextView
         android:id="@+id/tv_toggle_accounts_icon"
@@ -13,7 +14,8 @@
         android:layout_margin="4dp"
         android:text="{md-add-circle-outline}"
         android:textColor="@color/secondary_text"
-        android:textSize="20sp" />
+        android:textSize="20sp"
+        android:layout_alignParentStart="true" />
 
 
     <TextView
@@ -21,7 +23,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/tv_toggle_accounts_icon"
-        android:text="@string/savingAccounts" />
+        android:text="@string/savingAccounts"
+        android:layout_toEndOf="@id/tv_toggle_accounts_icon"
+        android:layout_marginLeft="12dp"
+        android:layout_marginStart="12dp" />
 
     <TextView
         android:id="@+id/tv_count_accounts"
@@ -37,7 +42,7 @@
         android:layout_width="wrap_content"
         android:layout_height="1dp"
         android:layout_below="@id/tv_toggle_accounts"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="8dp"
         android:background="@color/primary" />
 
     <ListView
diff --git a/mifosng-android/src/main/res/values-ca/strings.xml b/mifosng-android/src/main/res/values-ca/strings.xml
index f49cadc80bf..d9c15acc25d 100755
--- a/mifosng-android/src/main/res/values-ca/strings.xml
+++ b/mifosng-android/src/main/res/values-ca/strings.xml
@@ -163,4 +163,7 @@
     <string name="lang_changed">S\'ha canviat l\'idioma</string>
     <string name="lang_change_description">Seleccioneu l\'idioma en què voleu veure l\'aplicació</string>
     <string name="dark_mode">mode fosc</string>
+
+    <string name="accounts">Comptes</string>
+
 </resources>
diff --git a/mifosng-android/src/main/res/values-en/strings.xml b/mifosng-android/src/main/res/values-en/strings.xml
index a23cd20127d..b3e6177f53b 100755
--- a/mifosng-android/src/main/res/values-en/strings.xml
+++ b/mifosng-android/src/main/res/values-en/strings.xml
@@ -187,6 +187,7 @@
     <string name="product_name">Product Name</string>
     <string name="valid">Valid</string>
     <string name="surveyEmpty">This Survey is Empty</string>
+    <string name="accounts">Accounts</string>
 
 
 </resources>
diff --git a/mifosng-android/src/main/res/values-es/strings.xml b/mifosng-android/src/main/res/values-es/strings.xml
index 63c6e7e4ef7..1a50d0cf69a 100755
--- a/mifosng-android/src/main/res/values-es/strings.xml
+++ b/mifosng-android/src/main/res/values-es/strings.xml
@@ -163,4 +163,7 @@
     <string name="lang_changed">Idioma cambiado</string>
     <string name="lang_change_description">Seleccione el idioma en el que desea ver la aplicación</string>
     <string name="dark_mode">modo oscuro</string>
+
+    <string name="accounts">cuenta</string>
+
 </resources>
diff --git a/mifosng-android/src/main/res/values-fr/strings.xml b/mifosng-android/src/main/res/values-fr/strings.xml
index 4a6ece74ec9..14ff27c3882 100644
--- a/mifosng-android/src/main/res/values-fr/strings.xml
+++ b/mifosng-android/src/main/res/values-fr/strings.xml
@@ -610,4 +610,6 @@
     <string name="lang_change_description">Sélectionnez la langue dans laquelle vous souhaitez afficher l\'application</string>
     <string name="dark_mode">mode sombre</string>
 
+    <string name="accounts">Compte</string>
+
 </resources>
diff --git a/mifosng-android/src/main/res/values-hi/strings.xml b/mifosng-android/src/main/res/values-hi/strings.xml
index 7f762017ef2..bf3f4ebc12e 100644
--- a/mifosng-android/src/main/res/values-hi/strings.xml
+++ b/mifosng-android/src/main/res/values-hi/strings.xml
@@ -614,6 +614,7 @@
     <string name="collectionsheet_submit_success">कलेक्शन शीट सफलतापूर्वक जमा कर दी गई</string>
     <string name="individual_collection_sheet">व्यक्तिगत कलेक्शन शीट</string>
     <string name="due_collection">कलेक्शन का देय</string>
+    <string name="accounts">खाता</string>
 
     !-- About App -->
     <string name="about_app">फील्ड ऑफिसर एप्लीकेशन एक एप्लीकेशन है बैंक स्टाफ फील्ड ऑफिसर के लिए विकसित किया गया
diff --git a/mifosng-android/src/main/res/values-kn/strings.xml b/mifosng-android/src/main/res/values-kn/strings.xml
index 6e5e641467b..90c5dc1613d 100644
--- a/mifosng-android/src/main/res/values-kn/strings.xml
+++ b/mifosng-android/src/main/res/values-kn/strings.xml
@@ -593,4 +593,7 @@
     <string name="lang_changed">ಭಾಷೆ ಬದಲಾಗಿದೆ</string>
     <string name="lang_change_description">ನೀವು ಅಪ್ಲಿಕೇಶನ್ ವೀಕ್ಷಿಸಲು ಬಯಸುವ ಭಾಷೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
     <string name="dark_mode">ಡಾರ್ಕ್ ಮೋಡ್</string>
+
+    <string name="accounts">ಖಾತೆ</string>
+
 </resources>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values-sw/strings.xml b/mifosng-android/src/main/res/values-sw/strings.xml
index 23d46c0de8b..b34a47b0525 100644
--- a/mifosng-android/src/main/res/values-sw/strings.xml
+++ b/mifosng-android/src/main/res/values-sw/strings.xml
@@ -722,6 +722,7 @@
     <string name="failed_to_load_db_clients">Upakio wa wateja wa hifadhidata umefeli</string>
     <string name="failed_to_load_db_groups">Upakio wa makundi ya hifadhidata umefeli</string>
     <string name="browse">Vinjari</string>
+    <string name="accounts">akaunti</string>
 
     <!-- Language -->
     <string name="language">Lugha</string>
diff --git a/mifosng-android/src/main/res/values-zh/strings.xml b/mifosng-android/src/main/res/values-zh/strings.xml
index 19ac96debe0..57f7dd06a02 100755
--- a/mifosng-android/src/main/res/values-zh/strings.xml
+++ b/mifosng-android/src/main/res/values-zh/strings.xml
@@ -711,6 +711,7 @@
     <string name="incorrect_passcode">密码错误</string>
     <string name="incorrect_passcode_more_than_three">您已经输错三次密码了，请再次尝试</string>
     <string name="error_passcode">密码应该是4位数</string>
+    <string name="accounts">帳戶</string>
 
     <!-- Language -->
     <string name="language">语</string>
diff --git a/mifosng-android/src/main/res/values/strings.xml b/mifosng-android/src/main/res/values/strings.xml
index 81542ac9500..3028ef6f5f0 100755
--- a/mifosng-android/src/main/res/values/strings.xml
+++ b/mifosng-android/src/main/res/values/strings.xml
@@ -834,6 +834,7 @@
     <string name="something_went_wrong">Something went wrong</string>
     <string name="entry">ENTRY</string>
     <string name="network_issue">Network Issue</string>
+    <string name="accounts">Accounts</string>
     <string name="dark_mode">Dark Mode</string>
     <string name="ui">UI</string>
     <string name="dark_mode_def_value">MODE_NIGHT_FOLLOW_SYSTEM</string>
@@ -844,13 +845,6 @@
         <item>System Default</item>
     </string-array>
 
-    <string-array name="dark_mode_values"  translatable="false">
-        <item>light</item>
-        <item>dark</item>
-        <item>default</item>
-    </string-array>
-
-
     <!-- About App -->
     <string name="about_app">Field Officer Application is an application
         developed for the Bank staff field officer to keep track of Clients,
@@ -868,13 +862,18 @@
     <string name="about_license">License</string>
     <string name="about_license_sub">Check Mozilla Public License 2.0</string>
 
+    <string-array name="dark_mode_values"  translatable="false">
+        <item>light</item>
+        <item>dark</item>
+        <item>default</item>
+    </string-array>
+
     <!-- Language -->
     <string name="language">Language</string>
     <string name="language_type" translatable="false">language_type</string>
     <string name="lang_changed">Language Changed</string>
     <string name="lang_change_description">Select the language in which you want to view the app</string>
     <string name="mode_key">dark_mode</string>
-
     <string-array name="language_option" translatable="false">
         <item>Catalan</item>
         <item>English</item>
@@ -885,7 +884,6 @@
         <item>Chinese</item>
         <item>Kannada</item>
     </string-array>
-
     <string-array name="languages_value" translatable="false">
         <item>ca</item>
         <item>en</item>
@@ -896,10 +894,8 @@
         <item>zh</item>
         <item>kn</item>
     </string-array>
-
-
     <string name="passcode">Passcode</string>
     <string name="change_passcode">Change Passcode</string>
     <string name="change_app_passcode">Change App Passcode</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values/styles_linear.xml b/mifosng-android/src/main/res/values/styles_linear.xml
index c9522eb928d..432c97c747f 100755
--- a/mifosng-android/src/main/res/values/styles_linear.xml
+++ b/mifosng-android/src/main/res/values/styles_linear.xml
@@ -23,6 +23,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:orientation">horizontal</item>
+        <item name="android:gravity">center_horizontal</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values/styles_table.xml b/mifosng-android/src/main/res/values/styles_table.xml
index 0acc6f0fcde..7c0614a96b6 100755
--- a/mifosng-android/src/main/res/values/styles_table.xml
+++ b/mifosng-android/src/main/res/values/styles_table.xml
@@ -9,13 +9,15 @@
     <style name="Table">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="background">@drawable/table_row_round_bg</item>
     </style>
 
 
     <style name="TableRow">
-        <item name="android:layout_margin">3dp</item>
+        <item name="android:layout_marginTop">8dp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@drawable/table_row_round_bg</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values/styles_text.xml b/mifosng-android/src/main/res/values/styles_text.xml
index 9f16b751220..6d17f46c467 100755
--- a/mifosng-android/src/main/res/values/styles_text.xml
+++ b/mifosng-android/src/main/res/values/styles_text.xml
@@ -30,18 +30,26 @@
     <style name="TextView.Row" parent="TextView.Base">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_weight">0.5</item>
+        <item name="android:layout_marginLeft">6dp</item>
+        <item name="android:layout_marginTop">6dp</item>
+        <item name="android:layout_marginBottom">6dp</item>
         <item name="android:textColor">@color/secondary_text</item>
     </style>
 
     <style name="TextView.Row.Value" parent="TextView.Row">
         <item name="android:gravity">right</item>
+        <item name="android:layout_marginRight">6dp</item>
+        <item name="android:layout_marginTop">6dp</item>
+        <item name="android:layout_marginBottom">6dp</item>
         <item name="android:textColor">@color/primary_text</item>
     </style>
 
     <style name="TextView.Client" parent="TextView.Base">
-        <item name="android:textColor">@color/secondary_text</item>
+        <item name="android:textColor">@color/primary_text</item>
         <item name="android:textSize">20sp</item>
         <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_marginTop">12dp</item>
+        <item name="android:layout_marginBottom">12dp</item>
     </style>
 
     <style name="TextView.Search" parent="TextView.Base">

From c8e47da23a7ace1bbf5e6adb7bf4ce14d934c882 Mon Sep 17 00:00:00 2001
From: danishjamal104 <danishjamal.104@gmail.com>
Date: Wed, 23 Dec 2020 01:14:02 +0530
Subject: [PATCH 07/25] layout enhancements in
 item_individiual_collection_sheet.xml

---
 .../component/ActivityComponent.java          |   2 +-
 ...ndividualCollectionSheetDetailsFragment.kt |   3 -
 .../item_individual_collection_sheet.xml      | 182 ++++++++++--------
 3 files changed, 106 insertions(+), 81 deletions(-)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
index 99091f826c3..6c7a3cd3d95 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
@@ -19,6 +19,7 @@
 import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxFragment;
 import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxPendingTasksActivity;
 import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxTasksFragment;
+import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.IndividualCollectionSheetDetailsFragment;
 import com.mifos.mifosxdroid.online.runreports.report.ReportFragment;
 import com.mifos.mifosxdroid.online.runreports.reportcategory.ReportCategoryFragment;
 import com.mifos.mifosxdroid.online.runreports.reportdetail.ReportDetailFragment;
@@ -39,7 +40,6 @@
 import com.mifos.mifosxdroid.online.collectionsheet.CollectionSheetFragment;
 import com.mifos.mifosxdroid.online.collectionsheetindividual.IndividualCollectionSheetFragment;
 import com.mifos.mifosxdroid.online.collectionsheetindividual.NewIndividualCollectionSheetFragment;
-import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.IndividualCollectionSheetDetailsFragment;
 import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.PaymentDetailsFragment;
 import com.mifos.mifosxdroid.online.createnewcenter.CreateNewCenterFragment;
 import com.mifos.mifosxdroid.online.createnewclient.CreateNewClientFragment;
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsFragment.kt
index 2c48d327823..f4e776e5028 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsFragment.kt
@@ -103,10 +103,7 @@ class IndividualCollectionSheetDetailsFragment : MifosBaseFragment(), Individual
             }
         }
         val layoutManager = LinearLayoutManager(context)
-        val dividerItemDecoration = DividerItemDecoration(
-                recyclerSheets!!.context, layoutManager.orientation)
         recyclerSheets!!.layoutManager = layoutManager
-        recyclerSheets!!.addItemDecoration(dividerItemDecoration)
         recyclerSheets!!.adapter = sheetsAdapter
         sheetsAdapter!!.setSheetItemClickListener(this)
         sheetsAdapter!!.setLoans(loansAndClientNames)
diff --git a/mifosng-android/src/main/res/layout/item_individual_collection_sheet.xml b/mifosng-android/src/main/res/layout/item_individual_collection_sheet.xml
index 8a824f1ae5a..39bfbd64bf2 100644
--- a/mifosng-android/src/main/res/layout/item_individual_collection_sheet.xml
+++ b/mifosng-android/src/main/res/layout/item_individual_collection_sheet.xml
@@ -2,92 +2,120 @@
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/cv_client"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
-    android:foreground="?android:attr/selectableItemBackground"
     android:clickable="true"
-    app:cardUseCompatPadding="true" >
-<LinearLayout xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:elevation="8dp">
+    app:cardUseCompatPadding="true"
+    app:cardCornerRadius="10dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginRight="8dp"
+    android:layout_marginTop="8dp"
+    android:layout_marginStart="8dp"
+    android:layout_marginLeft="8dp">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.mifos.mifosxdroid.views.CircularImageView
+            android:id="@+id/iv_user_picture"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center_vertical"
+            android:elevation="2dp"
+            android:src="@drawable/ic_dp_placeholder"
+            app:border="false"
+            android:layout_marginLeft="@dimen/layout_padding_16dp"
+            android:layout_marginStart="@dimen/layout_padding_16dp"
+            android:layout_marginTop="@dimen/layout_padding_16dp"
+            android:layout_marginBottom="@dimen/layout_padding_16dp" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingLeft="18dp"
+            android:paddingStart="18dp"
+            android:paddingTop="@dimen/layout_padding_16dp"
+            android:paddingBottom="@dimen/layout_padding_16dp"
+            tools:ignore="RtlSymmetry">
+
+            <TextView
+                android:id="@+id/tv_client_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:textStyle="bold"
+                tools:text="Joseph Mobuto" />
+
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Total Due:"
+                    android:textSize="14sp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="due"
+                    android:textSize="14sp"
+                    android:id="@+id/tv_total_due"
+                    android:singleLine="true"
+                    android:scrollbars="horizontal"/>
+            </LinearLayout>
 
-    <com.mifos.mifosxdroid.views.CircularImageView
-        android:id="@+id/iv_user_picture"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_gravity="center_vertical"
-        android:elevation="2dp"
-        android:src="@drawable/ic_dp_placeholder"
-        app:border="false"
-        />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
-       <LinearLayout
-           android:layout_width="0dp"
-           android:layout_height="wrap_content"
-           android:layout_weight="1"
-           android:gravity="center_vertical"
-           android:orientation="vertical"
-           android:paddingLeft="16dp">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Total Charges:"
+                    android:textSize="14sp"
+                    android:singleLine="true"/>
 
-           <TextView
-               android:id="@+id/tv_client_name"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:textSize="24sp"
-               tools:text="Joseph Mobuto"/>
-           <TextView
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               tools:text="MDL (#Account No)"
-               android:textColor="@color/gray_dark"
-               android:id="@+id/tv_product_code"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="charge"
+                    android:textSize="14sp"
+                    android:id="@+id/et_charges"
+                    android:singleLine="true"
+                    android:scrollbars="horizontal"/>
+            </LinearLayout>
 
-           <LinearLayout
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:orientation="horizontal">
-               <TextView
-                   android:layout_width="120dp"
-                   android:layout_height="wrap_content"
-                   android:text="Total Due:"/>
-               <TextView
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_marginLeft="10dp"
-                   android:text="due"
-                   android:id="@+id/tv_total_due"/>
-           </LinearLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="MDL (#Account No)"
+                android:textColor="@color/gray_dark"
+                android:id="@+id/tv_product_code"
+                android:textSize="12sp" />
 
-           <LinearLayout
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:orientation="horizontal"
-               android:layout_marginBottom="20dp">
-               <TextView
-                   android:layout_width="120dp"
-                   android:layout_height="wrap_content"
-                   android:text="Total Charges:"/>
-               <TextView
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_marginLeft="10dp"
-                   android:text="charge"
-                   android:id="@+id/et_charges"/>
-           </LinearLayout>
-       </LinearLayout>
+        </LinearLayout>
 
-           <ImageView
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:src="@drawable/baseline_keyboard_arrow_right_black_36"
-               android:layout_alignParentRight="true"
-               android:layout_gravity="center_vertical"
-               android:id="@+id/btn_additional_details"
-               />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/baseline_keyboard_arrow_right_black_36"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/btn_additional_details" />
 
-</LinearLayout>
+    </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file

From 2f2e67d48fdb0c678c10242c731d477b9e77fc5c Mon Sep 17 00:00:00 2001
From: Danish Jamal <danishjamal.104@gmail.com>
Date: Thu, 3 Dec 2020 14:20:20 +0530
Subject: [PATCH 08/25] Toast corrected when no internet connectivity in
 SavingAccountsSummary

---
 .../SavingsAccountSummaryPresenter.kt                    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryPresenter.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryPresenter.kt
index d8390eed196..888f5ac83d1 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryPresenter.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryPresenter.kt
@@ -1,10 +1,12 @@
 package com.mifos.mifosxdroid.online.savingaccountsummary
 
+import com.mifos.App
 import com.mifos.api.datamanager.DataManagerSavings
 import com.mifos.mifosxdroid.R
 import com.mifos.mifosxdroid.base.BasePresenter
 import com.mifos.objects.accounts.savings.SavingsAccountWithAssociations
 import com.mifos.utils.Constants
+import com.mifos.utils.Network
 import rx.Subscriber
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
@@ -39,8 +41,13 @@ class SavingsAccountSummaryPresenter @Inject constructor(private val mDataManage
                     }
 
                     override fun onError(e: Throwable) {
+                        var error = R.string.failed_to_fetch_savingsaccount
                         mvpView!!.showProgressbar(false)
-                        mvpView!!.showFetchingError(R.string.failed_to_fetch_savingsaccount)
+                        if (!Network.isOnline(App.getContext())) {
+                            error = R.string.no_internet_connection
+                        }
+                        mvpView!!.showProgressbar(false)
+                        mvpView!!.showFetchingError(error)
                     }
 
                     override fun onNext(savingsAccountWithAssociations: SavingsAccountWithAssociations?) {

From fc20da004ca5143fee7f969c66e9a1964ad5d1ab Mon Sep 17 00:00:00 2001
From: Danish Jamal <danishjamal.104@gmail.com>
Date: Sun, 22 Nov 2020 02:04:51 +0530
Subject: [PATCH 09/25] infinite refresh issue resolved

---
 .../mifosxdroid/injection/component/ActivityComponent.java      | 2 +-
 .../mifos/mifosxdroid/online/centerlist/CenterListFragment.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
index 99091f826c3..9aeb4aa5cce 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
@@ -16,6 +16,7 @@
 import com.mifos.mifosxdroid.injection.PerActivity;
 import com.mifos.mifosxdroid.injection.module.ActivityModule;
 import com.mifos.mifosxdroid.login.LoginActivity;
+import com.mifos.mifosxdroid.online.centerlist.CenterListFragment;
 import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxFragment;
 import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxPendingTasksActivity;
 import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxTasksFragment;
@@ -31,7 +32,6 @@
 import com.mifos.mifosxdroid.offline.syncsavingsaccounttransaction.SyncSavingsAccountTransactionFragment;
 import com.mifos.mifosxdroid.online.activate.ActivateFragment;
 import com.mifos.mifosxdroid.online.centerdetails.CenterDetailsFragment;
-import com.mifos.mifosxdroid.online.centerlist.CenterListFragment;
 import com.mifos.mifosxdroid.online.clientcharge.ClientChargeFragment;
 import com.mifos.mifosxdroid.online.clientdetails.ClientDetailsFragment;
 import com.mifos.mifosxdroid.online.clientidentifiers.ClientIdentifiersFragment;
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.kt
index 7c70a7e5b79..a5f4511b15a 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.kt
@@ -97,11 +97,11 @@ class CenterListFragment : MifosBaseFragment(), CenterListMvpView, RecyclerItemC
         centers = ArrayList()
         selectedCenters = ArrayList()
         actionModeCallback = ActionModeCallback()
-        (activity as MifosBaseActivity?)!!.activityComponent.inject(this)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         rootView = inflater.inflate(R.layout.fragment_centers_list, container, false)
+        (activity as MifosBaseActivity?)!!.activityComponent.inject(this)
         ButterKnife.bind(this, rootView)
         mCenterListPresenter!!.attachView(this)
 

From 596c3db072a28cd015ae8ae3054785c13da61cf9 Mon Sep 17 00:00:00 2001
From: robustTechie <captain.shank75@gmail.com>
Date: Wed, 8 Jan 2020 15:46:04 +0530
Subject: [PATCH 10/25] interactive clear button

---
 .../injection/component/ActivityComponent.java      |  2 +-
 .../NewIndividualCollectionSheetFragment.kt         | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
index 6c7a3cd3d95..97ade5749de 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
@@ -20,6 +20,7 @@
 import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxPendingTasksActivity;
 import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxTasksFragment;
 import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.IndividualCollectionSheetDetailsFragment;
+import com.mifos.mifosxdroid.online.collectionsheetindividual.NewIndividualCollectionSheetFragment;
 import com.mifos.mifosxdroid.online.runreports.report.ReportFragment;
 import com.mifos.mifosxdroid.online.runreports.reportcategory.ReportCategoryFragment;
 import com.mifos.mifosxdroid.online.runreports.reportdetail.ReportDetailFragment;
@@ -39,7 +40,6 @@
 import com.mifos.mifosxdroid.online.clientlist.ClientListFragment;
 import com.mifos.mifosxdroid.online.collectionsheet.CollectionSheetFragment;
 import com.mifos.mifosxdroid.online.collectionsheetindividual.IndividualCollectionSheetFragment;
-import com.mifos.mifosxdroid.online.collectionsheetindividual.NewIndividualCollectionSheetFragment;
 import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.PaymentDetailsFragment;
 import com.mifos.mifosxdroid.online.createnewcenter.CreateNewCenterFragment;
 import com.mifos.mifosxdroid.online.createnewclient.CreateNewClientFragment;
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetFragment.kt
index a340f8c51a7..bdc4561201a 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetFragment.kt
@@ -9,6 +9,7 @@ import android.widget.AdapterView.OnItemSelectedListener
 import androidx.fragment.app.DialogFragment
 import butterknife.BindView
 import butterknife.ButterKnife
+import butterknife.OnClick
 import com.mifos.api.model.RequestCollectionSheetPayload
 import com.mifos.mifosxdroid.R
 import com.mifos.mifosxdroid.core.MifosBaseActivity
@@ -27,6 +28,7 @@ import com.mifos.utils.FragmentConstants
 import java.util.*
 import javax.inject.Inject
 
+
 /**
  * Created by aksh on 18/6/18.
  */
@@ -47,6 +49,10 @@ class NewIndividualCollectionSheetFragment : MifosBaseFragment(), IndividualColl
     @BindView(R.id.tv_repayment_date)
     var tvRepaymentDate: TextView? = null
 
+    @JvmField
+    @BindView(R.id.btn_clear)
+    var btnClear: Button? = null
+
     @JvmField
     @Inject
     var presenter: NewIndividualCollectionSheetPresenter? = null
@@ -231,6 +237,13 @@ class NewIndividualCollectionSheetFragment : MifosBaseFragment(), IndividualColl
         }
     }
 
+    @OnClick(R.id.btn_clear)
+    fun clear() {
+        spOffices!!.adapter = null
+        spStaff!!.adapter = null
+        setUpUi()
+    }
+
     companion object {
         fun newInstance(): NewIndividualCollectionSheetFragment {
             val args = Bundle()

From ff2d5abb721e5e7896cc8dcff75346c9d1d3b82a Mon Sep 17 00:00:00 2001
From: robustTechie <captain.shank75@gmail.com>
Date: Sat, 11 Jan 2020 20:25:27 +0530
Subject: [PATCH 11/25] Up button in Survey question page

---
 .../tests/SurveyQuestionViewPagerActivityTest.java       | 1 -
 mifosng-android/src/main/AndroidManifest.xml             | 9 ++++++++-
 .../mifos/mifosxdroid/online/SurveyQuestionActivity.kt   | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/SurveyQuestionViewPagerActivityTest.java b/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/SurveyQuestionViewPagerActivityTest.java
index d81a33bc3eb..78fa8d65282 100644
--- a/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/SurveyQuestionViewPagerActivityTest.java
+++ b/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/SurveyQuestionViewPagerActivityTest.java
@@ -10,7 +10,6 @@
 import android.test.suitebuilder.annotation.MediumTest;
 
 import com.mifos.mifosxdroid.R;
-import com.mifos.mifosxdroid.online.SurveyQuestionActivity;
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
diff --git a/mifosng-android/src/main/AndroidManifest.xml b/mifosng-android/src/main/AndroidManifest.xml
index 2d7ead2a552..89f96570537 100755
--- a/mifosng-android/src/main/AndroidManifest.xml
+++ b/mifosng-android/src/main/AndroidManifest.xml
@@ -50,10 +50,17 @@
             android:name=".online.DashboardActivity"
             android:label="@string/dashboard"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".online.SurveyQuestionActivity"
             android:label="Survey"
-            android:screenOrientation="portrait" />
+            android:parentActivityName="com.mifos.mifosxdroid.online.ClientActivity"
+            android:screenOrientation="portrait">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.mifos.mifosxdroid.online.ClientActivity"/>
+        </activity>
+
         <activity
             android:name=".online.GroupsActivity"
             android:configChanges="orientation|screenSize"
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionActivity.kt
index 00d3640eb8f..1f9d6a7c65f 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionActivity.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionActivity.kt
@@ -74,6 +74,8 @@ class SurveyQuestionActivity : MifosBaseActivity(), OnAnswerSelectedListener, Di
         mViewPager!!.adapter = mPagerAdapter
         mViewPager!!.addOnPageChangeListener(this)
         loadSurvey(survey)
+        val actionBar = supportActionBar
+        actionBar!!.setDisplayHomeAsUpEnabled(true)
     }
 
     override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}

From 4f0d7555bca65b836a8c51e99cf6ba2ddd88247d Mon Sep 17 00:00:00 2001
From: robustTechie <captain.shank75@gmail.com>
Date: Sat, 20 Jun 2020 01:57:47 +0530
Subject: [PATCH 12/25] Feat: Bottom navigation and fab implementation

---
 mifosng-android/build.gradle                  |  10 +-
 mifosng-android/src/main/AndroidManifest.xml  |  24 +-
 .../com/mifos/mifosxdroid/HomeActivity.kt     | 301 ++++++++++++++
 .../com/mifos/mifosxdroid/SettingsActivity.kt |   2 +-
 .../mifosxdroid/core/MifosBaseActivity.java   |   7 +-
 .../mifosxdroid/login/LoginActivity.java      |   4 +-
 .../mifosxdroid/online/DashboardActivity.java | 386 +-----------------
 .../online/centerlist/CenterListFragment.kt   |   2 +-
 .../online/clientlist/ClientListFragment.kt   |   2 +-
 .../online/groupslist/GroupsListFragment.kt   |   4 +-
 .../online/search/SearchFragment.java         |  65 ++-
 .../mifosxdroid/passcode/PassCodeActivity.kt  |   3 +-
 .../src/main/res/anim/fab_close.xml           |  17 +
 .../src/main/res/anim/fab_open.xml            |  18 +
 .../src/main/res/anim/rotate_backward.xml     |  10 +
 .../src/main/res/anim/rotate_forward.xml      |  10 +
 .../src/main/res/drawable/ic_logout.xml       |  12 +
 .../src/main/res/layout/activity_home.xml     |  74 ++++
 .../main/res/layout/fragment_centers_list.xml |   7 +-
 .../src/main/res/layout/fragment_client.xml   |  13 +-
 .../res/layout/fragment_client_search.xml     |  81 +++-
 .../src/main/res/layout/fragment_groups.xml   |   7 +-
 .../main/res/menu/bottom_navigation_menu.xml  |  33 ++
 .../src/main/res/menu/menu_main.xml           |  32 +-
 .../src/main/res/menu/menu_nav_drawer.xml     |  28 --
 25 files changed, 667 insertions(+), 485 deletions(-)
 create mode 100644 mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeActivity.kt
 create mode 100644 mifosng-android/src/main/res/anim/fab_close.xml
 create mode 100644 mifosng-android/src/main/res/anim/fab_open.xml
 create mode 100644 mifosng-android/src/main/res/anim/rotate_backward.xml
 create mode 100644 mifosng-android/src/main/res/anim/rotate_forward.xml
 create mode 100644 mifosng-android/src/main/res/drawable/ic_logout.xml
 create mode 100644 mifosng-android/src/main/res/layout/activity_home.xml
 create mode 100644 mifosng-android/src/main/res/menu/bottom_navigation_menu.xml

diff --git a/mifosng-android/build.gradle b/mifosng-android/build.gradle
index 3a53f1567e6..4a400a41bd2 100755
--- a/mifosng-android/build.gradle
+++ b/mifosng-android/build.gradle
@@ -105,7 +105,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguardTest-rules.pro'
         }
-
     }
     lintOptions {
         abortOnError false
@@ -114,7 +113,6 @@ android {
         disable 'OutdatedLibrary'
     }
 
-
     // Exclude duplicated Hamcrest LICENSE.txt from being packaged into the apk.
     // This is a workaround for https://code.google.com/p/android/issues/detail?id=65445.
     // The Hamcrest is used in tests.
@@ -135,7 +133,6 @@ android {
 
 task buildAndEMailAPK(type: Exec, description: 'Builds and Generates a Signed APK and emails it') {
 
-
 }
 
 tasks.withType(JavaCompile) {
@@ -179,6 +176,11 @@ dependencies {
     implementation "com.google.maps.android:android-maps-utils:$rootProject.mapUtilsServices"
     implementation 'androidx.test.espresso:espresso-idling-resource:3.1.0'
 
+    //Bottom navigation
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.navigation:navigation-fragment:2.2.2'
+    implementation 'androidx.navigation:navigation-ui:2.2.2'
+
     //Dagger dependencies
     annotationProcessor "com.google.dagger:dagger-compiler:$rootProject.daggerVersion"
     implementation "com.google.dagger:dagger:$rootProject.daggerVersion"
@@ -225,7 +227,6 @@ dependencies {
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
     implementation 'com.github.bumptech.glide:glide:3.7.0'
 
-
     //mifos passcode
     implementation "com.mifos.mobile:mifos-passcode:$mifosPasscodeVersion"
 
@@ -257,7 +258,6 @@ dependencies {
     //preferences
     implementation "androidx.preference:preference:$preference"
 }
-
 /*
 All direct/transitive dependencies shared between your test and production APKs need to be
 excluded from the test APK! This is necessary because both APKs will contain the same classes. Not
diff --git a/mifosng-android/src/main/AndroidManifest.xml b/mifosng-android/src/main/AndroidManifest.xml
index 89f96570537..2fd59f69c1f 100755
--- a/mifosng-android/src/main/AndroidManifest.xml
+++ b/mifosng-android/src/main/AndroidManifest.xml
@@ -46,6 +46,11 @@
             android:name=".login.LoginActivity"
             android:label="@string/mifos_account"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".HomeActivity"
+            android:label="home_activity"
+            android:windowSoftInputMode="adjustPan"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".online.DashboardActivity"
             android:label="@string/dashboard"
@@ -73,27 +78,27 @@
             android:name=".online.CentersActivity"
             android:label="@string/title_activity_centers"
             android:screenOrientation="portrait"
-            android:parentActivityName=".online.DashboardActivity">
+            android:parentActivityName=".HomeActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".online.DashboardActivity" />
+                android:value=".HomeActivity" />
         </activity>
         <activity
             android:name=".online.GenerateCollectionSheetActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_generate_collection_sheet"
-            android:parentActivityName=".online.DashboardActivity">
+            android:parentActivityName=".HomeActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".online.DashboardActivity" />
+                android:value=".HomeActivity" />
         </activity>
         <activity
             android:name=".online.RunReportsActivity"
             android:label="@string/run_report"
-            android:parentActivityName=".online.DashboardActivity">
+            android:parentActivityName=".HomeActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".online.DashboardActivity" />
+                android:value=".HomeActivity" />
         </activity>
         <activity
             android:name=".ClientListActivity"
@@ -136,7 +141,12 @@
         <activity
             android:name=".SettingsActivity"
             android:label="@string/settings"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:parentActivityName=".HomeActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".HomeActivity" />
+        </activity>
         <activity
             android:name=".offline.syncsavingsaccounttransaction.SyncSavingsAccountTransactionActivity"
             android:label="@string/sync_savingsaccounttransactions"
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeActivity.kt
new file mode 100644
index 00000000000..0685163c3c0
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeActivity.kt
@@ -0,0 +1,301 @@
+package com.mifos.mifosxdroid
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.Handler
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+
+import androidx.annotation.VisibleForTesting
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.widget.SwitchCompat
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.fragment.app.Fragment
+import androidx.navigation.NavController
+import androidx.navigation.Navigation
+import androidx.navigation.ui.AppBarConfiguration
+import androidx.navigation.ui.NavigationUI
+import androidx.test.espresso.IdlingResource
+
+import butterknife.BindView
+import butterknife.ButterKnife
+
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.navigation.NavigationView
+
+import com.mifos.mifosxdroid.activity.pathtracking.PathTrackingActivity
+import com.mifos.mifosxdroid.core.MifosBaseActivity
+import com.mifos.mifosxdroid.offline.offlinedashbarod.OfflineDashboardFragment
+import com.mifos.mifosxdroid.online.GenerateCollectionSheetActivity
+import com.mifos.mifosxdroid.online.RunReportsActivity
+import com.mifos.mifosxdroid.online.centerlist.CenterListFragment
+import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxPendingTasksActivity
+import com.mifos.mifosxdroid.online.clientlist.ClientListFragment
+import com.mifos.mifosxdroid.online.createnewcenter.CreateNewCenterFragment
+import com.mifos.mifosxdroid.online.createnewclient.CreateNewClientFragment
+import com.mifos.mifosxdroid.online.createnewgroup.CreateNewGroupFragment
+import com.mifos.mifosxdroid.online.groupslist.GroupsListFragment
+import com.mifos.mifosxdroid.online.search.SearchFragment
+import com.mifos.utils.Constants
+import com.mifos.utils.EspressoIdlingResource
+import com.mifos.utils.PrefManager
+
+/**
+ * Created by shashankpriyadarshi on 19/06/20.
+ */
+open class HomeActivity : MifosBaseActivity(), NavigationView.OnNavigationItemSelectedListener {
+
+
+    @BindView(R.id.navigation_view)
+    lateinit  var mNavigationView: NavigationView
+
+    @BindView(R.id.drawer)
+    lateinit var mDrawerLayout: DrawerLayout
+
+    private var menu: Menu? = null
+
+    private var itemClient = true
+    private var itemCenter = true
+    private var itemGroup = true
+
+    var navController: NavController? = null
+    private var mNavigationHeader: View? = null
+    var userStatusToggle: SwitchCompat? = null
+    private var doubleBackToExitPressedOnce = false
+    var appBarConfiguration: AppBarConfiguration? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_home)
+        mDrawerLayout = findViewById(R.id.drawer)
+        val bottomNavigationView = findViewById<BottomNavigationView>(R.id.nav_view)
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        mNavigationView = findViewById(R.id.navigation_view)
+        setSupportActionBar(toolbar)
+        navController = Navigation.findNavController(this, R.id.nav_host_fragment)
+        appBarConfiguration = AppBarConfiguration.Builder()
+                .setDrawerLayout(mDrawerLayout)
+                .build()
+        NavigationUI.setupActionBarWithNavController(this, navController!!, appBarConfiguration!!)
+        NavigationUI.setupWithNavController(mNavigationView, navController!!)
+        if (savedInstanceState == null) {
+            val fragment: Fragment = SearchFragment()
+            supportFragmentManager.beginTransaction().replace(R.id.container_a, fragment).commit()
+            supportActionBar!!.setTitle(R.string.dashboard)
+        }
+        bottomNavigationView.setOnNavigationItemSelectedListener { item ->
+            when (item.itemId) {
+                R.id.navigation_dashboard -> {
+                    openFragment(SearchFragment())
+                    supportActionBar!!.setTitle(R.string.dashboard)
+                }
+                R.id.navigation_client_list -> {
+                    openFragment(ClientListFragment())
+                    supportActionBar!!.setTitle(R.string.clients)
+                }
+                R.id.navigation_center_list -> {
+                    openFragment(CenterListFragment())
+                    supportActionBar!!.setTitle(R.string.title_activity_centers)
+                }
+                R.id.navigation_group_list -> {
+                    openFragment(GroupsListFragment())
+                    supportActionBar!!.setTitle(R.string.title_center_list)
+                }
+            }
+            true
+        }
+        setupNavigationBar()
+    }
+
+    private fun setMenuCreateGroup(isEnabled: Boolean) {
+        if (menu != null) {
+            //position of mItem_create_new_group is 2
+            menu!!.getItem(2).isEnabled = isEnabled
+        }
+    }
+
+    private fun setMenuCreateCentre(isEnabled: Boolean) {
+        if (menu != null) {
+            //position of mItem_create_new_centre is 1
+            menu!!.getItem(1).isEnabled = isEnabled
+        }
+    }
+
+    private fun setMenuCreateClient(isEnabled: Boolean) {
+        if (menu != null) {
+            //position of mItem_create_new_client is 0
+            menu!!.getItem(0).isEnabled = isEnabled
+        }
+    }
+
+    override fun onNavigationItemSelected(item: MenuItem): Boolean {
+        // ignore the current selected item
+        /*if (item.isChecked()) {
+            mDrawerLayout.closeDrawer(Gravity.LEFT);
+            return false;
+        }*/
+        clearFragmentBackStack()
+        val intent = Intent()
+        when (item.itemId) {
+            R.id.item_checker_inbox -> {
+                intent.setClass(this, CheckerInboxPendingTasksActivity::class.java);
+                startActivity(intent);
+            }
+            R.id.item_path_tracker -> {
+                intent.setClass(applicationContext, PathTrackingActivity::class.java)
+                startNavigationClickActivity(intent)
+            }
+            R.id.item_offline -> {
+                replaceFragment(OfflineDashboardFragment.newInstance(), false, R.id.container_a)
+                supportActionBar!!.setTitle(R.string.offline)
+            }
+            R.id.individual_collection_sheet -> {
+                intent.setClass(this, GenerateCollectionSheetActivity::class.java)
+                intent.putExtra(Constants.COLLECTION_TYPE, Constants.EXTRA_COLLECTION_INDIVIDUAL)
+                startActivity(intent)
+            }
+            R.id.collection_sheet -> {
+                intent.setClass(this, GenerateCollectionSheetActivity::class.java)
+                intent.putExtra(Constants.COLLECTION_TYPE, Constants.EXTRA_COLLECTION_COLLECTION)
+                startActivity(intent)
+            }
+            R.id.item_settings -> {
+                intent.setClass(this, SettingsActivity::class.java)
+                startActivity(intent)
+            }
+
+            R.id.runreport -> {
+                intent.setClass(this, RunReportsActivity::class.java)
+                startActivity(intent)
+            }
+            R.id.about -> {
+                intent.setClass(this, AboutActivity::class.java);
+                startActivity(intent);
+            }
+        }
+        mDrawerLayout!!.closeDrawer(GravityCompat.START)
+        return true
+    }
+
+    /**
+     * This SwitchCompat Toggle Handling the User Status.
+     * Setting the User Status to Offline or Online
+     */
+    fun setupUserStatusToggle() {
+        userStatusToggle = mNavigationHeader!!.findViewById(R.id.user_status_toggle)
+        if (PrefManager.getUserStatus() == Constants.USER_OFFLINE) {
+            userStatusToggle?.isChecked = true
+        }
+        userStatusToggle?.setOnClickListener(View.OnClickListener {
+            if (PrefManager.getUserStatus() == Constants.USER_OFFLINE) {
+                PrefManager.setUserStatus(Constants.USER_ONLINE)
+                userStatusToggle!!.isChecked = false
+            } else {
+                PrefManager.setUserStatus(Constants.USER_OFFLINE)
+                userStatusToggle!!.isChecked = true
+            }
+        })
+    }
+
+    fun startNavigationClickActivity(intent: Intent?) {
+        val handler = Handler()
+        handler.postDelayed({ startActivity(intent) }, 500)
+    }
+
+    /**
+     * downloads the logged in user's username
+     * sets dummy profile picture as no profile picture attribute available
+     */
+    private fun loadClientDetails() {
+        // download logged in user
+        val loggedInUser = PrefManager.getUser()
+        val textViewUsername = ButterKnife.findById<TextView>(mNavigationHeader!!, R.id.tv_user_name)
+        textViewUsername.text = loggedInUser.username
+
+        // no profile picture credential, using dummy profile picture
+        val imageViewUserPicture = ButterKnife
+                .findById<ImageView>(mNavigationHeader!!, R.id.iv_user_picture)
+        imageViewUserPicture.setImageResource(R.drawable.ic_dp_placeholder)
+    }
+
+    override fun onBackPressed() {
+        // check if the nav mDrawer is open
+        if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
+            mDrawerLayout.closeDrawer(GravityCompat.START)
+        } else {
+            if (doubleBackToExitPressedOnce) {
+                setMenuCreateClient(true)
+                setMenuCreateCentre(true)
+                setMenuCreateGroup(true)
+                super.onBackPressed()
+                return
+            }
+            doubleBackToExitPressedOnce = true
+            Toast.makeText(this, R.string.back_again, Toast.LENGTH_SHORT).show()
+            Handler().postDelayed({ doubleBackToExitPressedOnce = false }, 2000)
+        }
+    }
+
+    @get:VisibleForTesting
+    val countingIdlingResource: IdlingResource
+        get() = EspressoIdlingResource.getIdlingResource()
+
+    override fun onSupportNavigateUp(): Boolean {
+        return NavigationUI.navigateUp(navController!!, appBarConfiguration!!)
+    }
+
+    protected fun setupNavigationBar() {
+        mNavigationHeader = mNavigationView.getHeaderView(0)
+        setupUserStatusToggle()
+        mNavigationView.setNavigationItemSelectedListener(this as NavigationView.OnNavigationItemSelectedListener)
+
+        // setup drawer layout and sync to toolbar
+        val actionBarDrawerToggle: ActionBarDrawerToggle = object : ActionBarDrawerToggle(this,
+                mDrawerLayout, toolbar, R.string.open_drawer, R.string.close_drawer) {
+            override fun onDrawerClosed(drawerView: View) {
+                super.onDrawerClosed(drawerView)
+            }
+
+            override fun onDrawerOpened(drawerView: View) {
+                super.onDrawerOpened(drawerView)
+                setUserStatus(userStatusToggle)
+                hideKeyboard(mDrawerLayout)
+            }
+
+            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
+                if (slideOffset != 0f) super.onDrawerSlide(drawerView, slideOffset)
+            }
+        }
+        mDrawerLayout.addDrawerListener(actionBarDrawerToggle)
+        actionBarDrawerToggle.syncState()
+
+        // make an API call to fetch logged in client's details
+        loadClientDetails()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        this.menu = menu
+        menuInflater.inflate(R.menu.menu_main, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.logout) {
+            logout()
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    fun openFragment(fragment: Fragment?) {
+        val transaction = supportFragmentManager.beginTransaction()
+        transaction.replace(R.id.container_a, fragment!!)
+        transaction.addToBackStack(null)
+        transaction.commit()
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsActivity.kt
index a6ce1e65cf5..cc3f08c9089 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsActivity.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsActivity.kt
@@ -21,7 +21,7 @@ class SettingsActivity : MifosBaseActivity() {
 
     override fun onBackPressed() {
         super.onBackPressed()
-        val i = Intent(this, DashboardActivity::class.java)
+        val i = Intent(this, HomeActivity::class.java)
         startActivity(i)
     }
 }
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.java
index 0b51de75c1d..1217270155c 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.java
@@ -128,10 +128,9 @@ public void hideProgress() {
     }
 
     public void hideKeyboard(View view) {
-        InputMethodManager inputManager = (InputMethodManager) this
-                 .getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputManager.hideSoftInputFromWindow(getWindow().getAttributes().token, InputMethodManager
-                 .RESULT_UNCHANGED_SHOWN);
+        InputMethodManager inputMethodManager = (InputMethodManager)
+                getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
     }
 
     @Override
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/login/LoginActivity.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/login/LoginActivity.java
index 2b2d0d0488a..51bff16068f 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/login/LoginActivity.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/login/LoginActivity.java
@@ -20,10 +20,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 import com.mifos.api.BaseApiManager;
+import com.mifos.mifosxdroid.HomeActivity;
 import com.mifos.mifosxdroid.R;
 import com.mifos.mifosxdroid.core.MifosBaseActivity;
 import com.mifos.mifosxdroid.core.util.Toaster;
-import com.mifos.mifosxdroid.online.DashboardActivity;
 import com.mifos.mifosxdroid.passcode.PassCodeActivity;
 import com.mifos.objects.user.User;
 import com.mifos.utils.Constants;
@@ -195,7 +195,7 @@ public void onLoginSuccessful(User user) {
                 Toast.LENGTH_SHORT).show();
 
         if (PrefManager.getPassCodeStatus()) {
-            startActivity(new Intent(this, DashboardActivity.class));
+            startActivity(new Intent(this, HomeActivity.class));
         } else {
             Intent intent = new Intent(this, PassCodeActivity.class);
             intent.putExtra(Constants.INTIAL_LOGIN, true);
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/DashboardActivity.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/DashboardActivity.java
index 2fbbfd97211..4f03ccf941e 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/DashboardActivity.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/DashboardActivity.java
@@ -5,74 +5,23 @@
 
 package com.mifos.mifosxdroid.online;
 
-import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
 
-import androidx.annotation.VisibleForTesting;
-import com.google.android.material.navigation.NavigationView;
-import androidx.test.espresso.IdlingResource;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.core.view.GravityCompat;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.widget.SwitchCompat;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.mifos.mifosxdroid.AboutActivity;
 import com.mifos.mifosxdroid.R;
-import com.mifos.mifosxdroid.SettingsActivity;
-import com.mifos.mifosxdroid.activity.pathtracking.PathTrackingActivity;
 import com.mifos.mifosxdroid.core.MifosBaseActivity;
-import com.mifos.mifosxdroid.offline.offlinedashbarod.OfflineDashboardFragment;
 import com.mifos.mifosxdroid.offlinejobs.OfflineSyncCenter;
 import com.mifos.mifosxdroid.offlinejobs.OfflineSyncClient;
 import com.mifos.mifosxdroid.offlinejobs.OfflineSyncGroup;
 import com.mifos.mifosxdroid.offlinejobs.OfflineSyncLoanRepayment;
 import com.mifos.mifosxdroid.offlinejobs.OfflineSyncSavingsAccount;
-import com.mifos.mifosxdroid.online.centerlist.CenterListFragment;
-import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxPendingTasksActivity;
-import com.mifos.mifosxdroid.online.clientlist.ClientListFragment;
-import com.mifos.mifosxdroid.online.createnewcenter.CreateNewCenterFragment;
-import com.mifos.mifosxdroid.online.createnewclient.CreateNewClientFragment;
-import com.mifos.mifosxdroid.online.createnewgroup.CreateNewGroupFragment;
-import com.mifos.mifosxdroid.online.groupslist.GroupsListFragment;
 import com.mifos.mifosxdroid.online.search.SearchFragment;
-import com.mifos.objects.user.User;
-import com.mifos.utils.Constants;
-import com.mifos.utils.EspressoIdlingResource;
-import com.mifos.utils.PrefManager;
-
 
-import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
- * Created by ishankhanna on 09/02/14.
+ * Created by shashankpriyadarshi on 19/06/20.
  */
-public class DashboardActivity extends MifosBaseActivity
-        implements NavigationView.OnNavigationItemSelectedListener {
-
-    public static final String TAG = DashboardActivity.class.getSimpleName();
-
-    @BindView(R.id.navigation_view)
-    NavigationView mNavigationView;
-
-    @BindView(R.id.drawer)
-    DrawerLayout mDrawerLayout;
-
-
-    View mNavigationHeader;
-    SwitchCompat userStatusToggle;
-    private Menu menu;
-    private boolean doubleBackToExitPressedOnce = false;
-    private boolean itemClient = true, itemCenter = true, itemGroup = true;
+public class DashboardActivity extends MifosBaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -82,13 +31,6 @@ public void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
         //runJobs();
         replaceFragment(new SearchFragment(), false, R.id.container);
-
-        // setup navigation drawer and Navigation Toggle click and Offline Mode SwitchButton
-        setupNavigationBar();
-
-        //addOnBackStackChangedListener
-        //to change title after Back Stack Changed
-        addOnBackStackChangedListener();
     }
 
     private void runJobs() {
@@ -98,328 +40,4 @@ private void runJobs() {
         OfflineSyncSavingsAccount.schedulePeriodic();
         OfflineSyncLoanRepayment.schedulePeriodic();
     }
-
-    private void addOnBackStackChangedListener() {
-        if (getSupportFragmentManager() == null) {
-            return;
-        }
-        getSupportFragmentManager()
-                .addOnBackStackChangedListener(new FragmentManager.OnBackStackChangedListener() {
-                    @Override
-                    public void onBackStackChanged() {
-                        FragmentManager fragmentManager = getSupportFragmentManager();
-                        Fragment fragment = fragmentManager.findFragmentById(R.id.container);
-                        if (fragment instanceof CreateNewClientFragment) {
-                            setActionBarTitle(R.string.create_client);
-                            itemClient = false;
-                            itemGroup = true;
-                            itemCenter = true;
-                            invalidateOptionsMenu();
-                        } else if (fragment instanceof CreateNewGroupFragment) {
-                            setActionBarTitle(R.string.create_group);
-                            itemClient = true;
-                            itemGroup = false;
-                            itemCenter = true;
-                            invalidateOptionsMenu();
-                        } else if (fragment instanceof CreateNewCenterFragment) {
-                            setActionBarTitle(R.string.create_center);
-                            itemClient = true;
-                            itemGroup = true;
-                            itemCenter = false;
-                            invalidateOptionsMenu();
-                        } else {
-                            itemClient = true;
-                            itemGroup = true;
-                            itemCenter = true;
-                        }
-                    }
-                });
-
-    }
-
-    private void setMenuCreateGroup(boolean isEnabled) {
-        if (menu != null) {
-            //position of mItem_create_new_group is 2
-            menu.getItem(2).setEnabled(isEnabled);
-        }
-
-    }
-
-    private void setMenuCreateCentre(boolean isEnabled) {
-        if (menu != null) {
-            //position of mItem_create_new_centre is 1
-            menu.getItem(1).setEnabled(isEnabled);
-        }
-    }
-
-    private void setMenuCreateClient(boolean isEnabled) {
-        if (menu != null) {
-            //position of mItem_create_new_client is 0
-            menu.getItem(0).setEnabled(isEnabled);
-        }
-    }
-
-
-    /**
-     * sets up the navigation mDrawer in the activity
-     */
-    protected void setupNavigationBar() {
-
-        mNavigationHeader = mNavigationView.getHeaderView(0);
-        setupUserStatusToggle();
-        mNavigationView.setNavigationItemSelectedListener(this);
-
-        // setup drawer layout and sync to toolbar
-        ActionBarDrawerToggle actionBarDrawerToggle = new ActionBarDrawerToggle(this,
-                mDrawerLayout, toolbar, R.string.open_drawer, R.string.close_drawer) {
-
-            @Override
-            public void onDrawerClosed(View drawerView) {
-                super.onDrawerClosed(drawerView);
-            }
-
-            @Override
-            public void onDrawerOpened(View drawerView) {
-                super.onDrawerOpened(drawerView);
-                setUserStatus(userStatusToggle);
-            }
-
-            @Override
-            public void onDrawerSlide(View drawerView, float slideOffset) {
-                if (slideOffset != 0)
-                    hideKeyboard(mDrawerLayout);
-                super.onDrawerSlide(drawerView, slideOffset);
-            }
-        };
-        mDrawerLayout.addDrawerListener(actionBarDrawerToggle);
-        actionBarDrawerToggle.syncState();
-
-        // make an API call to fetch logged in client's details
-        loadClientDetails();
-    }
-
-
-    @Override
-    public boolean onNavigationItemSelected(MenuItem item) {
-
-        // ignore the current selected item
-        /*if (item.isChecked()) {
-            mDrawerLayout.closeDrawer(Gravity.LEFT);
-            return false;
-        }*/
-
-        // select which activity to open
-        clearFragmentBackStack();
-        final Intent intent = new Intent();
-        switch (item.getItemId()) {
-            case R.id.item_dashboard:
-                replaceFragment(new SearchFragment(), false, R.id.container);
-                break;
-            case R.id.item_clients:
-                replaceFragment(ClientListFragment.newInstance(), false, R.id.container);
-                break;
-            case R.id.item_groups:
-                replaceFragment(GroupsListFragment.newInstance(), false, R.id.container);
-                break;
-            case R.id.item_centers:
-                replaceFragment(CenterListFragment.newInstance(), false, R.id.container);
-                break;
-            case R.id.item_checker_inbox:
-                intent.setClass(this, CheckerInboxPendingTasksActivity.class);
-                startActivity(intent);
-                break;
-            case R.id.item_path_tracker:
-                intent.setClass(getApplicationContext(), PathTrackingActivity.class);
-                startNavigationClickActivity(intent);
-                break;
-            case R.id.item_offline:
-                replaceFragment(OfflineDashboardFragment.newInstance(), false, R.id.container);
-                break;
-            case R.id.individual_collection_sheet:
-                intent.setClass(this, GenerateCollectionSheetActivity.class);
-                intent.putExtra(Constants.COLLECTION_TYPE, Constants.EXTRA_COLLECTION_INDIVIDUAL);
-                startActivity(intent);
-                break;
-            case R.id.collection_sheet:
-                intent.setClass(this, GenerateCollectionSheetActivity.class);
-                intent.putExtra(Constants.COLLECTION_TYPE, Constants.EXTRA_COLLECTION_COLLECTION);
-                startActivity(intent);
-                break;
-            case R.id.item_settings:
-                startActivity(new Intent(this, SettingsActivity.class));
-                break;
-            case R.id.runreport:
-                intent.setClass(this, RunReportsActivity.class);
-                startActivity(intent);
-                break;
-            case R.id.about:
-                intent.setClass(this, AboutActivity.class);
-                startActivity(intent);
-                break;
-        }
-
-        mDrawerLayout.closeDrawer(GravityCompat.START);
-        mNavigationView.setCheckedItem(R.id.item_dashboard);
-        return true;
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        String currentFragment = getSupportFragmentManager().findFragmentById(R.id.container)
-                .getClass().getSimpleName();
-        switch (currentFragment) {
-            case "SearchFragment":
-                mNavigationView.setCheckedItem(R.id.item_dashboard);
-                break;
-            case "ClientListFragment":
-                mNavigationView.setCheckedItem(R.id.item_clients);
-                break;
-            case "GroupsListFragment":
-                mNavigationView.setCheckedItem(R.id.item_groups);
-                break;
-            case "CenterListFragment":
-                mNavigationView.setCheckedItem(R.id.item_centers);
-                break;
-            case "OfflineDashboardFragment":
-                mNavigationView.setCheckedItem(R.id.item_offline);
-        }
-    }
-
-    /**
-     * This SwitchCompat Toggle Handling the User Status.
-     * Setting the User Status to Offline or Online
-     */
-    public void setupUserStatusToggle() {
-        userStatusToggle
-                = mNavigationHeader.findViewById(R.id.user_status_toggle);
-        if (PrefManager.getUserStatus() == Constants.USER_OFFLINE) {
-            userStatusToggle.setChecked(true);
-        }
-
-        userStatusToggle.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (PrefManager.getUserStatus() == Constants.USER_OFFLINE) {
-                    PrefManager.setUserStatus(Constants.USER_ONLINE);
-                    userStatusToggle.setChecked(false);
-                } else {
-                    PrefManager.setUserStatus(Constants.USER_OFFLINE);
-                    userStatusToggle.setChecked(true);
-                }
-            }
-        });
-    }
-
-    public void startNavigationClickActivity(final Intent intent) {
-        Handler handler = new Handler();
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                startActivity(intent);
-
-            }
-        }, 500);
-    }
-
-
-    /**
-     * downloads the logged in user's username
-     * sets dummy profile picture as no profile picture attribute available
-     */
-    private void loadClientDetails() {
-
-        // download logged in user
-        final User loggedInUser = PrefManager.getUser();
-
-        TextView textViewUsername = ButterKnife.findById(mNavigationHeader, R.id.tv_user_name);
-        textViewUsername.setText(loggedInUser.getUsername());
-
-        // no profile picture credential, using dummy profile picture
-        ImageView imageViewUserPicture = ButterKnife
-                .findById(mNavigationHeader, R.id.iv_user_picture);
-        imageViewUserPicture.setImageResource(R.drawable.ic_dp_placeholder);
-    }
-
-    @Override
-    public void onBackPressed() {
-        // check if the nav mDrawer is open
-        if (mDrawerLayout != null && mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
-            mDrawerLayout.closeDrawer(GravityCompat.START);
-        } else {
-            if (doubleBackToExitPressedOnce) {
-                setMenuCreateClient(true);
-                setMenuCreateCentre(true);
-                setMenuCreateGroup(true);
-                super.onBackPressed();
-                return;
-            }
-            this.doubleBackToExitPressedOnce = true;
-            Toast.makeText(this, R.string.back_again, Toast.LENGTH_SHORT).show();
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    doubleBackToExitPressedOnce = false;
-                }
-            }, 2000);
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        this.menu = menu;
-        getMenuInflater().inflate(R.menu.menu_main, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        hideKeyboard(mDrawerLayout);
-        menu.getItem(0).setEnabled(itemClient);
-        menu.getItem(1).setEnabled(itemCenter);
-        menu.getItem(2).setEnabled(itemGroup);
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.mItem_create_new_client:
-                setActionBarTitle(R.string.create_client);
-                openCreateClient();
-                break;
-            case R.id.mItem_create_new_center:
-                setActionBarTitle(R.string.create_center);
-                openCreateCenter();
-                break;
-            case R.id.mItem_create_new_group:
-                openCreateGroup();
-                setActionBarTitle(R.string.create_group);
-                break;
-            case R.id.logout:
-                logout();
-                break;
-            default: //DO NOTHING
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    public void openCreateClient() {
-        replaceFragment(CreateNewClientFragment.newInstance(), true, R.id.container);
-    }
-
-    public void openCreateCenter() {
-        replaceFragment(CreateNewCenterFragment.newInstance(), true, R.id.container);
-
-    }
-
-    public void openCreateGroup() {
-        replaceFragment(CreateNewGroupFragment.newInstance(), true, R.id.container);
-    }
-
-    @VisibleForTesting
-    public IdlingResource getCountingIdlingResource() {
-        return EspressoIdlingResource.getIdlingResource();
-    }
 }
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.kt
index 7c70a7e5b79..cb8d26fb085 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.kt
@@ -144,7 +144,7 @@ class CenterListFragment : MifosBaseFragment(), CenterListMvpView, RecyclerItemC
     @OnClick(R.id.fab_create_center)
     fun onClickCreateNewCenter() {
         (activity as MifosBaseActivity?)!!.replaceFragment(CreateNewCenterFragment.newInstance(),
-                true, R.id.container)
+                true, R.id.container_a)
     }
 
     /**
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListFragment.kt
index 257d5cc4edb..332d2d80672 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListFragment.kt
@@ -183,7 +183,7 @@ class ClientListFragment : MifosBaseFragment(), RecyclerItemClickListener.OnItem
     @OnClick(R.id.fab_create_client)
     fun onClickCreateNewClient() {
         (activity as MifosBaseActivity?)!!.replaceFragment(CreateNewClientFragment.newInstance(),
-                true, R.id.container)
+                true, R.id.container_a)
     }
 
     /**
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListFragment.kt
index 3f467f4cae3..8d41258609f 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListFragment.kt
@@ -116,7 +116,7 @@ class GroupsListFragment : MifosBaseFragment(), GroupsListMvpView, RecyclerItemC
         selectedGroups = ArrayList()
         actionModeCallback = ActionModeCallback()
         if (arguments != null) {
-            mGroupList = arguments!!.getParcelableArrayList(Constants.GROUPS)
+            mGroupList = requireArguments().getParcelableArrayList(Constants.GROUPS)
             isParentFragment = arguments!!
                     .getBoolean(Constants.IS_A_PARENT_FRAGMENT)
         }
@@ -176,7 +176,7 @@ class GroupsListFragment : MifosBaseFragment(), GroupsListMvpView, RecyclerItemC
     @OnClick(R.id.fab_create_group)
     fun onClickCreateNewGroup() {
         (activity as MifosBaseActivity?)!!.replaceFragment(CreateNewGroupFragment.newInstance(),
-                true, R.id.container)
+                true, R.id.container_a)
     }
 
     /**
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
index cf06a03b34f..cd676bfd3d5 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
@@ -13,6 +13,8 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
@@ -20,6 +22,7 @@
 import android.widget.Spinner;
 import android.widget.Toast;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.mifos.mifosxdroid.R;
 import com.mifos.mifosxdroid.adapters.SearchAdapter;
 import com.mifos.mifosxdroid.core.MifosBaseActivity;
@@ -29,6 +32,9 @@
 import com.mifos.mifosxdroid.online.CentersActivity;
 import com.mifos.mifosxdroid.online.ClientActivity;
 import com.mifos.mifosxdroid.online.GroupsActivity;
+import com.mifos.mifosxdroid.online.createnewcenter.CreateNewCenterFragment;
+import com.mifos.mifosxdroid.online.createnewclient.CreateNewClientFragment;
+import com.mifos.mifosxdroid.online.createnewgroup.CreateNewGroupFragment;
 import com.mifos.objects.SearchedEntity;
 import com.mifos.utils.Constants;
 import com.mifos.utils.EspressoIdlingResource;
@@ -60,6 +66,18 @@ public class SearchFragment extends MifosBaseFragment implements SearchMvpView,
     @BindView(R.id.cb_exact_match)
     CheckBox cb_exactMatch;
 
+    @BindView(R.id.fab_create)
+    FloatingActionButton fabCreate;
+
+    @BindView(R.id.fab_client)
+    FloatingActionButton fabClient;
+
+    @BindView(R.id.fab_center)
+    FloatingActionButton fabCenter;
+
+    @BindView(R.id.fab_group)
+    FloatingActionButton fabGroup;
+
     @BindArray(R.array.search_options_values)
     String[] searchOptionsValues;
 
@@ -72,6 +90,8 @@ public class SearchFragment extends MifosBaseFragment implements SearchMvpView,
     private List<SearchedEntity> searchedEntities;
     private ArrayAdapter<CharSequence> searchOptionsAdapter;
     private String resources;
+    private Boolean isFabOpen = false;
+    private Animation fab_open, fab_close, rotate_forward, rotate_backward;
     private LinearLayoutManager layoutManager;
 
     @Override
@@ -79,6 +99,10 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ((MifosBaseActivity) getActivity()).getActivityComponent().inject(this);
         searchedEntities = new ArrayList<>();
+        fab_open = AnimationUtils.loadAnimation(getContext(), R.anim.fab_open);
+        fab_close = AnimationUtils.loadAnimation(getContext(), R.anim.fab_close);
+        rotate_forward = AnimationUtils.loadAnimation(getContext(), R.anim.rotate_forward);
+        rotate_backward = AnimationUtils.loadAnimation(getContext(), R.anim.rotate_backward);
     }
 
     @Override
@@ -109,6 +133,24 @@ public void showUserInterface() {
     }
 
 
+    @OnClick(R.id.fab_client)
+    public void onClickCreateClient() {
+        ((MifosBaseActivity) getActivity()).replaceFragment(CreateNewClientFragment.newInstance(),
+                true, R.id.container_a);
+    }
+
+    @OnClick(R.id.fab_center)
+    public void onClickCreateCenter() {
+        ((MifosBaseActivity) getActivity()).replaceFragment(CreateNewCenterFragment.newInstance(),
+                true, R.id.container_a);
+    }
+
+    @OnClick(R.id.fab_group)
+    public void onClickCreateCGroup() {
+        ((MifosBaseActivity) getActivity()).replaceFragment(CreateNewGroupFragment.newInstance(),
+                true, R.id.container_a);
+    }
+
     @OnClick(R.id.btn_search)
     public void onClickSearch() {
         hideKeyboard(et_search);
@@ -119,7 +161,29 @@ public void onClickSearch() {
         } else {
             Toaster.show(et_search, getString(R.string.no_search_query_entered));
         }
+    }
 
+    @OnClick(R.id.fab_create)
+    void onClickCreate() {
+        if (isFabOpen) {
+            fabCreate.startAnimation(rotate_backward);
+            fabClient.startAnimation(fab_close);
+            fabCenter.startAnimation(fab_close);
+            fabGroup.startAnimation(fab_close);
+            fabClient.setClickable(false);
+            fabCenter.setClickable(false);
+            fabGroup.setClickable(false);
+            isFabOpen = false;
+        } else {
+            fabCreate.startAnimation(rotate_forward);
+            fabClient.startAnimation(fab_open);
+            fabCenter.startAnimation(fab_open);
+            fabGroup.startAnimation(fab_open);
+            fabClient.setClickable(true);
+            fabCenter.setClickable(true);
+            fabGroup.setClickable(true);
+            isFabOpen = true;
+        }
     }
 
     @Override
@@ -250,5 +314,4 @@ public void onViewStateRestored(Bundle savedInstanceState) {
             }
         }
     }
-
 }
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/passcode/PassCodeActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/passcode/PassCodeActivity.kt
index d6cae066009..e773579b292 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/passcode/PassCodeActivity.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/passcode/PassCodeActivity.kt
@@ -3,6 +3,7 @@ package com.mifos.mifosxdroid.passcode;
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import com.mifos.mifosxdroid.HomeActivity
 import com.mifos.mifosxdroid.R
 import com.mifos.mifosxdroid.SplashScreenActivity
 import com.mifos.mifosxdroid.core.util.Toaster
@@ -38,7 +39,7 @@ class PassCodeActivity : MifosPassCodeActivity() {
         return EncryptionUtil.FINERACT_CN
     }
     override fun startNextActivity() {
-        startActivity(Intent(this, DashboardActivity::class.java))
+        startActivity(Intent(this, HomeActivity::class.java))
     }
 
     override fun onBackPressed() {
diff --git a/mifosng-android/src/main/res/anim/fab_close.xml b/mifosng-android/src/main/res/anim/fab_close.xml
new file mode 100644
index 00000000000..a8e450d484b
--- /dev/null
+++ b/mifosng-android/src/main/res/anim/fab_close.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fillAfter="true">
+    <scale
+        android:duration="300"
+        android:fromXScale="0.8"
+        android:fromYScale="0.8"
+        android:interpolator="@android:anim/linear_interpolator"
+        android:toXScale="0.0"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:toYScale="0.0" />
+    <alpha android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="300"/>
+</set>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/anim/fab_open.xml b/mifosng-android/src/main/res/anim/fab_open.xml
new file mode 100644
index 00000000000..0cc5ee30821
--- /dev/null
+++ b/mifosng-android/src/main/res/anim/fab_open.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fillAfter="true">
+    <scale
+        android:duration="300"
+        android:fromXScale="0.0"
+        android:fromYScale="0.0"
+        android:interpolator="@android:anim/linear_interpolator"
+        android:toXScale="0.8"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:toYScale="0.8" />
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="300"/>
+</set>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/anim/rotate_backward.xml b/mifosng-android/src/main/res/anim/rotate_backward.xml
new file mode 100644
index 00000000000..9bbb510ba6c
--- /dev/null
+++ b/mifosng-android/src/main/res/anim/rotate_backward.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fillAfter="true" >
+    <rotate android:fromDegrees="45"
+        android:toDegrees="0"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:duration="300"
+        android:interpolator="@android:anim/linear_interpolator"/>
+</set>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/anim/rotate_forward.xml b/mifosng-android/src/main/res/anim/rotate_forward.xml
new file mode 100644
index 00000000000..c1173e870bc
--- /dev/null
+++ b/mifosng-android/src/main/res/anim/rotate_forward.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fillAfter="true" >
+    <rotate android:fromDegrees="0"
+        android:toDegrees="45"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:duration="300"
+        android:interpolator="@android:anim/linear_interpolator"/>
+</set>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/drawable/ic_logout.xml b/mifosng-android/src/main/res/drawable/ic_logout.xml
new file mode 100644
index 00000000000..f7dbc0a26a5
--- /dev/null
+++ b/mifosng-android/src/main/res/drawable/ic_logout.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="44dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M52.4502,28.7679l-5,-4.999c-0.3769,-0.377 -0.9902,-0.377 -1.3672,0c-0.3779,0.3779 -0.3779,0.9902 0,1.3672l3.3172,3.3164H35.2666v2h14.1321l-3.3157,3.3164c-0.3779,0.3779 -0.3779,0.9902 0,1.3672c0.1885,0.1885 0.4366,0.2832 0.6836,0.2832c0.2471,0 0.4951,-0.0947 0.6836,-0.2832l5,-5.001c0.1817,-0.1816 0.2832,-0.4277 0.2832,-0.6836C52.7334,29.1947 52.6319,28.9496 52.4502,28.7679z"/>
+    <path
+        android:fillColor="#fff"
+        android:pathData="M40.2666,39.4524c-0.5527,0 -1,0.4473 -1,1v10.79c0,1.043 -0.831,2.21 -1.9433,2.21h-6.0567V11.2395V9.8678L30.0192,9.334L14.0765,2.5645l-0.2607,-0.112h23.5075c1.2168,0 1.9433,0.9922 1.9433,1.9512v15.0488c0,0.5527 0.4473,1 1,1c0.5528,0 1,-0.4473 1,-1V4.4036c0,-2.1787 -1.7685,-3.9512 -3.9433,-3.9512H12.2666c-0.5216,0 -0.9359,0.4029 -0.9823,0.9124L11.2666,1.3572V1.4525V55.034l17.1855,7.3064l2.8145,1.2071v-3.0951v-5h6.0567c2.3584,0 3.9433,-2.1768 3.9433,-4.21V40.4524C41.2666,39.8997 40.8194,39.4524 40.2666,39.4524zM29.2666,11.2395v49.213l-16,-6.7767V4.4524l15.9907,6.7728l0.0093,0.0039V11.2395z"/>
+</vector>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/layout/activity_home.xml b/mifosng-android/src/main/res/layout/activity_home.xml
new file mode 100644
index 00000000000..3f717e74aee
--- /dev/null
+++ b/mifosng-android/src/main/res/layout/activity_home.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.drawerlayout.widget.DrawerLayout
+    android:id="@+id/drawer"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".HomeActivity">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/container_new"
+        android:layout_width="match_parent"
+        android:background="?android:windowBackground"
+        android:layout_height="match_parent">
+
+        <include
+            android:id="@+id/toolbar"
+            layout="@layout/toolbar" />
+
+
+        <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/nav_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="?android:attr/windowBackground"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:menu="@menu/bottom_navigation_menu"
+            tools:ignore="MissingConstraints" />
+
+        <FrameLayout
+            android:id="@+id/container_a"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_above="@id/nav_view"
+            android:layout_below="@+id/toolbar"
+            app:layout_constraintBottom_toTopOf="@+id/nav_view"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+
+
+        <fragment
+            android:id="@+id/nav_host_fragment"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_above="@id/nav_view"
+            android:layout_below="@+id/toolbar"
+            app:defaultNavHost="true"
+            app:layout_constraintBottom_toTopOf="@+id/nav_view"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/navigation_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        app:headerLayout="@layout/view_nav_drawer_header"
+        app:menu="@menu/menu_nav_drawer"
+        />
+
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/layout/fragment_centers_list.xml b/mifosng-android/src/main/res/layout/fragment_centers_list.xml
index 0d79bdd5d88..8541fb13601 100755
--- a/mifosng-android/src/main/res/layout/fragment_centers_list.xml
+++ b/mifosng-android/src/main/res/layout/fragment_centers_list.xml
@@ -5,7 +5,7 @@
   ~ See https://github.com/openMF/android-client/blob/master/LICENSE.md
   -->
 
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -42,7 +42,8 @@
         android:id="@+id/fab_create_center"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
         android:layout_margin="16dp"
         app:srcCompat="@drawable/ic_add_white_24dp"/>
 
@@ -51,4 +52,4 @@
         android:visibility="gone"
         android:id="@+id/layout_error"/>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/layout/fragment_client.xml b/mifosng-android/src/main/res/layout/fragment_client.xml
index ed4ba040bd0..6760527d165 100755
--- a/mifosng-android/src/main/res/layout/fragment_client.xml
+++ b/mifosng-android/src/main/res/layout/fragment_client.xml
@@ -4,7 +4,7 @@
   ~ This project is licensed under the open source MPL V2.
   ~ See https://github.com/openMF/android-client/blob/master/LICENSE.md
   -->
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -14,7 +14,9 @@
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+
+        >
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_clients"
@@ -33,6 +35,7 @@
         android:id="@+id/pb_client"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
         android:layout_gravity="center"/>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -41,11 +44,13 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        app:srcCompat="@drawable/ic_add_white_24dp"/>
+        android:layout_alignParentBottom="true"
+        app:srcCompat="@drawable/ic_add_white_24dp"
+        android:layout_alignParentRight="true" />
 
     <include
         layout="@layout/layout_sweet_exception_handler"
         android:visibility="gone"
         android:id="@+id/layout_error"/>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</RelativeLayout>
diff --git a/mifosng-android/src/main/res/layout/fragment_client_search.xml b/mifosng-android/src/main/res/layout/fragment_client_search.xml
index a7e38853340..296f51b8b0e 100755
--- a/mifosng-android/src/main/res/layout/fragment_client_search.xml
+++ b/mifosng-android/src/main/res/layout/fragment_client_search.xml
@@ -17,16 +17,17 @@
         <TextView
             android:id="@+id/tv_search"
             android:paddingRight="4dp"
-            style="@style/TextView.Search" />
+            style="@style/TextView.Search"
+            android:paddingEnd="4dp" />
 
         <Spinner
             android:id="@+id/sp_search"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="50dp"
-            android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
-            android:gravity="end" />
+            android:layout_marginLeft="50dp"
+            android:gravity="end"
+            android:layout_marginTop="10dp"/>
     </LinearLayout>
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
@@ -71,7 +72,6 @@
         </RelativeLayout>
     </androidx.cardview.widget.CardView>
 
-
     <Button
         android:id="@+id/btn_search"
         style="@style/Button.Base"
@@ -83,18 +83,75 @@
     <TextView
         android:id="@+id/tv_title_search_results"
         style="@style/TextView.Search.Results"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <CheckBox
         android:id="@+id/cb_exact_match"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/exact_match" />
+        android:text="@string/exact_match"/>
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_search"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_search"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentTop="true"
+            android:layout_weight="1"/>
+
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_client"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="260dp"
+            android:layout_gravity="bottom|end"
+            android:layout_marginRight="@dimen/fab_margin"
+            android:visibility="invisible"
+            app:elevation="6dp"
+            app:pressedTranslationZ="12dp"
+            android:tint ="@color/white"
+            app:srcCompat="@drawable/ic_person_black_24dp"
+            android:layout_marginEnd="@dimen/fab_margin" />
 
-</LinearLayout>
\ No newline at end of file
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="180dp"
+            android:layout_gravity="bottom|end"
+            android:layout_marginRight="@dimen/fab_margin"
+            android:visibility="invisible"
+            app:elevation="6dp"
+            app:pressedTranslationZ="12dp"
+            android:tint ="@color/white"
+            app:srcCompat="@drawable/ic_centers_24dp"
+            android:layout_marginEnd="@dimen/fab_margin" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="100dp"
+            android:layout_gravity="bottom|end"
+            android:layout_marginRight="@dimen/fab_margin"
+            android:visibility="invisible"
+            app:elevation="6dp"
+            app:pressedTranslationZ="12dp"
+            android:tint ="@color/white"
+            app:srcCompat="@drawable/ic_group_black_24dp" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_create"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            app:elevation="6dp"
+            app:pressedTranslationZ="12dp"
+            android:layout_margin="@dimen/fab_margin"
+            app:srcCompat="@drawable/ic_add_white_24dp" />
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
diff --git a/mifosng-android/src/main/res/layout/fragment_groups.xml b/mifosng-android/src/main/res/layout/fragment_groups.xml
index 89160a28dde..3273903211a 100644
--- a/mifosng-android/src/main/res/layout/fragment_groups.xml
+++ b/mifosng-android/src/main/res/layout/fragment_groups.xml
@@ -5,7 +5,7 @@
   ~ See https://github.com/openMF/android-client/blob/master/LICENSE.md
   -->
 
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -43,7 +43,8 @@
         android:id="@+id/fab_create_group"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
         android:layout_margin="16dp"
         app:srcCompat="@drawable/ic_add_white_24dp"/>
 
@@ -52,4 +53,4 @@
         android:visibility="gone"
         android:id="@+id/layout_error"/>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/menu/bottom_navigation_menu.xml b/mifosng-android/src/main/res/menu/bottom_navigation_menu.xml
new file mode 100644
index 00000000000..275a241b842
--- /dev/null
+++ b/mifosng-android/src/main/res/menu/bottom_navigation_menu.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/navigation_dashboard"
+        android:checked="true"
+        android:icon="@drawable/ic_dashboard_black_24dp"
+        android:title="@string/dashboard"
+        />
+
+    <item
+        android:id="@+id/navigation_client_list"
+        android:checked="false"
+        android:icon="@drawable/ic_person_black_24dp"
+        android:title="@string/clients"
+        />
+
+    <item
+        android:id="@+id/navigation_center_list"
+        android:checked="false"
+        android:icon="@drawable/ic_centers_24dp"
+        android:title="@string/centers"
+        />
+
+    <item
+        android:id="@+id/navigation_group_list"
+        android:checked="false"
+        android:icon="@drawable/ic_group_black_24dp"
+        android:title="@string/groups"
+        />
+
+
+</menu>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/menu/menu_main.xml b/mifosng-android/src/main/res/menu/menu_main.xml
index 9352d354e67..6b1b90b5b22 100755
--- a/mifosng-android/src/main/res/menu/menu_main.xml
+++ b/mifosng-android/src/main/res/menu/menu_main.xml
@@ -1,30 +1,10 @@
-<!--
-  ~ This project is licensed under the open source MPL V2.
-  ~ See https://github.com/openMF/android-client/blob/master/LICENSE.md
-  -->
-
+<?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-
-
-    <item
-        android:id="@+id/mItem_create_new_client"
-        android:enabled="true"
-        android:title="@string/create_client"
-        app:showAsAction="never" />
-    <item
-        android:id="@+id/mItem_create_new_center"
-        android:enabled="true"
-        android:title="@string/create_center"
-        app:showAsAction="never" />
-    <item
-        android:id="@+id/mItem_create_new_group"
-        android:enabled="true"
-        android:title="@string/create_group"
-        app:showAsAction="never" />
     <item
         android:id="@+id/logout"
-        android:enabled="true"
-        android:title="@string/logout"
-        app:showAsAction="never" />
-</menu>
+        android:icon="@drawable/ic_logout"
+        app:showAsAction="always"
+        android:title="@string/logout">
+    </item>
+</menu>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/menu/menu_nav_drawer.xml b/mifosng-android/src/main/res/menu/menu_nav_drawer.xml
index 8393432cb2e..6a7464b504c 100644
--- a/mifosng-android/src/main/res/menu/menu_nav_drawer.xml
+++ b/mifosng-android/src/main/res/menu/menu_nav_drawer.xml
@@ -5,34 +5,6 @@
     <group android:checkableBehavior="single"
         android:id="@+id/group1" >
 
-        <item
-            android:id="@+id/item_dashboard"
-            android:checked="true"
-            android:icon="@drawable/ic_dashboard_black_24dp"
-            android:title="@string/dashboard"
-            />
-
-        <item
-            android:id="@+id/item_clients"
-            android:checked="false"
-            android:icon="@drawable/ic_person_black_24dp"
-            android:title="@string/clients"
-            />
-
-        <item
-            android:id="@+id/item_groups"
-            android:checked="false"
-            android:icon="@drawable/ic_group_black_24dp"
-            android:title="@string/groups"
-            />
-
-        <item
-            android:id="@+id/item_centers"
-            android:checked="false"
-            android:icon="@drawable/ic_centers_24dp"
-            android:title="@string/centers"
-            />
-
         <item
             android:id="@+id/item_checker_inbox"
             android:checked="false"

From 6725c93c94ee9518634af29ed812e99e44f753b0 Mon Sep 17 00:00:00 2001
From: danishjamal104 <danishjamal.104@gmail.com>
Date: Mon, 7 Dec 2020 00:03:06 +0530
Subject: [PATCH 13/25] UI enhancement in CenterDetailsFragment

---
 .../main/res/layout/fragment_center_details.xml    | 14 +++++++++-----
 .../src/main/res/values/styles_table.xml           |  3 +++
 .../src/main/res/values/styles_text.xml            |  2 ++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/mifosng-android/src/main/res/layout/fragment_center_details.xml b/mifosng-android/src/main/res/layout/fragment_center_details.xml
index d8098f2e3d8..74d9db08d88 100644
--- a/mifosng-android/src/main/res/layout/fragment_center_details.xml
+++ b/mifosng-android/src/main/res/layout/fragment_center_details.xml
@@ -10,7 +10,7 @@
     android:id="@+id/rl_center">
 
     <ScrollView style="@style/ScrollView.Base"
-                android:id="@+id/container">
+        android:id="@+id/container">
 
         <TableLayout
             android:id="@+id/tbl_centerDetails"
@@ -22,7 +22,9 @@
                 android:gravity="center_horizontal"
                 style="@style/TextView.Client"
                 android:textColor="@color/black"
-                android:text="@string/center_details"/>
+                android:text="@string/center_details"
+                android:paddingTop="@dimen/dimension_32_dp"
+                android:paddingBottom="@dimen/layout_padding_16dp"/>
 
             <TableRow
                 android:id="@+id/row_activation_date"
@@ -80,15 +82,17 @@
             <TextView
                 android:paddingTop="5dp"
                 android:paddingBottom="5dp"
-                android:layout_height="1dp"
+                android:layout_height="2dp"
                 android:layout_width="match_parent"
-                android:background="@color/black"/>
+                android:background="@color/black"
+                android:layout_marginTop="8dp"/>
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:gravity="center_horizontal"
-                android:paddingTop="16dp"
+                android:paddingTop="@dimen/dimension_32_dp"
+                android:paddingBottom="@dimen/layout_padding_16dp"
                 style="@style/TextView.Client"
                 android:textColor="@color/black"
                 android:text="@string/summary_info"/>
diff --git a/mifosng-android/src/main/res/values/styles_table.xml b/mifosng-android/src/main/res/values/styles_table.xml
index 7c0614a96b6..71f2752e234 100755
--- a/mifosng-android/src/main/res/values/styles_table.xml
+++ b/mifosng-android/src/main/res/values/styles_table.xml
@@ -18,6 +18,9 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">@drawable/table_row_round_bg</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:showDividers">middle</item>
+        <item name="android:divider">@color/primary_dark</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values/styles_text.xml b/mifosng-android/src/main/res/values/styles_text.xml
index 6d17f46c467..9964d68f368 100755
--- a/mifosng-android/src/main/res/values/styles_text.xml
+++ b/mifosng-android/src/main/res/values/styles_text.xml
@@ -34,6 +34,7 @@
         <item name="android:layout_marginTop">6dp</item>
         <item name="android:layout_marginBottom">6dp</item>
         <item name="android:textColor">@color/secondary_text</item>
+        <item name="android:paddingLeft">2dp</item>
     </style>
 
     <style name="TextView.Row.Value" parent="TextView.Row">
@@ -42,6 +43,7 @@
         <item name="android:layout_marginTop">6dp</item>
         <item name="android:layout_marginBottom">6dp</item>
         <item name="android:textColor">@color/primary_text</item>
+        <item name="android:paddingRight">32dp</item>
     </style>
 
     <style name="TextView.Client" parent="TextView.Base">

From 4ff2b55a88951b661fc7d2b0a59dca2bec738473 Mon Sep 17 00:00:00 2001
From: danishjamal104 <danishjamal.104@gmail.com>
Date: Fri, 11 Dec 2020 16:39:48 +0530
Subject: [PATCH 14/25] Intro added in SearchFragment

---
 mifosng-android/build.gradle                  |  3 ++
 .../online/search/SearchFragment.java         | 40 +++++++++++++++++++
 .../java/com/mifos/utils/PrefManager.java     | 13 ++++++
 .../src/main/res/values/strings.xml           |  9 +++++
 4 files changed, 65 insertions(+)

diff --git a/mifosng-android/build.gradle b/mifosng-android/build.gradle
index 4a400a41bd2..7b3da519881 100755
--- a/mifosng-android/build.gradle
+++ b/mifosng-android/build.gradle
@@ -9,6 +9,7 @@ buildscript {
         google()
         mavenCentral()
         maven { url 'https://maven.fabric.io/public' }
+        maven { url "https://jitpack.io" }
         jcenter()
     }
     dependencies {
@@ -219,6 +220,8 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.3.1'
     implementation 'com.facebook.stetho:stetho-okhttp3:1.3.1'
 
+    implementation 'com.github.deano2390:MaterialShowcaseView:1.3.4'
+
 
     implementation "com.joanzapata.iconify:android-iconify-material:2.1.1" // (v2.0.0)
     implementation('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
index e4be27805c1..53321fbeede 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
@@ -17,6 +17,7 @@
 import android.view.animation.AnimationUtils;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
@@ -49,12 +50,17 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import uk.co.deanwild.materialshowcaseview.MaterialShowcaseSequence;
+import uk.co.deanwild.materialshowcaseview.ShowcaseConfig;
 
 public class SearchFragment extends MifosBaseFragment implements SearchMvpView,
         RecyclerItemClickListener.OnItemClickListener, AdapterView.OnItemSelectedListener {
 
     private static final String LOG_TAG = SearchFragment.class.getSimpleName();
 
+    @BindView(R.id.btn_search)
+    Button bt_search;
+
     @BindView(R.id.et_search)
     EditText et_search;
 
@@ -131,12 +137,46 @@ public void showUserInterface() {
         rv_search.addOnItemTouchListener(new RecyclerItemClickListener(getActivity(), this));
         rv_search.setHasFixedSize(true);
         rv_search.setAdapter(searchAdapter);
+
         cb_exactMatch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
                 onClickSearch();
             }
         });
+
+        showGuide();
+    }
+
+    void showGuide() {
+        ShowcaseConfig config = new ShowcaseConfig();
+        config.setDelay(250); // half second between each showcase view
+
+        MaterialShowcaseSequence sequence = new MaterialShowcaseSequence(getActivity(), "123");
+
+        sequence.setConfig(config);
+
+        String et_search_intro = getString(R.string.et_search_intro);
+        int i = 1;
+        for (String s: searchOptionsValues) {
+            et_search_intro += "\n" + i + '.' + s;
+            i++;
+        }
+
+        String sp_search_intro = getString(R.string.sp_search_intro);
+        String cb_exactMatch_intro = getString(R.string.cb_exactMatch_intro);
+        String bt_search_intro = getString(R.string.bt_search_intro);
+
+        sequence.addSequenceItem(et_search,
+                et_search_intro, getString(R.string.got_it));
+        sequence.addSequenceItem(sp_search,
+                sp_search_intro, getString(R.string.next));
+        sequence.addSequenceItem(cb_exactMatch,
+                cb_exactMatch_intro, getString(R.string.next));
+        sequence.addSequenceItem(bt_search,
+                bt_search_intro, getString(R.string.finish));
+
+        sequence.start();
     }
 
 
diff --git a/mifosng-android/src/main/java/com/mifos/utils/PrefManager.java b/mifosng-android/src/main/java/com/mifos/utils/PrefManager.java
index c4b288a0556..5ff117b8636 100755
--- a/mifosng-android/src/main/java/com/mifos/utils/PrefManager.java
+++ b/mifosng-android/src/main/java/com/mifos/utils/PrefManager.java
@@ -26,6 +26,7 @@ public class PrefManager {
     private static final String USER_DETAILS = "user_details";
     private static final String PASSCODE = "passcode";
     private static final String PASSCODE_STATUS = "passcode_status";
+    public static final String FIRST_TIME_APP_LAUNCH = "preferences_app_launched";
 
     private static Gson gson = new Gson();
 
@@ -203,4 +204,16 @@ public static void setPassCodeStatus(boolean statusCode) {
     public static Boolean getPassCodeStatus() {
         return getBoolean(PASSCODE_STATUS, false);
     }
+
+    /**
+     * @return true if app is launched is first time and set the value to
+     * false which is returned whenever next time it is called
+     */
+    public  static Boolean isAppFirstTimeLaunched() {
+        Boolean result = getBoolean(FIRST_TIME_APP_LAUNCH, true);
+        if (result) {
+            putBoolean(FIRST_TIME_APP_LAUNCH, false);
+        }
+        return result;
+    }
 }
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values/strings.xml b/mifosng-android/src/main/res/values/strings.xml
index 3028ef6f5f0..845bdc4b371 100755
--- a/mifosng-android/src/main/res/values/strings.xml
+++ b/mifosng-android/src/main/res/values/strings.xml
@@ -835,6 +835,8 @@
     <string name="entry">ENTRY</string>
     <string name="network_issue">Network Issue</string>
     <string name="accounts">Accounts</string>
+
+>>>>>>> 9e9df49d (Intro added in SearchFragment)
     <string name="dark_mode">Dark Mode</string>
     <string name="ui">UI</string>
     <string name="dark_mode_def_value">MODE_NIGHT_FOLLOW_SYSTEM</string>
@@ -898,4 +900,11 @@
     <string name="change_passcode">Change Passcode</string>
     <string name="change_app_passcode">Change App Passcode</string>
 
+    <string name="got_it">GOT IT</string>
+    <string name="finish">FINISH</string>
+    <string name="sp_search_intro">Filter out the results using this dropdown</string>
+    <string name="cb_exactMatch_intro">To get the result matching exactly the keyword entered.\n Simply check this box</string>
+    <string name="bt_search_intro">Click this button to make a search.\nClick on three dot icon in top right to create new Client/ Center/ Group or logout.\nExplore the menu by clicking on 3 line icon on top left.</string>
+    <string name="et_search_intro">Enter keyword to search among</string>
+
 </resources>
\ No newline at end of file

From 33d5bc3c47e757be89a1bead06effaa60cb0e46b Mon Sep 17 00:00:00 2001
From: danishjamal104 <danishjamal.104@gmail.com>
Date: Wed, 30 Dec 2020 23:51:50 +0530
Subject: [PATCH 15/25] Transaction details layout added

---
 .../SavingsAccountSummaryFragmentTest.java    |   1 -
 .../component/ActivityComponent.java          |   2 +-
 .../SavingsAccountSummaryFragment.kt          |  39 ++++--
 .../transaction_detail_dialog_layout.xml      | 115 ++++++++++++++++++
 .../src/main/res/values/strings.xml           |  13 +-
 .../src/main/res/values/styles_table.xml      |   8 +-
 6 files changed, 159 insertions(+), 19 deletions(-)
 create mode 100644 mifosng-android/src/main/res/layout/transaction_detail_dialog_layout.xml

diff --git a/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/SavingsAccountSummaryFragmentTest.java b/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/SavingsAccountSummaryFragmentTest.java
index 6d4db1cd874..98b6c9dd162 100755
--- a/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/SavingsAccountSummaryFragmentTest.java
+++ b/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/SavingsAccountSummaryFragmentTest.java
@@ -16,7 +16,6 @@
 
 import com.mifos.mifosxdroid.R;
 import com.mifos.mifosxdroid.online.ClientActivity;
-import com.mifos.mifosxdroid.online.savingaccountsummary.SavingsAccountSummaryFragment;
 import com.mifos.mifosxdroid.online.documentlist.DocumentListFragment;
 import com.mifos.objects.accounts.savings.DepositType;
 import com.mifos.utils.Constants;
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
index 97ade5749de..457562f05d5 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
@@ -24,6 +24,7 @@
 import com.mifos.mifosxdroid.online.runreports.report.ReportFragment;
 import com.mifos.mifosxdroid.online.runreports.reportcategory.ReportCategoryFragment;
 import com.mifos.mifosxdroid.online.runreports.reportdetail.ReportDetailFragment;
+import com.mifos.mifosxdroid.online.savingaccountsummary.SavingsAccountSummaryFragment;
 import com.mifos.mifosxdroid.online.sign.SignatureFragment;
 import com.mifos.mifosxdroid.offline.offlinedashbarod.OfflineDashboardFragment;
 import com.mifos.mifosxdroid.offline.synccenterpayloads.SyncCenterPayloadsFragment;
@@ -62,7 +63,6 @@
 import com.mifos.mifosxdroid.online.loanrepaymentschedule.LoanRepaymentScheduleFragment;
 import com.mifos.mifosxdroid.online.loantransactions.LoanTransactionsFragment;
 import com.mifos.mifosxdroid.online.note.NoteFragment;
-import com.mifos.mifosxdroid.online.savingaccountsummary.SavingsAccountSummaryFragment;
 import com.mifos.mifosxdroid.online.savingaccounttransaction.SavingsAccountTransactionFragment;
 import com.mifos.mifosxdroid.online.savingsaccount.SavingsAccountFragment;
 import com.mifos.mifosxdroid.online.savingsaccountactivate.SavingsAccountActivateFragment;
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryFragment.kt
index a665c8fc179..fbeb3c6ce78 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryFragment.kt
@@ -5,6 +5,7 @@
 package com.mifos.mifosxdroid.online.savingaccountsummary
 
 import android.app.Activity
+import android.app.Dialog
 import android.os.Bundle
 import android.util.Log
 import android.view.*
@@ -318,18 +319,8 @@ class SavingsAccountSummaryFragment : ProgressableFragment(), SavingsAccountSumm
 
             // Cache transactions here
             listOfAllTransactions.addAll(savingsAccountWithAssociations.transactions)
-            lv_Transactions!!.onItemClickListener = AdapterView.OnItemClickListener { adapterView, view, i, l -> /*
-                                     On Click at a Savings Account Transaction
-                                     1. get the transactionId of that transaction
-                                     2. get the account Balance after that transaction
-                                    */
-                val transactionId = listOfAllTransactions[i].id
-                val runningBalance = listOfAllTransactions[i].runningBalance
-
-                //Display them as a Formatted string in a toast message
-                Toast.makeText(activity, String.format(resources
-                        .getString(R.string.savings_transaction_detail), transactionId,
-                        runningBalance), Toast.LENGTH_LONG).show()
+            lv_Transactions!!.onItemClickListener = AdapterView.OnItemClickListener { adapterView, view, i, l ->
+                showTransaction(i)
             }
             if (savingsAccountWithAssociations.status.submittedAndPendingApproval) {
                 bt_approve_saving!!.isEnabled = true
@@ -357,6 +348,29 @@ class SavingsAccountSummaryFragment : ProgressableFragment(), SavingsAccountSumm
         }
     }
 
+    fun showTransaction(i: Int) {
+        val transaction = listOfAllTransactions[i]
+        val dialog = Dialog(context)
+        dialog.window.setBackgroundDrawableResource(android.R.color.transparent)
+        dialog.setContentView(R.layout.transaction_detail_dialog_layout)
+        val transactionId = dialog.findViewById<TextView>(R.id.tv_transactionId)
+        val date = dialog.findViewById<TextView>(R.id.tv_date)
+        val transactionType = dialog.findViewById<TextView>(R.id.tv_transactionType)
+        val runningBalance = dialog.findViewById<TextView>(R.id.tv_runningBalance)
+        val savingAccountId = dialog.findViewById<TextView>(R.id.tv_savingAccountId)
+        val accountNumber = dialog.findViewById<TextView>(R.id.tv_accountNumber)
+        val currency = dialog.findViewById<TextView>(R.id.tv_currency)
+        val dateList = transaction.date
+        transactionId.text = transaction.id.toString()
+        date.text = String.format("%s-%s-%s", dateList[0], dateList[1], dateList[2])
+        transactionType.text = transaction.transactionType.value
+        runningBalance.text = transaction.runningBalance.toString()
+        savingAccountId.text = transaction.accountId.toString()
+        accountNumber.text = transaction.accountNo
+        currency.text = transaction.currency.name
+        dialog.show()
+    }
+
     override fun showSavingsActivatedSuccessfully(genericResponse: GenericResponse?) {
         Toast.makeText(activity, resources.getString(R.string.savings_account_activated),
                 Toast.LENGTH_LONG).show()
@@ -389,6 +403,7 @@ class SavingsAccountSummaryFragment : ProgressableFragment(), SavingsAccountSumm
         const val MENU_ITEM_DOCUMENTS = 1004
         private const val ACTION_APPROVE_SAVINGS = 4
         private const val ACTION_ACTIVATE_SAVINGS = 5
+
         @JvmStatic
         fun newInstance(savingsAccountNumber: Int,
                         type: DepositType?,
diff --git a/mifosng-android/src/main/res/layout/transaction_detail_dialog_layout.xml b/mifosng-android/src/main/res/layout/transaction_detail_dialog_layout.xml
new file mode 100644
index 00000000000..ba5d13ef76f
--- /dev/null
+++ b/mifosng-android/src/main/res/layout/transaction_detail_dialog_layout.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:cardBackgroundColor="@color/light_grey"
+    app:cardCornerRadius="10dp">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <TableLayout
+            android:id="@+id/tbl_transactionDetails"
+            style="@style/Table">
+
+            <TableRow
+                android:id="@+id/tr_transaction_id"
+                style="@style/TableRow">
+
+                <TextView
+                    style="@style/TextView.Row"
+                    android:text="@string/transaction_id"/>
+
+                <TextView
+                    android:id="@+id/tv_transactionId"
+                    style="@style/TextView.Row.Value"/>
+            </TableRow>
+
+            <TableRow
+                android:id="@+id/tr_date"
+                style="@style/TableRow">
+
+                <TextView
+                    style="@style/TextView.Row"
+                    android:text="@string/date"/>
+
+                <TextView
+                    android:id="@+id/tv_date"
+                    style="@style/TextView.Row.Value"/>
+            </TableRow>
+
+            <TableRow
+                android:id="@+id/tr_transactionType"
+                style="@style/TableRow">
+
+                <TextView
+                    style="@style/TextView.Row"
+                    android:text="@string/transaction_type"/>
+
+                <TextView
+                    android:id="@+id/tv_transactionType"
+                    style="@style/TextView.Row.Value"/>
+            </TableRow>
+
+            <TableRow
+                android:id="@+id/tr_runningBalance"
+                style="@style/TableRow">
+
+                <TextView
+                    style="@style/TextView.Row"
+                    android:text="@string/running_balance"/>
+
+                <TextView
+                    android:id="@+id/tv_runningBalance"
+                    style="@style/TextView.Row.Value"/>
+            </TableRow>
+
+            <TableRow
+                android:id="@+id/tr_savingAccountId"
+                style="@style/TableRow">
+
+                <TextView
+                    style="@style/TextView.Row"
+                    android:text="@string/saving_account_id"/>
+
+                <TextView
+                    android:id="@+id/tv_savingAccountId"
+                    style="@style/TextView.Row.Value"/>
+            </TableRow>
+
+            <TableRow
+                android:id="@+id/tr_accountNumber"
+                style="@style/TableRow">
+
+                <TextView
+                    style="@style/TextView.Row"
+                    android:text="@string/account_number"/>
+
+                <TextView
+                    android:id="@+id/tv_accountNumber"
+                    style="@style/TextView.Row.Value"/>
+            </TableRow>
+
+            <TableRow
+                android:id="@+id/tr_currency"
+                style="@style/TableRow"
+                android:paddingBottom="12dp">
+
+                <TextView
+                    style="@style/TextView.Row"
+                    android:text="@string/currency"/>
+
+                <TextView
+                    android:id="@+id/tv_currency"
+                    style="@style/TextView.Row.Value"
+                    android:text=""/>
+            </TableRow>
+
+        </TableLayout>
+
+
+    </RelativeLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values/strings.xml b/mifosng-android/src/main/res/values/strings.xml
index 3028ef6f5f0..90eb9efed5b 100755
--- a/mifosng-android/src/main/res/values/strings.xml
+++ b/mifosng-android/src/main/res/values/strings.xml
@@ -33,7 +33,6 @@
     <string name="default_instance_url" translatable="false">demo.openmf.org</string>
     <string name="review_transaction">Review Transaction</string>
     <string name="amount">Amount</string>
-    <string name="date">Date</string>
     <string name="date_colon">Date:</string>
     <string name="payment_type">Payment Type</string>
     <string name="mifos_instance_domain">Mifos Instance Domain</string>
@@ -41,7 +40,6 @@
     <string name="password">Password</string>
     <string name="mifos" translatable="false">Mifos</string>
     <string name="full_name">Name</string>
-    <string name="account_number">Account Number</string>
     <string name="external_id">External ID</string>
     <string name="loanproduct">Loan Product</string>
     <string name="loantype">Loan Type</string>
@@ -199,7 +197,6 @@
     <string name="no_payment_added">No Payment Added</string>
     <string name="add_payment_detail">Add Payment Detail</string>
     <string name="generate_new">Generate New</string>
-    <string name="currency">Currency</string>
     <string name="Log_in_success">Logged in successfully</string>
     <!-- General Terms End Here -->
 
@@ -333,7 +330,6 @@
     <string name="transaction_failed">Transaction Failed</string>
     <string name="transaction_saved_in_db">Transaction Saved in DB</string>
     <string name="payment_failed">Payment Failed</string>
-    <string name="transaction_type">Transaction Type</string>
     <string name="loan_submission_date">Submission Date</string>
     <string name="total_charges">Total Charges:</string>
     <string name="total_dues">Total Due:</string>
@@ -834,6 +830,7 @@
     <string name="something_went_wrong">Something went wrong</string>
     <string name="entry">ENTRY</string>
     <string name="network_issue">Network Issue</string>
+
     <string name="accounts">Accounts</string>
     <string name="dark_mode">Dark Mode</string>
     <string name="ui">UI</string>
@@ -897,5 +894,13 @@
     <string name="passcode">Passcode</string>
     <string name="change_passcode">Change Passcode</string>
     <string name="change_app_passcode">Change App Passcode</string>
+    <string name="currency">Currency</string>
+    <string name="account_number">Account Number</string>
+    <string name="saving_account_id">Saving Account Id</string>
+    <string name="running_balance">Running Balance</string>
+    <string name="transaction_type">Transaction Type</string>
+    <string name="date">Date</string>
+    <string name="transaction_id">Transaction Id</string>
+
 
 </resources>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values/styles_table.xml b/mifosng-android/src/main/res/values/styles_table.xml
index 7c0614a96b6..54916df0e6a 100755
--- a/mifosng-android/src/main/res/values/styles_table.xml
+++ b/mifosng-android/src/main/res/values/styles_table.xml
@@ -14,7 +14,13 @@
 
 
     <style name="TableRow">
-        <item name="android:layout_marginTop">8dp</item>
+
+        <item name="android:layout_margin">3dp</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:paddingStart">12dp</item>
+        <item name="android:paddingRight">12dp</item>
+        <item name="android:paddingEnd">12dp</item>
+        <item name="android:paddingTop">12dp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">@drawable/table_row_round_bg</item>

From 98b57b40156dfe35e4859e0401487f1be95c08ab Mon Sep 17 00:00:00 2001
From: Danish Jamal <danishjamal.104@gmail.com>
Date: Wed, 25 Nov 2020 21:39:55 +0530
Subject: [PATCH 16/25] replaced static declaration of text to tools namespace

---
 .../res/layout/view_account_accordion_section.xml     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mifosng-android/src/main/res/layout/view_account_accordion_section.xml b/mifosng-android/src/main/res/layout/view_account_accordion_section.xml
index 745d6ce008a..ed3311512b2 100755
--- a/mifosng-android/src/main/res/layout/view_account_accordion_section.xml
+++ b/mifosng-android/src/main/res/layout/view_account_accordion_section.xml
@@ -2,8 +2,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="10dp"
-    android:paddingBottom="12dp">
+    android:paddingBottom="12dp"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_marginTop="10dp">
+
 
     <com.joanzapata.iconify.widget.IconTextView
         android:id="@+id/tv_toggle_accounts_icon"
@@ -23,10 +25,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/tv_toggle_accounts_icon"
-        android:text="@string/savingAccounts"
         android:layout_toEndOf="@id/tv_toggle_accounts_icon"
         android:layout_marginLeft="12dp"
-        android:layout_marginStart="12dp" />
+        android:layout_marginStart="12dp"
+        tools:text="@string/savingAccounts" />
+
 
     <TextView
         android:id="@+id/tv_count_accounts"

From 6b050c9ae647efd811f9649eb01e8b8007d35853 Mon Sep 17 00:00:00 2001
From: danishjamal104 <danishjamal.104@gmail.com>
Date: Mon, 21 Dec 2020 12:03:34 +0530
Subject: [PATCH 17/25] visibility of info text fixed in individual collection
 sheet

---
 .../injection/component/ActivityComponent.java   |  2 +-
 .../PaymentDetailsFragment.kt                    | 16 +++++++++++++++-
 .../individual_collections_sheet_details.xml     |  3 ++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
index 97ade5749de..2f34a8541ed 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
@@ -21,6 +21,7 @@
 import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxTasksFragment;
 import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.IndividualCollectionSheetDetailsFragment;
 import com.mifos.mifosxdroid.online.collectionsheetindividual.NewIndividualCollectionSheetFragment;
+import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.PaymentDetailsFragment;
 import com.mifos.mifosxdroid.online.runreports.report.ReportFragment;
 import com.mifos.mifosxdroid.online.runreports.reportcategory.ReportCategoryFragment;
 import com.mifos.mifosxdroid.online.runreports.reportdetail.ReportDetailFragment;
@@ -40,7 +41,6 @@
 import com.mifos.mifosxdroid.online.clientlist.ClientListFragment;
 import com.mifos.mifosxdroid.online.collectionsheet.CollectionSheetFragment;
 import com.mifos.mifosxdroid.online.collectionsheetindividual.IndividualCollectionSheetFragment;
-import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.PaymentDetailsFragment;
 import com.mifos.mifosxdroid.online.createnewcenter.CreateNewCenterFragment;
 import com.mifos.mifosxdroid.online.createnewclient.CreateNewClientFragment;
 import com.mifos.mifosxdroid.online.createnewgroup.CreateNewGroupFragment;
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/PaymentDetailsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/PaymentDetailsFragment.kt
index 6db0fce97a9..7d7179f7caa 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/PaymentDetailsFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/PaymentDetailsFragment.kt
@@ -183,7 +183,7 @@ class PaymentDetailsFragment : MifosBaseFragment(), View.OnClickListener, OnItem
     }
 
     private fun saveAdditional() {
-        tvNoPayment!!.visibility = View.GONE
+        var isAnyDetailNull = false
         bulkRepaymentTransaction!!.setLoanId(loanAndClientNameItem
                 ?.getLoan()!!.loanId)
         val charge1: Double =   if (!tvCharges?.getText().toString().isEmpty())
@@ -197,18 +197,32 @@ class PaymentDetailsFragment : MifosBaseFragment(), View.OnClickListener, OnItem
 
         if (!etAccountNumber!!.text.toString().isEmpty()) {
             bulkRepaymentTransaction!!.accountNumber = etAccountNumber!!.text.toString()
+        } else {
+            isAnyDetailNull = true;
         }
         if (!etChequeNumber!!.text.toString().isEmpty()) {
             bulkRepaymentTransaction!!.checkNumber = etChequeNumber!!.text.toString()
+        } else {
+            isAnyDetailNull = true;
         }
         if (!etRoutingCode!!.text.toString().isEmpty()) {
             bulkRepaymentTransaction!!.routingCode = etRoutingCode!!.text.toString()
+        } else {
+            isAnyDetailNull = true;
         }
         if (!etReceiptNumber!!.text.toString().isEmpty()) {
             bulkRepaymentTransaction!!.receiptNumber = etReceiptNumber!!.text.toString()
+        } else {
+            isAnyDetailNull = true;
         }
         if (!etBankNumber!!.text.toString().isEmpty()) {
             bulkRepaymentTransaction!!.bankNumber = etBankNumber!!.text.toString()
+        } else {
+            isAnyDetailNull = true;
+        }
+
+        if(!isAnyDetailNull) {
+            tvNoPayment!!.visibility = View.GONE
         }
         onSaveAdditionalItem(bulkRepaymentTransaction, position)
         tableAdditional!!.visibility = View.GONE
diff --git a/mifosng-android/src/main/res/layout/individual_collections_sheet_details.xml b/mifosng-android/src/main/res/layout/individual_collections_sheet_details.xml
index 046ec466036..6697145c8aa 100644
--- a/mifosng-android/src/main/res/layout/individual_collections_sheet_details.xml
+++ b/mifosng-android/src/main/res/layout/individual_collections_sheet_details.xml
@@ -8,5 +8,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/recycler_collections"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        tools:listitem="@layout/item_individual_collection_sheet"/>
 </RelativeLayout>
\ No newline at end of file

From 3b47647e94be98f421216f212378a4edcb4906ed Mon Sep 17 00:00:00 2001
From: danishjamal104 <danishjamal.104@gmail.com>
Date: Wed, 9 Dec 2020 17:58:04 +0530
Subject: [PATCH 18/25] InstanceURl edit prefrence added in settings

---
 .../com/mifos/mifosxdroid/SettingsFragment.kt | 37 ++++++++++++++-----
 .../main/res/drawable/ic_baseline_edit_24.xml | 10 +++++
 .../src/main/res/values/strings.xml           |  6 ++-
 .../src/main/res/xml/preferences.xml          |  5 +++
 4 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 mifosng-android/src/main/res/drawable/ic_baseline_edit_24.xml

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt
index 6bfc4ebe4e6..d482c0b7d2d 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt
@@ -2,28 +2,23 @@ package com.mifos.mifosxdroid
 
 import android.content.Intent
 import android.content.SharedPreferences
+import android.os.Build
 import android.os.Bundle
-import android.preference.ListPreference
+import android.preference.*
 import android.preference.Preference.OnPreferenceChangeListener
-import android.preference.PreferenceFragment
-import android.preference.SwitchPreference
 import android.widget.Toast
 import com.mifos.mifosxdroid.dialogfragments.syncsurveysdialog.SyncSurveysDialogFragment
-import com.mifos.utils.FragmentConstants
-import com.mifos.utils.LanguageHelper
-import com.mifos.utils.ThemeHelper
-import android.preference.Preference
-import android.preference.PreferenceScreen
-
+import com.mifos.mifosxdroid.online.DashboardActivity
 import com.mifos.mifosxdroid.passcode.PassCodeActivity
 import com.mifos.mobile.passcode.utils.PasscodePreferencesHelper
-import com.mifos.utils.Constants
+import com.mifos.utils.*
 
 /**
  * Created by mayankjindal on 22/07/17.
  */
 class SettingsFragment : PreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
     var mEnableSyncSurvey: SwitchPreference? = null
+    var mInstanceUrlPref: EditTextPreference? = null
     private lateinit var languages: Array<String>
     private var languageCallback: LanguageCallback? = null
     var preference: Preference? = null
@@ -54,6 +49,28 @@ class SettingsFragment : PreferenceFragment(), SharedPreferences.OnSharedPrefere
             true
         }
 
+        mInstanceUrlPref = findPreference(
+                getString(R.string.hint_instance_url)) as EditTextPreference
+        val instanceUrl = PrefManager.getInstanceUrl()
+        mInstanceUrlPref!!.text = instanceUrl
+        mInstanceUrlPref!!.isSelectable = true
+        mInstanceUrlPref!!.dialogTitle = "Edit Instance Url"
+        mInstanceUrlPref!!.setDialogIcon(R.drawable.ic_baseline_edit_24)
+        mInstanceUrlPref!!.onPreferenceChangeListener = OnPreferenceChangeListener { preference, o ->
+            val newUrl = o.toString()
+            if (newUrl != instanceUrl) {
+                PrefManager.setInstanceUrl(newUrl)
+                Toast.makeText(activity, newUrl, Toast.LENGTH_SHORT).show()
+                startActivity(Intent(activity, DashboardActivity::class.java))
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                    activity.finishAffinity()
+                } else {
+                    activity.finish()
+                }
+            }
+            true
+        }
+
         val langPref = findPreference("language_type") as ListPreference
         langPref.onPreferenceChangeListener = OnPreferenceChangeListener {preference, newValue ->
             LanguageHelper.setLocale(this.activity, newValue.toString())
diff --git a/mifosng-android/src/main/res/drawable/ic_baseline_edit_24.xml b/mifosng-android/src/main/res/drawable/ic_baseline_edit_24.xml
new file mode 100644
index 00000000000..2844bafebe8
--- /dev/null
+++ b/mifosng-android/src/main/res/drawable/ic_baseline_edit_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/mifosng-android/src/main/res/values/strings.xml b/mifosng-android/src/main/res/values/strings.xml
index d1f7fbeea9f..8e158453661 100755
--- a/mifosng-android/src/main/res/values/strings.xml
+++ b/mifosng-android/src/main/res/values/strings.xml
@@ -833,7 +833,6 @@
 
     <string name="accounts">Accounts</string>
 
->>>>>>> 9e9df49d (Intro added in SearchFragment)
     <string name="dark_mode">Dark Mode</string>
     <string name="ui">UI</string>
     <string name="dark_mode_def_value">MODE_NIGHT_FOLLOW_SYSTEM</string>
@@ -896,6 +895,7 @@
     <string name="passcode">Passcode</string>
     <string name="change_passcode">Change Passcode</string>
     <string name="change_app_passcode">Change App Passcode</string>
+
     <string name="currency">Currency</string>
     <string name="account_number">Account Number</string>
     <string name="saving_account_id">Saving Account Id</string>
@@ -912,4 +912,6 @@
     <string name="bt_search_intro">Click this button to make a search.\nClick on three dot icon in top right to create new Client/ Center/ Group or logout.\nExplore the menu by clicking on 3 line icon on top left.</string>
     <string name="et_search_intro">Enter keyword to search among</string>
 
-</resources>
\ No newline at end of file
+    <string name="instance_url">Instance Url</string>
+
+</resources>
diff --git a/mifosng-android/src/main/res/xml/preferences.xml b/mifosng-android/src/main/res/xml/preferences.xml
index 80903b31b41..8b5ba7e12d0 100644
--- a/mifosng-android/src/main/res/xml/preferences.xml
+++ b/mifosng-android/src/main/res/xml/preferences.xml
@@ -26,4 +26,9 @@
         android:icon="@drawable/ic_passcode"
         android:summary="@string/change_app_passcode"
         android:title="@string/change_passcode"/>
+
+    <EditTextPreference
+        android:key="@string/hint_instance_url"
+        android:title="@string/instance_url"/>
+
 </PreferenceScreen>
\ No newline at end of file

From e4829574a03105945c43ce9864bf580570226646 Mon Sep 17 00:00:00 2001
From: Danish Jamal <danishjamal.104@gmail.com>
Date: Thu, 3 Dec 2020 13:37:56 +0530
Subject: [PATCH 19/25] Auto search added when user add filter in
 searchFragment

---
 .../mifosxdroid/online/search/SearchFragment.java      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
index 53321fbeede..a640a8657d9 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.java
@@ -94,6 +94,9 @@ public class SearchFragment extends MifosBaseFragment implements SearchMvpView,
     @Inject
     SearchPresenter searchPresenter;
 
+    // determines weather search is triggered by user or system
+    boolean autoTriggerSearch = false;
+
     private List<SearchedEntity> searchedEntities;
     private ArrayAdapter<CharSequence> searchOptionsAdapter;
     private String resources;
@@ -206,7 +209,9 @@ public void onClickSearch() {
             EspressoIdlingResource.increment(); // App is busy until further notice.
             searchPresenter.searchResources(query, resources, cb_exactMatch.isChecked());
         } else {
-            Toaster.show(et_search, getString(R.string.no_search_query_entered));
+            if (!autoTriggerSearch) {
+                Toaster.show(et_search, getString(R.string.no_search_query_entered));
+            }
         }
     }
 
@@ -231,6 +236,7 @@ void onClickCreate() {
             fabGroup.setClickable(true);
             isFabOpen = true;
         }
+        autoTriggerSearch = false;
     }
 
     @Override
@@ -322,6 +328,8 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
             } else {
                 resources = searchOptionsValues[position - 1];
             }
+            autoTriggerSearch = true;
+            onClickSearch();
         }
     }
 

From 315450ff409cf55e637097a84708186d273ffe42 Mon Sep 17 00:00:00 2001
From: danishjamal104 <danishjamal.104@gmail.com>
Date: Sat, 26 Dec 2020 00:58:07 +0530
Subject: [PATCH 20/25] search functionality added in individual collection
 sheet

---
 .../searchdialog/SearchDialog.java            |  97 +++++++++++++++++
 .../NewIndividualCollectionSheetFragment.kt   |  48 ++++++++-
 .../mifosxdroid/views/CustomSpinner.java      | 102 ++++++++++++++++++
 .../main/res/drawable/round_outline_bg.xml    |   8 ++
 .../layout/fragment_new_collection_sheet.xml  |   4 +-
 .../res/layout/search_list_dialog_layout.xml  |  28 +++++
 6 files changed, 283 insertions(+), 4 deletions(-)
 create mode 100644 mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/searchdialog/SearchDialog.java
 create mode 100644 mifosng-android/src/main/java/com/mifos/mifosxdroid/views/CustomSpinner.java
 create mode 100644 mifosng-android/src/main/res/drawable/round_outline_bg.xml
 create mode 100644 mifosng-android/src/main/res/layout/search_list_dialog_layout.xml

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/searchdialog/SearchDialog.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/searchdialog/SearchDialog.java
new file mode 100644
index 00000000000..e556c97917f
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/searchdialog/SearchDialog.java
@@ -0,0 +1,97 @@
+package com.mifos.mifosxdroid.dialogfragments.searchdialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ListView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.mifos.mifosxdroid.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SearchDialog extends Dialog {
+
+    private List<String> mainList;
+    private List<String> filterList;
+    private AdapterView.OnItemClickListener clickListener;
+
+    private EditText editText;
+    private ListView listView;
+    private ArrayAdapter<String> adapter;
+
+    public SearchDialog(@NonNull Context context, List<String> items,
+                        AdapterView.OnItemClickListener clickListener) {
+        super(context);
+        this.clickListener = clickListener;
+        this.mainList = items;
+        setUp();
+    }
+
+    private void setUp() {
+        filterList = new ArrayList<>();
+        filterList.addAll(mainList);
+        setContentView(0);
+
+        adapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_list_item_1,
+                android.R.id.text1, filterList);
+        listView = this.findViewById(R.id.lv_items);
+        editText = this.findViewById(R.id.et_drop_down_search);
+        editText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { }
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { }
+            @Override
+            public void afterTextChanged(Editable editable) {
+                filterList.clear();
+                String text = editable.toString().toLowerCase();
+                for (String s: mainList) {
+                    if (s.toLowerCase().contains(text)) {
+                        filterList.add(s);
+                    }
+                }
+                adapter.notifyDataSetChanged();
+            }
+        });
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                for (int pos = 0; pos < mainList.size(); pos++) {
+                    if (mainList.get(pos).equals(filterList.get(i))) {
+                        clickListener.onItemClick(adapterView, view, pos, l);
+                    }
+                }
+                dismiss();
+            }
+        });
+        listView.setAdapter(adapter);
+    }
+
+    @Override
+    public void setContentView(int layoutResID) {
+        layoutResID = R.layout.search_list_dialog_layout;
+        super.setContentView(layoutResID);
+    }
+
+    @Override
+    @Deprecated
+    public void setContentView(@NonNull View view) {
+        super.setContentView(view);
+    }
+
+    @Override
+    @Deprecated
+    public void addContentView(@NonNull View view, @Nullable ViewGroup.LayoutParams params) {
+        super.addContentView(view, params);
+    }
+}
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetFragment.kt
index bdc4561201a..5de25f34c78 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetFragment.kt
@@ -16,9 +16,12 @@ import com.mifos.mifosxdroid.core.MifosBaseActivity
 import com.mifos.mifosxdroid.core.MifosBaseFragment
 import com.mifos.mifosxdroid.core.util.Toaster
 import com.mifos.mifosxdroid.dialogfragments.collectionsheetdialog.CollectionSheetDialogFragment
+import com.mifos.mifosxdroid.dialogfragments.searchdialog.SearchDialog
 import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.IndividualCollectionSheetDetailsFragment
 import com.mifos.mifosxdroid.uihelpers.MFDatePicker
 import com.mifos.mifosxdroid.uihelpers.MFDatePicker.OnDatePickListener
+import com.mifos.mifosxdroid.views.CustomSpinner
+import com.mifos.mifosxdroid.views.CustomSpinner.OnSpinnerEventsListener
 import com.mifos.objects.collectionsheet.IndividualCollectionSheet
 import com.mifos.objects.organisation.Office
 import com.mifos.objects.organisation.Staff
@@ -39,11 +42,11 @@ class NewIndividualCollectionSheetFragment : MifosBaseFragment(), IndividualColl
 
     @JvmField
     @BindView(R.id.sp_office_list)
-    var spOffices: Spinner? = null
+    var spOffices: CustomSpinner? = null
 
     @JvmField
     @BindView(R.id.sp_staff_list)
-    var spStaff: Spinner? = null
+    var spStaff: CustomSpinner? = null
 
     @JvmField
     @BindView(R.id.tv_repayment_date)
@@ -72,6 +75,10 @@ class NewIndividualCollectionSheetFragment : MifosBaseFragment(), IndividualColl
     private var success = true
     private var actualDisbursementDate: String? = null
     private var transactionDate: String? = null
+
+    private var officeSearchDialog: SearchDialog? = null
+    private var staffSearchDialog: SearchDialog? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (activity as MifosBaseActivity?)!!.activityComponent.inject(this)
@@ -107,6 +114,43 @@ class NewIndividualCollectionSheetFragment : MifosBaseFragment(), IndividualColl
         tvRepaymentDate!!.setOnClickListener(this)
         btnFetchSheet!!.setOnClickListener(this)
         presenter!!.fetchOffices()
+
+        spOffices!!.setSpinnerEventsListener(object : OnSpinnerEventsListener {
+            override fun onSpinnerOpened(spinner: Spinner, isItemListLarge: Boolean) {
+                if (isItemListLarge) {
+                    enableOfficeSearch()
+                }
+            }
+
+            override fun onSpinnerClosed(spinner: Spinner) {}
+        })
+
+        spStaff!!.setSpinnerEventsListener(object : OnSpinnerEventsListener {
+            override fun onSpinnerOpened(spinner: Spinner, isItemListLarge: Boolean) {
+                if (isItemListLarge) {
+                    enableStaffSearch()
+                }
+            }
+
+            override fun onSpinnerClosed(spinner: Spinner) {}
+        })
+
+    }
+
+    fun enableOfficeSearch() {
+        if (officeSearchDialog == null) {
+            val listener = AdapterView.OnItemClickListener { adapterView, view, i, l -> spOffices!!.setSelection(i) }
+            officeSearchDialog = SearchDialog(requireContext(), officeNameList, listener)
+        }
+        officeSearchDialog!!.show()
+    }
+
+    fun enableStaffSearch() {
+        if (staffSearchDialog == null) {
+            val listener = AdapterView.OnItemClickListener { adapterView, view, i, l -> spStaff!!.setSelection(i) }
+            staffSearchDialog = SearchDialog(requireContext(), staffNameList, listener)
+        }
+        staffSearchDialog!!.show()
     }
 
     fun setRepaymentDate() {
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/CustomSpinner.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/CustomSpinner.java
new file mode 100644
index 00000000000..c100cb85fbc
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/CustomSpinner.java
@@ -0,0 +1,102 @@
+package com.mifos.mifosxdroid.views;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.AttributeSet;
+import android.widget.Spinner;
+
+public class CustomSpinner extends androidx.appcompat.widget.AppCompatSpinner {
+
+    public interface OnSpinnerEventsListener {
+
+        /**
+         * Callback triggered when the spinner was opened.
+         */
+        void onSpinnerOpened(Spinner spinner, boolean isItemListLarge);
+
+        /**
+         * Callback triggered when the spinner was closed.
+         */
+        void onSpinnerClosed(Spinner spinner);
+
+    }
+
+    private OnSpinnerEventsListener mListener;
+    private boolean mOpenInitiated = false;
+
+    @Override
+    public boolean performClick() {
+        // register that the Spinner was opened so we have a status
+        // indicator for when the container holding this Spinner may lose focus
+        mOpenInitiated = true;
+        if (mListener != null) {
+            if (super.getAdapter().getCount() >= 10) {
+                mListener.onSpinnerOpened(this, true);
+                return true;
+            } else {
+                mListener.onSpinnerOpened(this, false);
+            }
+        }
+        return super.performClick();
+    }
+
+    @Override
+    public void onWindowFocusChanged (boolean hasFocus) {
+        if (hasBeenOpened() && hasFocus) {
+            performClosedEvent();
+        }
+    }
+
+    /**
+     * Register the listener which will listen for events.
+     */
+    public void setSpinnerEventsListener(
+            OnSpinnerEventsListener onSpinnerEventsListener) {
+        mListener = onSpinnerEventsListener;
+    }
+
+    /**
+     * Propagate the closed Spinner event to the listener from outside if needed.
+     */
+    public void performClosedEvent() {
+        mOpenInitiated = false;
+        if (mListener != null) {
+            mListener.onSpinnerClosed(this);
+        }
+    }
+
+
+    /**
+     * A boolean flag indicating that the Spinner triggered an open event.
+     *
+     * @return true for opened Spinner
+     */
+    public boolean hasBeenOpened() {
+        return mOpenInitiated;
+    }
+
+    public CustomSpinner(Context context) {
+        super(context);
+    }
+
+    public CustomSpinner(Context context, int mode) {
+        super(context, mode);
+    }
+
+    public CustomSpinner(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CustomSpinner(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public CustomSpinner(Context context, AttributeSet attrs, int defStyleAttr, int mode) {
+        super(context, attrs, defStyleAttr, mode);
+    }
+
+    public CustomSpinner(Context context, AttributeSet attrs,
+                         int defStyleAttr, int mode, Resources.Theme popupTheme) {
+        super(context, attrs, defStyleAttr, mode, popupTheme);
+    }
+}
diff --git a/mifosng-android/src/main/res/drawable/round_outline_bg.xml b/mifosng-android/src/main/res/drawable/round_outline_bg.xml
new file mode 100644
index 00000000000..65a32a0a901
--- /dev/null
+++ b/mifosng-android/src/main/res/drawable/round_outline_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke android:color="@color/primary" android:width="2dp"/>
+    <corners android:radius="2dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/layout/fragment_new_collection_sheet.xml b/mifosng-android/src/main/res/layout/fragment_new_collection_sheet.xml
index 3269b7b114a..6a1558b5eda 100644
--- a/mifosng-android/src/main/res/layout/fragment_new_collection_sheet.xml
+++ b/mifosng-android/src/main/res/layout/fragment_new_collection_sheet.xml
@@ -21,7 +21,7 @@
             android:layout_marginTop="5dp"
             android:layout_marginBottom="10dp"/>
 
-        <androidx.appcompat.widget.AppCompatSpinner
+        <com.mifos.mifosxdroid.views.CustomSpinner
             style="@style/spinner_style"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
@@ -41,7 +41,7 @@
             android:layout_marginBottom="40dp"
             android:text="@string/repayment_date"/>
 
-        <androidx.appcompat.widget.AppCompatSpinner
+        <com.mifos.mifosxdroid.views.CustomSpinner
             style="@style/spinner_style"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
diff --git a/mifosng-android/src/main/res/layout/search_list_dialog_layout.xml b/mifosng-android/src/main/res/layout/search_list_dialog_layout.xml
new file mode 100644
index 00000000000..f2ea12d2fb9
--- /dev/null
+++ b/mifosng-android/src/main/res/layout/search_list_dialog_layout.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <EditText
+        android:id="@+id/et_drop_down_search"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Search"
+        android:padding="8dp"
+        android:background="@drawable/round_outline_bg"
+        android:visibility="visible"
+        android:layout_margin="12dp"/>
+
+    <ListView
+        android:id="@+id/lv_items"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/et_drop_down_search"
+        android:layout_marginStart="12dp"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:layout_marginEnd="12dp"/>
+
+
+</RelativeLayout>
\ No newline at end of file

From 69c62a008a9bfd49ac3977fc1e81f7f4a4ec3a5d Mon Sep 17 00:00:00 2001
From: Danish Jamal <danishjamal.104@gmail.com>
Date: Tue, 20 Jul 2021 16:40:24 +0530
Subject: [PATCH 21/25] Language setting change fixed

---
 .../src/main/java/com/mifos/utils/LanguageHelper.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mifosng-android/src/main/java/com/mifos/utils/LanguageHelper.java b/mifosng-android/src/main/java/com/mifos/utils/LanguageHelper.java
index 92dc76c18b8..06de3bded3a 100644
--- a/mifosng-android/src/main/java/com/mifos/utils/LanguageHelper.java
+++ b/mifosng-android/src/main/java/com/mifos/utils/LanguageHelper.java
@@ -43,13 +43,17 @@ private static String getPersistedData(Context context, String defaultLanguage)
 
     @TargetApi(Build.VERSION_CODES.N)
     private static Context updateResources(Context context, String language) {
-        Locale locale = new Locale(language);
+        Locale locale = new Locale(language.toLowerCase());
         Locale.setDefault(locale);
 
-        Configuration configuration = context.getResources().getConfiguration();
+        Resources resources = context.getResources();
+        Configuration configuration = resources.getConfiguration();
+
         configuration.setLocale(locale);
         configuration.setLayoutDirection(locale);
 
+        resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
         return context.createConfigurationContext(configuration);
     }
 

From 929e1cb88aa18b2bb1c3a5876d0d0a7d32033827 Mon Sep 17 00:00:00 2001
From: Danish Jamal <danishjamal.104@gmail.com>
Date: Tue, 20 Jul 2021 16:40:24 +0530
Subject: [PATCH 22/25] Language setting fixed, code reformatted and optimised

---
 .../com/mifos/mifosxdroid/SettingsFragment.kt | 100 +++++++++++-------
 1 file changed, 60 insertions(+), 40 deletions(-)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt
index d482c0b7d2d..f3adda9c432 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package com.mifos.mifosxdroid
 
 import android.content.Intent
@@ -34,45 +36,82 @@ class SettingsFragment : PreferenceFragment(), SharedPreferences.OnSharedPrefere
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setUpPreferences()
+
+        when (preference?.key) {
+            getString(R.string.password) -> {
+                //    TODO("create changePasswordActivity and implement the logic for password change")
+            }
+            getString(R.string.passcode) -> {
+                activity?.let {
+                    val passCodePreferencesHelper = PasscodePreferencesHelper(activity)
+                    val currPassCode = passCodePreferencesHelper.passCode
+                    passCodePreferencesHelper.savePassCode("")
+                    val intent = Intent(it, PassCodeActivity::class.java).apply {
+                        putExtra(Constants.CURR_PASSWORD, currPassCode)
+                        putExtra(Constants.IS_TO_UPDATE_PASS_CODE, true)
+                    }
+                    preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+                    startActivity(intent)
+                }
+            }
+        }
+    }
+
+    fun setUpPreferences() {
         addPreferencesFromResource(R.xml.preferences)
         languages = activity.resources.getStringArray(R.array.language_option)
+
+        initSurveyPreferences()
+        initInstanceUrlPreferences()
+        initLanguagePreferences()
+        initThemePreferences()
+    }
+
+    private fun initSurveyPreferences() {
         mEnableSyncSurvey = findPreference(resources.getString(R.string.sync_survey)) as SwitchPreference
-        mEnableSyncSurvey!!.onPreferenceChangeListener = OnPreferenceChangeListener { preference, newValue ->
+        mEnableSyncSurvey!!.onPreferenceChangeListener = OnPreferenceChangeListener { _, newValue ->
             if (newValue as Boolean) {
                 val syncSurveysDialogFragment = SyncSurveysDialogFragment.newInstance()
                 val fragmentTransaction = fragmentManager.beginTransaction()
                 fragmentTransaction.addToBackStack(FragmentConstants.FRAG_SURVEYS_SYNC)
                 syncSurveysDialogFragment.isCancelable = false
                 syncSurveysDialogFragment.show(fragmentTransaction,
-                        resources.getString(R.string.sync_clients))
+                    resources.getString(R.string.sync_clients))
             }
             true
         }
+    }
 
+    private fun initInstanceUrlPreferences() {
         mInstanceUrlPref = findPreference(
-                getString(R.string.hint_instance_url)) as EditTextPreference
+            getString(R.string.hint_instance_url)
+        ) as EditTextPreference
         val instanceUrl = PrefManager.getInstanceUrl()
         mInstanceUrlPref!!.text = instanceUrl
         mInstanceUrlPref!!.isSelectable = true
         mInstanceUrlPref!!.dialogTitle = "Edit Instance Url"
         mInstanceUrlPref!!.setDialogIcon(R.drawable.ic_baseline_edit_24)
-        mInstanceUrlPref!!.onPreferenceChangeListener = OnPreferenceChangeListener { preference, o ->
-            val newUrl = o.toString()
-            if (newUrl != instanceUrl) {
-                PrefManager.setInstanceUrl(newUrl)
-                Toast.makeText(activity, newUrl, Toast.LENGTH_SHORT).show()
-                startActivity(Intent(activity, DashboardActivity::class.java))
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                    activity.finishAffinity()
-                } else {
-                    activity.finish()
+        mInstanceUrlPref!!.onPreferenceChangeListener =
+            OnPreferenceChangeListener { _, o ->
+                val newUrl = o.toString()
+                if (newUrl != instanceUrl) {
+                    PrefManager.setInstanceUrl(newUrl)
+                    Toast.makeText(activity, newUrl, Toast.LENGTH_SHORT).show()
+                    startActivity(Intent(activity, DashboardActivity::class.java))
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                        activity.finishAffinity()
+                    } else {
+                        activity.finish()
+                    }
                 }
+                true
             }
-            true
-        }
+    }
 
+    private fun initLanguagePreferences() {
         val langPref = findPreference("language_type") as ListPreference
-        langPref.onPreferenceChangeListener = OnPreferenceChangeListener {preference, newValue ->
+        langPref.onPreferenceChangeListener = OnPreferenceChangeListener { _, newValue ->
             LanguageHelper.setLocale(this.activity, newValue.toString())
             startActivity(Intent(activity, activity.javaClass))
             preferenceScreen = null
@@ -80,34 +119,17 @@ class SettingsFragment : PreferenceFragment(), SharedPreferences.OnSharedPrefere
             preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
             true
         }
+    }
 
+    private fun initThemePreferences() {
         val themePreference = findPreference(resources.getString(R.string.mode_key)) as ListPreference
-        themePreference.onPreferenceChangeListener = OnPreferenceChangeListener { preference, newValue ->
+        themePreference.onPreferenceChangeListener = OnPreferenceChangeListener { _, newValue ->
             val themeOption = newValue as String
             ThemeHelper.applyTheme(themeOption)
             startActivity(Intent(activity, activity.javaClass))
-            Toast.makeText(activity, "Switched to ${themeOption.toString()} Mode", Toast.LENGTH_SHORT).show()
+            Toast.makeText(activity, "Switched to $themeOption Mode", Toast.LENGTH_SHORT).show()
             true
         }
-
-        when (preference?.key) {
-            getString(R.string.password) -> {
-                //    TODO("create changePasswordActivity and implement the logic for password change")
-            }
-            getString(R.string.passcode) -> {
-                activity?.let {
-                    val passCodePreferencesHelper = PasscodePreferencesHelper(activity)
-                    val currPassCode = passCodePreferencesHelper.passCode
-                    passCodePreferencesHelper.savePassCode("")
-                    val intent = Intent(it, PassCodeActivity::class.java).apply {
-                        putExtra(Constants.CURR_PASSWORD, currPassCode)
-                        putExtra(Constants.IS_TO_UPDATE_PASS_CODE, true)
-                    }
-                    preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
-                    startActivity(intent)
-                }
-            }
-        }
     }
 
     override fun onPause() {
@@ -124,9 +146,7 @@ class SettingsFragment : PreferenceFragment(), SharedPreferences.OnSharedPrefere
         LanguageHelper.setLocale(this.activity, preference.value)
     }
 
-    interface LanguageCallback {
-        fun updateNavDrawer()
-    }
+    interface LanguageCallback
 
     override fun onPreferenceTreeClick(preferenceScreen: PreferenceScreen?, preference: Preference?): Boolean {
         when (preference?.key) {

From 90a9c6b47d8163677af35304ebb2970efa66b2eb Mon Sep 17 00:00:00 2001
From: Chinmay Kulkarni <chinmaykulkarni8@gmail.com>
Date: Fri, 23 Jul 2021 14:00:30 +0530
Subject: [PATCH 23/25] Fix: cache for GitHub Actions

---
 .github/workflows/android.yml | 67 +++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 14a80a6656d..12c3c9e7fdc 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,26 +1,49 @@
-name: Android Build 
-on: [push, pull_request]
+name: Android Client CI
+on:
+  push:
+  pull_request:
+    branches:
+      - master
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-      
-      # Set up JDK 1.8
-    - name: set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-      
-      # Build with Gradle
-    - name: Build with Gradle
-      run: chmod +x gradlew && ./gradlew build check
-      
-      # Upload Build Artifact
-    - name: Upload Build Artifacts
-      uses: actions/upload-artifact@v2.2.0
-      with:
-        # Artifact name
-        name: apk-debug
-        # File path describing what artifact to upload
-        path: app/build/outputs/apk/debug/app-debug.apk
+      - uses: actions/checkout@v2
+
+        # Cache dependencies
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.OS }}-gradle-cache-${{ hashFiles('**/build.gradle') }}
+
+        # Set up JDK 1.8
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+        # Build with Gradle
+      - name: Build with Gradle
+        run: chmod +x gradlew && ./gradlew build check
+
+        # Upload Build Reports
+      - name: Upload Reports
+        uses: actions/upload-artifact@v2.2.0
+        with:
+          # Artifact name
+          name: reports
+          # File path describing what artifact to upload
+          path: mifosng-android/build/reports/**
+
+        # Upload APK
+      - name: Upload APK
+        uses: actions/upload-artifact@v2.2.0
+        with:
+          # Artifact name
+          name: android-client
+          # File path describing what artifact to upload
+          path: mifosng-android/build/outputs/apk/debug/mifosng-android-debug.apk

From dddfe2674d9af53147a1319bcc3847c46868be8f Mon Sep 17 00:00:00 2001
From: Grandolf49 <chinmaykulkarni8@gmail.com>
Date: Tue, 27 Jul 2021 12:33:32 +0530
Subject: [PATCH 24/25] Fix: distinct jobs for gradle tasks

---
 .github/workflows/android.yml | 115 ++++++++++++++++++++++++++++------
 1 file changed, 96 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 12c3c9e7fdc..a8bbff5acdf 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -11,39 +11,116 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-        # Cache dependencies
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.OS }}-gradle-cache-${{ hashFiles('**/build.gradle') }}
-
         # Set up JDK 1.8
-      - name: set up JDK 1.8
+      - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
 
         # Build with Gradle
       - name: Build with Gradle
-        run: chmod +x gradlew && ./gradlew build check
+        run: chmod +x gradlew && ./gradlew assembleDebug
 
-        # Upload Build Reports
-      - name: Upload Reports
+        # Upload APK
+      - name: Upload APK
         uses: actions/upload-artifact@v2.2.0
         with:
           # Artifact name
-          name: reports
+          name: android-client-app
           # File path describing what artifact to upload
-          path: mifosng-android/build/reports/**
+          path: mifosng-android/build/outputs/apk/debug/mifosng-android-debug.apk
 
-        # Upload APK
-      - name: Upload APK
+  test:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+        # Test with Gradle
+      - name: Test App
+        run: ./gradlew test
+
+        # Upload test reports
+      - name: Upload Test Reports
         uses: actions/upload-artifact@v2.2.0
         with:
           # Artifact name
-          name: android-client
+          name: test-reports
           # File path describing what artifact to upload
-          path: mifosng-android/build/outputs/apk/debug/mifosng-android-debug.apk
+          path: mifosng-android/build/reports/tests/**
+
+  lintCheck:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+        # Perform Lint Check
+      - name: Lint Check
+        run: ./gradlew lint
+
+        # Upload reports
+      - name: Upload Lint Reports
+        uses: actions/upload-artifact@v2.2.0
+        with:
+          # Artifact name
+          name: lint-reports
+          # File path describing what artifact to upload
+          path: mifosng-android/build/reports/lint-results**
+
+  pmd:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+        # Perform PMD Check
+      - name: PMD Check
+        run: ./gradlew pmd
+
+        # Upload reports
+      - name: Upload PMD Reports
+        uses: actions/upload-artifact@v2.2.0
+        with:
+          # Artifact name
+          name: pmd-reports
+          # File path describing what artifact to upload
+          path: mifosng-android/build/reports/pmd/**
+
+  checkstyle:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+        # Perform Checkstyle Check
+      - name: Checkstyle
+        run: ./gradlew checkstyle
+
+        # Upload reports
+      - name: Upload Checkstyle Reports
+        uses: actions/upload-artifact@v2.2.0
+        with:
+          # Artifact name
+          name: checkstyle-reports
+          # File path describing what artifact to upload
+          path: mifosng-android/build/reports/checkstyle/**
+
+  findbugs:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+        # Find bugs Check
+      - name: Findbugs
+        run: ./gradlew findbugs
+
+        # Upload reports
+      - name: Upload Checkstyle Reports
+        uses: actions/upload-artifact@v2.2.0
+        with:
+          # Artifact name
+          name: findbugs-reports
+          # File path describing what artifact to upload
+          path: mifosng-android/build/reports/findbugs/**

From dcd653b33c8cbf399deb183d94dbdb317b4b443d Mon Sep 17 00:00:00 2001
From: Danish Jamal <danishjamal.104@gmail.com>
Date: Sat, 19 Mar 2022 16:43:05 +0530
Subject: [PATCH 25/25] Datatable and Savings sdk migration

---
 .../api/datamanager/DataManagerDataTable.kt   | 124 ++++++
 .../api/datamanager/DataManagerSavings.kt     | 363 ++++++++++++++++++
 .../com/mifos/api/mappers/CenterMapper.kt     |  30 ++
 .../com/mifos/api/mappers/GenericMapper.kt    |  24 ++
 .../com/mifos/api/mappers/PageCenterMapper.kt |  26 ++
 .../mifos/api/mappers/SavingsStatusMapper.kt  |  16 +
 .../java/com/mifos/api/mappers/UserMapper.kt  |  33 ++
 .../com/mifos/api/mappers/UserRoleMapper.kt   |  23 ++
 .../accounts/GetClientsClientIdAccsMapper.kt  |  25 ++
 .../mappers/accounts/loan/LoanAccMapper.kt    |  49 +++
 .../accounts/loan/LoanAccStatusMapper.kt      |  56 +++
 .../accounts/loan/LoanAccTypeMapper.kt        |  32 ++
 ...tSavingsAccountsAccountIdResponseMapper.kt |  39 ++
 .../savings/SavingsAccCurrencyMapper.kt       |  65 ++++
 .../accounts/savings/SavingsAccMapper.kt      |  79 ++++
 .../savings/SavingsAccStatusMapper.kt         |  79 ++++
 .../savings/SavingsProductTemplateMapper.kt   |  58 +++
 .../accounts/savings/SavingsStatusMapper.kt   |  25 ++
 .../mappers/centers/CentersPageItemsMapper.kt |  42 ++
 .../GetCentersCenterIdResponseMapper.kt       |  24 ++
 .../centers/GetCentersResponseMapper.kt       |  23 ++
 .../client/ClientActivatingRequestMapper.kt   |  23 ++
 .../mifos/api/mappers/client/ClientMapper.kt  |  36 ++
 .../api/mappers/client/ClientStatusMapper.kt  |  25 ++
 .../client/ClientsClientIdResponseMapper.kt   |  50 +++
 .../mappers/client/GetClientResponseMapper.kt |  24 ++
 .../mappers/client/PostClientRequestMapper.kt |  44 +++
 .../client/PostClientResponseMapper.kt        |  20 +
 .../identifiers/AllowedDocumentTypeMapper.kt  |  24 ++
 .../GetIdentifiersTemplateMapper.kt           |  24 ++
 .../IdentifierCreationResponseMapper.kt       |  24 ++
 .../client/identifiers/IdentifierMapper.kt    |  37 ++
 .../identifiers/PostIdentifierMapper.kt       |  24 ++
 .../template/ClientColumnHeaderDataMapper.kt  |  26 ++
 .../client/template/ClientDataTableMapper.kt  |  25 ++
 .../client/template/OfficeOptionMapper.kt     |  23 ++
 .../template/SavingProductOptionMapper.kt     |  25 ++
 .../client/template/StaffOptionMapper.kt      |  33 ++
 .../mappers/client/template/TemplateMapper.kt |  36 ++
 .../datatable/ColumnHeaderDataMapper.kt       |  28 ++
 .../datatable/GetDataTablesResponseMapper.kt  |  25 ++
 .../groups/CreateGroupRequestMapper.kt        |  23 ++
 .../groups/CreateGroupResponseMapper.kt       |  23 ++
 .../groups/GetGroupsGroupIdAccountsMapper.kt  |  23 ++
 .../mappers/groups/GetGroupsGroupIdMapper.kt  |  38 ++
 .../groups/GetGroupsPagedItemsMapper.kt       |  41 ++
 .../groups/GetPagedGroupsResponseMapper.kt    |  23 ++
 .../mappers/groups/GroupsTimelineMapper.kt    |  28 ++
 .../com/mifos/api/mappers/note/NoteMapper.kt  |  36 ++
 .../mappers/office/GetOfficeResponseMapper.kt |  29 ++
 .../mifos/api/mappers/staff/StaffMapper.kt    |  33 ++
 .../api/mappers/survey/QuestionDataMapper.kt  |  47 +++
 .../api/mappers/survey/ScorecardDataMapper.kt |  39 ++
 .../api/mappers/survey/SurveyDataMapper.kt    |  55 +++
 .../java/com/mifos/api/utils/DataTables.kt    |   5 +
 .../java/com/mifos/api/utils/extesnions.kt    |  27 ++
 .../main/java/com/mifos/utils/PrefManager.kt  |  56 +++
 57 files changed, 2337 insertions(+)
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerDataTable.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerSavings.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/CenterMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/GenericMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/PageCenterMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/SavingsStatusMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/UserMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/UserRoleMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/accounts/GetClientsClientIdAccsMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/accounts/loan/LoanAccMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/accounts/loan/LoanAccStatusMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/accounts/loan/LoanAccTypeMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/GetSavingsAccountsAccountIdResponseMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsAccCurrencyMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsAccMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsAccStatusMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsProductTemplateMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsStatusMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/centers/CentersPageItemsMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/centers/GetCentersCenterIdResponseMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/centers/GetCentersResponseMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientActivatingRequestMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientStatusMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientsClientIdResponseMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/GetClientResponseMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/PostClientRequestMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/PostClientResponseMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/AllowedDocumentTypeMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/GetIdentifiersTemplateMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/IdentifierCreationResponseMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/IdentifierMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/PostIdentifierMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/template/ClientColumnHeaderDataMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/template/ClientDataTableMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/template/OfficeOptionMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/template/SavingProductOptionMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/template/StaffOptionMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/client/template/TemplateMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/datatable/ColumnHeaderDataMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/datatable/GetDataTablesResponseMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/groups/CreateGroupRequestMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/groups/CreateGroupResponseMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetGroupsGroupIdAccountsMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetGroupsGroupIdMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetGroupsPagedItemsMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetPagedGroupsResponseMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/groups/GroupsTimelineMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/note/NoteMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/office/GetOfficeResponseMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/staff/StaffMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/survey/QuestionDataMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/survey/ScorecardDataMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/mappers/survey/SurveyDataMapper.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/utils/DataTables.kt
 create mode 100644 mifosng-android/src/main/java/com/mifos/api/utils/extesnions.kt
 create mode 100755 mifosng-android/src/main/java/com/mifos/utils/PrefManager.kt

diff --git a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerDataTable.kt b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerDataTable.kt
new file mode 100644
index 00000000000..82387c8be61
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerDataTable.kt
@@ -0,0 +1,124 @@
+package com.mifos.api.datamanager
+
+import javax.inject.Singleton
+import javax.inject.Inject
+import com.mifos.api.local.databasehelper.DatabaseHelperDataTable
+import org.apache.fineract.client.services.DataTablesApi
+import com.mifos.objects.noncore.DataTable
+import org.apache.fineract.client.models.GetDataTablesResponse
+import com.google.gson.JsonArray
+import com.mifos.api.GenericResponse
+import com.google.gson.Gson
+import com.google.gson.JsonElement
+import com.google.gson.JsonParser
+import com.mifos.api.BaseApiManager
+import com.mifos.api.mappers.GenericMapper
+import com.mifos.api.mappers.datatable.GetDataTablesResponseMapper
+import org.apache.fineract.client.models.PostDataTablesAppTableIdResponse
+import com.mifos.objects.user.UserLocation
+import rx.Observable
+import java.util.HashMap
+
+/**
+ * This DataManager is for Managing DataTable API, In which Request is going to Server
+ * and In Response, We are getting DataTable API Observable Response using Retrofit2
+ *
+ * Created by Rajan Maurya on 3/7/16.
+ */
+@Singleton
+class DataManagerDataTable @Inject constructor(
+    val mBaseApiManager: BaseApiManager,
+    val mDatabaseHelperDataTable: DatabaseHelperDataTable,
+    val sdkBaseApiManager: org.mifos.core.apimanager.BaseApiManager
+) {
+    private val USER_LOCATION_TABLE = "user_tracking"
+    private val datatableApi: DataTablesApi
+        private get() = sdkBaseApiManager.getDataTableApi()
+
+    /**
+     * This Method Request the REST API of Datatable and In response give the List of DataTable
+     * Type of DataTable is
+     * 1. m_client
+     * 2. m_savings_account
+     * 3. m_loan
+     * @param tableName DataTable Name
+     * @return List<DataTable>
+    </DataTable> */
+    fun getDataTable(tableName: String?): Observable<List<DataTable>> {
+        return datatableApi.getDatatables(tableName)
+            .map { obj: List<GetDataTablesResponse> ->
+                GetDataTablesResponseMapper.mapFromEntityList(obj) }
+        //return mBaseApiManager.getDataTableApi().getTableOf(tableName);
+    }
+
+    fun getDataTableInfo(table: String?, entityId: Int): Observable<JsonArray> {
+        return datatableApi.getDatatable1(table, entityId.toLong(), null).map {
+            val elm = JsonParser().parse(it)
+            elm.asJsonArray
+        }
+        //return mBaseApiManager.dataTableApi.getDataOfDataTable(table, entityId)
+    }
+
+    fun addDataTableEntry(
+        table: String?, entityId: Int, payload: Map<String?, Any?>?
+    ): Observable<GenericResponse> {
+        val req = Gson().toJson(payload)
+        datatableApi.createDatatableEntry(table, entityId.toLong(), req)
+            .map {
+                val response = GenericResponse()
+                val map = HashMap<String, Any?>()
+                map["resourceId"] = it.resourceId
+                response.responseFields = map
+                response
+            }
+        return mBaseApiManager.dataTableApi
+            .createEntryInDataTable(table, entityId, payload)
+    }
+
+    fun deleteDataTableEntry(table: String?, entity: Int, rowId: Int): Observable<GenericResponse> {
+        datatableApi.deleteDatatableEntries1(table, entity.toLong(), rowId.toLong())
+            .map {
+                val response = GenericResponse()
+                val map = HashMap<String, Any?>()
+                map["resourceId"] = it.resourceId
+                response.responseFields = map
+                response
+            }
+        return mBaseApiManager.dataTableApi.deleteEntryOfDataTableManyToMany(
+            table, entity, rowId
+        )
+    }
+
+    /**
+     * This Method is adding the User Tracking Data in the data Table "user_tracking"
+     *
+     * @param userId UserId Id
+     * @param userLocation  UserLocation
+     * @return GenericResponse
+     */
+    fun addUserPathTracking(
+        userId: Int,
+        userLocation: UserLocation?
+    ): Observable<GenericResponse> {
+        val req = Gson().toJson(userLocation)
+        return datatableApi.createDatatableEntry(USER_LOCATION_TABLE, userId.toLong(), req)
+            .map { it: PostDataTablesAppTableIdResponse ->
+                val response = GenericResponse()
+                val map = HashMap<String, Any?>()
+                map["resourceId"] = it.resourceId
+                response.responseFields = map
+                response
+            }
+        //return mBaseApiManager.getDataTableApi().addUserPathTracking(userId, userLocation);
+    }
+
+    /**
+     * This Method is fetching the User Path Tracking from the DataTable "user_tracking"
+     *
+     * @param userId UserId Id
+     * @return List<UserLocation>
+    </UserLocation> */
+    fun getUserPathTracking(userId: Int): Observable<List<UserLocation>> {
+        return mBaseApiManager.dataTableApi.getUserPathTracking(userId)
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerSavings.kt b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerSavings.kt
new file mode 100644
index 00000000000..efde2ccb7e7
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerSavings.kt
@@ -0,0 +1,363 @@
+package com.mifos.api.datamanager
+
+import androidx.core.view.OneShotPreDrawListener.add
+import com.mifos.api.mappers.GenericMapper.gson
+import javax.inject.Singleton
+import javax.inject.Inject
+import com.mifos.api.local.databasehelper.DatabaseHelperSavings
+import org.apache.fineract.client.services.SavingsAccountApi
+import org.apache.fineract.client.services.SavingsProductApi
+import org.apache.fineract.client.services.SavingsChargesApi
+import com.mifos.objects.accounts.savings.SavingsAccountWithAssociations
+import com.mifos.utils.PrefManager
+import rx.functions.Func1
+import com.mifos.api.GenericResponse
+import com.mifos.objects.templates.savings.SavingsAccountTransactionTemplate
+import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest
+import com.mifos.objects.accounts.savings.SavingsAccountTransactionResponse
+import com.mifos.objects.organisation.ProductSavings
+import com.mifos.services.data.SavingsPayload
+import com.mifos.objects.client.Savings
+import com.mifos.objects.templates.savings.SavingProductsTemplate
+import com.mifos.objects.accounts.loan.SavingsApproval
+import com.google.gson.Gson
+import com.mifos.api.BaseApiManager
+import com.mifos.api.mappers.GenericMapper
+import com.mifos.api.mappers.GenericMapper.convert
+import com.mifos.api.mappers.accounts.savings.GetSavingsAccountsAccountIdResponseMapper
+import com.mifos.api.mappers.accounts.savings.SavingsProductTemplateMapper
+import org.apache.fineract.client.models.*
+import org.apache.fineract.client.services.SavingsAccountTransactionsApi
+import rx.Observable
+import java.util.HashMap
+
+/**
+ * Created by Rajan Maurya on 17/08/16.
+ */
+@Singleton
+class DataManagerSavings @Inject constructor(
+    val mBaseApiManager: BaseApiManager,
+    val mDatabaseHelperSavings: DatabaseHelperSavings,
+    val sdkBaseApiManager: org.mifos.core.apimanager.BaseApiManager
+) {
+
+    private val SAVINGS_COMMAND_ACTIVATE = "activate"
+    private val SAVINGS_COMMAND_APPROVE = "approve"
+
+    private val savingsAccountApi: SavingsAccountApi
+        private get() = sdkBaseApiManager.getSavingsApi()
+    private val savingsProductApi: SavingsProductApi
+        private get() = sdkBaseApiManager.getClient().savingsProducts
+    private val savingsChargesApi: SavingsChargesApi
+        private get() = sdkBaseApiManager.getClient().savingsAccountCharges
+    private val savingsTransactionApi: SavingsAccountTransactionsApi
+        private get() = sdkBaseApiManager.getClient().savingsTransactions
+
+    /**
+     * This Method Make the Request to the REST API
+     * https://demo.openmf.org/fineract-provider/api/v1/savingsaccounts/{savingsAccountId}
+     * ?associations={all or transactions or charges}
+     * and fetch savings application/account.
+     *
+     * @param type             Type of the SavingsAccount
+     * @param savingsAccountId Savings Account Id
+     * @param association      {all or transactions or charges}
+     * 'all': Gets data related to all associations e.g. ?associations=all.
+     * 'transactions': Gets data related to transactions on the account e.g.
+     * ?associations=transactions
+     * 'charges':Savings Account charges data.
+     * @return SavingsAccountWithAssociations
+     */
+    fun getSavingsAccount(
+        type: String?, savingsAccountId: Int, association: String?
+    ): Observable<SavingsAccountWithAssociations> {
+        return when (PrefManager.getUserStatus()) {
+            0 -> {
+                savingsAccountApi
+                    .retrieveOne24(savingsAccountId.toLong(), null, null)
+                    .map(GetSavingsAccountsAccountIdResponseMapper::mapFromEntity)
+                //mBaseApiManager.savingsApi.getSavingsAccountWithAssociations(type, savingsAccountId, association)
+            }
+            1 ->
+                /**
+                 * Return SavingsAccountWithAssociations from DatabaseHelperSavings.
+                 */
+                mDatabaseHelperSavings.readSavingsAccount(savingsAccountId)
+            else -> Observable.just(SavingsAccountWithAssociations())
+        }
+    }
+
+    /**
+     * This Method Make the Request to the REST API
+     * https://demo.openmf.org/fineract-provider/api/v1/savingsaccounts/{savingsAccountId}
+     * ?associations={all or transactions or charges}
+     * and fetch savings application/account. and After Fetching SavingsAccount DataManager
+     * send Fetched SavingsAccount to DatabaseHelperSavings to save the SavingsAccount in Database
+     * for Offline use and DatabaseHelperSavings returns saved SavingsAccount.
+     *
+     * @param type             Type of the SavingsAccount
+     * @param savingsAccountId Savings Account Id
+     * @param association      {all or transactions or charges}
+     * 'all': Gets data related to all associations e.g. ?associations=all.
+     * 'transactions': Gets data related to transactions on the account e.g.
+     * ?associations=transactions
+     * 'charges':Savings Account charges data.
+     * @return SavingsAccountWithAssociations
+     */
+    fun syncSavingsAccount(
+        type: String?, savingsAccountId: Int, association: String?
+    ): Observable<SavingsAccountWithAssociations> {
+        return savingsAccountApi
+            .retrieveOne24(savingsAccountId.toLong(), null, null)
+            .map(GetSavingsAccountsAccountIdResponseMapper::mapFromEntity)
+            .concatMap { savingsAccountWithAssociations ->
+                mDatabaseHelperSavings.saveSavingsAccount(
+                    savingsAccountWithAssociations
+                )
+            }
+    }
+
+    fun activateSavings(
+        savingsAccountId: Int,
+        request: HashMap<String, Any?>?
+    ): Observable<GenericResponse> {
+        val req: PostSavingsAccountsAccountIdRequest  = convert(request)
+        return savingsAccountApi.handleCommands6(
+            savingsAccountId.toLong(),
+            req, SAVINGS_COMMAND_ACTIVATE
+        )
+            .map {
+                val response = GenericResponse()
+                val map = HashMap<String, Any?>()
+                map["resourceId"] = it.resourceId
+                map["officeId"] = it.officeId
+                map["clientId"] = it.clientId
+                response.responseFields = map
+                response
+            }
+        // return mBaseApiManager.savingsApi. activateSavings(savingsAccountId, request)
+    }
+
+    /**
+     * This Method make the Request to REST API, if the User Status if Online at:
+     * https://demo.openmf.org/fineract-provider/api/v1/{savingsAccountType}/{savingsAccountId}
+     * /transactions/template.
+     * using retrofit 2 with SavingsAccountService and the SavingsAccountTransactionTemplate in
+     * response.
+     * If User Status is Offline then It make the request to the DatabaseHelperSavings and get
+     * the SavingAccount TransactionTemplate According to SavingAccount Id
+     *
+     * @param type             Savings Account Type Example : savingsaccounts
+     * @param savingsAccountId SavingsAccount Id
+     * @param transactionType  Transaction Type Example : 'Deposit', 'Withdrawal'
+     * @return SavingsAccountTransactionTemplate
+     */
+    fun getSavingsAccountTransactionTemplate(
+        type: String?, savingsAccountId: Int, transactionType: String?
+    ): Observable<SavingsAccountTransactionTemplate> {
+        return when (PrefManager.getUserStatus()) {
+            0 -> savingsTransactionApi.retrieveTemplate18(savingsAccountId.toLong()).map {
+                    convert<SavingsAccountTransactionTemplate>(it)
+                }
+            1 ->
+                /**
+                 * Return SavingsAccountTransactionTemplate from DatabaseHelperSavings.
+                 */
+                mDatabaseHelperSavings.readSavingsAccountTransactionTemplate(savingsAccountId)
+            else -> Observable.just(
+                SavingsAccountTransactionTemplate()
+            )
+        }
+    }
+
+    /**
+     * This Method make the Request to REST API, if the User Status is Online at:
+     * https://demo.openmf.org/fineract-provider/api/v1/{savingsAccountType}/{savingsAccountId}
+     * /transactions/template.
+     * using retrofit 2 with SavingsAccountService and get SavingsAccountTransactionTemplate in
+     * response. and then DataManager send fetched SavingsAccountTransactionTemplate to
+     * DatabaseHelperSavings to save in the SavingsAccountTransactionTemplate_Table for offline use
+     *
+     * @param savingsAccountType Savings Account Type Example : savingsaccounts
+     * @param savingsAccountId   SavingsAccount Id
+     * @param transactionType    Transaction Type Example : 'Deposit', 'Withdrawal'
+     * @return SavingsAccountTransactionTemplate
+     */
+    fun syncSavingsAccountTransactionTemplate(
+        savingsAccountType: String?, savingsAccountId: Int, transactionType: String?
+    ): Observable<SavingsAccountTransactionTemplate> {
+        return savingsTransactionApi.retrieveTemplate18(savingsAccountId.toLong()).map {
+            convert<SavingsAccountTransactionTemplate>(it)
+        }.concatMap { savingsAccountTransactionTemplate ->
+                mDatabaseHelperSavings.saveSavingsAccountTransactionTemplate(
+                    savingsAccountTransactionTemplate
+                )
+            }
+    }
+
+    /**
+     * This Method makes the Transaction of SavingAccount. Here is two mode, one is Online.
+     * if the user is Online, then request will be made to server and transaction will be sync to
+     * server and if user is on offline mode then transaction will be saved in Database.
+     * and User is able to sync that transaction when ever he have good internet connection
+     *
+     * @param savingsAccountType Type of Transaction
+     * @param savingsAccountId   Savings Account Id
+     * @param transactionType    Transaction Type Example : 'Deposit', 'Withdrawal'
+     * @param request            SavingsAccountTransactionRequest
+     * @return SavingsAccountTransactionResponse
+     */
+    fun processTransaction(
+        savingsAccountType: String?, savingsAccountId: Int, transactionType: String?,
+        request: SavingsAccountTransactionRequest?
+    ): Observable<SavingsAccountTransactionResponse> {
+        val req =  (Gson()).toJson(request)
+        return when (PrefManager.getUserStatus()) {
+            0 -> savingsTransactionApi.transaction2(savingsAccountId.toLong(), transactionType, req)
+                .map { convert<SavingsAccountTransactionResponse>(it) }
+            1 ->
+                /**
+                 * Return SavingsAccountTransactionResponse from DatabaseHelperSavings.
+                 */
+                mDatabaseHelperSavings
+                    .saveSavingsAccountTransaction(
+                        savingsAccountType, savingsAccountId,
+                        transactionType, request
+                    )
+            else -> Observable.just(
+                SavingsAccountTransactionResponse()
+            )
+        }
+    }
+
+    /**
+     * This Method is making Transaction into Database SavingsAccountTransactionRequest_Table
+     * and returns the SavingsAccountTransactionRequest with SavingAccount Id {savingAccountId}.
+     * If Database does not contain any entry in SavingsAccountTransactionRequest_Table with
+     * SavingAccount Id then it return null.
+     *
+     * @param savingAccountId SavingsAccount Id
+     * @return SavingsAccountTransactionRequest
+     */
+    fun getSavingsAccountTransaction(
+        savingAccountId: Int
+    ): Observable<SavingsAccountTransactionRequest> {
+        return mDatabaseHelperSavings.getSavingsAccountTransaction(savingAccountId)
+    }
+
+    /**
+     * This Method sent the request to DatabaseHelperSavings and DatabaseHelperSavings load the
+     * All SavingsAccountTransactions from the SavingsAccountTransactionRequest_Table.
+     * and returns the List<SavingsAccountTransactionRequest>
+     *
+     * @return List<SavingsAccountTransactionRequest></SavingsAccountTransactionRequest>>
+    </SavingsAccountTransactionRequest> */
+    val allSavingsAccountTransactions: Observable<List<SavingsAccountTransactionRequest>>
+        get() = mDatabaseHelperSavings.allSavingsAccountTransaction
+
+    /**
+     * This method sending request DatabaseHelper and Deleting the SavingsAccountTransaction
+     * with savingsAccountId from SavingsAccountTransaction_Table and again loading list of
+     * SavingsAccountTransaction from Database.
+     *
+     * @param savingsAccountId Loan Id of the Loan
+     * @return List<SavingsAccountTransaction>
+    </SavingsAccountTransaction> */
+    fun deleteAndUpdateTransactions(
+        savingsAccountId: Int
+    ): Observable<List<SavingsAccountTransactionRequest>> {
+        return mDatabaseHelperSavings.deleteAndUpdateTransaction(savingsAccountId)
+    }
+
+    /**
+     * This Method updating SavingsAccountTransactionRequest in to Database and return the same
+     * SavingsAccountTransactionRequest to the Presenter
+     *
+     * @param savingsAccountTransactionRequest Updating SavingsAccountTransactionRequest
+     * in to Database.
+     * @return LoanRepaymentRequest
+     */
+    fun updateLoanRepaymentTransaction(
+        savingsAccountTransactionRequest: SavingsAccountTransactionRequest?
+    ): Observable<SavingsAccountTransactionRequest> {
+        return mDatabaseHelperSavings.updateSavingsAccountTransaction(
+            savingsAccountTransactionRequest
+        )
+    }
+
+
+    fun savingsAccounts(): Observable<List<ProductSavings>> {
+        return savingsProductApi.retrieveAll34().map{
+            val res = ArrayList<ProductSavings>();
+            it.forEach { savingsProduct ->
+                res.add(convert(savingsProduct))
+            }
+            res
+        }
+        //return mBaseApiManager.savingsApi.allSavingsAccounts
+    }
+
+    fun createSavingsAccount(savingsPayload: SavingsPayload?): Observable<Savings> {
+        // todo: #1, response mismatch PostSavingsAccountsResponse and Savings
+        // 1.5.0 Fineract version works fine with the older mBaseApiManager
+        /*val req: PostSavingsAccountsRequest = convert(savingsPayload)
+        savingsAccountApi.submitApplication2(req)*/
+        return mBaseApiManager.savingsApi.createSavingsAccount(savingsPayload)
+    }
+
+    fun savingsAccountTemplate(): Observable<SavingProductsTemplate> {
+        return savingsProductApi.retrieveTemplate19()
+            .map(SavingsProductTemplateMapper::mapFromEntity)
+    }
+
+    fun getClientSavingsAccountTemplateByProduct(
+        clientId: Int,
+        productId: Int
+    ): Observable<SavingProductsTemplate> {
+        // todo: #2, invalid sdk class definition GetSavingsAccountsTemplateResponse
+        // 1.5.0 Fineract version works fine with the older mBaseApiManager
+        /*return savingsAccountApi.template14(clientId.toLong(), null, productId.toLong(), null).map{
+            convert<GetSavingsAccountsTemplateResponse, SavingProductsTemplate>(it)
+        }*/
+        return mBaseApiManager.savingsApi.getClientSavingsAccountTemplateByProduct(
+            clientId,
+            productId
+        )
+    }
+
+    fun getGroupSavingsAccountTemplateByProduct(
+        groupId: Int,
+        productId: Int
+    ): Observable<SavingProductsTemplate> {
+        // todo: #3, invalid sdk class definition GetSavingsAccountsTemplateResponse
+        // 1.5.0 Fineract version works fine with the older mBaseApiManager
+        /*return savingsAccountApi.template14(null, groupId.toLong(), productId.toLong(), null).map{
+            convert<GetSavingsAccountsTemplateResponse, SavingProductsTemplate>(it)
+        }*/
+        return mBaseApiManager.savingsApi.getGroupSavingsAccountTemplateByProduct(
+            groupId,
+            productId
+        )
+    }
+
+    fun approveSavingsApplication(
+        savingsAccountId: Int,
+        savingsApproval: SavingsApproval?
+    ): Observable<GenericResponse> {
+        val request: PostSavingsAccountsAccountIdRequest  = convert(savingsApproval)
+        return savingsAccountApi.handleCommands6(
+            savingsAccountId.toLong(),
+            request, SAVINGS_COMMAND_APPROVE
+        )
+            .map {
+                val response = GenericResponse()
+                val map = HashMap<String, Any?>()
+                map["resourceId"] = it.resourceId
+                map["officeId"] = it.officeId
+                map["clientId"] = it.clientId
+                response.responseFields = map
+                response
+            }
+        //return mBaseApiManager.getSavingsApi().approveSavingsApplication(savingsAccountId, savingsApproval);
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/CenterMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/CenterMapper.kt
new file mode 100644
index 00000000000..680124dfa3b
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/CenterMapper.kt
@@ -0,0 +1,30 @@
+package com.mifos.api.mappers
+
+import com.mifos.objects.group.Center
+import org.apache.fineract.client.models.GetCentersPageItems
+import org.mifos.core.data.AbstractMapper
+
+
+object CenterMapper: AbstractMapper<GetCentersPageItems, Center>() {
+
+    override fun mapFromEntity(entity: GetCentersPageItems): Center {
+        return Center().apply {
+            id = entity.id
+            name = entity.name
+            officeId = entity.officeId
+            officeName = entity.officeName
+            active = entity.active
+        }
+    }
+
+    override fun mapToEntity(domainModel: Center): GetCentersPageItems {
+        return GetCentersPageItems().apply {
+            id = domainModel.id
+            name = domainModel.name
+            officeId = domainModel.officeId
+            officeName = domainModel.officeName
+            active = domainModel.active
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/GenericMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/GenericMapper.kt
new file mode 100644
index 00000000000..9cd3abdb088
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/GenericMapper.kt
@@ -0,0 +1,24 @@
+package com.mifos.api.mappers
+
+import android.util.Log
+import com.google.gson.Gson
+import com.mifos.api.mappers.accounts.savings.SavingsProductTemplateMapper
+
+object GenericMapper {
+
+    val gson = Gson()
+
+    inline fun <IN, reified OUT> convert(entity: IN): OUT {
+        val json = gson.toJson(entity)
+        Log.i("convert", json)
+        return gson.fromJson(json, OUT::class.java)
+    }
+
+    inline fun <IN, reified OUT> convert(entity: List<IN>): List<OUT> {
+        return entity.map { convert<IN, OUT>(it) }
+    }
+
+    inline fun <reified OUT> convert(json: String): OUT {
+        return gson.fromJson(json, OUT::class.java)
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/PageCenterMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/PageCenterMapper.kt
new file mode 100644
index 00000000000..7f18708eba1
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/PageCenterMapper.kt
@@ -0,0 +1,26 @@
+package com.mifos.api.mappers
+
+import com.mifos.objects.client.Page
+import com.mifos.objects.group.Center
+import org.apache.fineract.client.models.GetCentersPageItems
+import org.apache.fineract.client.models.GetCentersResponse
+import org.mifos.core.data.AbstractMapper
+
+
+object PageCenterMapper : AbstractMapper<GetCentersResponse, Page<Center>>() {
+
+    override fun mapFromEntity(entity: GetCentersResponse): Page<Center> {
+        return Page<Center>().apply {
+            totalFilteredRecords = entity.totalFilteredRecords!!
+            pageItems = CenterMapper.mapFromEntityList(entity.pageItems as List<GetCentersPageItems>)
+        }
+    }
+
+    override fun mapToEntity(domainModel: Page<Center>): GetCentersResponse {
+        return GetCentersResponse().apply {
+            totalFilteredRecords = domainModel.totalFilteredRecords
+            pageItems = CenterMapper.mapToEntityList(domainModel.pageItems)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/SavingsStatusMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/SavingsStatusMapper.kt
new file mode 100644
index 00000000000..b4072697207
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/SavingsStatusMapper.kt
@@ -0,0 +1,16 @@
+package com.mifos.api.mappers
+
+import com.mifos.objects.db.Status
+import org.apache.fineract.client.models.GetCentersCenterIdStatus
+import org.mifos.core.data.AbstractMapper
+
+object SavingsStatusMapper: AbstractMapper<GetCentersCenterIdStatus, Status>() {
+
+    override fun mapFromEntity(entity: GetCentersCenterIdStatus): Status {
+        TODO("Not yet implemented")
+    }
+
+    override fun mapToEntity(domainModel: Status): GetCentersCenterIdStatus {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/UserMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/UserMapper.kt
new file mode 100644
index 00000000000..b6bd6d2692b
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/UserMapper.kt
@@ -0,0 +1,33 @@
+package com.mifos.api.mappers
+
+import com.mifos.objects.user.User
+import org.apache.fineract.client.models.PostAuthenticationResponse
+import org.mifos.core.data.AbstractMapper
+
+object UserMapper: AbstractMapper<PostAuthenticationResponse, User>() {
+
+    override fun mapFromEntity(entity: PostAuthenticationResponse): User {
+        return User().apply {
+            username = entity.username
+            userId = entity.userId?.toInt()!!
+            base64EncodedAuthenticationKey = entity.base64EncodedAuthenticationKey
+            officeId = entity.officeId?.toInt()!!
+            officeName = entity.officeName
+            roles = UserRoleMapper.mapFromEntityList(entity.roles!!)
+            permissions = entity.permissions
+        }
+    }
+
+    override fun mapToEntity(domainModel: User): PostAuthenticationResponse {
+        return PostAuthenticationResponse().apply {
+            username = domainModel.username
+            userId = domainModel.userId.toLong()
+            base64EncodedAuthenticationKey = domainModel.base64EncodedAuthenticationKey
+            officeId = domainModel.officeId.toLong()
+            officeName = domainModel.officeName
+            roles = UserRoleMapper.mapToEntityList(domainModel.roles)
+            permissions = domainModel.permissions
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/UserRoleMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/UserRoleMapper.kt
new file mode 100644
index 00000000000..f0b916b884e
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/UserRoleMapper.kt
@@ -0,0 +1,23 @@
+package com.mifos.api.mappers
+
+import com.mifos.objects.client.Role
+import org.apache.fineract.client.models.RoleData
+import org.mifos.core.data.AbstractMapper
+
+object UserRoleMapper: AbstractMapper<RoleData, Role>() {
+
+    override fun mapFromEntity(entity: RoleData): Role {
+        return Role().apply {
+            id = entity.id?.toInt()!!
+            name = entity.name
+            description = "NAN"
+        }
+    }
+
+    override fun mapToEntity(domainModel: Role): RoleData {
+        return RoleData().apply {
+            id = domainModel.id.toLong()
+            name = domainModel.name
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/GetClientsClientIdAccsMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/GetClientsClientIdAccsMapper.kt
new file mode 100644
index 00000000000..c5ab8499aa2
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/GetClientsClientIdAccsMapper.kt
@@ -0,0 +1,25 @@
+package com.mifos.api.mappers.accounts
+
+import com.mifos.api.mappers.accounts.loan.LoanAccMapper
+import com.mifos.api.mappers.accounts.savings.SavingsAccMapper
+import com.mifos.objects.accounts.ClientAccounts
+import org.apache.fineract.client.models.GetClientsClientIdAccountsResponse
+import org.mifos.core.data.AbstractMapper
+
+object GetClientsClientIdAccsMapper: AbstractMapper<GetClientsClientIdAccountsResponse, ClientAccounts>() {
+    override fun mapFromEntity(entity: GetClientsClientIdAccountsResponse): ClientAccounts {
+        return ClientAccounts().apply {
+            savingsAccounts = entity.savingsAccounts?.let { SavingsAccMapper.mapFromEntityList(it) }
+                ?: listOf()
+            loanAccounts = entity.loanAccounts?.let { LoanAccMapper.mapFromEntityList(it) }
+                ?: listOf()
+        }
+    }
+
+    override fun mapToEntity(domainModel: ClientAccounts): GetClientsClientIdAccountsResponse {
+        return GetClientsClientIdAccountsResponse().apply {
+            savingsAccounts = SavingsAccMapper.mapToEntityList(domainModel.savingsAccounts)
+            loanAccounts = LoanAccMapper.mapToEntityList(domainModel.loanAccounts)
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/loan/LoanAccMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/loan/LoanAccMapper.kt
new file mode 100644
index 00000000000..395a4828e5a
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/loan/LoanAccMapper.kt
@@ -0,0 +1,49 @@
+package com.mifos.api.mappers.accounts.loan
+
+import com.mifos.objects.accounts.loan.LoanAccount
+import org.apache.fineract.client.models.GetClientsLoanAccounts
+import org.apache.fineract.client.models.GetGroupsGroupIdAccountsLoanAccounts
+import org.mifos.core.data.AbstractMapper
+
+object LoanAccMapper: AbstractMapper<GetClientsLoanAccounts, LoanAccount>() {
+    override fun mapFromEntity(entity: GetClientsLoanAccounts): LoanAccount {
+        return LoanAccount().apply {
+            id = entity.id
+            accountNo = entity.accountNo
+            externalId = entity.externalId.toString()
+            productId = entity.productId
+            productName = entity.productName
+            status = LoanAccStatusMapper.mapFromEntity(entity.status!!)
+            loanType = LoanAccTypeMapper.mapFromEntity(entity.loanType!!)
+            loanCycle = entity.loanCycle
+        }
+    }
+
+    override fun mapToEntity(domainModel: LoanAccount): GetClientsLoanAccounts {
+        return GetClientsLoanAccounts().apply {
+            id = domainModel.id
+            accountNo = domainModel.accountNo
+            externalId = domainModel.externalId.toInt()
+            productId = domainModel.productId
+            productName = domainModel.productName
+            status = LoanAccStatusMapper.mapToEntity(domainModel.status!!)
+            loanType = LoanAccTypeMapper.mapToEntity(domainModel.loanType!!)
+            loanCycle = domainModel.loanCycle
+        }
+    }
+
+    fun mapFromEntity(entity: GetGroupsGroupIdAccountsLoanAccounts): LoanAccount {
+        return LoanAccount().apply {
+            id = entity.id
+            accountNo = entity.accountNo.toString()
+            productId = entity.productId
+            productName = entity.productName
+            status = LoanAccStatusMapper.mapFromEntity(entity.status!!)
+            loanType = LoanAccTypeMapper.mapFromEntity(entity.loanType!!)
+        }
+    }
+
+    fun mapFromEntityGroupsList(entities: List<GetGroupsGroupIdAccountsLoanAccounts>): List<LoanAccount> {
+        return entities.map { mapFromEntity(it) }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/loan/LoanAccStatusMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/loan/LoanAccStatusMapper.kt
new file mode 100644
index 00000000000..974722cbe32
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/loan/LoanAccStatusMapper.kt
@@ -0,0 +1,56 @@
+package com.mifos.api.mappers.accounts.loan
+
+import com.mifos.objects.accounts.loan.Status
+import org.apache.fineract.client.models.GetClientsLoanAccountsStatus
+import org.apache.fineract.client.models.GetGroupsGroupIdAccountsStatus
+import org.mifos.core.data.AbstractMapper
+
+object LoanAccStatusMapper: AbstractMapper<GetClientsLoanAccountsStatus, Status>() {
+    override fun mapFromEntity(entity: GetClientsLoanAccountsStatus): Status {
+        return Status().apply {
+            id = entity.id
+            code = entity.code
+            value = entity.description
+            pendingApproval = entity.pendingApproval
+            waitingForDisbursal = entity.waitingForDisbursal
+            active = entity.active
+            closedObligationsMet = entity.closedObligationsMet
+            closedWrittenOff = entity.closedWrittenOff
+            closedRescheduled = entity.closedRescheduled
+            closed = entity.closed
+            overpaid = entity.overpaid
+        }
+    }
+
+    override fun mapToEntity(domainModel: Status): GetClientsLoanAccountsStatus {
+        return GetClientsLoanAccountsStatus().apply {
+            id = domainModel.id
+            code = domainModel.code
+            description = domainModel.value
+            pendingApproval = domainModel.pendingApproval
+            waitingForDisbursal = domainModel.waitingForDisbursal
+            active = domainModel.active
+            closedObligationsMet = domainModel.closedObligationsMet
+            closedWrittenOff = domainModel.closedWrittenOff
+            closedRescheduled = domainModel.closedRescheduled
+            closed = domainModel.closed
+            overpaid = domainModel.overpaid
+        }
+    }
+
+    fun mapFromEntity(entity: GetGroupsGroupIdAccountsStatus): Status {
+        return Status().apply {
+            id = entity.id
+            code = entity.code
+            value = entity.description
+            pendingApproval = entity.pendingApproval
+            waitingForDisbursal = entity.waitingForDisbursal
+            active = entity.active
+            closedObligationsMet = entity.closedObligationsMet
+            closedWrittenOff = entity.closedWrittenOff
+            closedRescheduled = entity.closedRescheduled
+            closed = entity.closed
+            overpaid = entity.overpaid
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/loan/LoanAccTypeMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/loan/LoanAccTypeMapper.kt
new file mode 100644
index 00000000000..ce80887faa9
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/loan/LoanAccTypeMapper.kt
@@ -0,0 +1,32 @@
+package com.mifos.api.mappers.accounts.loan
+
+import com.mifos.objects.accounts.loan.LoanType
+import org.apache.fineract.client.models.GetClientsLoanAccountsType
+import org.apache.fineract.client.models.GetGroupsGroupIdAccountsLoanType
+import org.mifos.core.data.AbstractMapper
+
+object LoanAccTypeMapper: AbstractMapper<GetClientsLoanAccountsType, LoanType>() {
+    override fun mapFromEntity(entity: GetClientsLoanAccountsType): LoanType {
+        return LoanType().apply {
+            id = entity.id
+            code = entity.code
+            value = entity.description
+        }
+    }
+
+    override fun mapToEntity(domainModel: LoanType): GetClientsLoanAccountsType {
+        return GetClientsLoanAccountsType().apply {
+            id = domainModel.id
+            code = domainModel.code
+            description = domainModel.value
+        }
+    }
+
+    fun mapFromEntity(entity: GetGroupsGroupIdAccountsLoanType): LoanType {
+        return LoanType().apply {
+            id = entity.id
+            code = entity.code
+            value = entity.description
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/GetSavingsAccountsAccountIdResponseMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/GetSavingsAccountsAccountIdResponseMapper.kt
new file mode 100644
index 00000000000..2e46f9c1ea8
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/GetSavingsAccountsAccountIdResponseMapper.kt
@@ -0,0 +1,39 @@
+package com.mifos.api.mappers.accounts.savings
+
+import com.mifos.api.mappers.GenericMapper.convert
+import com.mifos.api.utils.toArray
+import com.mifos.api.utils.toIntArray
+import com.mifos.objects.accounts.savings.SavingsAccountWithAssociations
+import com.mifos.objects.accounts.savings.Timeline
+import org.apache.fineract.client.models.GetSavingsAccountsAccountIdResponse
+import org.mifos.core.data.AbstractMapper
+
+object GetSavingsAccountsAccountIdResponseMapper: AbstractMapper<GetSavingsAccountsAccountIdResponse, SavingsAccountWithAssociations>() {
+    override fun mapFromEntity(entity: GetSavingsAccountsAccountIdResponse): SavingsAccountWithAssociations {
+        return SavingsAccountWithAssociations().apply {
+            id = entity.id
+            accountNo = entity.accountNo
+            clientId = entity.clientId
+            clientName = entity.clientName
+            savingsProductId = entity.savingsProductId
+            savingsProductName = entity.savingsProductName
+            fieldOfficerId = entity.fieldOfficerId
+            status = convert(entity.status)
+            currency = convert(entity.currency)
+            timeline = Timeline().apply {
+                submittedOnDate = entity.timeline!!.submittedOnDate!!.toArray()
+                // todo: add remaining fields once GetSavingsTimeline is fixed
+            }
+            nominalAnnualInterestRate = entity.nominalAnnualInterestRate
+            interestCompoundingPeriodType = convert(entity.interestCompoundingPeriodType)
+            interestPostingPeriodType = convert(entity.interestPostingPeriodType)
+            interestCalculationType = convert(entity.interestCalculationType)
+            interestCalculationDaysInYearType = convert(entity.interestCalculationDaysInYearType)
+            summary = convert(entity.summary)
+        }
+    }
+
+    override fun mapToEntity(domainModel: SavingsAccountWithAssociations): GetSavingsAccountsAccountIdResponse {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsAccCurrencyMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsAccCurrencyMapper.kt
new file mode 100644
index 00000000000..a823aa006d8
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsAccCurrencyMapper.kt
@@ -0,0 +1,65 @@
+package com.mifos.api.mappers.accounts.savings
+
+import com.mifos.objects.accounts.savings.Currency
+import org.apache.fineract.client.models.GetCentersCenterIdCurrency
+import org.apache.fineract.client.models.GetClientsSavingsAccountsCurrency
+import org.apache.fineract.client.models.GetGroupsGroupIdAccountsSavingCurrency
+import org.mifos.core.data.AbstractMapper
+
+object SavingsAccCurrencyMapper: AbstractMapper<GetClientsSavingsAccountsCurrency, Currency>() {
+    override fun mapFromEntity(entity: GetClientsSavingsAccountsCurrency): Currency {
+        return Currency().apply {
+            code = entity.code
+            name = entity.name
+            nameCode = entity.nameCode
+            decimalPlaces = entity.decimalPlaces
+            displaySymbol = entity.displaySymbol
+            displayLabel = entity.displayLabel
+        }
+    }
+
+    override fun mapToEntity(domainModel: Currency): GetClientsSavingsAccountsCurrency {
+        return GetClientsSavingsAccountsCurrency().apply {
+            code = domainModel.code
+            name = domainModel.name
+            nameCode = domainModel.nameCode
+            decimalPlaces = domainModel.decimalPlaces
+            displaySymbol = domainModel.displaySymbol
+            displayLabel = domainModel.displayLabel
+        }
+    }
+
+    fun mapFromEntity(entity: GetGroupsGroupIdAccountsSavingCurrency): Currency {
+        return Currency().apply {
+            code = entity.code
+            name = entity.name
+            nameCode = entity.nameCode
+            decimalPlaces = entity.decimalPlaces
+            displaySymbol = entity.displaySymbol
+            displayLabel = entity.displayLabel
+        }
+    }
+
+    fun mapFromEntity(entity: GetCentersCenterIdCurrency): Currency {
+
+        return Currency().apply {
+            code = entity.code
+            name = entity.name
+            nameCode = entity.nameCode
+            decimalPlaces = entity.decimalPlaces
+            displaySymbol = entity.displaySymbol
+            displayLabel = entity.displayLabel
+        }
+    }
+
+    fun mapToGetCentersCenterIdCurrencyEntity(domainModel: Currency): GetCentersCenterIdCurrency {
+        return GetCentersCenterIdCurrency().apply {
+            code = domainModel.code
+            name = domainModel.name
+            nameCode = domainModel.nameCode
+            decimalPlaces = domainModel.decimalPlaces
+            displaySymbol = domainModel.displaySymbol
+            displayLabel = domainModel.displayLabel
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsAccMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsAccMapper.kt
new file mode 100644
index 00000000000..5b16ca43ad8
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsAccMapper.kt
@@ -0,0 +1,79 @@
+package com.mifos.api.mappers.accounts.savings
+
+import com.mifos.api.mappers.GenericMapper
+import com.mifos.api.mappers.accounts.loan.LoanAccMapper
+import com.mifos.objects.accounts.loan.LoanAccount
+import com.mifos.objects.accounts.savings.SavingsAccount
+import org.apache.fineract.client.models.GetCentersSavingsAccounts
+import org.apache.fineract.client.models.GetClientsSavingsAccounts
+import org.apache.fineract.client.models.GetGroupsGroupIdAccountsLoanAccounts
+import org.apache.fineract.client.models.GetGroupsGroupIdAccountsSavingAccounts
+import org.mifos.core.data.AbstractMapper
+
+object SavingsAccMapper: AbstractMapper<GetClientsSavingsAccounts, SavingsAccount>() {
+    override fun mapFromEntity(entity: GetClientsSavingsAccounts): SavingsAccount {
+        return SavingsAccount().apply {
+            id = entity.id
+            accountNo = entity.accountNo
+            productId = entity.productId
+            productName = entity.productName
+            status = SavingsAccStatusMapper.mapFromEntity(entity.status!!)
+            currency = SavingsAccCurrencyMapper.mapFromEntity(entity.currency!!)
+            depositType = GenericMapper.convert(entity.depositType)
+        }
+    }
+
+    override fun mapToEntity(domainModel: SavingsAccount): GetClientsSavingsAccounts {
+        return GetClientsSavingsAccounts().apply {
+            id = domainModel.id
+            accountNo = domainModel.accountNo
+            productId = domainModel.productId
+            productName = domainModel.productName
+            status = SavingsAccStatusMapper.mapToEntity(domainModel.status!!)
+            currency = SavingsAccCurrencyMapper.mapToEntity(domainModel.currency!!)
+            depositType = GenericMapper.convert(domainModel.depositType)
+        }
+    }
+
+    fun mapFromEntity(entity: GetGroupsGroupIdAccountsSavingAccounts): SavingsAccount {
+        return SavingsAccount().apply {
+            id = entity.id
+            accountNo = entity.accountNo.toString()
+            productId = entity.productId
+            productName = entity.productName
+            status = SavingsAccStatusMapper.mapFromEntity(entity.status!!)
+            currency = SavingsAccCurrencyMapper.mapFromEntity(entity.currency!!)
+        }
+    }
+
+    fun mapFromEntityGroupsList(entities: List<GetGroupsGroupIdAccountsSavingAccounts>):
+            List<SavingsAccount> {
+        return entities.map { mapFromEntity(it) }
+    }
+
+    fun mapFromEntity(entity: GetCentersSavingsAccounts): SavingsAccount {
+
+        return SavingsAccount().apply {
+            id = entity.id
+            accountNo = entity.accountNo.toString()
+            productId = entity.productId
+            productName = entity.productName
+            status = SavingsAccStatusMapper.mapFromEntity(entity.status!!)
+            currency = SavingsAccCurrencyMapper.mapFromEntity(entity.currency!!)
+        }
+    }
+
+    fun mapToGetCentersSavingsAccountsEntity(domainModel: SavingsAccount):
+            GetCentersSavingsAccounts {
+        return GetCentersSavingsAccounts().apply {
+            id = domainModel.id
+            accountNo = domainModel.accountNo.toLong()
+            productId = domainModel.productId
+            productName = domainModel.productName
+            status = SavingsAccStatusMapper
+                .mapToGetCentersCenterIdStatusEntity(domainModel.status!!)
+            currency = SavingsAccCurrencyMapper
+                .mapToGetCentersCenterIdCurrencyEntity(domainModel.currency!!)
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsAccStatusMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsAccStatusMapper.kt
new file mode 100644
index 00000000000..647e68c722c
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsAccStatusMapper.kt
@@ -0,0 +1,79 @@
+package com.mifos.api.mappers.accounts.savings
+
+import com.mifos.objects.accounts.savings.Status
+import org.apache.fineract.client.models.GetCentersCenterIdStatus
+import org.apache.fineract.client.models.GetClientsSavingsAccountsStatus
+import org.apache.fineract.client.models.GetGroupsGroupIdAccountsSavingStatus
+import org.mifos.core.data.AbstractMapper
+
+object SavingsAccStatusMapper: AbstractMapper<GetClientsSavingsAccountsStatus, Status>() {
+    override fun mapFromEntity(entity: GetClientsSavingsAccountsStatus): Status {
+        return Status().apply {
+            id = entity.id
+            code = entity.code
+            value = entity.value
+            submittedAndPendingApproval = entity.submittedAndPendingApproval
+            approved = entity.approved
+            rejected = entity.rejected
+            withdrawnByApplicant = entity.withdrawnByApplicant
+            active = entity.active
+            closed = entity.closed
+        }
+    }
+
+    override fun mapToEntity(domainModel: Status): GetClientsSavingsAccountsStatus {
+        return GetClientsSavingsAccountsStatus().apply {
+            id = domainModel.id
+            code = domainModel.code
+            value = domainModel.value
+            submittedAndPendingApproval = domainModel.submittedAndPendingApproval
+            approved = domainModel.approved
+            rejected = domainModel.rejected
+            withdrawnByApplicant = domainModel.withdrawnByApplicant
+            active = domainModel.active
+            closed = domainModel.closed
+        }
+    }
+
+    fun mapFromEntity(entity: GetGroupsGroupIdAccountsSavingStatus): Status {
+        return Status().apply {
+            id = entity.id
+            code = entity.code
+            value = entity.description
+            submittedAndPendingApproval = entity.submittedAndPendingApproval
+            approved = entity.approved
+            rejected = entity.rejected
+            withdrawnByApplicant = entity.withdrawnByApplicant
+            active = entity.active
+            closed = entity.closed
+        }
+    }
+
+    fun mapFromEntity(entity: GetCentersCenterIdStatus): Status {
+        return Status().apply {
+            id = entity.id
+            code = entity.code
+            value = entity.description
+            submittedAndPendingApproval = entity.submittedAndPendingApproval
+            approved = entity.approved
+            rejected = entity.rejected
+            withdrawnByApplicant = entity.withdrawnByApplicant
+            active = entity.active
+            closed = entity.closed
+        }
+    }
+
+    fun mapToGetCentersCenterIdStatusEntity(domainModel: Status): GetCentersCenterIdStatus {
+        return GetCentersCenterIdStatus().apply {
+            id = domainModel.id
+            code = domainModel.code
+            description = domainModel.value
+            submittedAndPendingApproval = domainModel.submittedAndPendingApproval
+            approved = domainModel.approved
+            rejected = domainModel.rejected
+            withdrawnByApplicant = domainModel.withdrawnByApplicant
+            active = domainModel.active
+            closed = domainModel.closed
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsProductTemplateMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsProductTemplateMapper.kt
new file mode 100644
index 00000000000..4b19868f68b
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsProductTemplateMapper.kt
@@ -0,0 +1,58 @@
+package com.mifos.api.mappers.accounts.savings
+
+import com.mifos.api.mappers.GenericMapper.convert
+import com.mifos.objects.PaymentTypeOption
+import com.mifos.objects.accounts.savings.Currency
+import com.mifos.objects.common.InterestType
+import com.mifos.objects.templates.savings.SavingProductsTemplate
+import org.apache.fineract.client.models.*
+import org.mifos.core.data.AbstractMapper
+
+object SavingsProductTemplateMapper: AbstractMapper<GetSavingsProductsTemplateResponse, SavingProductsTemplate>() {
+
+    override fun mapFromEntity(entity: GetSavingsProductsTemplateResponse): SavingProductsTemplate {
+        return SavingProductsTemplate().apply {
+            currency = convert(entity.currency)
+            interestCompoundingPeriodType = convert(entity.interestCompoundingPeriodType)
+            interestPostingPeriodType = convert(entity.interestPostingPeriodType)
+            interestCalculationType = convert(entity.interestCalculationType)
+            interestCalculationDaysInYearType = convert(entity.interestCalculationDaysInYearType)
+            accountingRule = convert(entity.accountingRule)
+            currencyOptions = entity.currencyOptions?.let { it ->
+                it.map { convert<GetSavingsCurrency, Currency>(it) }
+            } ?: listOf()
+            interestCompoundingPeriodTypeOptions = entity.interestCompoundingPeriodTypeOptions?.let {
+                convert<GetSavingsProductsInterestCompoundingPeriodType, InterestType>(it)
+            } ?: listOf()
+            interestPostingPeriodTypeOptions = entity.interestPostingPeriodTypeOptions?.let {
+                convert<GetSavingsProductsInterestPostingPeriodType, InterestType>(it)
+            } ?: listOf()
+            interestCalculationTypeOptions = entity.interestCalculationTypeOptions?.let {
+                convert<GetSavingsProductsInterestCalculationType, InterestType>(it)
+            } ?: listOf()
+            interestCalculationDaysInYearTypeOptions = entity.interestCalculationDaysInYearTypeOptions?.let {
+                convert<GetSavingsProductsInterestCalculationDaysInYearType, InterestType>(it)
+            } ?: listOf()
+            lockinPeriodFrequencyTypeOptions = entity.lockinPeriodFrequencyTypeOptions?.let {
+                convert<GetSavingsProductsLockinPeriodFrequencyTypeOptions, InterestType>(it)
+            } ?: listOf()
+            withdrawalFeeTypeOptions = entity.withdrawalFeeTypeOptions?.let {
+                convert<GetSavingsProductsWithdrawalFeeTypeOptions, InterestType>(it)
+            } ?: listOf()
+            paymentTypeOptions = entity.paymentTypeOptions?.let {
+                convert<GetSavingsProductsPaymentTypeOptions, PaymentTypeOption>(it)
+            } ?: listOf()
+            accountingRuleOptions = entity.accountingRuleOptions?.let {
+                convert<GetSavingsProductsTemplateAccountingRule, InterestType>(it)
+            } ?: listOf()
+            assetAccountOptions = listOf()
+            expenseAccountOptions = listOf()
+            incomeAccountOptions = listOf()
+            fieldOfficerOptions = listOf()
+        }
+    }
+
+    override fun mapToEntity(domainModel: SavingProductsTemplate): GetSavingsProductsTemplateResponse {
+        return convert(domainModel)
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsStatusMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsStatusMapper.kt
new file mode 100644
index 00000000000..68b0ec817b5
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/accounts/savings/SavingsStatusMapper.kt
@@ -0,0 +1,25 @@
+package com.mifos.api.mappers.accounts.savings
+
+import com.mifos.objects.accounts.savings.Status
+import org.apache.fineract.client.models.GetSavingsStatus
+import org.mifos.core.data.AbstractMapper
+
+object SavingsStatusMapper: AbstractMapper<GetSavingsStatus, Status>() {
+    override fun mapFromEntity(entity: GetSavingsStatus): Status {
+        return Status().apply {
+            id = entity.id
+            code = entity.code
+            value = entity.value
+            submittedAndPendingApproval = entity.submittedAndPendingApproval
+            approved =  entity.approved
+            rejected = entity.rejected
+            withdrawnByApplicant = entity.withdrawnByApplicant
+            active = entity.active
+            closed =  entity.closed
+        }
+    }
+
+    override fun mapToEntity(domainModel: Status): GetSavingsStatus {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/centers/CentersPageItemsMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/centers/CentersPageItemsMapper.kt
new file mode 100644
index 00000000000..8fd8795e670
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/centers/CentersPageItemsMapper.kt
@@ -0,0 +1,42 @@
+package com.mifos.api.mappers.centers
+
+import com.mifos.api.mappers.client.ClientStatusMapper
+import com.mifos.objects.client.Status
+import com.mifos.objects.group.Center
+import org.apache.fineract.client.models.GetCentersPageItems
+import org.apache.fineract.client.models.GetCentersStatus
+import org.mifos.core.data.AbstractMapper
+
+object CentersPageItemsMapper: AbstractMapper<GetCentersPageItems, Center>() {
+    override fun mapFromEntity(entity: GetCentersPageItems): Center {
+        return Center().apply {
+            id = entity.id
+            active = entity.active
+            name = entity.name
+            officeId = entity.officeId
+            officeName = entity.officeName
+            hierarchy = entity.hierarchy
+            status = Status().apply {
+                id = entity.status!!.id!!
+                code = entity.status!!.code
+                value = entity.status!!.description
+            }
+        }
+    }
+
+    override fun mapToEntity(domainModel: Center): GetCentersPageItems {
+        return GetCentersPageItems().apply {
+            id = domainModel.id
+            active = domainModel.active
+            name = domainModel.name
+            officeId = domainModel.officeId
+            officeName = domainModel.officeName
+            hierarchy = domainModel.hierarchy
+            status = GetCentersStatus().apply {
+                id = domainModel.status.id
+                code = domainModel.status.code
+                description = domainModel.status.value
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/centers/GetCentersCenterIdResponseMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/centers/GetCentersCenterIdResponseMapper.kt
new file mode 100644
index 00000000000..46b4ba4c157
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/centers/GetCentersCenterIdResponseMapper.kt
@@ -0,0 +1,24 @@
+package com.mifos.api.mappers.centers
+
+import com.mifos.api.mappers.accounts.savings.SavingsAccMapper
+import com.mifos.objects.accounts.CenterAccounts
+import org.apache.fineract.client.models.GetCentersCenterIdAccountsResponse
+import org.mifos.core.data.AbstractMapper
+
+object GetCentersCenterIdResponseMapper: AbstractMapper<GetCentersCenterIdAccountsResponse, CenterAccounts>() {
+    override fun mapFromEntity(entity: GetCentersCenterIdAccountsResponse): CenterAccounts {
+        return CenterAccounts().apply {
+            savingsAccounts = entity.savingsAccounts?.map { SavingsAccMapper.mapFromEntity(it) } ?:
+            listOf()
+            loanAccounts = listOf()
+            memberLoanAccounts = listOf()
+        }
+    }
+
+    override fun mapToEntity(domainModel: CenterAccounts): GetCentersCenterIdAccountsResponse {
+        return GetCentersCenterIdAccountsResponse().apply {
+            savingsAccounts = domainModel.savingsAccounts.map { SavingsAccMapper.mapToGetCentersSavingsAccountsEntity(it) }
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/centers/GetCentersResponseMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/centers/GetCentersResponseMapper.kt
new file mode 100644
index 00000000000..64729d95f73
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/centers/GetCentersResponseMapper.kt
@@ -0,0 +1,23 @@
+package com.mifos.api.mappers.centers
+
+import com.mifos.objects.client.Page
+import com.mifos.objects.group.Center
+import org.apache.fineract.client.models.GetCentersResponse
+import org.mifos.core.data.AbstractMapper
+
+object GetCentersResponseMapper: AbstractMapper<GetCentersResponse, Page<Center>>() {
+    override fun mapFromEntity(entity: GetCentersResponse): Page<Center> {
+        return Page<Center>().apply{
+            totalFilteredRecords = entity.totalFilteredRecords!!
+            pageItems = entity.pageItems?.let { CentersPageItemsMapper.mapFromEntityList(it) } ?:
+            listOf()
+        }
+    }
+
+    override fun mapToEntity(domainModel: Page<Center>): GetCentersResponse {
+        return GetCentersResponse().apply{
+            totalFilteredRecords = domainModel.totalFilteredRecords!!
+            pageItems = CentersPageItemsMapper.mapToEntityList(domainModel.pageItems)
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientActivatingRequestMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientActivatingRequestMapper.kt
new file mode 100644
index 00000000000..52b99be7b4a
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientActivatingRequestMapper.kt
@@ -0,0 +1,23 @@
+package com.mifos.api.mappers.client
+
+import com.mifos.objects.client.ActivatePayload
+import org.apache.fineract.client.models.PostClientsClientIdRequest
+import org.mifos.core.data.AbstractMapper
+
+object ClientActivatingRequestMapper: AbstractMapper<PostClientsClientIdRequest, ActivatePayload>() {
+    override fun mapFromEntity(entity: PostClientsClientIdRequest): ActivatePayload {
+        return ActivatePayload().apply {
+            activationDate = entity.activationDate
+            dateFormat = entity.dateFormat
+            locale = entity.locale
+        }
+    }
+
+    override fun mapToEntity(domainModel: ActivatePayload): PostClientsClientIdRequest {
+        return PostClientsClientIdRequest().apply {
+            activationDate = domainModel.activationDate
+            dateFormat = domainModel.dateFormat
+            locale = domainModel.locale
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientMapper.kt
new file mode 100644
index 00000000000..e2cb3132ab1
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientMapper.kt
@@ -0,0 +1,36 @@
+package com.mifos.api.mappers.client
+
+import com.mifos.objects.client.Client
+import org.apache.fineract.client.models.GetClientsPageItemsResponse
+import org.mifos.core.data.AbstractMapper
+
+object ClientMapper: AbstractMapper<GetClientsPageItemsResponse, Client>() {
+
+    override fun mapFromEntity(entity: GetClientsPageItemsResponse): Client {
+        return Client().apply {
+            id = entity.id!!
+            accountNo = entity.accountNo
+            fullname = entity.fullname
+            firstname = entity.displayName!!.split(" ")[0]
+            lastname = if (entity.displayName!!.split(" ").size >= 2) entity.displayName!!.split(" ")[1] else ""
+            displayName = entity.displayName
+            officeId = entity.officeId!!
+            officeName = entity.officeName
+            isActive = entity.active!!
+            status = ClientStatusMapper.mapFromEntity(entity.status!!)
+        }
+    }
+
+    override fun mapToEntity(domainModel: Client): GetClientsPageItemsResponse {
+        return GetClientsPageItemsResponse().apply {
+            id = domainModel.id
+            accountNo = domainModel.accountNo
+            fullname = domainModel.fullname
+            displayName = domainModel.displayName
+            officeId = domainModel.officeId
+            officeName = domainModel.officeName
+            active = domainModel.isActive
+            status = ClientStatusMapper.mapToEntity(domainModel.status!!)
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientStatusMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientStatusMapper.kt
new file mode 100644
index 00000000000..026082c395a
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientStatusMapper.kt
@@ -0,0 +1,25 @@
+package com.mifos.api.mappers.client
+
+import com.mifos.objects.client.Status
+import org.apache.fineract.client.models.GetClientStatus
+import org.mifos.core.data.AbstractMapper
+
+object ClientStatusMapper: AbstractMapper<GetClientStatus, Status>() {
+
+    override fun mapFromEntity(entity: GetClientStatus): Status {
+        return Status().apply {
+            id = entity.id!!
+            code = entity.code
+            value = entity.description
+        }
+    }
+
+    override fun mapToEntity(domainModel: Status): GetClientStatus {
+        return GetClientStatus().apply {
+            id = domainModel.id!!
+            code = domainModel.code
+            description = domainModel.value
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientsClientIdResponseMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientsClientIdResponseMapper.kt
new file mode 100644
index 00000000000..26ed2dec4e0
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/ClientsClientIdResponseMapper.kt
@@ -0,0 +1,50 @@
+package com.mifos.api.mappers.client
+
+import com.mifos.api.utils.toArray
+import com.mifos.objects.client.Client
+import com.mifos.objects.client.Status
+import org.apache.fineract.client.models.GetClientsClientIdResponse
+import org.apache.fineract.client.models.GetClientsClientIdStatus
+import org.mifos.core.data.AbstractMapper
+import java.util.*
+
+object ClientsClientIdResponseMapper: AbstractMapper<GetClientsClientIdResponse, Client>() {
+
+    override fun mapFromEntity(entity: GetClientsClientIdResponse): Client {
+        return Client().apply {
+            id = entity.id!!
+            accountNo = entity.accountNo.toString()
+            fullname = "${entity.firstname} ${entity.lastname}"
+            displayName = entity.displayName
+            officeId = entity.officeId!!
+            officeName = entity.officeName
+            isActive = entity.active!!
+            status = Status().apply {
+                id = entity.status!!.id!!
+                code = entity.status!!.code
+                value = entity.status!!.description
+            }
+            activationDate = entity.activationDate?.let { it.toArray() } ?: listOf()
+        }
+    }
+
+    override fun mapToEntity(domainModel: Client): GetClientsClientIdResponse {
+        return GetClientsClientIdResponse().apply {
+            id = domainModel.id
+            accountNo = domainModel.accountNo
+            firstname = domainModel.fullname.split(" ")[0]
+            lastname = domainModel.fullname.split(" ")[1]
+            displayName = domainModel.displayName
+            officeId = domainModel.officeId
+            officeName = domainModel.officeName
+            active = domainModel.isActive
+            status = GetClientsClientIdStatus().apply {
+                id = domainModel.status.id
+                code = domainModel.status.code
+                description = domainModel.status.value
+            }
+            activationDate = Date(domainModel.activationDate[0], domainModel.activationDate[1], domainModel.activationDate[2])
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/GetClientResponseMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/GetClientResponseMapper.kt
new file mode 100644
index 00000000000..e065a703908
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/GetClientResponseMapper.kt
@@ -0,0 +1,24 @@
+package com.mifos.api.mappers.client
+
+import com.mifos.objects.client.Client
+import com.mifos.objects.client.Page
+import org.apache.fineract.client.models.GetClientsResponse
+import org.mifos.core.data.AbstractMapper
+
+object GetClientResponseMapper: AbstractMapper<GetClientsResponse, Page<Client>>() {
+
+    override fun mapFromEntity(entity: GetClientsResponse): Page<Client> {
+        return Page<Client>().apply {
+            totalFilteredRecords = entity.totalFilteredRecords!!
+            pageItems = ClientMapper.mapFromEntityList(entity.pageItems!!)
+        }
+    }
+
+    override fun mapToEntity(domainModel: Page<Client>): GetClientsResponse {
+        return GetClientsResponse().apply {
+            totalFilteredRecords = domainModel.totalFilteredRecords
+            pageItems = ClientMapper.mapToEntityList(domainModel.pageItems)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/PostClientRequestMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/PostClientRequestMapper.kt
new file mode 100644
index 00000000000..f599a3fe3f3
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/PostClientRequestMapper.kt
@@ -0,0 +1,44 @@
+package com.mifos.api.mappers.client
+
+import com.mifos.objects.client.ClientPayload
+import com.mifos.objects.noncore.DataTablePayload
+import org.apache.fineract.client.models.PostClientsDatatable
+import org.apache.fineract.client.models.PostClientsRequest
+import org.mifos.core.data.AbstractMapper
+import java.util.HashMap
+
+object PostClientRequestMapper: AbstractMapper<PostClientsRequest, ClientPayload>() {
+    override fun mapFromEntity(entity: PostClientsRequest): ClientPayload {
+        return ClientPayload().apply {
+            officeId = entity.officeId
+            firstname = entity.fullname!!.split(" ")[0]
+            lastname = entity.fullname!!.split(" ")[1]
+            dateFormat = entity.dateFormat
+            locale = entity.locale
+            activationDate = entity.activationDate
+            isActive = entity.active!!
+            datatables = entity.datatables?.let { it.map { DataTablePayload().apply {
+                registeredTableName = it.registeredTableName
+                data = it.data as HashMap<String, Any>?
+            } } }
+        }
+    }
+
+    override fun mapToEntity(domainModel: ClientPayload): PostClientsRequest {
+        val middleName = if (domainModel.middlename  != null) domainModel.middlename else ""
+        return PostClientsRequest().apply {
+            officeId = domainModel.officeId
+            fullname = "${domainModel.firstname} $middleName ${domainModel.lastname}"
+            dateFormat = domainModel.dateFormat
+            locale = domainModel.locale
+            activationDate = domainModel.activationDate
+            active = domainModel.isActive
+            groupId = 1
+            datatables = domainModel.datatables?.let { it.map { PostClientsDatatable().apply {
+                registeredTableName = it.registeredTableName
+                data = it.data as HashMap<String, Any>?
+            } } }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/PostClientResponseMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/PostClientResponseMapper.kt
new file mode 100644
index 00000000000..2d51cb67ee1
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/PostClientResponseMapper.kt
@@ -0,0 +1,20 @@
+package com.mifos.api.mappers.client
+
+import com.mifos.objects.client.Client
+import org.apache.fineract.client.models.PostClientsResponse
+import org.mifos.core.data.AbstractMapper
+
+object PostClientResponseMapper: AbstractMapper<PostClientsResponse, Client>() {
+    override fun mapFromEntity(entity: PostClientsResponse): Client {
+        return Client().apply {
+            id = entity.clientId!!
+            officeId = entity.officeId!!
+            groupId = entity.groupId!!
+            isImagePresent = false
+        }
+    }
+
+    override fun mapToEntity(domainModel: Client): PostClientsResponse {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/AllowedDocumentTypeMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/AllowedDocumentTypeMapper.kt
new file mode 100644
index 00000000000..e53247074c1
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/AllowedDocumentTypeMapper.kt
@@ -0,0 +1,24 @@
+package com.mifos.api.mappers.client.identifiers
+
+import com.mifos.objects.noncore.DocumentType
+import org.apache.fineract.client.models.GetClientsAllowedDocumentTypes
+import org.apache.fineract.client.models.GetClientsDocumentType
+import org.mifos.core.data.AbstractMapper
+
+object AllowedDocumentTypeMapper: AbstractMapper<GetClientsAllowedDocumentTypes, DocumentType>() {
+    override fun mapFromEntity(entity: GetClientsAllowedDocumentTypes): DocumentType {
+        return DocumentType().apply {
+            id = entity.id
+            name = entity.name
+            position = entity.position
+        }
+    }
+
+    override fun mapToEntity(domainModel: DocumentType): GetClientsAllowedDocumentTypes {
+        return GetClientsAllowedDocumentTypes().apply {
+            id = domainModel.id
+            name = domainModel.name
+            position = domainModel.position
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/GetIdentifiersTemplateMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/GetIdentifiersTemplateMapper.kt
new file mode 100644
index 00000000000..203d341dc5d
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/GetIdentifiersTemplateMapper.kt
@@ -0,0 +1,24 @@
+package com.mifos.api.mappers.client.identifiers
+
+import com.mifos.objects.noncore.IdentifierTemplate
+import org.apache.fineract.client.models.GetClientsClientIdIdentifiersTemplateResponse
+import org.mifos.core.data.AbstractMapper
+
+object GetIdentifiersTemplateMapper :
+    AbstractMapper<GetClientsClientIdIdentifiersTemplateResponse, IdentifierTemplate>() {
+    override fun mapFromEntity(entity: GetClientsClientIdIdentifiersTemplateResponse): IdentifierTemplate {
+        return IdentifierTemplate().apply {
+            allowedDocumentTypes = entity.allowedDocumentTypes?.let {
+                AllowedDocumentTypeMapper.mapFromEntityList(
+                    it
+                )
+            }
+        }
+    }
+
+    override fun mapToEntity(domainModel: IdentifierTemplate): GetClientsClientIdIdentifiersTemplateResponse {
+        return GetClientsClientIdIdentifiersTemplateResponse().apply {
+            allowedDocumentTypes = AllowedDocumentTypeMapper.mapToEntityList(domainModel.allowedDocumentTypes)
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/IdentifierCreationResponseMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/IdentifierCreationResponseMapper.kt
new file mode 100644
index 00000000000..3d1a49938d1
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/IdentifierCreationResponseMapper.kt
@@ -0,0 +1,24 @@
+package com.mifos.api.mappers.client.identifiers
+
+import com.mifos.objects.noncore.IdentifierCreationResponse
+import org.apache.fineract.client.models.PostClientsClientIdIdentifiersResponse
+import org.mifos.core.data.AbstractMapper
+
+object IdentifierCreationResponseMapper :
+    AbstractMapper<PostClientsClientIdIdentifiersResponse, IdentifierCreationResponse>() {
+    override fun mapFromEntity(entity: PostClientsClientIdIdentifiersResponse): IdentifierCreationResponse {
+        return IdentifierCreationResponse().apply {
+            clientId = entity.clientId!!
+            officeId = entity.officeId!!
+            resourceId = entity.resourceId!!
+        }
+    }
+
+    override fun mapToEntity(domainModel: IdentifierCreationResponse): PostClientsClientIdIdentifiersResponse {
+        return PostClientsClientIdIdentifiersResponse().apply {
+            clientId = domainModel.clientId
+            officeId = domainModel.officeId
+            resourceId = domainModel.resourceId
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/IdentifierMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/IdentifierMapper.kt
new file mode 100644
index 00000000000..6ee2ddec2f0
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/IdentifierMapper.kt
@@ -0,0 +1,37 @@
+package com.mifos.api.mappers.client.identifiers
+
+import com.mifos.objects.noncore.DocumentType
+import com.mifos.objects.noncore.Identifier
+import org.apache.fineract.client.models.GetClientsClientIdIdentifiersResponse
+import org.apache.fineract.client.models.GetClientsDocumentType
+import org.mifos.core.data.AbstractMapper
+
+object IdentifierMapper: AbstractMapper<GetClientsClientIdIdentifiersResponse, Identifier>() {
+    override fun mapFromEntity(entity: GetClientsClientIdIdentifiersResponse): Identifier {
+        return Identifier().apply {
+            id = entity.id
+            clientId = entity.clientId
+            documentKey = entity.documentKey
+            description = entity.description
+            documentType = entity.documentType?.let {
+                DocumentType().apply {
+                    id = it.id
+                    name = it.name
+                }
+            }
+        }
+    }
+
+    override fun mapToEntity(domainModel: Identifier): GetClientsClientIdIdentifiersResponse {
+        return GetClientsClientIdIdentifiersResponse().apply {
+            id = domainModel.id
+            clientId = domainModel.clientId
+            documentKey = domainModel.documentKey
+            description = domainModel.description
+            documentType = GetClientsDocumentType().apply {
+                id = this.id
+                name = this.name
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/PostIdentifierMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/PostIdentifierMapper.kt
new file mode 100644
index 00000000000..208e9be9374
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/identifiers/PostIdentifierMapper.kt
@@ -0,0 +1,24 @@
+package com.mifos.api.mappers.client.identifiers
+
+import com.mifos.objects.noncore.IdentifierPayload
+import org.apache.fineract.client.models.PostClientsClientIdIdentifiersRequest
+import org.mifos.core.data.AbstractMapper
+
+object PostIdentifierMapper :
+    AbstractMapper<PostClientsClientIdIdentifiersRequest, IdentifierPayload>() {
+    override fun mapFromEntity(entity: PostClientsClientIdIdentifiersRequest): IdentifierPayload {
+        return IdentifierPayload().apply {
+            documentTypeId = entity.documentTypeId
+            documentKey = entity.documentKey
+            description = entity.description
+        }
+    }
+
+    override fun mapToEntity(domainModel: IdentifierPayload): PostClientsClientIdIdentifiersRequest {
+        return PostClientsClientIdIdentifiersRequest().apply {
+            documentTypeId = domainModel.documentTypeId
+            documentKey = domainModel.documentKey
+            description = domainModel.description
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/ClientColumnHeaderDataMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/ClientColumnHeaderDataMapper.kt
new file mode 100644
index 00000000000..fb82086e65f
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/ClientColumnHeaderDataMapper.kt
@@ -0,0 +1,26 @@
+package com.mifos.api.mappers.client.template
+
+import com.mifos.objects.noncore.ColumnHeader
+import com.mifos.objects.noncore.ColumnValue
+import org.apache.fineract.client.models.GetClientsColumnHeaderData
+import org.mifos.core.data.AbstractMapper
+
+object ClientColumnHeaderDataMapper: AbstractMapper<GetClientsColumnHeaderData, ColumnHeader>() {
+    override fun mapFromEntity(entity: GetClientsColumnHeaderData): ColumnHeader {
+        return ColumnHeader().apply {
+            columnName = entity.columnName
+            columnType = entity.columnType
+            columnLength = entity.columnLength
+            columnDisplayType = entity.columnDisplayType
+            columnNullable = entity.isColumnNullable
+            columnPrimaryKey = entity.isColumnPrimaryKey
+            columnValues = entity.columnValues?.map { cv -> ColumnValue().apply {
+                value = cv
+            } }
+        }
+    }
+
+    override fun mapToEntity(domainModel: ColumnHeader): GetClientsColumnHeaderData {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/ClientDataTableMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/ClientDataTableMapper.kt
new file mode 100644
index 00000000000..9f6ad511996
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/ClientDataTableMapper.kt
@@ -0,0 +1,25 @@
+package com.mifos.api.mappers.client.template
+
+import com.mifos.objects.noncore.DataTable
+import org.apache.fineract.client.models.GetClientsDataTables
+import org.mifos.core.data.AbstractMapper
+
+object ClientDataTableMapper: AbstractMapper<GetClientsDataTables, DataTable>() {
+    override fun mapFromEntity(entity: GetClientsDataTables): DataTable {
+        return DataTable().apply {
+            applicationTableName = entity.applicationTableName
+            registeredTableName = entity.registeredTableName
+            columnHeaderData = ClientColumnHeaderDataMapper
+                .mapFromEntityList(entity.columnHeaderData!!)
+        }
+    }
+
+    override fun mapToEntity(domainModel: DataTable): GetClientsDataTables {
+        return GetClientsDataTables().apply {
+            applicationTableName = domainModel.applicationTableName
+            registeredTableName = domainModel.registeredTableName
+            columnHeaderData = ClientColumnHeaderDataMapper
+                .mapToEntityList(domainModel.columnHeaderData)
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/OfficeOptionMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/OfficeOptionMapper.kt
new file mode 100644
index 00000000000..c726a40de42
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/OfficeOptionMapper.kt
@@ -0,0 +1,23 @@
+package com.mifos.api.mappers.client.template
+
+import com.mifos.objects.templates.clients.OfficeOptions
+import org.apache.fineract.client.models.GetClientsOfficeOptions
+import org.mifos.core.data.AbstractMapper
+
+object OfficeOptionMapper: AbstractMapper<GetClientsOfficeOptions, OfficeOptions>() {
+    override fun mapFromEntity(entity: GetClientsOfficeOptions): OfficeOptions {
+        return OfficeOptions().apply {
+            id = entity.id!!
+            name = entity.name
+            nameDecorated = entity.nameDecorated
+        }
+    }
+
+    override fun mapToEntity(domainModel: OfficeOptions): GetClientsOfficeOptions {
+        return GetClientsOfficeOptions().apply {
+            id = domainModel.id
+            name = domainModel.name
+            nameDecorated = domainModel.nameDecorated
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/SavingProductOptionMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/SavingProductOptionMapper.kt
new file mode 100644
index 00000000000..100c88b30d2
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/SavingProductOptionMapper.kt
@@ -0,0 +1,25 @@
+package com.mifos.api.mappers.client.template
+
+import com.mifos.objects.templates.clients.SavingProductOptions
+import org.apache.fineract.client.models.GetClientsSavingProductOptions
+import org.mifos.core.data.AbstractMapper
+
+object SavingProductOptionMapper: AbstractMapper<GetClientsSavingProductOptions, SavingProductOptions>() {
+    override fun mapFromEntity(entity: GetClientsSavingProductOptions): SavingProductOptions {
+        return SavingProductOptions().apply {
+            id = entity.id!!
+            name = entity.name
+            isWithdrawalFeeForTransfers = entity.withdrawalFeeForTransfers!!
+            isAllowOverdraft = entity.allowOverdraft!!
+        }
+    }
+
+    override fun mapToEntity(domainModel: SavingProductOptions): GetClientsSavingProductOptions {
+        return GetClientsSavingProductOptions().apply {
+            id = domainModel.id!!
+            name = domainModel.name
+            withdrawalFeeForTransfers = domainModel.isWithdrawalFeeForTransfers
+            allowOverdraft = domainModel.isAllowOverdraft
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/StaffOptionMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/StaffOptionMapper.kt
new file mode 100644
index 00000000000..e9f58908303
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/StaffOptionMapper.kt
@@ -0,0 +1,33 @@
+package com.mifos.api.mappers.client.template
+
+import com.mifos.objects.templates.clients.StaffOptions
+import org.apache.fineract.client.models.GetClientsStaffOptions
+import org.mifos.core.data.AbstractMapper
+
+object StaffOptionMapper: AbstractMapper<GetClientsStaffOptions, StaffOptions>() {
+    override fun mapFromEntity(entity: GetClientsStaffOptions): StaffOptions {
+        return StaffOptions().apply {
+            id = entity.id!!
+            firstname = entity.firstname
+            lastname = entity.lastname
+            displayName = entity.displayName
+            officeId = entity.officeId!!
+            officeName = entity.officeName
+            setIsLoanOfficer(entity.isLoanOfficer!!)
+            setIsActive(entity.isActive!!)
+        }
+    }
+
+    override fun mapToEntity(domainModel: StaffOptions): GetClientsStaffOptions {
+        return GetClientsStaffOptions().apply {
+            id = domainModel.id
+            firstname = domainModel.firstname
+            lastname = domainModel.lastname
+            displayName = domainModel.displayName
+            officeId = domainModel.officeId
+            officeName = domainModel.officeName
+            isLoanOfficer = domainModel.isLoanOfficer
+            isActive = domainModel.isActive
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/TemplateMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/TemplateMapper.kt
new file mode 100644
index 00000000000..04e2a084756
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/client/template/TemplateMapper.kt
@@ -0,0 +1,36 @@
+package com.mifos.api.mappers.client.template
+
+import com.mifos.api.utils.toDate
+import com.mifos.api.utils.toIntArray
+import com.mifos.objects.templates.clients.ClientsTemplate
+import org.apache.fineract.client.models.GetClientsTemplateResponse
+import org.mifos.core.data.AbstractMapper
+
+object TemplateMapper: AbstractMapper<GetClientsTemplateResponse, ClientsTemplate>() {
+    override fun mapFromEntity(entity: GetClientsTemplateResponse): ClientsTemplate {
+        return ClientsTemplate().apply {
+            activationDate = entity.activationDate!!.toIntArray()
+            officeId = entity.officeId!!
+            officeOptions = entity.officeOptions?.let { OfficeOptionMapper.mapFromEntityList(it) } ?:  listOf()
+            staffOptions = entity.staffOptions?.let { StaffOptionMapper.mapFromEntityList(it) } ?:  listOf()
+            savingProductOptions = entity.savingProductOptions?.let {
+                SavingProductOptionMapper.mapFromEntityList(
+                    it
+                )
+            } ?:  listOf()
+            genderOptions = listOf()
+            clientTypeOptions = listOf()
+            clientClassificationOptions = listOf()
+            clientLegalFormOptions = listOf()
+            dataTables = entity.datatables?.let { ClientDataTableMapper.mapFromEntityList(it) } ?:  listOf()
+        }
+    }
+
+    override fun mapToEntity(domainModel: ClientsTemplate): GetClientsTemplateResponse {
+        return GetClientsTemplateResponse().apply {
+            activationDate = domainModel.activationDate!!.toDate()
+            officeId = domainModel.officeId!!
+            officeOptions = OfficeOptionMapper.mapToEntityList(domainModel.officeOptions!!)
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/datatable/ColumnHeaderDataMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/datatable/ColumnHeaderDataMapper.kt
new file mode 100644
index 00000000000..98b33bd234b
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/datatable/ColumnHeaderDataMapper.kt
@@ -0,0 +1,28 @@
+package com.mifos.api.mappers.datatable
+
+import com.mifos.objects.noncore.ColumnHeader
+import org.apache.fineract.client.models.ResultsetColumnHeaderData
+import org.mifos.core.data.AbstractMapper
+
+object ColumnHeaderDataMapper: AbstractMapper<ResultsetColumnHeaderData, ColumnHeader>() {
+    override fun mapFromEntity(entity: ResultsetColumnHeaderData): ColumnHeader {
+        return ColumnHeader().apply {
+            columnName = entity.columnName
+            columnType = entity.columnType
+            columnLength = entity.columnLength!!.toInt()
+            columnDisplayType = entity.columnDisplayType
+            columnCode = entity.columnCode
+            columnPrimaryKey = false
+        }
+    }
+
+    override fun mapToEntity(domainModel: ColumnHeader): ResultsetColumnHeaderData {
+        return ResultsetColumnHeaderData().apply {
+            columnName = domainModel.columnName
+            columnType = domainModel.columnType
+            columnLength = domainModel.columnLength.toLong()
+            columnDisplayType = domainModel.columnDisplayType
+            columnCode = domainModel.columnCode
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/datatable/GetDataTablesResponseMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/datatable/GetDataTablesResponseMapper.kt
new file mode 100644
index 00000000000..3ea7d58ffb1
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/datatable/GetDataTablesResponseMapper.kt
@@ -0,0 +1,25 @@
+package com.mifos.api.mappers.datatable
+
+import com.mifos.objects.noncore.DataTable
+import org.apache.fineract.client.models.GetDataTablesResponse
+import org.mifos.core.data.AbstractMapper
+
+object GetDataTablesResponseMapper: AbstractMapper<GetDataTablesResponse, DataTable>() {
+    override fun mapFromEntity(entity: GetDataTablesResponse): DataTable {
+        return DataTable().apply {
+            applicationTableName = entity.applicationTableName
+            registeredTableName = entity.registeredTableName
+            columnHeaderData = entity.columnHeaderData?.let { ColumnHeaderDataMapper.mapFromEntityList(it) }
+                ?: listOf()
+        }
+    }
+
+    override fun mapToEntity(domainModel: DataTable): GetDataTablesResponse {
+        return GetDataTablesResponse().apply {
+            applicationTableName = domainModel.applicationTableName
+            registeredTableName = domainModel.registeredTableName
+            columnHeaderData = domainModel.columnHeaderData?.let { ColumnHeaderDataMapper.mapToEntityList(it) }
+                ?: listOf()
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/groups/CreateGroupRequestMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/CreateGroupRequestMapper.kt
new file mode 100644
index 00000000000..19a1efa94f3
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/CreateGroupRequestMapper.kt
@@ -0,0 +1,23 @@
+package com.mifos.api.mappers.groups
+
+import com.mifos.objects.group.GroupPayload
+import org.apache.fineract.client.models.PostGroupsRequest
+import org.mifos.core.data.AbstractMapper
+
+object CreateGroupRequestMapper: AbstractMapper<PostGroupsRequest, GroupPayload>() {
+    override fun mapFromEntity(entity: PostGroupsRequest): GroupPayload {
+        return GroupPayload().apply {
+            officeId = entity.officeId!!
+            name = entity.name
+            isActive = entity.active!!
+        }
+    }
+
+    override fun mapToEntity(domainModel: GroupPayload): PostGroupsRequest {
+        return PostGroupsRequest().apply {
+            officeId = domainModel.officeId
+            name = domainModel.name
+            active = domainModel.isActive
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/groups/CreateGroupResponseMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/CreateGroupResponseMapper.kt
new file mode 100644
index 00000000000..b5e6f5cee06
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/CreateGroupResponseMapper.kt
@@ -0,0 +1,23 @@
+package com.mifos.api.mappers.groups
+
+import com.mifos.objects.response.SaveResponse
+import org.apache.fineract.client.models.PostGroupsResponse
+import org.mifos.core.data.AbstractMapper
+
+object CreateGroupResponseMapper: AbstractMapper<PostGroupsResponse, SaveResponse>() {
+    override fun mapFromEntity(entity: PostGroupsResponse): SaveResponse {
+        return SaveResponse().apply {
+            officeId = entity.officeId
+            groupId = entity.groupId
+            resourceId = entity.resourceId
+        }
+    }
+
+    override fun mapToEntity(domainModel: SaveResponse): PostGroupsResponse {
+        return PostGroupsResponse().apply {
+            officeId = domainModel.officeId
+            groupId = domainModel.groupId
+            resourceId = domainModel.resourceId
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetGroupsGroupIdAccountsMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetGroupsGroupIdAccountsMapper.kt
new file mode 100644
index 00000000000..93efe690942
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetGroupsGroupIdAccountsMapper.kt
@@ -0,0 +1,23 @@
+package com.mifos.api.mappers.groups
+
+import com.mifos.api.mappers.accounts.loan.LoanAccMapper
+import com.mifos.api.mappers.accounts.savings.SavingsAccMapper
+import com.mifos.objects.accounts.GroupAccounts
+import org.apache.fineract.client.models.GetGroupsGroupIdAccountsResponse
+import org.mifos.core.data.AbstractMapper
+
+object GetGroupsGroupIdAccountsMapper: AbstractMapper<GetGroupsGroupIdAccountsResponse, GroupAccounts>() {
+    override fun mapFromEntity(entity: GetGroupsGroupIdAccountsResponse): GroupAccounts {
+        return GroupAccounts().apply {
+            loanAccounts = entity.loanAccounts?.let { LoanAccMapper.mapFromEntityGroupsList(it) } ?: listOf()
+            savingsAccounts = entity.savingsAccounts?.let {
+                SavingsAccMapper.mapFromEntityGroupsList(it)
+            } ?: listOf()
+        }
+    }
+
+    @Deprecated("This mapper doesn't support mapping to entity")
+    override fun mapToEntity(domainModel: GroupAccounts): GetGroupsGroupIdAccountsResponse {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetGroupsGroupIdMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetGroupsGroupIdMapper.kt
new file mode 100644
index 00000000000..4a8edd5553a
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetGroupsGroupIdMapper.kt
@@ -0,0 +1,38 @@
+package com.mifos.api.mappers.groups
+
+import com.mifos.objects.client.Status
+import com.mifos.objects.group.Group
+import org.apache.fineract.client.models.GetGroupsGroupIdResponse
+import org.mifos.core.data.AbstractMapper
+
+/**
+ * active field missing in [GetGroupsGroupIdResponse]]
+ */
+object GetGroupsGroupIdMapper: AbstractMapper<GetGroupsGroupIdResponse, Group>() {
+
+
+    override fun mapFromEntity(entity: GetGroupsGroupIdResponse): Group {
+        return Group().apply {
+            id = entity.id
+            name = entity.name
+            externalId = entity.externalId
+            active = true
+            officeId = entity.officeId
+            officeName = entity.officeName
+            hierarchy = entity.hierarchy
+            timeline = entity.timeline?.let { GroupsTimelineMapper.mapFromEntity(it) }
+        }
+    }
+
+    override fun mapToEntity(domainModel: Group): GetGroupsGroupIdResponse {
+        return GetGroupsGroupIdResponse().apply {
+            id = domainModel.id
+            name = domainModel.name
+            externalId = domainModel.externalId
+            officeId = domainModel.officeId
+            officeName = domainModel.officeName
+            hierarchy = domainModel.hierarchy
+            timeline = GroupsTimelineMapper.mapToEntity(domainModel.timeline)
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetGroupsPagedItemsMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetGroupsPagedItemsMapper.kt
new file mode 100644
index 00000000000..0a317fa4822
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetGroupsPagedItemsMapper.kt
@@ -0,0 +1,41 @@
+package com.mifos.api.mappers.groups
+
+import com.mifos.objects.client.Status
+import com.mifos.objects.group.Group
+import org.apache.fineract.client.models.GetGroupsPageItems
+import org.apache.fineract.client.models.GetGroupsStatus
+import org.mifos.core.data.AbstractMapper
+
+object GetGroupsPagedItemsMapper: AbstractMapper<GetGroupsPageItems, Group>() {
+    override fun mapFromEntity(entity: GetGroupsPageItems): Group {
+        return Group().apply {
+            id = entity.id
+            name = entity.name
+            status = Status().apply {
+                id = entity.status!!.id!!
+                code = entity.status!!.code
+                value = entity.status!!.description
+            }
+            active = entity.active
+            officeId = entity.officeId
+            officeName = entity.officeName
+            hierarchy = entity.hierarchy
+        }
+    }
+
+    override fun mapToEntity(domainModel: Group): GetGroupsPageItems {
+        return GetGroupsPageItems().apply {
+            id = domainModel.id
+            name = domainModel.name
+            status = GetGroupsStatus().apply {
+                id = domainModel.status.id
+                code = domainModel.status.code
+                description = domainModel.status.value
+            }
+            active = domainModel.active
+            officeId = domainModel.officeId
+            officeName = domainModel.officeName
+            hierarchy = domainModel.hierarchy
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetPagedGroupsResponseMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetPagedGroupsResponseMapper.kt
new file mode 100644
index 00000000000..21d3271d2c4
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GetPagedGroupsResponseMapper.kt
@@ -0,0 +1,23 @@
+package com.mifos.api.mappers.groups
+
+import com.mifos.objects.client.Page
+import org.apache.fineract.client.models.GetGroupsResponse
+import com.mifos.objects.group.Group
+import org.mifos.core.data.AbstractMapper
+
+object GetPagedGroupsResponseMapper: AbstractMapper<GetGroupsResponse, Page<Group>>() {
+    override fun mapFromEntity(entity: GetGroupsResponse): Page<Group> {
+        return Page<Group>().apply {
+            totalFilteredRecords = entity.totalFilteredRecords!!
+            pageItems = GetGroupsPagedItemsMapper.mapFromEntityList(entity.pageItems!!)
+        }
+    }
+
+    override fun mapToEntity(domainModel: Page<Group>): GetGroupsResponse {
+        return GetGroupsResponse().apply {
+            totalFilteredRecords = domainModel.totalFilteredRecords
+            pageItems = GetGroupsPagedItemsMapper.mapToEntityList(domainModel.pageItems)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GroupsTimelineMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GroupsTimelineMapper.kt
new file mode 100644
index 00000000000..562c533d8e1
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/groups/GroupsTimelineMapper.kt
@@ -0,0 +1,28 @@
+package com.mifos.api.mappers.groups
+
+import com.mifos.api.utils.toArray
+import com.mifos.api.utils.toDate
+import com.mifos.api.utils.toIntArray
+import com.mifos.objects.Timeline
+import org.apache.fineract.client.models.GetGroupsGroupIdTimeline
+import org.mifos.core.data.AbstractMapper
+
+object GroupsTimelineMapper: AbstractMapper<GetGroupsGroupIdTimeline, Timeline>() {
+    override fun mapFromEntity(entity: GetGroupsGroupIdTimeline): Timeline {
+        return Timeline().apply {
+            activatedOnDate = entity.activatedOnDate?.toArray()
+            activatedByUsername = entity.activatedByUsername
+            activatedByFirstname = entity.activatedByFirstname
+            activatedByLastname = entity.activatedByLastname
+        }
+    }
+
+    override fun mapToEntity(domainModel: Timeline): GetGroupsGroupIdTimeline {
+        return GetGroupsGroupIdTimeline().apply {
+            activatedOnDate = domainModel.activatedOnDate.toDate()
+            activatedByUsername = domainModel.activatedByUsername
+            activatedByFirstname = domainModel.activatedByFirstname
+            activatedByLastname = domainModel.activatedByLastname
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/note/NoteMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/note/NoteMapper.kt
new file mode 100644
index 00000000000..8e9f5f35533
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/note/NoteMapper.kt
@@ -0,0 +1,36 @@
+package com.mifos.api.mappers.note
+
+import com.mifos.objects.noncore.Note
+import org.apache.fineract.client.models.GetResourceTypeResourceIdNotesResponse
+import org.mifos.core.data.AbstractMapper
+import java.util.*
+
+object NoteMapper: AbstractMapper<GetResourceTypeResourceIdNotesResponse, Note>() {
+    override fun mapFromEntity(entity: GetResourceTypeResourceIdNotesResponse): Note {
+        return Note().apply {
+            id = entity.id!!
+            clientId = entity.clientId!!
+            noteContent = entity.note
+            createdById = entity.createdById!!
+            createdByUsername = entity.createdByUsername
+            createdOn = entity.createdOn!!.time
+            updatedById = entity.updatedById!!
+            updatedByUsername = entity.updatedByUsername
+            updatedOn = entity.updatedOn!!.time
+        }
+    }
+
+    override fun mapToEntity(domainModel: Note): GetResourceTypeResourceIdNotesResponse {
+        return GetResourceTypeResourceIdNotesResponse().apply {
+            id = domainModel.id
+            clientId = domainModel.clientId
+            note = domainModel.noteContent
+            createdById = domainModel.createdById
+            createdByUsername = domainModel.createdByUsername
+            createdOn = Date(domainModel.createdOn)
+            updatedById = domainModel.updatedById
+            updatedByUsername = domainModel.updatedByUsername
+            updatedOn = Date(domainModel.updatedOn)
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/office/GetOfficeResponseMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/office/GetOfficeResponseMapper.kt
new file mode 100644
index 00000000000..d7dd7a87f65
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/office/GetOfficeResponseMapper.kt
@@ -0,0 +1,29 @@
+package com.mifos.api.mappers.office
+
+import com.mifos.api.utils.toArray
+import com.mifos.api.utils.toDate
+import com.mifos.objects.organisation.Office
+import org.apache.fineract.client.models.GetOfficesResponse
+import org.mifos.core.data.AbstractMapper
+
+object GetOfficeResponseMapper: AbstractMapper<GetOfficesResponse, Office>() {
+    override fun mapFromEntity(entity: GetOfficesResponse): Office {
+        return Office().apply {
+            id = entity.id!!.toInt()
+            name = entity.name
+            nameDecorated = entity.nameDecorated
+            externalId = entity.externalId
+            openingDate = entity.openingDate?.toArray()
+        }
+    }
+
+    override fun mapToEntity(domainModel: Office): GetOfficesResponse {
+        return GetOfficesResponse().apply {
+            id = domainModel.id.toLong()
+            name = domainModel.name
+            nameDecorated = domainModel.nameDecorated
+            externalId = domainModel.externalId
+            openingDate = domainModel.openingDate.toDate()
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/staff/StaffMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/staff/StaffMapper.kt
new file mode 100644
index 00000000000..5a8da0bbcfd
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/staff/StaffMapper.kt
@@ -0,0 +1,33 @@
+package com.mifos.api.mappers.staff
+
+import com.mifos.objects.organisation.Staff
+import org.apache.fineract.client.models.RetrieveOneResponse
+import org.mifos.core.data.AbstractMapper
+
+object StaffMapper: AbstractMapper<RetrieveOneResponse, Staff>() {
+    override fun mapFromEntity(entity: RetrieveOneResponse): Staff {
+        return Staff().apply {
+            id = entity.id!!.toInt()
+            firstname = entity.firstname
+            lastname = entity.lastname
+            displayName = entity.displayName
+            officeId = entity.officeId!!.toInt()
+            officeName = entity.officeName
+            isLoanOfficer = entity.isLoanOfficer
+            isActive = entity.isActive
+        }
+    }
+
+    override fun mapToEntity(domainModel: Staff): RetrieveOneResponse {
+        return RetrieveOneResponse().apply {
+            id = domainModel.id.toLong()
+            firstname = domainModel.firstname
+            lastname = domainModel.lastname
+            displayName = domainModel.displayName
+            officeId = domainModel.officeId.toLong()
+            officeName = domainModel.officeName
+            isLoanOfficer = domainModel.isLoanOfficer
+            isActive = domainModel.isActive
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/survey/QuestionDataMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/survey/QuestionDataMapper.kt
new file mode 100644
index 00000000000..9a55bed37b7
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/survey/QuestionDataMapper.kt
@@ -0,0 +1,47 @@
+package com.mifos.api.mappers.survey
+
+import com.mifos.objects.survey.QuestionDatas
+import com.mifos.objects.survey.ResponseDatas
+import org.apache.fineract.client.models.QuestionData
+import org.apache.fineract.client.models.ResponseData
+import org.mifos.core.data.AbstractMapper
+
+object QuestionDataMapper:AbstractMapper<QuestionData, QuestionDatas>() {
+    override fun mapFromEntity(entity: QuestionData): QuestionDatas {
+        return QuestionDatas().apply {
+            id = entity.id!!.toInt()
+            componentKey = entity.componentKey
+            key = entity.key
+            text = entity.text
+            description = entity.description
+            sequenceNo = entity.sequenceNo!!
+            responseDatas = entity.responseDatas!!.map {
+                ResponseDatas().apply {
+                    id = it.id!!.toInt()
+                    text = it.text
+                    value = it.value!!
+                    sequenceNo = it.sequenceNo!!
+                }
+            }
+        }
+    }
+
+    override fun mapToEntity(domainModel: QuestionDatas): QuestionData {
+        return QuestionData().apply {
+            id = domainModel.id.toLong()
+            componentKey = domainModel.componentKey
+            key = domainModel.key
+            text = domainModel.text
+            description = domainModel.description
+            sequenceNo = domainModel.sequenceNo
+            responseDatas = domainModel.responseDatas.map {
+                ResponseData().apply {
+                    id = it.questionId.toLong()
+                    text = it.text
+                    value = it.value
+                    sequenceNo = it.sequenceNo
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/survey/ScorecardDataMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/survey/ScorecardDataMapper.kt
new file mode 100644
index 00000000000..3345b1bca27
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/survey/ScorecardDataMapper.kt
@@ -0,0 +1,39 @@
+package com.mifos.api.mappers.survey
+
+import com.mifos.objects.survey.Scorecard
+import com.mifos.objects.survey.ScorecardValues
+import org.apache.fineract.client.models.ScorecardData
+import org.apache.fineract.client.models.ScorecardValue
+import org.mifos.core.data.AbstractMapper
+
+object ScorecardDataMapper: AbstractMapper<ScorecardData, Scorecard>() {
+    override fun mapFromEntity(entity: ScorecardData): Scorecard {
+        return Scorecard().apply {
+            clientId = entity.clientId!!.toInt()
+            userId = entity.userId!!.toInt()
+            scorecardValues = entity.scorecardValues?.let {
+                it.map {
+                ScorecardValues().apply {
+                    questionId = it.questionId!!.toInt()
+                    responseId = it.responseId!!.toInt()
+                    value = it.value
+                }
+            }
+            }
+        }
+    }
+
+    override fun mapToEntity(domainModel: Scorecard): ScorecardData {
+        return ScorecardData().apply {
+            clientId = domainModel.clientId.toLong()
+            userId = domainModel.userId.toLong()
+            scorecardValues = domainModel.scorecardValues.map {
+                ScorecardValue().apply {
+                    questionId = it.questionId.toLong()
+                    responseId = it.responseId.toLong()
+                    value = it.value
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/mappers/survey/SurveyDataMapper.kt b/mifosng-android/src/main/java/com/mifos/api/mappers/survey/SurveyDataMapper.kt
new file mode 100644
index 00000000000..585528dc469
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/mappers/survey/SurveyDataMapper.kt
@@ -0,0 +1,55 @@
+package com.mifos.api.mappers.survey
+
+import com.mifos.objects.survey.ComponentDatas
+import com.mifos.objects.survey.Survey
+import org.apache.fineract.client.models.ComponentData
+import org.apache.fineract.client.models.SurveyData
+import org.mifos.core.data.AbstractMapper
+
+object SurveyDataMapper: AbstractMapper<SurveyData, Survey>() {
+    override fun mapFromEntity(entity: SurveyData): Survey {
+        return Survey().apply {
+            id = entity.id!!.toInt()
+            key = entity.key
+            name = entity.name
+            description = entity.description
+            countryCode = entity.countryCode
+            questionDatas = entity.questionDatas?.let { QuestionDataMapper.mapFromEntityList(it) }
+                ?: listOf()
+            componentDatas = entity.componentDatas?.let { mp ->
+                mp.map {
+                    ComponentDatas().apply {
+                        id = it.id!!.toInt()
+                        text = it.text
+                        key = it.key
+                        description = it.description
+                        sequenceNo = it.sequenceNo!!
+                    }
+                }
+            }
+        }
+    }
+
+    override fun mapToEntity(domainModel: Survey): SurveyData {
+        return SurveyData().apply {
+            id = domainModel.id.toLong()
+            key = domainModel.key
+            name = domainModel.name
+            description = domainModel.description
+            countryCode = domainModel.countryCode
+            questionDatas = domainModel.questionDatas?.let { QuestionDataMapper.mapToEntityList(it) }
+                ?: listOf()
+            componentDatas = domainModel.componentDatas?.let { mp ->
+                mp.map {
+                    ComponentData().apply {
+                        id = it.id.toLong()
+                        text = it.text
+                        key = it.key
+                        description = it.description
+                        sequenceNo = it.sequenceNo
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/utils/DataTables.kt b/mifosng-android/src/main/java/com/mifos/api/utils/DataTables.kt
new file mode 100644
index 00000000000..b51493b7ea8
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/utils/DataTables.kt
@@ -0,0 +1,5 @@
+package com.mifos.api.utils
+
+enum class DataTables(val datatable: String) {
+    ClientPinPointLocation("client_pinpoint_location")
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/utils/extesnions.kt b/mifosng-android/src/main/java/com/mifos/api/utils/extesnions.kt
new file mode 100644
index 00000000000..aaf0a584417
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/api/utils/extesnions.kt
@@ -0,0 +1,27 @@
+package com.mifos.api.utils
+
+import java.lang.IndexOutOfBoundsException
+import java.util.*
+
+fun Date.toArray(): List<Int> {
+    return listOf(this.year, this.month, this.date)
+}
+
+fun Date.toIntArray(): IntArray {
+    return IntArray(3).let {
+        it.plus(this.year)
+        it.plus(this.month)
+        it.plus(this.date)
+    }
+}
+
+fun List<Int>.toDate(): Date {
+    if(size < 3) {
+        throw IndexOutOfBoundsException()
+    }
+    return Date(get(0), get(1), get(2))
+}
+
+fun IntArray.toDate(): Date {
+    return Date(this[0], this[1], this[2])
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/utils/PrefManager.kt b/mifosng-android/src/main/java/com/mifos/utils/PrefManager.kt
new file mode 100755
index 00000000000..cda85544b5a
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/utils/PrefManager.kt
@@ -0,0 +1,56 @@
+package com.mifos.utils
+
+import android.content.SharedPreferences
+import android.preference.PreferenceManager
+import com.mifos.App
+import com.mifos.objects.user.User
+import org.mifos.core.sharedpreference.Key
+import org.mifos.core.sharedpreference.UserPreferences
+
+/**
+ * @author fomenkoo
+ * @see UserPreferences
+ */
+object  PrefManager : UserPreferences<User>() {
+
+    private const val USER_DETAILS = "user_details"
+    private const val AUTH_USERNAME = "auth_username"
+    private const val AUTH_PASSWORD = "auth_password"
+
+    override val preference: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(App.getInstance()
+            .applicationContext)
+
+    override fun getUser(): User {
+        return get<User>(Key.Custom(USER_DETAILS))!!
+    }
+
+    override fun saveUser(user: User) {
+        put(Key.Custom(USER_DETAILS), user)
+    }
+
+    fun setServiceStatus(status: Boolean) {
+        put(Key.Custom(Constants.SERVICE_STATUS), status)
+    }
+
+    fun getServiceStatus(): Boolean {
+        return get(Key.Custom(Constants.SERVICE_STATUS), false)
+    }
+
+    fun setPermissionDeniedStatus(permissionDeniedStatus: String, status: Boolean) {
+        put(Key.Custom(permissionDeniedStatus), status)
+    }
+
+    fun getPermissionDeniedStatus(permissionDeniedStatus: String): Boolean {
+        return get(Key.Custom(permissionDeniedStatus), true)
+    }
+
+    fun setUsernamePassword(username: String, password: String) {
+        put(Key.Custom(AUTH_USERNAME), username)
+        put(Key.Custom(AUTH_PASSWORD), password)
+    }
+
+    fun getUsernamePassword(): Pair<String, String> {
+        return Pair(get(Key.Custom(AUTH_USERNAME)), get(Key.Custom(AUTH_PASSWORD)))
+    }
+
+}
\ No newline at end of file