ui changes and minor fixes

app/src/main/java/com/remit/jmecustomer/features/homeV3/adpaters/SendTypeAdapter.kt

@@ -1,19 +1,38 @@
 package com.remit.jmecustomer.features.homeV3.adpaters
 
+import android.annotation.SuppressLint
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.remit.jmecustomer.R
 import com.remit.jmecustomer.databinding.RowSendTypeBinding
 import com.remit.jmecustomer.features.exrate.model.PaymentModeMapper
 import com.remit.jmecustomer.features.exrate.model.datav2.PaymentMode
 
 class SendTypeAdapter(private var items: MutableList<PaymentMode>) :
     RecyclerView.Adapter<SendTypeAdapter.ViewHolder>() {
+    var mContext: Context? = null;
 
-    class ViewHolder(private val binding: RowSendTypeBinding) :
+    inner class ViewHolder(private val binding: RowSendTypeBinding) :
         RecyclerView.ViewHolder(binding.root) {
 
+        @SuppressLint("NotifyDataSetChanged")
         fun bind(item: PaymentMode) {
+            if (item.isSelected) {
+                binding.rowMain.setBackgroundResource(R.drawable.blue_border_background)
+                mContext?.resources?.getColor(R.color.light_blue)
+                    ?.let { binding.ivText.setTextColor(it) }
+            } else {
+                binding.rowMain.setBackgroundResource(R.drawable.light_blue_grey_border)
+                mContext?.resources?.getColor(R.color.black_opacity_87)
+                    ?.let { binding.ivText.setTextColor(it) }
+            }
+            binding.rowMain.setOnClickListener {
+                item.isSelected = true
+                notifyDataSetChanged()
+
+            }
             binding.ivIcon.setImageResource(
                 PaymentModeMapper.getPaymentModeImageFromId(
                     item.id
@@ -29,12 +48,14 @@ class SendTypeAdapter(private var items: MutableList<PaymentMode>) :
             parent,
             false
         )
+        mContext = parent.context
         return ViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val item = items[position]
         holder.bind(item)
+        item.isSelected = false
     }
 
     override fun getItemCount(): Int = items.size

app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt

@@ -15,6 +15,7 @@ import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
+import androidx.viewpager.widget.ViewPager
 import com.google.android.material.tabs.TabLayout
 import com.remit.jmecustomer.R
 import com.remit.jmecustomer.RemitApplication
@@ -76,7 +77,8 @@ import com.remit.jmecustomer.features.withdraw.view.WithdrawActivity
 class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
     HomeV2PresenterInterface.HomeV2ContractInterface, SendMoneyActionListener,
     SendMoneyV2ContractInterface,
-    TransactionHistoryV2PresenterInterface.TransactionHistoryV2ContractInterface , View.OnClickListener {
+    TransactionHistoryV2PresenterInterface.TransactionHistoryV2ContractInterface,
+    View.OnClickListener {
     lateinit var binding: ActivityHomeV3Binding
     private var pagerAdapter: HomePagerAdapter? = null
     private val currentFragment: Fragment? = null
@@ -141,6 +143,23 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
         binding.tabLayout.addTab(tab2)
         binding.tabLayout.addTab(tab3)
 
+        binding.vpDashboard.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+            override fun onPageScrolled(
+                position: Int,
+                positionOffset: Float,
+                positionOffsetPixels: Int
+            ) {
+            }
+
+            override fun onPageSelected(position: Int) {
+                binding.tabLayout.selectTab(binding.tabLayout.getTabAt(position));
+            }
+
+            override fun onPageScrollStateChanged(state: Int) {
+            }
+
+        })
+
 
         binding.tabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
             override fun onTabSelected(tab: TabLayout.Tab) {

app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java

@@ -140,6 +140,11 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
         viewmodel.subscribeToRewardsPoint().observe(getViewLifecycleOwner(), this::updateRewardDetails);
     }
 
+    private void setDefaultAmount(){
+        sendMoneyEditText.setText("100000");
+        getForex();
+    }
+
     @Override
     public void onStart() {
         super.onStart();
@@ -222,6 +227,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
                 showSelectedCurrency(amountDetailRelatedData.getDefaultSelectedCurrency().getCountryCode(), amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode());
                 updateButtonToCalculate(true);
             }
+            setDefaultAmount();
         });
 
         viewmodel.subscribeToExRateData().observe(getViewLifecycleOwner(), data -> {

app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java

@@ -9,7 +9,9 @@ import android.view.ViewGroup;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatImageView;
+import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import com.google.android.material.button.MaterialButton;
@@ -21,6 +23,7 @@ import com.remit.jmecustomer.R;
 import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog;
 import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog;
 import com.remit.jmecustomer.common.model.FormInputStateDTO;
+import com.remit.jmecustomer.features.homeV3.view.HomeActivityV3;
 import com.remit.jmecustomer.features.security.RemitAuthManager1;
 import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult;
 import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult;
@@ -29,6 +32,7 @@ import com.remit.jmecustomer.features.settings.model.FingerPrintSetupResponse;
 import com.remit.jmecustomer.features.settings.viewModel.FingerPrintSetupPresenterInterface;
 import com.remit.jmecustomer.features.settings.viewModel.FingerSetupLiveData;
 import com.remit.jmecustomer.features.settings.viewModel.FingerSetupViewModel;
+import com.remit.jmecustomer.features.userprofile.view.ProfileFragment;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -65,9 +69,9 @@ public class FingerSetUpPasswordFragment extends BottomSheetDialogFragment
     private boolean switchStatus;
 
 
-    public FingerSetUpPasswordFragment(RemitSucessFailureCallBack remitSucessFailureCallBack,boolean switchStatus) {
+    public FingerSetUpPasswordFragment(RemitSucessFailureCallBack remitSucessFailureCallBack, boolean switchStatus) {
         listner = remitSucessFailureCallBack;
-        this.switchStatus=switchStatus;
+        this.switchStatus = switchStatus;
 
     }
 
@@ -83,14 +87,14 @@ public class FingerSetUpPasswordFragment extends BottomSheetDialogFragment
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if(switchStatus==false){
+        if (switchStatus == false) {
             tvDescription.setText(getString(R.string.enter_your_password_to_setupoff_fingerprint));
         }
         viewModel = new ViewModelProvider(this, new FingerPrintSetupModelFactory(this)).get(FingerSetupViewModel.class);
         ButterKnife.bind(this, view);
         remitAuthManager = new RemitAuthManager1((AppCompatActivity) getActivity());
         remitAuthManager.setListener(this);
-        FingerSetupLiveData fingerSetupLiveData=viewModel.getFingerPrintRelatedViewEvents(new FingerSetupLiveData.FingerSetupBindings(
+        FingerSetupLiveData fingerSetupLiveData = viewModel.getFingerPrintRelatedViewEvents(new FingerSetupLiveData.FingerSetupBindings(
                 RxTextView.textChanges(edVerifyPassword).skipInitialValue()
         ));
         fingerSetupLiveData.getPasswordInputLiveData().observe(this, this::onPasswordDataReceived);
@@ -150,22 +154,22 @@ public class FingerSetUpPasswordFragment extends BottomSheetDialogFragment
     }
 
     @Override
-    public void passwordSubmitSucess(FingerPrintSetupResponse fingerPrintSetupResponse,String userId) {
-        if(switchStatus==true){
+    public void passwordSubmitSucess(FingerPrintSetupResponse fingerPrintSetupResponse, String userId) {
+        if (switchStatus == true) {
             if (remitAuthManager.bioMetricCanAuthenticates().equals(BIOMETRIC_SUCCESS)) {
-                encryptLoginCredentialsWithBioMetric(fingerPrintSetupResponse.getId(),userId);
+                encryptLoginCredentialsWithBioMetric(fingerPrintSetupResponse.getId(), userId);
             } else if (remitAuthManager.bioMetricCanAuthenticates().equals(BIOMETRIC_ERROR_NONE_ENROLLED)) {
                 //@Todo 1
             }
-        }else{
+        } else {
             listner.fingerOffSucessCallBack();
         }
 
     }
 
-    private void encryptLoginCredentialsWithBioMetric(String token,String userId) {
+    private void encryptLoginCredentialsWithBioMetric(String token, String userId) {
         try {
-            remitAuthManager.encryptPrompt(LOGIN, token.getBytes(),userId);
+            remitAuthManager.encryptPrompt(LOGIN, token.getBytes(), userId);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -223,7 +227,12 @@ public class FingerSetUpPasswordFragment extends BottomSheetDialogFragment
 
     @Override
     public void showMessageAlertDialog(String bodyMessage) {
-        ((SettingsView)getActivity()).showMessageAlertDialog(bodyMessage);
+        HomeActivityV3 homeActivityV3 = (HomeActivityV3) requireActivity();
+        ViewPager viewPager = homeActivityV3.binding.vpDashboard;
+        FragmentManager fragmentManager = requireActivity().getSupportFragmentManager();
+        String fragmentTag = "android:switcher:" + viewPager.getId() + ":" + viewPager.getCurrentItem();
+        ProfileFragment fragment = (ProfileFragment) fragmentManager.findFragmentByTag(fragmentTag);
+        fragment.showMessageAlertDialog(bodyMessage);
     }
 
     public interface RemitSucessFailureCallBack {

app/src/main/java/com/remit/jmecustomer/features/userprofile/view/ProfileFragment.kt

@@ -5,11 +5,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.CompoundButton
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.SwitchCompat
 import androidx.lifecycle.ViewModelProvider
 import com.remit.jmecustomer.R
 import com.remit.jmecustomer.base.BaseFragment
 import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog
 import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog.GenericDialogPromptListener
+import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialogSingleButton
 import com.remit.jmecustomer.databinding.FragmentProfileBinding
 import com.remit.jmecustomer.features.aboutscreen.view.AboutJMERemit
 import com.remit.jmecustomer.features.changetxnpin.view.ChangeTxnPinActivity
@@ -18,21 +22,44 @@ import com.remit.jmecustomer.features.depositinfo.view.DepositInfo
 import com.remit.jmecustomer.features.homeV3.view.HomeActivityV3
 import com.remit.jmecustomer.features.loyaltypoints.view.LoyaltyPointsActivity
 import com.remit.jmecustomer.features.mynotifications.view.MyNotificationActivity
+import com.remit.jmecustomer.features.security.RemitAuthManager
+import com.remit.jmecustomer.features.security.RemitAuthManager1
+import com.remit.jmecustomer.features.security.RemitAuthManagerGateway
+import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult
+import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult
+import com.remit.jmecustomer.features.settings.gateway.LanguageSelectionGateway
+import com.remit.jmecustomer.features.settings.gateway.LanguageSelectionGatewayInterface
+import com.remit.jmecustomer.features.settings.view.FingerSetUpPasswordFragment
+import com.remit.jmecustomer.features.settings.view.FingerSetUpPasswordFragment.RemitSucessFailureCallBack
+import com.remit.jmecustomer.features.settings.view.LanguageSelectionListingDialog
 import com.remit.jmecustomer.features.settings.view.SettingsView
+import com.remit.jmecustomer.features.splashscreen.model.LanguageModel
 import com.remit.jmecustomer.features.userprofile.UserProfileViewModelFactory
 import com.remit.jmecustomer.features.userprofile.model.UserProfile
 import com.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterInterface
 import com.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterV2
 import com.remit.jmecustomer.features.walletstatement.view.WalletStatementV2Activity
+import com.remit.jmecustomer.utils.Constants
 import com.remit.jmecustomer.utils.other.Utility
-import java.util.*
+import io.reactivex.disposables.Disposable
 
 class ProfileFragment : BaseFragment(), View.OnClickListener,
-    UserProfilePresenterInterface.UserProfileContractInterface {
+    UserProfilePresenterInterface.UserProfileContractInterface, RemitSucessFailureCallBack,
+    CompoundButton.OnCheckedChangeListener {
     private var _binding: FragmentProfileBinding? = null
     private val binding get() = _binding!!
     private var viewModel: UserProfilePresenterV2? = null
 
+    var languageSelectionGatewayInterface: LanguageSelectionGatewayInterface? = null
+
+    var viewFingerPrint: SwitchCompat? = null
+
+    var fingerPrintAuthEnableSubs: Disposable? = null
+    var fingerSetUpPasswordFragment: FingerSetUpPasswordFragment? = null
+    var remitAuthManager: RemitAuthManager? = null
+    var remitAuthManager1: RemitAuthManager1? = null
+    var remitAuthManagerGateway: RemitAuthManagerGateway? = null
+
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -45,6 +72,8 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
     }
 
     fun init() {
+        viewFingerPrint = binding.enableFingerPrint
+        remitAuthManagerGateway = RemitAuthManagerGateway()
         viewModel = ViewModelProvider(this, UserProfileViewModelFactory(this)).get(
             UserProfilePresenterV2::class.java
         )
@@ -53,6 +82,7 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
         binding.llFaqLayout.setOnClickListener(this)
         binding.rlLogout.setOnClickListener(this)
         binding.llChangePin.setOnClickListener(this)
+        binding.llLanguage.setOnClickListener(this)
         viewModel!!.subscribeToUserProfileInfoFetchEvent().observe(
             this
         ) { body: UserProfile? ->
@@ -60,6 +90,21 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
                 body!!
             )
         }
+        remitAuthManager =
+            RemitAuthManager.getGmeAuthManager(requireActivity() as AppCompatActivity?)
+        remitAuthManager1 = RemitAuthManager1(requireActivity() as AppCompatActivity?)
+        if (remitAuthManager1!!.bioMetricCanAuthenticates() == Constants.BIOMETRIC_ERROR_NO_HARDWARE || remitAuthManager1!!.bioMetricCanAuthenticates() == Constants.BIOMETRIC_ERROR_HW_UNAVAILABLE) {
+            viewFingerPrint?.visibility = View.GONE
+        } else {
+            viewFingerPrint?.isChecked = remitAuthManagerGateway!!.isFingerPrintLoginEnabled
+        }
+        languageSelectionGatewayInterface = LanguageSelectionGateway()
+        /*   if (!remitAuthManager.isBiometricSupportedByDevice()) {
+            view_fingerprint.setVisibility(View.GONE);
+            view_fingerprint_divider.setVisibility(View.GONE);
+        } else {
+            view_fingerprint.setChecked(remitAuthManager.isBiometricEnabledOnTheApp());
+        }*/
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -78,7 +123,12 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
                     AboutJMERemit::class.java
                 )
             )
-            R.id.ll_change_pin ->  startActivity(Intent(requireActivity(), ChangeTxnPinActivity::class.java))
+            R.id.ll_change_pin -> startActivity(
+                Intent(
+                    requireActivity(),
+                    ChangeTxnPinActivity::class.java
+                )
+            )
             R.id.view_setting -> startActivity(Intent(requireActivity(), SettingsView::class.java))
             R.id.rl_logout -> {
                 showLogoutConfirmationDialog()
@@ -107,6 +157,8 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
                     LoyaltyPointsActivity::class.java
                 )
             )
+            R.id.ll_language ->
+                promptLanguageSelectionDialog()
         }
     }
 
@@ -151,4 +203,207 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
 //        tv_referral.setText(String.format("%s\n%s", referralCodeTitle, referralCode));
 //        tv_referral.setText(Html.fromHtml(referralCodeTitle + "<b><font color='#0C2169'> <br>" + referralCode + "</font></b>"));
     }
+
+
+    override fun onStart() {
+        super.onStart()
+        viewFingerPrint?.setOnCheckedChangeListener(this)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        viewFingerPrint?.setOnCheckedChangeListener(null)
+    }
+
+    private fun promptLanguageSelectionDialog() {
+        val languageSelectionDialog = LanguageSelectionListingDialog()
+        languageSelectionDialog.setLanguageData(languageSelectionGatewayInterface?.getRelatedLanguageData())
+        languageSelectionDialog.hideSearchView(false)
+        languageSelectionDialog.setListener { languageModel ->
+            languageSelectionDialog.dismiss()
+            changeLocale(languageModel)
+        }
+        if (!languageSelectionDialog.isAdded) languageSelectionDialog.show(
+            requireActivity().supportFragmentManager,
+            "GenericTextListingDialog"
+        )
+    }
+
+    private fun changeLocale(lang: LanguageModel) {
+        languageSelectionGatewayInterface?.updatePreferredLocaleToStorage(lang.localeCode)
+        languageSelectionGatewayInterface?.updatePreferredLanguageToStorage(lang.countryName)
+        languageSelectionGatewayInterface?.updatePreferredCountryToStorage(lang.countryCode)
+        restartApp()
+    }
+
+    fun restartApp() {
+        val i: Intent? = requireContext().packageManager
+            .getLaunchIntentForPackage(requireContext().packageName)
+        i?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+        startActivity(i)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        if (fingerPrintAuthEnableSubs != null && !fingerPrintAuthEnableSubs!!.isDisposed) fingerPrintAuthEnableSubs!!.dispose()
+    }
+
+    /* @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        switch (buttonView.getId()) {
+            case R.id.view_fingerprint:
+
+
+                      view_fingerprint.setOnCheckedChangeListener(null);
+                view_fingerprint.setChecked(!isChecked);
+                view_fingerprint.setOnCheckedChangeListener(this);
+
+                if (remitAuthManager.isBiometricDataAvailable()) {
+
+                    remitAuthManager.requestBiometricAuth().setListener(new RemitAuthManager.RemitAuthListener() {
+                        @Override
+                        public void onRemitAuthSuccess(RemitAuthSuccessResult result) {
+                            remitAuthManager.turnOfBiometric(!isChecked);
+                            view_fingerprint.setOnCheckedChangeListener(null);
+                            view_fingerprint.setChecked(isChecked);
+                            view_fingerprint.setOnCheckedChangeListener(SettingsView.this);
+                        }
+
+                        @Override
+                        public void onRemitAuthFailed(RemitAuthFailedResult failedResult) {
+                                showToastMessage(failedResult.getFailedReason());
+
+                        }
+
+                        @Override
+                        public void onRemitAuthCancelled() {
+
+                        }
+                    }).prompt();
+
+                } else {
+                    showPopUpMessage(getString(R.string.fingerprint_changed_externally), CustomAlertDialog.AlertType.ALERT,
+                            alert -> {
+                                RemitApplication.getStorage().edit().clear().apply();
+                                logout();
+                            });
+                }
+
+                break;
+
+
+        }
+    }*/
+
+    /* @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        switch (buttonView.getId()) {
+            case R.id.view_fingerprint:
+
+
+                      view_fingerprint.setOnCheckedChangeListener(null);
+                view_fingerprint.setChecked(!isChecked);
+                view_fingerprint.setOnCheckedChangeListener(this);
+
+                if (remitAuthManager.isBiometricDataAvailable()) {
+
+                    remitAuthManager.requestBiometricAuth().setListener(new RemitAuthManager.RemitAuthListener() {
+                        @Override
+                        public void onRemitAuthSuccess(RemitAuthSuccessResult result) {
+                            remitAuthManager.turnOfBiometric(!isChecked);
+                            view_fingerprint.setOnCheckedChangeListener(null);
+                            view_fingerprint.setChecked(isChecked);
+                            view_fingerprint.setOnCheckedChangeListener(SettingsView.this);
+                        }
+
+                        @Override
+                        public void onRemitAuthFailed(RemitAuthFailedResult failedResult) {
+                                showToastMessage(failedResult.getFailedReason());
+
+                        }
+
+                        @Override
+                        public void onRemitAuthCancelled() {
+
+                        }
+                    }).prompt();
+
+                } else {
+                    showPopUpMessage(getString(R.string.fingerprint_changed_externally), CustomAlertDialog.AlertType.ALERT,
+                            alert -> {
+                                RemitApplication.getStorage().edit().clear().apply();
+                                logout();
+                            });
+                }
+
+                break;
+
+
+        }
+    }*/
+    private fun switchOnOffPasswordBottomDialog(switchStatus: Boolean) {
+        fingerSetUpPasswordFragment = FingerSetUpPasswordFragment(this, switchStatus)
+        fingerSetUpPasswordFragment?.show(
+            requireActivity().supportFragmentManager,
+            FingerSetUpPasswordFragment.TAG
+        )
+    }
+
+
+    override fun fingerSucessCallBack(successResult: RemitAuthSuccessResult?, data: ByteArray?) {
+        remitAuthManagerGateway?.setFingerPrintLoginStatus(true)
+        viewFingerPrint?.setOnCheckedChangeListener(null)
+        fingerSetUpPasswordFragment?.dismiss()
+        requireActivity().runOnUiThread(Runnable { viewFingerPrint?.setChecked(true) })
+        viewFingerPrint?.setOnCheckedChangeListener(this)
+    }
+
+    override fun fingerFailedCallBack(failedResult: RemitAuthFailedResult?) {
+        viewFingerPrint?.setOnCheckedChangeListener(null)
+        fingerSetUpPasswordFragment?.dismiss()
+        requireActivity().runOnUiThread(Runnable { viewFingerPrint?.setChecked(false) })
+        viewFingerPrint?.setOnCheckedChangeListener(this)
+    }
+
+    override fun fingerOffSucessCallBack() {
+        remitAuthManagerGateway?.setFingerPrintLoginStatus(false)
+        viewFingerPrint?.setOnCheckedChangeListener(null)
+        fingerSetUpPasswordFragment?.dismiss()
+        viewFingerPrint?.setChecked(false)
+        viewFingerPrint?.setOnCheckedChangeListener(this)
+    }
+
+    override fun fingerPrintCancelCallBack() {
+        fingerSetUpPasswordFragment?.dismiss()
+    }
+
+    override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) {
+        viewFingerPrint?.setOnCheckedChangeListener(null)
+        if (remitAuthManagerGateway?.isFingerPrintLoginEnabled() == false) {
+            viewFingerPrint?.setChecked(!isChecked)
+            switchOnOffPasswordBottomDialog(isChecked)
+        } else {
+            if (isChecked) {
+                viewFingerPrint?.setChecked(isChecked)
+            } else {
+                viewFingerPrint?.setChecked(!isChecked)
+                switchOnOffPasswordBottomDialog(isChecked)
+            }
+        }
+        viewFingerPrint?.setOnCheckedChangeListener(this@ProfileFragment)
+    }
+
+    fun showMessageAlertDialog(bodyMessage: String?) {
+        this.fingerSetUpPasswordFragment?.dismiss()
+        val genericPromptDialog = GenericPromptDialogSingleButton()
+        genericPromptDialog.setTitleMessage(getString(R.string.info_text))
+        genericPromptDialog.setBodyMessage(bodyMessage)
+        genericPromptDialog.setIconsRes(-1)
+        genericPromptDialog.setCancellable(true)
+        genericPromptDialog.setPositiveBtnString(getString(R.string.ok_text))
+        if (!genericPromptDialog.isAdded) genericPromptDialog.show(
+            requireActivity().supportFragmentManager,
+            "PROMPTAPIRESPONSE"
+        )
+    }
 }

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:radius="@dimen/_10sdp" />
+
+    <stroke android:width="@dimen/_1sdp"
+        android:color="@color/black_opacity_16"/>
+
+    <solid
+        android:color="@color/light_transparent_blue" />
+</shape>

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

@@ -38,7 +38,7 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:background="@drawable/background_red_gradient"
+                        android:background="@drawable/light_blue_grey_border"
                         android:orientation="horizontal"
                         android:paddingVertical="@dimen/_15sdp"
                         app:cardCornerRadius="@dimen/_8sdp">
@@ -51,7 +51,7 @@
                             android:paddingStart="@dimen/_15sdp"
                             android:paddingEnd="@dimen/_15sdp"
                             android:text="@string/app_name"
-                            android:textColor="@color/white"
+                            android:textColor="@color/black_opacity_87"
                             android:textSize="@dimen/_20sdp"
                             app:layout_constraintBottom_toTopOf="@+id/jmeDepositTextView"
                             app:layout_constraintStart_toStartOf="parent"
@@ -66,7 +66,7 @@
                             android:paddingStart="@dimen/_15sdp"
                             android:paddingEnd="@dimen/_15sdp"
                             android:text="@string/deposit_service_text"
-                            android:textColor="@color/white"
+                            android:textColor="@color/black_opacity_87"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="1.0"
@@ -77,6 +77,7 @@
                         <ImageView
                             android:layout_width="@dimen/_30sdp"
                             android:layout_height="@dimen/_25sdp"
+                            app:tint="@color/black_opacity_87"
                             android:layout_centerHorizontal="true"
                             android:layout_centerVertical="true"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -107,7 +108,7 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:background="@drawable/background_red_gradient"
+                        android:background="@drawable/light_blue_grey_border"
                         android:orientation="horizontal"
                         android:paddingVertical="@dimen/_15sdp"
                         app:cardCornerRadius="@dimen/_8sdp">
@@ -124,7 +125,8 @@
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent"
                             app:srcCompat="@drawable/jp_post_white"
-                            tools:ignore="ContentDescription" />
+                            tools:ignore="ContentDescription"
+                            app:tint="@color/black_opacity_87" />
 
                         <com.remit.jmecustomer.common.customwidgets.JmeTextView
                             android:id="@+id/jpPostTextView"
@@ -134,7 +136,7 @@
                             android:paddingStart="@dimen/_15sdp"
                             android:paddingEnd="@dimen/_15sdp"
                             android:text="@string/jp_post_furikomi_text"
-                            android:textColor="@color/white"
+                            android:textColor="@color/black_opacity_87"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="1.0"
@@ -156,13 +158,14 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:background="@drawable/background_red_gradient"
+                        android:background="@drawable/light_blue_grey_border"
                         android:orientation="horizontal"
                         android:paddingVertical="@dimen/_15sdp"
                         app:cardCornerRadius="@dimen/_8sdp">
 
 
                         <ImageView
+                            app:tint="@color/black_opacity_87"
                             android:id="@+id/lawsonCardIcon"
                             android:layout_width="@dimen/_30sdp"
                             android:layout_height="@dimen/_30sdp"
@@ -183,7 +186,7 @@
                             android:paddingStart="@dimen/_15sdp"
                             android:paddingEnd="@dimen/_15sdp"
                             android:text="@string/lawson_card_deposit_text"
-                            android:textColor="@color/white"
+                            android:textColor="@color/black_opacity_87"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="1.0"
@@ -213,13 +216,14 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:background="@drawable/background_red_gradient"
+                        android:background="@drawable/light_blue_grey_border"
                         android:orientation="horizontal"
                         android:paddingVertical="@dimen/_15sdp"
                         app:cardCornerRadius="@dimen/_8sdp">
 
 
                         <ImageView
+                            app:tint="@color/black_opacity_87"
                             android:id="@+id/eBankingIcon"
                             android:layout_width="@dimen/_30sdp"
                             android:layout_height="@dimen/_30sdp"
@@ -240,7 +244,7 @@
                             android:paddingStart="@dimen/_15sdp"
                             android:paddingEnd="@dimen/_15sdp"
                             android:text="@string/eBanking_text"
-                            android:textColor="@color/white"
+                            android:textColor="@color/black_opacity_87"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="1.0"
@@ -262,13 +266,14 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:background="@drawable/background_red_gradient"
+                        android:background="@drawable/light_blue_grey_border"
                         android:orientation="horizontal"
                         android:paddingVertical="@dimen/_15sdp"
                         app:cardCornerRadius="@dimen/_8sdp">
 
 
                         <ImageView
+                            app:tint="@color/black_opacity_87"
                             android:id="@+id/cashDepositCardIcon"
                             android:layout_width="@dimen/_30sdp"
                             android:layout_height="@dimen/_30sdp"
@@ -289,7 +294,7 @@
                             android:paddingStart="@dimen/_15sdp"
                             android:paddingEnd="@dimen/_15sdp"
                             android:text="@string/cash_deposit_text"
-                            android:textColor="@color/white"
+                            android:textColor="@color/black_opacity_87"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="1.0"
@@ -320,13 +325,14 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:background="@drawable/background_red_gradient"
+                        android:background="@drawable/light_blue_grey_border"
                         android:orientation="horizontal"
                         android:paddingVertical="@dimen/_15sdp"
                         app:cardCornerRadius="@dimen/_8sdp">
 
 
                         <ImageView
+                            app:tint="@color/black_opacity_87"
                             android:id="@+id/furikomiIcon"
                             android:layout_width="@dimen/_30sdp"
                             android:layout_height="@dimen/_30sdp"
@@ -347,7 +353,7 @@
                             android:paddingStart="@dimen/_15sdp"
                             android:paddingEnd="@dimen/_15sdp"
                             android:text="@string/jp_bank_details_text"
-                            android:textColor="@color/white"
+                            android:textColor="@color/black_opacity_87"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="1.0"

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

@@ -13,17 +13,19 @@
         android:layout_gravity="center"
         android:layout_margin="@dimen/_10sdp"
         android:visibility="gone"
-        app:srcCompat="@drawable/ic_auto_debit_renew" />
+        app:srcCompat="@drawable/ic_auto_debit_renew"
+        app:tint="@color/light_blue" />
 
     <com.remit.jmecustomer.common.customwidgets.JmeTextView
         android:id="@+id/txt_dialog_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        style="@style/TextStyle.VolteSemiBold14"
         android:layout_gravity="center"
         android:layout_margin="@dimen/_10sdp"
         android:gravity="center"
         android:text="@string/important_text"
-        android:textColor="@color/colorPrimary"
+        android:textColor="@color/black_opacity_87"
         android:textSize="@dimen/_13sdp"
         android:textStyle="bold" />
 
@@ -32,6 +34,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        style="@style/TextStyle.VolteSemiBold14"
         android:layout_marginLeft="@dimen/_10sdp"
         android:layout_marginRight="@dimen/_10sdp"
         android:layout_marginBottom="@dimen/_10sdp"
@@ -44,35 +47,38 @@
         android:background="#CDCED2" />
 
     <LinearLayout
+        android:layout_marginEnd="@dimen/_10sdp"
+        android:gravity="end"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
         <com.remit.jmecustomer.common.customwidgets.JmeTextView
             android:id="@+id/btnLater"
-            android:layout_width="0dp"
+            android:paddingHorizontal="@dimen/_10sdp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/_1sdp"
-            android:layout_weight="1"
-            android:background="@color/colorPrimary"
+            style="@style/TextStyle.VolteSemiBold14"
             android:gravity="center"
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
             android:text="@string/cancel_text"
-            android:textColor="@color/white"
+            android:textColor="@color/light_blue"
             android:textSize="@dimen/_13sdp" />
 
         <com.remit.jmecustomer.common.customwidgets.JmeTextView
+            android:paddingHorizontal="@dimen/_10sdp"
             android:id="@+id/btnRenew"
-            android:layout_width="0dp"
+            android:layout_marginStart="@dimen/_10sdp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@color/colorPrimary"
+            style="@style/TextStyle.VolteSemiBold14"
             android:gravity="center"
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
             android:text="@string/ok_text"
-            android:textColor="@color/white"
+            android:textColor="@color/light_blue"
             android:textSize="@dimen/_13sdp" />
     </LinearLayout>
 </LinearLayout>

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginEnd="@dimen/_10sdp"
+    android:paddingEnd="@dimen/_10sdp"
     android:background="#F7F7F7"
     android:paddingStart="@dimen/_10sdp">
 

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

@@ -289,72 +289,6 @@
                     </LinearLayout>
                 </RelativeLayout>
 
-
-                <RelativeLayout
-                    android:id="@+id/enableLockScreenLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:orientation="horizontal"
-                    android:paddingLeft="@dimen/_13sdp"
-                    android:paddingTop="@dimen/_13sdp"
-                    android:paddingBottom="@dimen/_10sdp"
-                    android:visibility="visible">
-
-                    <ImageView
-                        android:id="@+id/ic_lock_app"
-                        android:layout_width="@dimen/_20sdp"
-                        android:layout_height="@dimen/_20sdp"
-                        android:layout_centerVertical="true"
-                        app:srcCompat="@drawable/phonelink_lock_24px" />
-
-
-                    <TextView
-                        android:id="@+id/tv_title"
-                        style="@style/TextStyle.VolteSemiBold16"
-
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/_26sdp"
-                        android:layout_marginLeft="@dimen/_26sdp"
-                        android:layout_toEndOf="@+id/ic_lock_app"
-                        android:layout_toRightOf="@+id/ic_lock_app"
-                        android:text="Lock app"
-                        android:textColor="@color/black_opacity_87" />
-
-                    <TextView
-                        android:id="@+id/tv_applockDetail"
-                        style="@style/TextStyle.VolteSemiBold14"
-
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/tv_title"
-                        android:layout_marginStart="@dimen/_26sdp"
-                        android:layout_marginLeft="@dimen/_26sdp"
-                        android:layout_marginTop="@dimen/_4sdp"
-                        android:layout_marginRight="@dimen/_2sdp"
-                        android:layout_toEndOf="@+id/ic_lock_app"
-                        android:layout_toRightOf="@+id/ic_lock_app"
-                        android:text="Ask verification for opening"
-
-                        android:textColor="@color/black_opacity_60" />
-
-                    <androidx.appcompat.widget.SwitchCompat
-                        android:id="@+id/enableLock"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerInParent="true"
-                        android:layout_marginRight="@dimen/_4sdp"
-
-                        android:layout_toRightOf="@id/tv_applockDetail"
-                        android:checked="false"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:theme="@style/SwitchTheme" />
-
-                </RelativeLayout>
-
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/fingerprintLockScreen"
                     android:layout_width="match_parent"

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

@@ -3,10 +3,11 @@
     android:layout_width="wrap_content"
     android:paddingTop="@dimen/_5sdp"
     android:paddingBottom="@dimen/_5sdp"
+    android:id="@+id/row_main"
     android:paddingEnd="@dimen/_8sdp"
     android:paddingStart="@dimen/_8sdp"
     android:layout_marginEnd="@dimen/_10sdp"
-    android:background="@drawable/blue_border_background"
+    android:background="@drawable/light_blue_grey_border"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
@@ -23,7 +24,7 @@
         style="@style/TextStyle.VolteSemiBold12"
         android:layout_marginStart="@dimen/_5sdp"
         android:text="Cash Pickup"
-        android:textColor="@color/light_blue"
+        android:textColor="@color/black_opacity_87"
         app:layout_constraintStart_toEndOf="@id/iv_icon"
         app:layout_constraintTop_toTopOf="@id/iv_icon"
         android:id="@+id/iv_text"