Migrated to android x

.idea/assetWizardSettings.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WizardSettings">
-    <option name="children">
-      <map>
-        <entry key="imageWizard">
-          <value>
-            <PersistentState />
-          </value>
-        </entry>
-        <entry key="vectorWizard">
-          <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="vectorAssetStep">
-                    <value>
-                      <PersistentState>
-                        <option name="values">
-                          <map>
-                            <entry key="assetSourceType" value="FILE" />
-                            <entry key="outputName" value="vd_gme_loader" />
-                            <entry key="sourceFile" value="$USER_HOME$/Desktop/gme_loader (1).svg" />
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

.idea/encodings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>

.idea/gradle.xml

@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="false" />
-        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -18,6 +15,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="CheckTagEmptyBody" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>

.idea/misc.xml

@@ -1,39 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="10">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
-          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
-          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
-          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
-          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="9">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
-          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
-          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
-        </list>
-      </value>
-    </option>
-  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

.idea/modules.xml

@@ -3,13 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.iml" filepath="$PROJECT_DIR$/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.iml" />
-      <module fileurl="file://$PROJECT_DIR$/Swift-gme-android.iml" filepath="$PROJECT_DIR$/Swift-gme-android.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/gme-android.iml" filepath="$PROJECT_DIR$/gme-android.iml" />
-      <module fileurl="file://$PROJECT_DIR$/SpinnerDatePickerLib-release/gme-android-SpinnerDatePickerLib-release.iml" filepath="$PROJECT_DIR$/SpinnerDatePickerLib-release/gme-android-SpinnerDatePickerLib-release.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/gme-android-app.iml" filepath="$PROJECT_DIR$/app/gme-android-app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/httpclient-release/gme-android-httpclient-release.iml" filepath="$PROJECT_DIR$/httpclient-release/gme-android-httpclient-release.iml" />
-      <module fileurl="file://$PROJECT_DIR$/securitykeypad/gme-android-securitykeypad.iml" filepath="$PROJECT_DIR$/securitykeypad/gme-android-securitykeypad.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/gme-android.iml" filepath="$PROJECT_DIR$/.idea/gme-android.iml" />
       <module fileurl="file://$PROJECT_DIR$/httpclient-release/httpclient-release.iml" filepath="$PROJECT_DIR$/httpclient-release/httpclient-release.iml" />
       <module fileurl="file://$PROJECT_DIR$/securitykeypad/securitykeypad.iml" filepath="$PROJECT_DIR$/securitykeypad/securitykeypad.iml" />
     </modules>

SpinnerDatePickerLib-release/build/.transforms/0bbee23400413d5fcbd3115b68c6583e.bin

@@ -0,0 +1 @@
+o/classes

SpinnerDatePickerLib-release/build/.transforms/1fef308579ee49ba258b163e1e831598.bin

@@ -0,0 +1 @@
+i/

SpinnerDatePickerLib-release/build/.transforms/3ef2e3e0fb4c156547cdabd51a19c927.bin

@@ -0,0 +1 @@
+o/classes

SpinnerDatePickerLib-release/build/.transforms/486ee9eb1a6fb483dd4e0ef018d715fd.bin

@@ -0,0 +1 @@
+o/SpinnerDatePickerLib-release-api.jar

SpinnerDatePickerLib-release/build/.transforms/565c8e6f06018278accba3082c7cc529.bin

@@ -0,0 +1 @@
+o/SpinnerDatePickerLib-release

SpinnerDatePickerLib-release/build/.transforms/565c8e6f06018278accba3082c7cc529/SpinnerDatePickerLib-release/AndroidManifest.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tsongkha.spinnerdatepicker"
+    android:versionCode="106"
+    android:versionName="1.0.6" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="27" />
+
+    <application android:supportsRtl="true" >
+    </application>
+
+</manifest>

SpinnerDatePickerLib-release/build/.transforms/565c8e6f06018278accba3082c7cc529/SpinnerDatePickerLib-release/R.txt

