Minor ui fixes

.idea/assetWizardSettings.xml

@@ -3,6 +3,11 @@
   <component name="WizardSettings">
     <option name="children">
       <map>
+        <entry key="imageWizard">
+          <value>
+            <PersistentState />
+          </value>
+        </entry>
         <entry key="vectorWizard">
           <value>
             <PersistentState>
@@ -14,8 +19,8 @@
                         <option name="values">
                           <map>
                             <entry key="assetSourceType" value="FILE" />
-                            <entry key="outputName" value="vd_close" />
-                            <entry key="sourceFile" value="$USER_HOME$/Desktop/close.svg" />
+                            <entry key="outputName" value="ic_edit" />
+                            <entry key="sourceFile" value="$USER_HOME$/Downloads/edit.svg" />
                           </map>
                         </option>
                       </PersistentState>

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/banklistingdialog/BankIconMapper.java

@@ -42,7 +42,10 @@ public class BankIconMapper {
                 return R.drawable.ico_bank_keb;
             case "088":
                 return R.drawable.ico_bank_shinhan;
-
+            case "089":
+                return R.drawable.ico_bank_kakao;
+            case "090":
+                return R.drawable.ico_bank_kbank;
             default:
                 return R.drawable.ic_bank;
         }

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java

@@ -591,7 +591,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
         View topupReportView = nav_drawer.findViewById(R.id.view_topup_report);
 
         if (action) {
-            withdrawView.setVisibility(View.VISIBLE);
+//            withdrawView.setVisibility(View.VISIBLE);
             manageAccountDivider.setVisibility(View.VISIBLE);
             manageAccountViewGroup.setVisibility(View.VISIBLE);
             transactionReportDivider.setVisibility(View.VISIBLE);
@@ -601,7 +601,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
             topupReportDivider.setVisibility(View.VISIBLE);
             topupReportView.setVisibility(View.VISIBLE);
         } else {
-            withdrawView.setVisibility(View.INVISIBLE);
+//            withdrawView.setVisibility(View.INVISIBLE);
             manageAccountDivider.setVisibility(View.GONE);
             manageAccountViewGroup.setVisibility(View.GONE);
             transactionReportDivider.setVisibility(View.GONE);

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1Fragment.java

@@ -357,7 +357,7 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen
         List<Gender> data = new ArrayList<>();
         data.add(new Gender("M", getString(R.string.male_text)));
         data.add(new Gender("F", getString(R.string.female_text)));
-        data.add(new Gender("O", getString(R.string.other_text)));
+//        data.add(new Gender("O", getString(R.string.other_text)));
         genderSelectDialog.setData(data);
         genderSelectDialog.setListener(selectedGender ->
         {

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientListingV3Activity.java

@@ -3,11 +3,17 @@ package com.gmeremit.online.gmeremittance_native.recipientV3.view.recipientlisti
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+
+import com.gmeremit.online.gmeremittance_native.domesticremit.send.view.RecipientConfirmDialog;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
+
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import android.os.Bundle;
+
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.View;
 import android.widget.EditText;
 import android.widget.FrameLayout;
@@ -109,10 +115,9 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
         iv_back.setOnClickListener(null);
     }
 
-    private void init()
-    {
-        this.presenter=new RecipientListingV3Presenter(this,new RecipientListingV3Gateway());
-        searchEditTextTextWatcher=new SearchEditTextTextWatcher();
+    private void init() {
+        this.presenter = new RecipientListingV3Presenter(this, new RecipientListingV3Gateway());
+        searchEditTextTextWatcher = new SearchEditTextTextWatcher();
         setupRecyclerView();
 
     }
@@ -122,21 +127,19 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
 //        recipientListRv.addItemDecoration(new SelectedRedBorderDecoration(getActivity()));
 //        recipientListRv.setItemAnimator(new DefaultItemAnimator());
         recipientListRv.setAdapter(recipientListingRvAdapter);
-        recipientListRv.addItemDecoration(new LineDividerItemDecoration(this,LineDividerItemDecoration.VERTICAL_LIST));
+        recipientListRv.addItemDecoration(new LineDividerItemDecoration(this, LineDividerItemDecoration.VERTICAL_LIST));
     }
 
-    private void performDefaultAction(Bundle savedInstance)
-    {
+    private void performDefaultAction(Bundle savedInstance) {
         iv_cancel.setVisibility(View.INVISIBLE);
         toolbarTitle.setText(getString(R.string.recipient_listing_title_text));
         this.presenter.getAllRecipientList(null);
     }
 
 
-
     @Override
-    public void showAllRecipientToUser(List<ReceiverInfoV3Model> recipientInfoModelList,boolean changeLayoutBehavior) {
-        if(changeLayoutBehavior) {
+    public void showAllRecipientToUser(List<ReceiverInfoV3Model> recipientInfoModelList, boolean changeLayoutBehavior) {
+        if (changeLayoutBehavior) {
             if (recipientInfoModelList != null && recipientInfoModelList.size() > 0) {
                 recipientHintTextViewContainer.setVisibility(View.VISIBLE);
 
@@ -173,28 +176,25 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
 
     @Override
     public void showNoRecipientFoundView(boolean action) {
-            if(action)
-            {
-                recipientListRv.setVisibility(View.INVISIBLE);
-                noDataFoundTextView.setVisibility(View.VISIBLE);
-            }
-            else
-            {
-                recipientListRv.setVisibility(View.VISIBLE);
-                noDataFoundTextView.setVisibility(View.INVISIBLE);
+        if (action) {
+            recipientListRv.setVisibility(View.INVISIBLE);
+            noDataFoundTextView.setVisibility(View.VISIBLE);
+        } else {
+            recipientListRv.setVisibility(View.VISIBLE);
+            noDataFoundTextView.setVisibility(View.INVISIBLE);
 
 
-            }
+        }
     }
 
     @Override
-    public void promptToSendMoney(GenericPromptDialog.GenericDialogPromptListener listener,String message) {
-            GenericPromptDialog genericPromptDialog=new GenericPromptDialog();
-            genericPromptDialog.setTitleMessage(getString(R.string.important_text));
-            genericPromptDialog.setBodyMessage(message);
-            genericPromptDialog.setIconsRes(-1);
-            genericPromptDialog.setCancellable(true);
-            genericPromptDialog.setListener(listener);
+    public void promptToSendMoney(GenericPromptDialog.GenericDialogPromptListener listener, String message) {
+        GenericPromptDialog genericPromptDialog = new GenericPromptDialog();
+        genericPromptDialog.setTitleMessage(getString(R.string.important_text));
+        genericPromptDialog.setBodyMessage(message);
+        genericPromptDialog.setIconsRes(-1);
+        genericPromptDialog.setCancellable(true);
+        genericPromptDialog.setListener(listener);
         if (!genericPromptDialog.isAdded())
             genericPromptDialog.show(getSupportFragmentManager(), "PROMPTSENDMONEY");
     }
@@ -207,8 +207,8 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
     }
 
     @Override
-    public void promptToEditRecipient(GenericPromptDialog.GenericDialogPromptListener genericDialogPromptListener,String message) {
-        GenericPromptDialog genericPromptDialog=new GenericPromptDialog();
+    public void promptToEditRecipient(GenericPromptDialog.GenericDialogPromptListener genericDialogPromptListener, String message) {
+        GenericPromptDialog genericPromptDialog = new GenericPromptDialog();
         genericPromptDialog.setTitleMessage(getString(R.string.important_text));
         genericPromptDialog.setBodyMessage(message);
         genericPromptDialog.setIconsRes(-1);
@@ -226,23 +226,37 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
     }
 
 
-
     @Override
     public void onRecipientLongPressed(ReceiverInfoV3Model recipientInfoModel) {
-        CharSequence[] charSequences = new CharSequence[]{getString(R.string.delete_text), getString(R.string.edit_text)};
-        AlertDialog.Builder alert = new AlertDialog.Builder(this);
-        alert.setItems(charSequences, new DialogInterface.OnClickListener() {
+//        CharSequence[] charSequences = new CharSequence[]{getString(R.string.delete_text), getString(R.string.edit_text)};
+//        AlertDialog.Builder alert = new AlertDialog.Builder(this);
+//        alert.setItems(charSequences, new DialogInterface.OnClickListener() {
+//            @Override
+//            public void onClick(DialogInterface dialogInterface, int i) {
+//                if (i == 0) {
+//                    presenter.deleteRecipient(recipientInfoModel.getReceiverId());
+//                } else {
+//                    proceedToEditRecipient(recipientInfoModel);
+//                }
+//            }
+//        });
+//        alert.create();
+//        alert.show();
+        RecipientModifyPromptDialog dialog= RecipientModifyPromptDialog.showRecipientModifyPromptDialog(new RecipientModifyPromptDialog.RecipientModifyPromptDialogListener() {
+            @Override
+            public void redirectToRecipientEdit() {
+                proceedToEditRecipient(recipientInfoModel);
+
+            }
+
             @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                if (i == 0) {
-                    presenter.deleteRecipient(recipientInfoModel.getReceiverId());
-                } else {
-                    proceedToEditRecipient(recipientInfoModel);
-                }
+            public void redirectToRecipientDelete() {
+                presenter.deleteRecipient(recipientInfoModel.getReceiverId());
             }
         });
-        alert.create();
-        alert.show();
+
+        dialog.show(getSupportFragmentManager(),RecipientConfirmDialog.class.getSimpleName());
+
     }
 
     @Override
@@ -252,22 +266,22 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
 
     @Override
     public void showPaymentSourceSelection(List<AutoDebitAccount> autoDebitAccountList) {
-        if(autoDebitAccountList==null||autoDebitAccountList.size()<1)
+        if (autoDebitAccountList == null || autoDebitAccountList.size() < 1)
             return;
 
-        if(autoDebitAccountListingDialog==null)
-            autoDebitAccountListingDialog =new AutoDebitAccountListingDialog();
+        if (autoDebitAccountListingDialog == null)
+            autoDebitAccountListingDialog = new AutoDebitAccountListingDialog();
 
         autoDebitAccountListingDialog.setAccountData(autoDebitAccountList);
         autoDebitAccountListingDialog.setListener(new AccountListingRvAdapter.AccountSelectionListener() {
             @Override
             public void onAccountSelected(AutoDebitAccount selectedAccount) {
-                SendMoneyRequiredDataV3 sendMoneyRequiredData=presenter.getSendMoneyRequiredData(selectedAccount);
+                SendMoneyRequiredDataV3 sendMoneyRequiredData = presenter.getSendMoneyRequiredData(selectedAccount);
                 Intent intent = new Intent(RecipientListingV3Activity.this, SendMoneyV2Activity.class);
                 intent.putExtra(RecipientAddV2Activity.RECIPIENT_INFO_BUNDLE_KEY, sendMoneyRequiredData);
                 startActivity(intent);
 
-                if(autoDebitAccountListingDialog !=null&& autoDebitAccountListingDialog.isAdded())
+                if (autoDebitAccountListingDialog != null && autoDebitAccountListingDialog.isAdded())
                     autoDebitAccountListingDialog.dismiss();
             }
 
@@ -294,10 +308,9 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
     @Override
     public void onClick(View v) {
 
-        switch (v.getId())
-        {
+        switch (v.getId()) {
             case R.id.addReceipient:
-                startActivityForResult(new Intent(this, RecipientAddEditV3Activity.class),RecipientAddEditV3Activity.RECIPIENT_INFO_ACTION_EDIT_REQUEST_CODE);
+                startActivityForResult(new Intent(this, RecipientAddEditV3Activity.class), RecipientAddEditV3Activity.RECIPIENT_INFO_ACTION_EDIT_REQUEST_CODE);
                 break;
 
             case R.id.iv_back:
@@ -309,13 +322,13 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == RecipientAddEditV3Activity.RECIPIENT_INFO_ACTION_EDIT_REQUEST_CODE && resultCode == RESULT_OK) {
             presenter.onRecipentUpdatedSucesss(data.getStringExtra(RecipientAddEditV3Activity.RECIPIENT_UPDATED_ID_BUNDLE_KEY));
         }
     }
 
-    class SearchEditTextTextWatcher extends TextWatcherAdapter
-    {
+    class SearchEditTextTextWatcher extends TextWatcherAdapter {
         @Override
         public void onTextUpdated(String text) {
             presenter.searchForReciever(text);

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientModifyPromptDialog.java

@@ -0,0 +1,94 @@
+package com.gmeremit.online.gmeremittance_native.recipientV3.view.recipientlistingV3;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
+import com.gmeremit.online.gmeremittance_native.R;
+import com.gmeremit.online.gmeremittance_native.topup.local.view.topup.ConfirmRechargePaymentBottomSheetDialog;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class RecipientModifyPromptDialog extends DialogFragment {
+
+    private RecipientModifyPromptDialogListener listener;
+
+
+
+    public static RecipientModifyPromptDialog showRecipientModifyPromptDialog(RecipientModifyPromptDialogListener listener) {
+        RecipientModifyPromptDialog confirmRechargePaymentBottomSheetDialog = new RecipientModifyPromptDialog();
+
+        confirmRechargePaymentBottomSheetDialog.setListener(listener);
+        return confirmRechargePaymentBottomSheetDialog;
+    }
+
+    private void setListener(RecipientModifyPromptDialogListener listener) {
+        this.listener = listener;
+    }
+
+//    @Override
+//    public void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        setStyle(STYLE_NORMAL, R.style.AppBottomSheetDialogTheme);
+//    }
+
+//    @Override
+//    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+//                             Bundle savedInstanceState) {
+//        // Inflate the layout for this fragment
+//        View v = inflater.inflate(R.layout.confirm_recipient_modify_bottom_sheet, container, false);
+//        ButterKnife.bind(this, v);
+//
+//        return v;
+//
+//    }
+
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        View view = getActivity().getLayoutInflater().inflate(R.layout.confirm_recipient_modify_bottom_sheet, null);
+        ButterKnife.bind(this, view);
+        builder.setView(view);
+
+
+        return builder.create();
+
+    }
+
+    @OnClick(R.id.tv_edit)
+    public void onEdit() {
+        this.dismiss();
+        if (listener != null)
+            listener.redirectToRecipientEdit();
+    }
+
+
+    @OnClick(R.id.tv_delete)
+    public void onDelete() {
+        this.dismiss();
+        if (listener != null)
+            listener.redirectToRecipientDelete();
+    }
+
+
+    @OnClick(R.id.img_close)
+    public void closeView() {
+       this.dismiss();
+    }
+
+
+    public interface RecipientModifyPromptDialogListener {
+        void redirectToRecipientEdit();
+        void redirectToRecipientDelete();
+    }
+}

app/src/main/res/drawable/vd_edit.xml

@@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="480"
+    android:viewportWidth="480" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="M145,433c-78,-41 -115,-103 -115,-193 0,-128 82,-210 210,-210 128,0 210,82 210,210 0,90 -37,152 -112,191 -47,24 -150,25 -193,2zM343,377c100,-76 85,-238 -29,-292 -52,-25 -132,-17 -177,18 -99,75 -85,235 25,291 50,25 136,17 181,-17z" android:strokeColor="#00000000"/>
+    <path android:fillColor="#000000"
+        android:pathData="M130,240l0,-110 65,0c36,0 65,4 65,8 0,18 -26,32 -57,32l-33,0 0,70 0,70 70,0 70,0 0,-33c0,-31 14,-57 32,-57 4,0 8,29 8,65l0,65 -110,0 -110,0 0,-110z" android:strokeColor="#00000000"/>
+    <path android:fillColor="#000000"
+        android:pathData="M180,277c0,-33 116,-149 144,-145 41,6 29,41 -35,106 -67,68 -109,82 -109,39z" android:strokeColor="#00000000"/>
+</vector>

app/src/main/res/layout/activity_profile.xml

@@ -48,7 +48,7 @@
                 android:id="@+id/iv_edit_profile"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_edit"
+                android:src="@drawable/vd_edit"
                 tools:visibility="invisible"
                 android:visibility="gone"
                 android:layout_alignParentRight="true"
@@ -198,7 +198,7 @@
                 android:text="@string/withdraw_text"
                 android:textColor="@color/darkgray"
                 android:textSize="12sp"
-                android:visibility="visible"
+                android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="@+id/tv_currency"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:txtfontName="@string/semibold" />

app/src/main/res/layout/confirm_recharge_payment_bottom_sheet.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    >
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/img_close"

app/src/main/res/layout/confirm_recipient_modify_bottom_sheet.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:paddingTop="@dimen/_8sdp"
+    android:paddingBottom="@dimen/_8sdp"
+    android:layout_height="match_parent">
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/img_close"
+            android:visibility="gone"
+            android:padding="@dimen/_5sdp"
+            android:layout_marginStart="@dimen/_8sdp"
+            android:layout_marginBottom="@dimen/_2sdp"
+            android:layout_width="@dimen/_22sdp"
+            android:layout_height="@dimen/_22sdp"
+            app:layout_constraintBottom_toBottomOf="@+id/txt_header"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/txt_header"
+            app:srcCompat="@drawable/vd_close" />
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+        android:orientation="horizontal"
+    android:layout_marginStart="@dimen/_25sdp"
+    android:layout_marginEnd="@dimen/_25sdp">
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_gravity="center_vertical"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+
+                app:srcCompat="@drawable/vd_edit"/>
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+            android:id="@+id/tv_edit"
+            android:layout_marginStart="@dimen/_8sdp"
+            android:paddingTop="@dimen/_10sdp"
+            android:paddingBottom="@dimen/_10sdp"
+            android:textColor="@color/black"
+            android:textSize="@dimen/_12ssp"
+            android:layout_width="match_parent"
+            android:gravity="start|bottom"
+            android:text="@string/edit_text"
+            android:layout_height="wrap_content"/>
+</LinearLayout>
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginStart="@dimen/_25sdp"
+    android:layout_marginEnd="@dimen/_25sdp">
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_gravity="center_vertical"
+            android:layout_width="24dp"
+            app:tint="@color/black"
+            app:tintMode="src_in"
+            android:layout_height="24dp"
+                app:srcCompat="@drawable/ic_delete"/>
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+            android:id="@+id/tv_delete"
+            android:layout_marginStart="@dimen/_8sdp"
+            android:paddingTop="@dimen/_10sdp"
+            android:paddingBottom="@dimen/_10sdp"
+            android:textColor="@color/black"
+            android:textSize="@dimen/_12ssp"
+            android:layout_width="match_parent"
+            android:gravity="start|bottom"
+            android:text="@string/delete_text"
+            android:layout_height="wrap_content"/>
+</LinearLayout>
+      
+
+</LinearLayout>

app/src/main/res/layout/fragment_profile.xml

@@ -46,7 +46,7 @@
                 android:id="@+id/iv_edit_profile"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_edit"
+                android:src="@drawable/vd_edit"
                 tools:visibility="visible"
                 android:visibility="gone"
                 android:layout_alignParentRight="true"

app/src/main/res/layout/nav_drawer_fragment.xml

@@ -149,7 +149,7 @@
                         android:textSize="15sp" />
                     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                         android:layout_gravity="bottom"
-                        android:visibility="visible"
+                        android:visibility="gone"
                         android:id="@+id/btn_withdraw"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"

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

@@ -507,7 +507,7 @@
     <string name="payment_mode_placeholder_text">Выберите способ оплаты</string>
     <string name="bank_placeholder_text">Выберите Тип Карты или банк</string>
     <string name="branch_placeholder_text">Выберите филиал</string>
-    <string name="account_placeholder_text">Номер банковской карты</string>
+    <string name="account_placeholder_text">Номер банковской карты (Счет)</string>
     <string name="first_name_placeholder_text">Введите имя</string>
     <string name="middle_name_placeholder_text">Введите отчество</string>
     <string name="last_name_placeholder_text">Введите фамилию</string>