From bddf082df0df1a9dfce94b24ccc5917a97eaca8b Mon Sep 17 00:00:00 2001
From: Preyea Regmi <preyearegmi@outlook.com>
Date: Thu, 24 Sep 2020 15:19:18 +0545
Subject: [PATCH] Back button fixes

---
 .idea/codeStyles/Project.xml                      | 15 +++------------
 .../features/login/view/LoginV2Activity.java      |  2 ++
 .../newcustomer/view/NewRegisterV2Activity.java   |  1 +
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0d156937..663459aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,18 +3,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
         </value>
       </option>
     </JetCodeStyleSettings>
diff --git a/app/src/main/java/com/swifttech/remit/android/features/login/view/LoginV2Activity.java b/app/src/main/java/com/swifttech/remit/android/features/login/view/LoginV2Activity.java
index dc03c34c..98738145 100644
--- a/app/src/main/java/com/swifttech/remit/android/features/login/view/LoginV2Activity.java
+++ b/app/src/main/java/com/swifttech/remit/android/features/login/view/LoginV2Activity.java
@@ -154,6 +154,7 @@ public class LoginV2Activity extends BaseActivity implements View.OnClickListene
         registerTxt.setOnClickListener(this);
         loginBtn.setOnClickListener(this);
         fingerprintScannerView.setOnClickListener(this);
+        iv_back.setOnClickListener(this);
 
 
     }
@@ -167,6 +168,7 @@ public class LoginV2Activity extends BaseActivity implements View.OnClickListene
         registerTxt.setOnClickListener(null);
         loginBtn.setOnClickListener(null);
         fingerprintScannerView.setOnClickListener(null);
+        iv_back.setOnClickListener(null);
 
 
     }
diff --git a/app/src/main/java/com/swifttech/remit/android/features/registerv2/newcustomer/view/NewRegisterV2Activity.java b/app/src/main/java/com/swifttech/remit/android/features/registerv2/newcustomer/view/NewRegisterV2Activity.java
index 18b36e09..041aa5af 100644
--- a/app/src/main/java/com/swifttech/remit/android/features/registerv2/newcustomer/view/NewRegisterV2Activity.java
+++ b/app/src/main/java/com/swifttech/remit/android/features/registerv2/newcustomer/view/NewRegisterV2Activity.java
@@ -308,6 +308,7 @@ public class NewRegisterV2Activity extends BaseActivity implements NewRegisterV2
     }
 
 
+    @OnClick(R.id.iv_back)
     @Override
     public void onBackPressed() {
         if (verificationViewContainer.getVisibility() == View.GONE) {