@@ -0,0 +1,17 @@
+int id datePickerContainer 0x7f0b0001
+int id dateRangePickerContainer 0x7f0b0002
+int id day 0x7f0b0003
+int id fromDateText 0x7f0b0004
+int id month 0x7f0b0005
+int id number_picker 0x7f0b0006
+int id parent 0x7f0b0007
+int id toDateText 0x7f0b0008
+int id year 0x7f0b0009
+int layout date_picker 0x7f0e0001
+int layout date_picker_container 0x7f0e0002
+int layout date_picker_dialog 0x7f0e0003
+int layout date_picker_dialog_container 0x7f0e0004
+int layout date_range_picker_dialog_container 0x7f0e0005
+int layout number_picker_day_month 0x7f0e0006
+int layout number_picker_year 0x7f0e0007
+int string app_name 0x7f140001

SpinnerDatePickerLib-release/build/.transforms/565c8e6f06018278accba3082c7cc529/SpinnerDatePickerLib-release/res/layout/date_picker.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="270dip"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center_horizontal"
+              android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="horizontal">
+
+        <!-- Month -->
+        <NumberPicker
+            android:id="@+id/month"
+            android:layout_width="80dip"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="1dip"
+            android:layout_marginLeft="1dip"
+            android:layout_marginRight="1dip"
+            android:layout_marginStart="1dip"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            />
+
+        <!-- Day -->
+        <NumberPicker
+            android:id="@+id/day"
+            android:layout_width="80dip"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="1dip"
+            android:layout_marginLeft="1dip"
+            android:layout_marginRight="1dip"
+            android:layout_marginStart="1dip"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            />
+
+        <!-- Year -->
+        <NumberPicker
+            android:id="@+id/year"
+            android:layout_width="95dip"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="1dip"
+            android:layout_marginLeft="1dip"
+            android:layout_marginRight="1dip"
+            android:layout_marginStart="1dip"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            />
+    </LinearLayout>
+</LinearLayout>

SpinnerDatePickerLib-release/build/.transforms/565c8e6f06018278accba3082c7cc529/SpinnerDatePickerLib-release/res/layout/date_picker_container.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- Layout of date picker-->
+
+<!-- The width of this container is manually set a little bigger than the one of the children
+     contained in it. This helps to prevent rounding errors when toggling the "Show year" option -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_gravity="center_horizontal"
+              android:layout_width="270dip"
+              android:layout_height="wrap_content">
+
+    <!-- Warning: everything within the parent is removed and re-ordered depending
+         on the date format selected by the user. -->
+    <LinearLayout
+        android:id="@+id/parent"
+        android:orientation="horizontal"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+    </LinearLayout>
+</LinearLayout>

SpinnerDatePickerLib-release/build/.transforms/565c8e6f06018278accba3082c7cc529/SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.tsongkha.spinnerdatepicker.DatePicker xmlns:android="http://schemas.android.com/apk/res/android"
+                                           android:id="@+id/datePickerContainer"
+                                           android:layout_gravity="center_horizontal"
+                                           android:layout_width="wrap_content"
+                                           android:layout_height="wrap_content"
+                                           android:spinnersShown="true"
+                                           android:calendarViewShown="false"
+            />
+    <!--android:dialogMode="true" -->

SpinnerDatePickerLib-release/build/.transforms/565c8e6f06018278accba3082c7cc529/SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml

@@ -0,0 +1,8 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:id="@+id/datePickerContainer"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_gravity="center_horizontal">
+
+</FrameLayout>
+

SpinnerDatePickerLib-release/build/.transforms/565c8e6f06018278accba3082c7cc529/SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="wrap_content"
+    android:id="@+id/dateRangePickerContainer"
+    android:layout_height="wrap_content">
+    <TextView
+        android:layout_marginStart="25dp"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="10dp"
+        android:paddingTop="3dp"
+        android:paddingBottom="3dp"
+        android:text="From Date: "
+        android:id="@+id/fromDateText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        />
+
+
+    <TextView
+        android:layout_marginTop="5dp"
+        android:layout_marginStart="25dp"
+        android:layout_marginLeft="25dp"
+        android:paddingTop="3dp"
+        android:paddingBottom="3dp"
+        android:text="To Date: "
+        android:id="@+id/toDateText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"/>
+
+
+</LinearLayout>

