From fb965d25c0fb2f816714471d82712e81ea77717f Mon Sep 17 00:00:00 2001
From: EGOR-IND <56648862+EGOR-IND@users.noreply.github.com>
Date: Tue, 23 Mar 2021 02:51:23 +0530
Subject: [PATCH] added extra layer to edit is_member status

---
 .../FormCustomerDetailsFragment.java          | 43 +++++++++++++++++++
 .../res/drawable/ic_cross_cricle_red_24dp.xml |  9 ++++
 .../layout/fragment_form_customer_details.xml | 23 +++++++++-
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_cross_cricle_red_24dp.xml

diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java
index 6e779fc5..6edb0da1 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java
@@ -3,9 +3,11 @@
 import android.app.Activity;
 import android.app.DatePickerDialog;
 import android.content.Context;
+import android.os.Build;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.google.android.material.textfield.TextInputLayout;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -16,6 +18,8 @@
 import android.widget.CheckBox;
 import android.widget.DatePicker;
 import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.VerificationError;
@@ -33,6 +37,7 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnCheckedChanged;
 import butterknife.OnClick;
 
 /**
@@ -76,6 +81,12 @@ public class FormCustomerDetailsFragment extends FineractBaseFragment implements
     @BindView(R.id.cb_is_member)
     CheckBox cbIsmember;
 
+    @BindView(R.id.tv_member_status)
+    TextView tvMemberStatus;
+
+    @BindView(R.id.iv_edit_is_member)
+    ImageView ivEditIsMember;
+
     View rootView;
 
     private Calendar calendar = Calendar.getInstance();
@@ -144,6 +155,9 @@ public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth
     }
 
     public void showPreviousCustomerDetails() {
+        tvMemberStatus.setVisibility(View.VISIBLE);
+        ivEditIsMember.setVisibility(View.VISIBLE);
+        cbIsmember.setVisibility(View.GONE);
         etAccount.setText(customer.getIdentifier());
         etAccount.setEnabled(false);
         etFirstName.setText(customer.getGivenName());
@@ -152,6 +166,7 @@ public void showPreviousCustomerDetails() {
         }
         etLastName.setText(customer.getSurname());
         cbIsmember.setChecked(customer.getMember());
+        setIsMemberStatus();
         dateOfBirth = customer.getDateOfBirth();
 
         calendar.set(Calendar.YEAR, dateOfBirth.getYear());
@@ -298,4 +313,32 @@ public void onAttach(Context context) {
                     + " must implement OnNavigationBarListener.CustomerDetails");
         }
     }
+
+    @OnClick(R.id.iv_edit_is_member)
+    void editIsMember() {
+        if (tvMemberStatus.getVisibility() == View.VISIBLE) {
+            tvMemberStatus.setVisibility(View.GONE);
+            cbIsmember.setVisibility(View.VISIBLE);
+            ivEditIsMember.setImageResource(R.drawable.ms_ic_check);
+        } else {
+            tvMemberStatus.setVisibility(View.VISIBLE);
+            cbIsmember.setVisibility(View.GONE);
+            ivEditIsMember.setImageResource(R.drawable.ic_edit_black_24dp);
+        }
+    }
+
+    @OnCheckedChanged(R.id.cb_is_member)
+    void setIsMemberStatus() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            if (cbIsmember.isChecked()) {
+                tvMemberStatus.
+                        setCompoundDrawablesRelativeWithIntrinsicBounds(
+                        R.drawable.ic_check_circle_black_24dp, 0, 0, 0);
+            } else {
+                tvMemberStatus.
+                        setCompoundDrawablesRelativeWithIntrinsicBounds(
+                        R.drawable.ic_cross_cricle_red_24dp, 0, 0, 0);
+            }
+        }
+    }
 }
diff --git a/app/src/main/res/drawable/ic_cross_cricle_red_24dp.xml b/app/src/main/res/drawable/ic_cross_cricle_red_24dp.xml
new file mode 100644
index 00000000..dce37b6e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cross_cricle_red_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/red_dark"
+        android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_form_customer_details.xml b/app/src/main/res/layout/fragment_form_customer_details.xml
index ef89fbad..50688b91 100644
--- a/app/src/main/res/layout/fragment_form_customer_details.xml
+++ b/app/src/main/res/layout/fragment_form_customer_details.xml
@@ -123,7 +123,8 @@
                     android:orientation="horizontal"
                     android:paddingBottom="@dimen/layout_padding_16dp"
                     android:paddingLeft="@dimen/layout_padding_16dp"
-                    android:paddingRight="@dimen/layout_padding_16dp">
+                    android:paddingRight="@dimen/layout_padding_16dp"
+                    android:gravity="center_vertical">
 
                     <CheckBox
                         android:id="@+id/cb_is_member"
@@ -133,7 +134,25 @@
                         android:paddingRight="@dimen/layout_padding_16dp"
                         android:checked="true"
                         android:layout_width="wrap_content"
-                        android:paddingLeft="@dimen/layout_padding_16dp"/>
+                        android:paddingLeft="@dimen/layout_padding_16dp"
+                        android:layout_weight="1"/>
+
+                    <TextView
+                        android:id="@+id/tv_member_status"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/is_member"
+                        android:drawablePadding="@dimen/layout_padding_5dp"
+                        android:visibility="gone"
+                        android:layout_weight="1"/>
+
+                    <ImageView
+                        android:id="@+id/iv_edit_is_member"
+                        android:layout_width="@dimen/layout_padding_24dp"
+                        android:layout_height="@dimen/layout_padding_24dp"
+                        app:srcCompat="@drawable/ic_edit_black_24dp"
+                        android:tint="@color/black"
+                        android:visibility="gone"/>
 
                 </LinearLayout>