SpinnerDatePickerLib-release/build/.transforms/565c8e6f06018278accba3082c7cc529/SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml

@@ -0,0 +1,12 @@
+<NumberPicker
+    android:id="@+id/number_picker"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="80dip"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="1dip"
+    android:layout_marginRight="1dip"
+    android:layout_marginStart="1dip"
+    android:layout_marginEnd="1dip"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    />

SpinnerDatePickerLib-release/build/.transforms/565c8e6f06018278accba3082c7cc529/SpinnerDatePickerLib-release/res/layout/number_picker_year.xml

@@ -0,0 +1,12 @@
+<NumberPicker
+    android:id="@+id/number_picker"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="95dip"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="1dip"
+    android:layout_marginRight="1dip"
+    android:layout_marginStart="1dip"
+    android:layout_marginEnd="1dip"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    />

SpinnerDatePickerLib-release/build/.transforms/565c8e6f06018278accba3082c7cc529/SpinnerDatePickerLib-release/res/values/values.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">SpinnerDatePicker</string>
+</resources>

SpinnerDatePickerLib-release/build/.transforms/780f9c83ee1e72d8ca71629e116c3de7.bin

@@ -0,0 +1 @@
+i/jars/classes.jar

SpinnerDatePickerLib-release/build/.transforms/7cf943c22da799983de03e032e6f9336.bin

@@ -0,0 +1 @@
+i/

SpinnerDatePickerLib-release/build/.transforms/7ec9badf2b2fc91cd87cbd7d9592d805.bin

@@ -0,0 +1 @@
+o/SpinnerDatePickerLib-release-runtime.jar

SpinnerDatePickerLib-release/build/.transforms/c81d03c6d5de8846d928fef73366c4c2.bin

@@ -0,0 +1 @@
+i/res

SpinnerDatePickerLib-release/build/.transforms/ce3a9cacc0d2a85d9a230b3c89d7f0de.bin

@@ -0,0 +1 @@
+o/package-aware-r.txt

SpinnerDatePickerLib-release/build/.transforms/ce3a9cacc0d2a85d9a230b3c89d7f0de/package-aware-r.txt

@@ -0,0 +1,18 @@
+com.tsongkha.spinnerdatepicker
+id datePickerContainer
+id dateRangePickerContainer
+id day
+id fromDateText
+id month
+id number_picker
+id parent
+id toDateText
+id year
+layout date_picker
+layout date_picker_container
+layout date_picker_dialog
+layout date_picker_dialog_container
+layout date_range_picker_dialog_container
+layout number_picker_day_month
+layout number_picker_year
+string app_name

SpinnerDatePickerLib-release/build/.transforms/cfe5d4fbdf0659a1675d03c289e3cef9.bin

@@ -0,0 +1 @@
+i/AndroidManifest.xml

SpinnerDatePickerLib-release/build/.transforms/e5a6767849512cb39984138ce32906ea.bin

@@ -0,0 +1 @@
+i/jars/classes.jar

SpinnerDatePickerLib-release/build/.transforms/f6be4ad018d36970d49488cbbbac01e9.bin

@@ -0,0 +1 @@
+i/

app/build.gradle

@@ -120,32 +120,32 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //noinspection GradleCompatible
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 //    implementation 'com.android.support.constraint:constraint-layout:2.0.0-beta3'
-    implementation 'com.android.support:support-vector-drawable:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
     implementation 'com.google.firebase:firebase-core:16.0.4'
     implementation 'com.google.firebase:firebase-messaging:17.3.3'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
     implementation 'com.github.kapilmhr:TextDrawable:1.0.1'
-    implementation 'com.github.bumptech.glide:glide:3.8.0'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.leavjenn.smoothdaterangepicker:library:0.2.0'
     implementation 'de.hdodenhof:circleimageview:2.2.0'
-    implementation 'com.jakewharton:butterknife:8.8.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    implementation 'com.jakewharton:butterknife:10.2.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
     implementation 'id.zelory:compressor:2.1.0'
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.1.0'
-    implementation 'com.android.support:percent:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'androidx.percentlayout:percentlayout:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
     implementation 'com.scottyab:rootbeer-lib:0.0.7'
     implementation 'com.mtramin:rxfingerprint:2.2.1'

app/src/main/AndroidManifest.xml

@@ -88,7 +88,7 @@
             android:windowSoftInputMode="stateAlwaysHidden" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${fileProvider}"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java

@@ -5,18 +5,13 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.annotation.StringRes;
-import android.support.multidex.MultiDex;
-import android.support.multidex.MultiDexApplication;
+import androidx.annotation.StringRes;
+import androidx.multidex.MultiDex;
+import androidx.multidex.MultiDexApplication;
 
 import com.crashlytics.android.Crashlytics;
 import com.zoyi.channel.plugin.android.ChannelIO;
 
-import java.io.File;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
 import io.fabric.sdk.android.Fabric;
 
 import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_COUNTRY_CODE;

app/src/main/java/com/gmeremit/online/gmeremittance_native/MainActivity.java

@@ -1,7 +1,7 @@
 package com.gmeremit.online.gmeremittance_native;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class MainActivity extends AppCompatActivity {
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/adapter/accountlisting/AccountListingRvAdapter.java

@@ -1,6 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.accountmanage.adapter.accountlisting;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -78,6 +78,16 @@ public class AccountListingRvAdapter extends RecyclerView.Adapter<RecyclerView.V
                 });
             }
 
+            if (shouldDisableCornerView)
+            {
+                holder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        listener.onAccountSelected(autoDebitAccount);
+                    }
+                });
+            }
+
             holder.getRemoveAccountImageView().setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/adapter/accountlisting/AccountManageViewPagerAdapter.java

@@ -1,8 +1,8 @@
 package com.gmeremit.online.gmeremittance_native.accountmanage.adapter.accountlisting;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/adapter/accountlisting/InboundAccountListingRvAdapter.java

@@ -1,7 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.accountmanage.adapter.accountlisting;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/AccountListingV2Activity.java

@@ -3,10 +3,10 @@ package com.gmeremit.online.gmeremittance_native.accountmanage.view.accountlisti
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 import android.view.ViewGroup;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/autodebitlisting/AccountAddRVViewHolder.java

@@ -1,7 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.accountmanage.view.accountlisting.autodebitlisting;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import com.gmeremit.online.gmeremittance_native.R;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/autodebitlisting/AccountListingRVViewHolder.java

@@ -1,7 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.accountmanage.view.accountlisting.autodebitlisting;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/autodebitlisting/AutoDebitAccountListingDialog.java

@@ -4,8 +4,9 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -23,7 +24,7 @@ import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisti
 import java.util.ArrayList;
 import java.util.List;
 
-public class AutoDebitAccountListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
+public class AutoDebitAccountListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<AutoDebitAccount> data;
     private AccountListingRvAdapter.AccountSelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/autodebitlisting/AutoDebitAccountListingFragment.java

@@ -4,9 +4,9 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/autodebitlisting/CountryListRvViewHolder.java

@@ -1,6 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.accountmanage.view.accountlisting.autodebitlisting;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/autodebitlisting/CountryListingRvAdapter.java

@@ -1,6 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.accountmanage.view.accountlisting.autodebitlisting;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/inboundlisting/InboundAccountListingFragment.java

@@ -2,8 +2,8 @@ package com.gmeremit.online.gmeremittance_native.accountmanage.view.accountlisti
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/bankaccountvalidation/BankAccountValidationV2Activity.java

@@ -3,7 +3,7 @@ package com.gmeremit.online.gmeremittance_native.accountmanage.view.bankaccountv
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.TextInputLayout;
+import com.google.android.material.textfield.TextInputLayout;
 import android.view.View;
 import android.widget.EditText;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActivity.java

@@ -6,8 +6,8 @@ import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.os.Parcelable;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
 import android.os.Bundle;
 import android.view.ViewGroup;
 import android.view.Window;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountConfirmFragment.java

@@ -1,7 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.view.LayoutInflater;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountPennyTestFragment.java

@@ -1,8 +1,8 @@
 package com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
 import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,7 +14,6 @@ import android.widget.TextView;
 
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
-import com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField;
 import com.gmeremit.online.gmeremittance_native.customwidgets.TextWatcherAdapter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.banklistingdialog.BankIconMapper;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/adapter/AgentListV2RvAdapter.java

@@ -1,6 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.agentsV2.adapter;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/view/AgentListV2Activity.java

@@ -3,7 +3,7 @@ package com.gmeremit.online.gmeremittance_native.agentsV2.view;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import com.gmeremit.online.gmeremittance_native.R;

app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/view/AgentListV2ItemViewHolder.java

@@ -1,6 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.agentsV2.view;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/appupdate/AppUpdateActivity.java

@@ -2,15 +2,13 @@ package com.gmeremit.online.gmeremittance_native.appupdate;
 
 import android.app.Activity;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
-import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java

@@ -1,21 +1,17 @@
 package com.gmeremit.online.gmeremittance_native.base;
 
 import android.app.Activity;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;

app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseFragment.java

@@ -3,12 +3,14 @@ package com.gmeremit.online.gmeremittance_native.base;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 
+import androidx.fragment.app.Fragment;
+
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 
-public class BaseFragment extends android.support.v4.app.Fragment implements BaseContractInterface {
+public class BaseFragment extends Fragment implements BaseContractInterface {
 
     BaseContractInterface baseActivity;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/CustomerSupportFragment.java

@@ -5,9 +5,9 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/GeneralEnquiry.java

@@ -4,8 +4,8 @@ import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
@@ -16,7 +16,6 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.customer_support.CustomerSupportContract;
 import com.gmeremit.online.gmeremittance_native.customer_support.model.Suggestion;
-import com.gmeremit.online.gmeremittance_native.customer_support.model.SuggestionModel;
 import com.gmeremit.online.gmeremittance_native.customer_support.presenter.CustomerSupportPresenter;
 import com.gmeremit.online.gmeremittance_native.static_pages.view.SupportActivity;
 import com.gmeremit.online.gmeremittance_native.utils.Utils;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/SuggestionFeedback.java

@@ -4,8 +4,8 @@ import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
@@ -15,7 +15,6 @@ import android.widget.Toast;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.customer_support.CustomerSupportContract;
 import com.gmeremit.online.gmeremittance_native.customer_support.model.Suggestion;
-import com.gmeremit.online.gmeremittance_native.customer_support.model.SuggestionModel;
 import com.gmeremit.online.gmeremittance_native.customer_support.presenter.CustomerSupportPresenter;
 import com.gmeremit.online.gmeremittance_native.static_pages.view.SupportActivity;
 import com.gmeremit.online.gmeremittance_native.utils.Utils;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/TransactionAmendment.java

@@ -4,8 +4,8 @@ import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
@@ -15,7 +15,6 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.customer_support.CustomerSupportContract;
 import com.gmeremit.online.gmeremittance_native.customer_support.model.AmendmentRequest;
-import com.gmeremit.online.gmeremittance_native.customer_support.model.SuggestionModel;
 import com.gmeremit.online.gmeremittance_native.customer_support.presenter.CustomerSupportPresenter;
 import com.gmeremit.online.gmeremittance_native.static_pages.view.SupportActivity;
 import com.gmeremit.online.gmeremittance_native.utils.Utils;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/CircularIndexView.java

@@ -3,8 +3,8 @@ package com.gmeremit.online.gmeremittance_native.customwidgets;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/CustomAlertDialog.java

@@ -2,20 +2,22 @@ package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.graphics.drawable.AnimatedVectorDrawableCompat;
-import android.support.graphics.drawable.VectorDrawableCompat;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.Nullable;
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
+import androidx.appcompat.app.AlertDialog;
 import android.view.View;
 import android.view.Window;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.fragment.app.DialogFragment;
+
 import com.gmeremit.online.gmeremittance_native.GmeApplication;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.PrefKeys;
 
-public class CustomAlertDialog extends android.support.v4.app.DialogFragment {
+public class CustomAlertDialog extends DialogFragment {
 
     private ImageView imgStatusImgView;
     private TextView dialogTitleTxt, dialogDescriptionTxt, dialogOkButtonTxt;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/CustomAppBarLayoutBehavior.java

@@ -1,9 +1,9 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.content.Context;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.view.ViewCompat;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/CustomPaddingRv.java

@@ -1,7 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 public class CustomPaddingRv extends RecyclerView.ItemDecoration {

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/CustomProgressDialog.java

@@ -2,15 +2,17 @@ package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.fragment.app.DialogFragment;
+
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.UIStateHandler;
 
-public class CustomProgressDialog extends android.support.v4.app.DialogFragment {
+public class CustomProgressDialog extends DialogFragment {
 
     private String message = "";
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/CustomSwipeRefreshLayout.java

@@ -1,7 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.content.Context;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/DepthTransformation.java

@@ -1,6 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets;
 
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 
 public class DepthTransformation implements ViewPager.PageTransformer {

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/GMEFormInputField.java

@@ -2,7 +2,7 @@ package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v7.view.ContextThemeWrapper;
+import androidx.appcompat.view.ContextThemeWrapper;
 import android.text.InputFilter;
 import android.text.TextWatcher;
 import android.util.AttributeSet;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/GMELoaderDialog.java

@@ -1,23 +1,22 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.app.Dialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.graphics.drawable.AnimatedVectorDrawableCompat;
-import android.support.v4.widget.ImageViewCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
+import androidx.core.widget.ImageViewCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.view.View;
 import android.view.Window;
-import android.view.WindowManager;
+
+import androidx.fragment.app.DialogFragment;
 
 import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.base.UIStateHandler;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class GMELoaderDialog extends android.support.v4.app.DialogFragment {
+public class GMELoaderDialog extends DialogFragment {
 
     @BindView(R.id.imageView)
     AppCompatImageView gmeLoaderImageView;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/GMETextInputLayout.java

@@ -1,7 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.content.Context;
-import android.support.design.widget.TextInputLayout;
+import com.google.android.material.textfield.TextInputLayout;
 import android.util.AttributeSet;
 import android.widget.TextView;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/GmeButton.java

@@ -3,8 +3,8 @@ package com.gmeremit.online.gmeremittance_native.customwidgets;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
-import android.support.v7.widget.AppCompatButton;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.util.AttributeSet;
 
 import com.gmeremit.online.gmeremittance_native.R;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/GmeEditText.java

@@ -2,7 +2,7 @@ package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v7.widget.AppCompatEditText;
+import androidx.appcompat.widget.AppCompatEditText;
 import android.text.InputFilter;
 import android.text.Spanned;
 import android.util.AttributeSet;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/GmeErrorTextView.java

@@ -4,8 +4,8 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.util.AttributeSet;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.Interpolator;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/GmeRxTextInputLayout.java

@@ -1,7 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.content.Context;
-import android.support.design.widget.TextInputLayout;
+import com.google.android.material.textfield.TextInputLayout;
 import android.util.AttributeSet;
 
 public class GmeRxTextInputLayout extends TextInputLayout {

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/GmeTextView.java

@@ -2,8 +2,8 @@ package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.Typeface;
-import android.support.v7.widget.AppCompatTextView;
+
+import androidx.appcompat.widget.AppCompatTextView;
 import android.util.AttributeSet;
 
 import com.gmeremit.online.gmeremittance_native.R;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/HorizontalSwipeDisabledViewPager.java

@@ -1,9 +1,9 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 
 public class HorizontalSwipeDisabledViewPager extends ViewPager {

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/LineDividerItemDecoration.java

@@ -5,9 +5,9 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 public class LineDividerItemDecoration extends RecyclerView.ItemDecoration {

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/PaddedVerticalView.java

@@ -3,8 +3,8 @@ package com.gmeremit.online.gmeremittance_native.customwidgets;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/SwipeDisabledViewPager.java

@@ -2,7 +2,7 @@ package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.animation.DecelerateInterpolator;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/UserLockBottomSheetBehavior.java

@@ -1,8 +1,8 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets;
 
 import android.content.Context;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.CoordinatorLayout;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/ZoomOutTransformation.java

@@ -1,7 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets;
 
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 
 public class ZoomOutTransformation  implements ViewPager.PageTransformer  {

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

@@ -4,8 +4,9 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -29,7 +30,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class BankWithIconListingDialog<T extends BankWithIconListingDialog.ImageWithDataDTOInterface> extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
+public class BankWithIconListingDialog<T extends BankWithIconListingDialog.ImageWithDataDTOInterface> extends DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<T> data;
     private GenericImageWithTextListingDialogListener<T> listener;
@@ -256,7 +257,7 @@ public class BankWithIconListingDialog<T extends BankWithIconListingDialog.Image
             if(resId!=-1)
             Glide.with(holder.getImageView().getContext())
                     .load(data.get(holder.getAdapterPosition()).getResourceId())
-                    .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+                    .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
                     .into(holder.getImageView());
 
         }

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/common/GenericImageWithTextListingDialog.java

@@ -4,8 +4,9 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -29,7 +30,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class GenericImageWithTextListingDialog<T extends GenericImageWithTextListingDialog.ImageWithDataDTOInterface> extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
+public class GenericImageWithTextListingDialog<T extends GenericImageWithTextListingDialog.ImageWithDataDTOInterface> extends DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<T> data;
     private GenericImageWithTextListingDialogListener<T> listener;
@@ -256,7 +257,7 @@ public class GenericImageWithTextListingDialog<T extends GenericImageWithTextLis
             if(resId!=-1)
             Glide.with(holder.getImageView().getContext())
                     .load(data.get(holder.getAdapterPosition()).getResourceId())
-                    .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+                    .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
                     .into(holder.getImageView());
 
         }

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/common/GenericPromptDialog.java

@@ -2,7 +2,7 @@ package com.gmeremit.online.gmeremittance_native.customwidgets.common;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
@@ -10,9 +10,11 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.fragment.app.DialogFragment;
+
 import com.gmeremit.online.gmeremittance_native.R;
 
-public class GenericPromptDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener {
+public class GenericPromptDialog extends DialogFragment implements View.OnClickListener {
 
     ImageView iconView;
     TextView btnRenew;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/common/GenericTextListingDialog.java

@@ -4,8 +4,9 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -18,7 +19,6 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,7 +26,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class GenericTextListingDialog<T> extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
+public class GenericTextListingDialog<T> extends DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<T> data;
     private GenericTextListingDialogListener<T> listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java

@@ -1,6 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets.exchangecountrylistingdialog;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java

@@ -1,6 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets.exchangecountrylistingdialog;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java

@@ -4,8 +4,9 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -24,7 +25,7 @@ import com.gmeremit.online.gmeremittance_native.exrate.model.datav2.CountryPayme
 import java.util.ArrayList;
 import java.util.List;
 
-public class ExchangeRateCurrencyListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
+public class ExchangeRateCurrencyListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<CountryPaymentService> data;
     private CountrySelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/genderdialog/GenderListingDialog.java

@@ -1,13 +1,13 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets.genderdialog;
 
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextWatcher;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,7 +22,7 @@ import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDec
 import java.util.ArrayList;
 import java.util.List;
 
-public class GenderListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener {
+public class GenderListingDialog extends DialogFragment implements View.OnClickListener {
 
     private List<Gender> data;
     private GenderSelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/genderdialog/GenderListingRvAdapter.java

@@ -1,6 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.customwidgets.genderdialog;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;