diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6796a766..dc571502 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,97 +3,22 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/background_red_gradient.xml" value="0.176" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/circular_tab_layout_bg.xml" value="0.26614583333333336" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/circular_tab_selected_bg.xml" value="0.26614583333333336" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/circular_tab_selector.xml" value="0.26614583333333336" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/circular_white_bg.xml" value="0.1" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/ic_rounded_white.xml" value="0.26614583333333336" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/icv_home_nav_icon.xml" value="0.1" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/icv_home_notification_badge.xml" value="0.1" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/icv_menu_transaction_report.xml" value="0.1" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/icv_menu_wallet_statement.xml" value="0.26614583333333336" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/icv_sm_setting.xml" value="0.1" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/icv_upload_image.xml" value="0.26614583333333336" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/icv_vd_about_me.xml" value="0.1" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/text_field_bg.xml" value="0.18333333333333332" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/drawable/vd_jme_logo_only.xml" value="0.1" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_about_jme.xml" value="0.15534420289855072" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_atm_cash_deposit.xml" value="0.3625" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_deposit_info.xml" value="0.264" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_deposit_slip.xml" value="0.1" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_exchange_method_v2.xml" value="0.3625" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_existing_customer_register_v2.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_home_v2.xml" value="0.15534420289855072" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_invite.xml" value="0.5052631578947369" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_kyc_v3.xml" value="0.1793478260869565" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_login_v2.xml" value="0.20260416666666667" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_my_notifications.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_notice.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_profile.xml" value="0.3625" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_recipient_add_edit.xml" value="0.12760416666666666" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_recipient_add_edit_v3.xml" value="0.12760416666666666" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_recipients_list.xml" value="0.15534420289855072" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_register_v2.xml" value="0.12760416666666666" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_remit_transaction_history.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_renew_id_layout.xml" value="0.4584527220630373" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_reward_points.xml" value="0.3625" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_rewards.xml" value="0.3625" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_send_money_v2.xml" value="0.12760416666666666" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml" value="0.125" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_settings.xml" value="0.3625" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_slip_report.xml" value="0.15534420289855072" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_splash_screen_key_1.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_splash_screen_key_2.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_support_v2.xml" value="0.17481884057971014" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_terms_and_condition_acitivity.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_upload_slip.xml" value="0.15534420289855072" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/activity_web_browser_v2.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/alert_example_layout.xml" value="0.18568840579710144" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/dialog_answer_input.xml" value="0.1" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml" value="0.3625" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_beneficiary_add_edit.xml" value="0.12760416666666666" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_ccdi_send_money_v2.xml" value="0.2427536231884058" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_existing_customer_registration_request.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_existing_customer_registration_submit.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_existing_kyc_customer_detail.xml" value="0.1793478260869565" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_existing_kyc_document.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_home_v3.xml" value="0.1480978260869565" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_invite_tab.xml" value="1.0" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_kyc_customer_detail.xml" value="0.1793478260869565" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_main.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_my_notice_detail.xml" value="0.3625" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_my_notice_listing.xml" value="0.3625" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_notice_detail.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_notice_listing.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_referral_tab.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_referrals_listing.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_transaction_v2.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/fragment_web_browser_v2.xml" value="0.1" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/home_menu_item_v2.xml" value="0.18568840579710144" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/layout_reward_points_toolbar.xml" value="0.3625" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/layout_sendmoney_toolbar.xml" value="0.125" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/my_notice_list_viewholder.xml" value="0.72" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/nav_drawer_fragment.xml" value="0.4" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/notice_list_viewholder.xml" value="0.184375" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/notice_list_viewholder_v3.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/referrals_list_viewholder.xml" value="0.25" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/send_money_header.xml" value="0.3625" />
-        <entry key="..\:/Projects/JME-Android/app/src/main/res/layout/transaction_history_viewholder_v3.xml" value="0.25" />
+        <entry key="../../../../layout/custom_preview.xml" value="0.1196043165467626" />
+        <entry key="app/src/main/res/drawable/black_rounded_border.xml" value="0.2105" />
+        <entry key="app/src/main/res/drawable/drawable_red_right_radius.xml" value="0.2095" />
+        <entry key="app/src/main/res/drawable/ic_home_selected.xml" value="0.2105" />
+        <entry key="app/src/main/res/drawable/ic_msg.xml" value="0.2105" />
+        <entry key="app/src/main/res/layout/activity_beneficiary_detail.xml" value="0.15052083333333333" />
+        <entry key="app/src/main/res/layout/activity_home_v3.xml" value="0.203125" />
+        <entry key="app/src/main/res/layout/activity_recipient_add_edit_v3.xml" value="0.1953125" />
+        <entry key="app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml" value="0.13802083333333334" />
+        <entry key="app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml" value="0.1953125" />
+        <entry key="app/src/main/res/layout/fragment_beneficiary_add_edit_v3.xml" value="0.17592592592592593" />
+        <entry key="app/src/main/res/layout/fragment_home_new.xml" value="0.165" />
+        <entry key="app/src/main/res/layout/fragment_my_transfers.xml" value="0.15052083333333333" />
+        <entry key="app/src/main/res/layout/toolbar_dashboard_v3.xml" value="0.1890625" />
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-  <component name="VisualizationToolProject">
-    <option name="state">
-      <ProjectState>
-        <option name="scale" value="0.264" />
-      </ProjectState>
-    </option>
-  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/043e3521b82b6d3b66ea62fefc9afd92/results.bin b/SpinnerDatePickerLib-release/build/.transforms/043e3521b82b6d3b66ea62fefc9afd92/results.bin
new file mode 100644
index 00000000..c842ce77
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/043e3521b82b6d3b66ea62fefc9afd92/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release.aar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/043e3521b82b6d3b66ea62fefc9afd92/transformed/jetified-SpinnerDatePickerLib-release.aar b/SpinnerDatePickerLib-release/build/.transforms/043e3521b82b6d3b66ea62fefc9afd92/transformed/jetified-SpinnerDatePickerLib-release.aar
new file mode 100644
index 00000000..c43aa7e8
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/043e3521b82b6d3b66ea62fefc9afd92/transformed/jetified-SpinnerDatePickerLib-release.aar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/0e650c9074fea1a2ac5226bb6c7b88c6/results.bin b/SpinnerDatePickerLib-release/build/.transforms/0e650c9074fea1a2ac5226bb6c7b88c6/results.bin
new file mode 100644
index 00000000..a895d906
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/0e650c9074fea1a2ac5226bb6c7b88c6/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-runtime
diff --git a/SpinnerDatePickerLib-release/build/.transforms/0e650c9074fea1a2ac5226bb6c7b88c6/transformed/jetified-SpinnerDatePickerLib-release-runtime/classes.dex b/SpinnerDatePickerLib-release/build/.transforms/0e650c9074fea1a2ac5226bb6c7b88c6/transformed/jetified-SpinnerDatePickerLib-release-runtime/classes.dex
new file mode 100644
index 00000000..6da84c01
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/0e650c9074fea1a2ac5226bb6c7b88c6/transformed/jetified-SpinnerDatePickerLib-release-runtime/classes.dex differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/0e94fcc5c1de9522617cab9f598fde69/results.bin b/SpinnerDatePickerLib-release/build/.transforms/0e94fcc5c1de9522617cab9f598fde69/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/0ed0f5d298080db08acf75c1b3292a71/results.bin b/SpinnerDatePickerLib-release/build/.transforms/0ed0f5d298080db08acf75c1b3292a71/results.bin
new file mode 100644
index 00000000..c842ce77
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/0ed0f5d298080db08acf75c1b3292a71/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release.aar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/0ed0f5d298080db08acf75c1b3292a71/transformed/jetified-SpinnerDatePickerLib-release.aar b/SpinnerDatePickerLib-release/build/.transforms/0ed0f5d298080db08acf75c1b3292a71/transformed/jetified-SpinnerDatePickerLib-release.aar
new file mode 100644
index 00000000..c43aa7e8
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/0ed0f5d298080db08acf75c1b3292a71/transformed/jetified-SpinnerDatePickerLib-release.aar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/11e500214c46cca940786b75dc2f41b1/results.bin b/SpinnerDatePickerLib-release/build/.transforms/11e500214c46cca940786b75dc2f41b1/results.bin
new file mode 100644
index 00000000..1045ed22
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/11e500214c46cca940786b75dc2f41b1/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-api.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/11e500214c46cca940786b75dc2f41b1/transformed/jetified-SpinnerDatePickerLib-release-api.jar b/SpinnerDatePickerLib-release/build/.transforms/11e500214c46cca940786b75dc2f41b1/transformed/jetified-SpinnerDatePickerLib-release-api.jar
new file mode 100644
index 00000000..f504a0d6
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/11e500214c46cca940786b75dc2f41b1/transformed/jetified-SpinnerDatePickerLib-release-api.jar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/1ac7632da1a7b5fa69b9eeccaf24bdc6/results.bin b/SpinnerDatePickerLib-release/build/.transforms/1ac7632da1a7b5fa69b9eeccaf24bdc6/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/1ba1448e29d00b2e6574bfe53a4c569f.bin b/SpinnerDatePickerLib-release/build/.transforms/1ba1448e29d00b2e6574bfe53a4c569f.bin
new file mode 100644
index 00000000..c626d1be
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/1ba1448e29d00b2e6574bfe53a4c569f.bin
@@ -0,0 +1 @@
+i/jars/classes.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/1bfb96e71bccc5376b164911e027e09b/results.bin b/SpinnerDatePickerLib-release/build/.transforms/1bfb96e71bccc5376b164911e027e09b/results.bin
new file mode 100644
index 00000000..a895d906
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/1bfb96e71bccc5376b164911e027e09b/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-runtime
diff --git a/SpinnerDatePickerLib-release/build/.transforms/1bfb96e71bccc5376b164911e027e09b/transformed/jetified-SpinnerDatePickerLib-release-runtime/classes.dex b/SpinnerDatePickerLib-release/build/.transforms/1bfb96e71bccc5376b164911e027e09b/transformed/jetified-SpinnerDatePickerLib-release-runtime/classes.dex
new file mode 100644
index 00000000..dd5bcd8a
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/1bfb96e71bccc5376b164911e027e09b/transformed/jetified-SpinnerDatePickerLib-release-runtime/classes.dex differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/1f1886038b86471eba672b6516e84cb6/results.bin b/SpinnerDatePickerLib-release/build/.transforms/1f1886038b86471eba672b6516e84cb6/results.bin
new file mode 100644
index 00000000..da3b3ce0
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/1f1886038b86471eba672b6516e84cb6/results.bin
@@ -0,0 +1 @@
+i/res
diff --git a/SpinnerDatePickerLib-release/build/.transforms/278e4bdd3346c6a5ace02a498e2f701a/results.bin b/SpinnerDatePickerLib-release/build/.transforms/278e4bdd3346c6a5ace02a498e2f701a/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/results.bin b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/results.bin
new file mode 100644
index 00000000..2367e569
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/results.bin
@@ -0,0 +1 @@
+o/com.tsongkha.spinnerdatepicker
diff --git a/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker.xml.flat
new file mode 100644
index 00000000..7d2b03c8
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_container.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_container.xml.flat
new file mode 100644
index 00000000..74110bae
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_container.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog.xml.flat
new file mode 100644
index 00000000..ad62d705
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog_container.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog_container.xml.flat
new file mode 100644
index 00000000..4a3aed5e
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog_container.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_range_picker_dialog_container.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_range_picker_dialog_container.xml.flat
new file mode 100644
index 00000000..3c0ee771
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_date_range_picker_dialog_container.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_day_month.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_day_month.xml.flat
new file mode 100644
index 00000000..7fd67b90
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_day_month.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_year.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_year.xml.flat
new file mode 100644
index 00000000..6b891fb9
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/2a2ab492fa39fc9432b7c484fda6114b/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_year.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/31d9b0a903432c3ac15b9848534a9227/results.bin b/SpinnerDatePickerLib-release/build/.transforms/31d9b0a903432c3ac15b9848534a9227/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/results.bin b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/results.bin
new file mode 100644
index 00000000..2367e569
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/results.bin
@@ -0,0 +1 @@
+o/com.tsongkha.spinnerdatepicker
diff --git a/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker.xml.flat
new file mode 100644
index 00000000..aaa0c3a5
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_container.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_container.xml.flat
new file mode 100644
index 00000000..6bda4643
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_container.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog.xml.flat
new file mode 100644
index 00000000..cc01c05d
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog_container.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog_container.xml.flat
new file mode 100644
index 00000000..18631346
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog_container.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_range_picker_dialog_container.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_range_picker_dialog_container.xml.flat
new file mode 100644
index 00000000..fafaad0f
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_date_range_picker_dialog_container.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_day_month.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_day_month.xml.flat
new file mode 100644
index 00000000..f771af9f
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_day_month.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_year.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_year.xml.flat
new file mode 100644
index 00000000..e03e433f
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/31e107b82cdee3327b449f6431b38827/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_year.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/328051f52f73e478f589d4a7b219eb1a.bin b/SpinnerDatePickerLib-release/build/.transforms/328051f52f73e478f589d4a7b219eb1a.bin
new file mode 100644
index 00000000..ea58ad44
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/328051f52f73e478f589d4a7b219eb1a.bin
@@ -0,0 +1 @@
+o/SpinnerDatePickerLib-release-runtime
diff --git a/SpinnerDatePickerLib-release/build/.transforms/328051f52f73e478f589d4a7b219eb1a/SpinnerDatePickerLib-release-runtime/classes.dex b/SpinnerDatePickerLib-release/build/.transforms/328051f52f73e478f589d4a7b219eb1a/SpinnerDatePickerLib-release-runtime/classes.dex
new file mode 100644
index 00000000..746eca80
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/328051f52f73e478f589d4a7b219eb1a/SpinnerDatePickerLib-release-runtime/classes.dex differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/347112758d83923e1c10493de026507b.bin b/SpinnerDatePickerLib-release/build/.transforms/347112758d83923e1c10493de026507b.bin
new file mode 100644
index 00000000..da3b3ce0
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/347112758d83923e1c10493de026507b.bin
@@ -0,0 +1 @@
+i/res
diff --git a/SpinnerDatePickerLib-release/build/.transforms/3aa2d929b7d86abeb8549977971944a7/results.bin b/SpinnerDatePickerLib-release/build/.transforms/3aa2d929b7d86abeb8549977971944a7/results.bin
new file mode 100644
index 00000000..83091ceb
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/3aa2d929b7d86abeb8549977971944a7/results.bin
@@ -0,0 +1 @@
+o/com.tsongkha.spinnerdatepicker-r.txt
diff --git a/SpinnerDatePickerLib-release/build/.transforms/3aa2d929b7d86abeb8549977971944a7/transformed/com.tsongkha.spinnerdatepicker-r.txt b/SpinnerDatePickerLib-release/build/.transforms/3aa2d929b7d86abeb8549977971944a7/transformed/com.tsongkha.spinnerdatepicker-r.txt
new file mode 100644
index 00000000..48e8b003
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/3aa2d929b7d86abeb8549977971944a7/transformed/com.tsongkha.spinnerdatepicker-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
diff --git a/SpinnerDatePickerLib-release/build/.transforms/3c7dde488151653bfd2c2754a61555a6.bin b/SpinnerDatePickerLib-release/build/.transforms/3c7dde488151653bfd2c2754a61555a6.bin
new file mode 100644
index 00000000..1ed65e03
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/3c7dde488151653bfd2c2754a61555a6.bin
@@ -0,0 +1 @@
+i/
diff --git a/SpinnerDatePickerLib-release/build/.transforms/4105ce2cd5777de85fc632f895ef85ef/results.bin b/SpinnerDatePickerLib-release/build/.transforms/4105ce2cd5777de85fc632f895ef85ef/results.bin
new file mode 100644
index 00000000..fcbf8d4b
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/4105ce2cd5777de85fc632f895ef85ef/results.bin
@@ -0,0 +1 @@
+i/AndroidManifest.xml
diff --git a/SpinnerDatePickerLib-release/build/.transforms/4428256f0a23e752fb405ac6f6d3ba3e.bin b/SpinnerDatePickerLib-release/build/.transforms/4428256f0a23e752fb405ac6f6d3ba3e.bin
new file mode 100644
index 00000000..c65eb735
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/4428256f0a23e752fb405ac6f6d3ba3e.bin
@@ -0,0 +1 @@
+o/package-aware-r.txt
diff --git a/SpinnerDatePickerLib-release/build/.transforms/4428256f0a23e752fb405ac6f6d3ba3e/package-aware-r.txt b/SpinnerDatePickerLib-release/build/.transforms/4428256f0a23e752fb405ac6f6d3ba3e/package-aware-r.txt
new file mode 100644
index 00000000..48e8b003
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/4428256f0a23e752fb405ac6f6d3ba3e/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
diff --git a/SpinnerDatePickerLib-release/build/.transforms/4478fee3bbe1a583063f862a6618e543/results.bin b/SpinnerDatePickerLib-release/build/.transforms/4478fee3bbe1a583063f862a6618e543/results.bin
new file mode 100644
index 00000000..1045ed22
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/4478fee3bbe1a583063f862a6618e543/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-api.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/4478fee3bbe1a583063f862a6618e543/transformed/jetified-SpinnerDatePickerLib-release-api.jar b/SpinnerDatePickerLib-release/build/.transforms/4478fee3bbe1a583063f862a6618e543/transformed/jetified-SpinnerDatePickerLib-release-api.jar
new file mode 100644
index 00000000..f504a0d6
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/4478fee3bbe1a583063f862a6618e543/transformed/jetified-SpinnerDatePickerLib-release-api.jar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/449aabe7f7e08019cb966a14aec07b8e/results.bin b/SpinnerDatePickerLib-release/build/.transforms/449aabe7f7e08019cb966a14aec07b8e/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/4b31320bd9be1ebecf2f7b2f6675b180.bin b/SpinnerDatePickerLib-release/build/.transforms/4b31320bd9be1ebecf2f7b2f6675b180.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/4dd2c19f7006d19c14f8da6fbd886602/results.bin b/SpinnerDatePickerLib-release/build/.transforms/4dd2c19f7006d19c14f8da6fbd886602/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/4e0ae689a0329c9d2b3990c0404dead7/results.bin b/SpinnerDatePickerLib-release/build/.transforms/4e0ae689a0329c9d2b3990c0404dead7/results.bin
new file mode 100644
index 00000000..83091ceb
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/4e0ae689a0329c9d2b3990c0404dead7/results.bin
@@ -0,0 +1 @@
+o/com.tsongkha.spinnerdatepicker-r.txt
diff --git a/SpinnerDatePickerLib-release/build/.transforms/4e0ae689a0329c9d2b3990c0404dead7/transformed/com.tsongkha.spinnerdatepicker-r.txt b/SpinnerDatePickerLib-release/build/.transforms/4e0ae689a0329c9d2b3990c0404dead7/transformed/com.tsongkha.spinnerdatepicker-r.txt
new file mode 100644
index 00000000..48e8b003
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/4e0ae689a0329c9d2b3990c0404dead7/transformed/com.tsongkha.spinnerdatepicker-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
diff --git a/SpinnerDatePickerLib-release/build/.transforms/56172ab2ac0b36c0bbc050e55fbd039d/results.bin b/SpinnerDatePickerLib-release/build/.transforms/56172ab2ac0b36c0bbc050e55fbd039d/results.bin
new file mode 100644
index 00000000..1ed65e03
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/56172ab2ac0b36c0bbc050e55fbd039d/results.bin
@@ -0,0 +1 @@
+i/
diff --git a/SpinnerDatePickerLib-release/build/.transforms/57d1db94a355c4370141cbff48051942/results.bin b/SpinnerDatePickerLib-release/build/.transforms/57d1db94a355c4370141cbff48051942/results.bin
new file mode 100644
index 00000000..1045ed22
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/57d1db94a355c4370141cbff48051942/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-api.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/57d1db94a355c4370141cbff48051942/transformed/jetified-SpinnerDatePickerLib-release-api.jar b/SpinnerDatePickerLib-release/build/.transforms/57d1db94a355c4370141cbff48051942/transformed/jetified-SpinnerDatePickerLib-release-api.jar
new file mode 100644
index 00000000..f504a0d6
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/57d1db94a355c4370141cbff48051942/transformed/jetified-SpinnerDatePickerLib-release-api.jar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/results.bin b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/results.bin
new file mode 100644
index 00000000..72f42ec4
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release
diff --git a/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/AndroidManifest.xml b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/AndroidManifest.xml
new file mode 100644
index 00000000..91872c26
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-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>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/R.txt b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/R.txt
new file mode 100644
index 00000000..a4cd40bf
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-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
diff --git a/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/jars/classes.jar b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/jars/classes.jar
new file mode 100644
index 00000000..ccf6e3ec
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/jars/classes.jar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker.xml b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker.xml
new file mode 100644
index 00000000..3b80854a
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-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>
diff --git a/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_container.xml b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_container.xml
new file mode 100644
index 00000000..d0adf06a
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-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>
diff --git a/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml
new file mode 100644
index 00000000..58420ea2
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-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" -->
diff --git a/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml
new file mode 100644
index 00000000..08cd4a09
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-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>
+
diff --git a/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml
new file mode 100644
index 00000000..f5157e55
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-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>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml
new file mode 100644
index 00000000..88fa7445
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-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"
+    />
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_year.xml b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_year.xml
new file mode 100644
index 00000000..b728394a
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-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"
+    />
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/values/values.xml b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-SpinnerDatePickerLib-release/res/values/values.xml
new file mode 100644
index 00000000..c81f7153
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/59bceb9f89a3c8b1241cb3d1cd44174b/transformed/jetified-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>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/5de8f68b22bce551c9582ceaf8f90b0a/results.bin b/SpinnerDatePickerLib-release/build/.transforms/5de8f68b22bce551c9582ceaf8f90b0a/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/615779eae6c603d9a71bfa6bb44e810c/results.bin b/SpinnerDatePickerLib-release/build/.transforms/615779eae6c603d9a71bfa6bb44e810c/results.bin
new file mode 100644
index 00000000..da3b3ce0
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/615779eae6c603d9a71bfa6bb44e810c/results.bin
@@ -0,0 +1 @@
+i/res
diff --git a/SpinnerDatePickerLib-release/build/.transforms/63292e82923cbe6e7c4d75f6a0008b1c/results.bin b/SpinnerDatePickerLib-release/build/.transforms/63292e82923cbe6e7c4d75f6a0008b1c/results.bin
new file mode 100644
index 00000000..fcbf8d4b
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/63292e82923cbe6e7c4d75f6a0008b1c/results.bin
@@ -0,0 +1 @@
+i/AndroidManifest.xml
diff --git a/SpinnerDatePickerLib-release/build/.transforms/6793734a0a4ab3cb0f5eaf1d0f009c0c/results.bin b/SpinnerDatePickerLib-release/build/.transforms/6793734a0a4ab3cb0f5eaf1d0f009c0c/results.bin
new file mode 100644
index 00000000..1ed65e03
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/6793734a0a4ab3cb0f5eaf1d0f009c0c/results.bin
@@ -0,0 +1 @@
+i/
diff --git a/SpinnerDatePickerLib-release/build/.transforms/68c138b2d9e4df698db2278070a26d79/results.bin b/SpinnerDatePickerLib-release/build/.transforms/68c138b2d9e4df698db2278070a26d79/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/752ed24858fa8d634dff86f2669827e8/results.bin b/SpinnerDatePickerLib-release/build/.transforms/752ed24858fa8d634dff86f2669827e8/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/7630ffc009f22491a5832d4edd49bb49/results.bin b/SpinnerDatePickerLib-release/build/.transforms/7630ffc009f22491a5832d4edd49bb49/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/7717ba9b7fb1ab223afed75be99a294f/results.bin b/SpinnerDatePickerLib-release/build/.transforms/7717ba9b7fb1ab223afed75be99a294f/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/7836ba311c5040409dc587bd857c4529/results.bin b/SpinnerDatePickerLib-release/build/.transforms/7836ba311c5040409dc587bd857c4529/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/793dd935755be793c1e0de7a02c2d7f8/results.bin b/SpinnerDatePickerLib-release/build/.transforms/793dd935755be793c1e0de7a02c2d7f8/results.bin
new file mode 100644
index 00000000..c626d1be
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/793dd935755be793c1e0de7a02c2d7f8/results.bin
@@ -0,0 +1 @@
+i/jars/classes.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/7b2673a2bad3460e97bdab7812c4bad4/results.bin b/SpinnerDatePickerLib-release/build/.transforms/7b2673a2bad3460e97bdab7812c4bad4/results.bin
new file mode 100644
index 00000000..da3b3ce0
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/7b2673a2bad3460e97bdab7812c4bad4/results.bin
@@ -0,0 +1 @@
+i/res
diff --git a/SpinnerDatePickerLib-release/build/.transforms/8453d1f38f9c3d71cd5efec182317720.bin b/SpinnerDatePickerLib-release/build/.transforms/8453d1f38f9c3d71cd5efec182317720.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/8a7623b9ae4324341b006881137548bb/results.bin b/SpinnerDatePickerLib-release/build/.transforms/8a7623b9ae4324341b006881137548bb/results.bin
new file mode 100644
index 00000000..2b02ce5d
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/8a7623b9ae4324341b006881137548bb/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-runtime.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/8a7623b9ae4324341b006881137548bb/transformed/jetified-SpinnerDatePickerLib-release-runtime.jar b/SpinnerDatePickerLib-release/build/.transforms/8a7623b9ae4324341b006881137548bb/transformed/jetified-SpinnerDatePickerLib-release-runtime.jar
new file mode 100644
index 00000000..7622f0df
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/8a7623b9ae4324341b006881137548bb/transformed/jetified-SpinnerDatePickerLib-release-runtime.jar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/8dd83a4b83b43612cf2b48b2017ce3f4.bin b/SpinnerDatePickerLib-release/build/.transforms/8dd83a4b83b43612cf2b48b2017ce3f4.bin
new file mode 100644
index 00000000..738beb37
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/8dd83a4b83b43612cf2b48b2017ce3f4.bin
@@ -0,0 +1 @@
+o/SpinnerDatePickerLib-release-runtime.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/8dd83a4b83b43612cf2b48b2017ce3f4/SpinnerDatePickerLib-release-runtime.jar b/SpinnerDatePickerLib-release/build/.transforms/8dd83a4b83b43612cf2b48b2017ce3f4/SpinnerDatePickerLib-release-runtime.jar
new file mode 100644
index 00000000..ccf6e3ec
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/8dd83a4b83b43612cf2b48b2017ce3f4/SpinnerDatePickerLib-release-runtime.jar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/91128d81abacddbcec6da5df81cad6d0/results.bin b/SpinnerDatePickerLib-release/build/.transforms/91128d81abacddbcec6da5df81cad6d0/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/9391661a7495d10a02ff4b29b98b3de4/results.bin b/SpinnerDatePickerLib-release/build/.transforms/9391661a7495d10a02ff4b29b98b3de4/results.bin
new file mode 100644
index 00000000..1ed65e03
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/9391661a7495d10a02ff4b29b98b3de4/results.bin
@@ -0,0 +1 @@
+i/
diff --git a/SpinnerDatePickerLib-release/build/.transforms/94283629a61a49b8fedb5bdc4b538585.bin b/SpinnerDatePickerLib-release/build/.transforms/94283629a61a49b8fedb5bdc4b538585.bin
new file mode 100644
index 00000000..0e23e693
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/94283629a61a49b8fedb5bdc4b538585.bin
@@ -0,0 +1 @@
+o/SpinnerDatePickerLib-release-api.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/94283629a61a49b8fedb5bdc4b538585/SpinnerDatePickerLib-release-api.jar b/SpinnerDatePickerLib-release/build/.transforms/94283629a61a49b8fedb5bdc4b538585/SpinnerDatePickerLib-release-api.jar
new file mode 100644
index 00000000..ccf6e3ec
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/94283629a61a49b8fedb5bdc4b538585/SpinnerDatePickerLib-release-api.jar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/962f89f138a505b909b27051ee905c1c/results.bin b/SpinnerDatePickerLib-release/build/.transforms/962f89f138a505b909b27051ee905c1c/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/9a6ea4a0678a063d2747dadb3da114bd/results.bin b/SpinnerDatePickerLib-release/build/.transforms/9a6ea4a0678a063d2747dadb3da114bd/results.bin
new file mode 100644
index 00000000..fcbf8d4b
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/9a6ea4a0678a063d2747dadb3da114bd/results.bin
@@ -0,0 +1 @@
+i/AndroidManifest.xml
diff --git a/SpinnerDatePickerLib-release/build/.transforms/9d5b60b289a8464e095910ce6a41dcad/results.bin b/SpinnerDatePickerLib-release/build/.transforms/9d5b60b289a8464e095910ce6a41dcad/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a2e8c562dbc35dd36ffa08c929f6ad17/results.bin b/SpinnerDatePickerLib-release/build/.transforms/a2e8c562dbc35dd36ffa08c929f6ad17/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/results.bin b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/results.bin
new file mode 100644
index 00000000..72f42ec4
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/AndroidManifest.xml b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/AndroidManifest.xml
new file mode 100644
index 00000000..91872c26
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-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>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/R.txt b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/R.txt
new file mode 100644
index 00000000..a4cd40bf
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-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
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/jars/classes.jar b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/jars/classes.jar
new file mode 100644
index 00000000..ccf6e3ec
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/jars/classes.jar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker.xml b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker.xml
new file mode 100644
index 00000000..3b80854a
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-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>
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_container.xml b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_container.xml
new file mode 100644
index 00000000..d0adf06a
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-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>
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml
new file mode 100644
index 00000000..58420ea2
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-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" -->
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml
new file mode 100644
index 00000000..08cd4a09
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-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>
+
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml
new file mode 100644
index 00000000..f5157e55
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-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>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml
new file mode 100644
index 00000000..88fa7445
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-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"
+    />
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_year.xml b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_year.xml
new file mode 100644
index 00000000..b728394a
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-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"
+    />
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/values/values.xml b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-SpinnerDatePickerLib-release/res/values/values.xml
new file mode 100644
index 00000000..c81f7153
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/a98b18dde3f24ebc13e4fe17d23a2193/transformed/jetified-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>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/aa975cfecc3e9ee46e198c967cdebc4b/results.bin b/SpinnerDatePickerLib-release/build/.transforms/aa975cfecc3e9ee46e198c967cdebc4b/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ae67b0ea3cb3bf08c7e04ac619c538e2.bin b/SpinnerDatePickerLib-release/build/.transforms/ae67b0ea3cb3bf08c7e04ac619c538e2.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/aebffa93b2f6939483f3da0ed67bd1b1.bin b/SpinnerDatePickerLib-release/build/.transforms/aebffa93b2f6939483f3da0ed67bd1b1.bin
new file mode 100644
index 00000000..fcbf8d4b
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/aebffa93b2f6939483f3da0ed67bd1b1.bin
@@ -0,0 +1 @@
+i/AndroidManifest.xml
diff --git a/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/results.bin b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/results.bin
new file mode 100644
index 00000000..72f42ec4
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release
diff --git a/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/AndroidManifest.xml b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/AndroidManifest.xml
new file mode 100644
index 00000000..91872c26
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-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>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/R.txt b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/R.txt
new file mode 100644
index 00000000..a4cd40bf
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-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
diff --git a/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/jars/classes.jar b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/jars/classes.jar
new file mode 100644
index 00000000..ccf6e3ec
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/jars/classes.jar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker.xml b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker.xml
new file mode 100644
index 00000000..3b80854a
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-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>
diff --git a/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_container.xml b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_container.xml
new file mode 100644
index 00000000..d0adf06a
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-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>
diff --git a/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml
new file mode 100644
index 00000000..58420ea2
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-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" -->
diff --git a/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml
new file mode 100644
index 00000000..08cd4a09
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-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>
+
diff --git a/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml
new file mode 100644
index 00000000..f5157e55
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-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>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml
new file mode 100644
index 00000000..88fa7445
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-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"
+    />
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_year.xml b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_year.xml
new file mode 100644
index 00000000..b728394a
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-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"
+    />
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/values/values.xml b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-SpinnerDatePickerLib-release/res/values/values.xml
new file mode 100644
index 00000000..c81f7153
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/b31bee13f768e5667e109b3c50a244e9/transformed/jetified-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>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/bf139bc395e64dac7ef6a008ee540f38/results.bin b/SpinnerDatePickerLib-release/build/.transforms/bf139bc395e64dac7ef6a008ee540f38/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/c2367a17e370d8dcf54a2169707a836d.bin b/SpinnerDatePickerLib-release/build/.transforms/c2367a17e370d8dcf54a2169707a836d.bin
new file mode 100644
index 00000000..c626d1be
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/c2367a17e370d8dcf54a2169707a836d.bin
@@ -0,0 +1 @@
+i/jars/classes.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/c515ca5825e1f80ade74d1ecfbaf9a52/results.bin b/SpinnerDatePickerLib-release/build/.transforms/c515ca5825e1f80ade74d1ecfbaf9a52/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ca5ddcbe42f5df6d6817a3f19a3448a0/results.bin b/SpinnerDatePickerLib-release/build/.transforms/ca5ddcbe42f5df6d6817a3f19a3448a0/results.bin
new file mode 100644
index 00000000..83091ceb
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ca5ddcbe42f5df6d6817a3f19a3448a0/results.bin
@@ -0,0 +1 @@
+o/com.tsongkha.spinnerdatepicker-r.txt
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ca5ddcbe42f5df6d6817a3f19a3448a0/transformed/com.tsongkha.spinnerdatepicker-r.txt b/SpinnerDatePickerLib-release/build/.transforms/ca5ddcbe42f5df6d6817a3f19a3448a0/transformed/com.tsongkha.spinnerdatepicker-r.txt
new file mode 100644
index 00000000..48e8b003
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ca5ddcbe42f5df6d6817a3f19a3448a0/transformed/com.tsongkha.spinnerdatepicker-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
diff --git a/SpinnerDatePickerLib-release/build/.transforms/cc6da5513ea65144af24bf215895d44b/results.bin b/SpinnerDatePickerLib-release/build/.transforms/cc6da5513ea65144af24bf215895d44b/results.bin
new file mode 100644
index 00000000..2b02ce5d
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/cc6da5513ea65144af24bf215895d44b/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-runtime.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/cc6da5513ea65144af24bf215895d44b/transformed/jetified-SpinnerDatePickerLib-release-runtime.jar b/SpinnerDatePickerLib-release/build/.transforms/cc6da5513ea65144af24bf215895d44b/transformed/jetified-SpinnerDatePickerLib-release-runtime.jar
new file mode 100644
index 00000000..7622f0df
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/cc6da5513ea65144af24bf215895d44b/transformed/jetified-SpinnerDatePickerLib-release-runtime.jar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/d50a8b564a152f5fffea2148c1255847/results.bin b/SpinnerDatePickerLib-release/build/.transforms/d50a8b564a152f5fffea2148c1255847/results.bin
new file mode 100644
index 00000000..2b02ce5d
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/d50a8b564a152f5fffea2148c1255847/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-runtime.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/d50a8b564a152f5fffea2148c1255847/transformed/jetified-SpinnerDatePickerLib-release-runtime.jar b/SpinnerDatePickerLib-release/build/.transforms/d50a8b564a152f5fffea2148c1255847/transformed/jetified-SpinnerDatePickerLib-release-runtime.jar
new file mode 100644
index 00000000..7622f0df
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/d50a8b564a152f5fffea2148c1255847/transformed/jetified-SpinnerDatePickerLib-release-runtime.jar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/d861f0ea3015665fc67f949839daa7b1.bin b/SpinnerDatePickerLib-release/build/.transforms/d861f0ea3015665fc67f949839daa7b1.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/dfd7fb48f22e6593eaa7545342acf68d/results.bin b/SpinnerDatePickerLib-release/build/.transforms/dfd7fb48f22e6593eaa7545342acf68d/results.bin
new file mode 100644
index 00000000..c626d1be
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/dfd7fb48f22e6593eaa7545342acf68d/results.bin
@@ -0,0 +1 @@
+i/jars/classes.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/e2ff709de5d4057abb61de5b14020df4/results.bin b/SpinnerDatePickerLib-release/build/.transforms/e2ff709de5d4057abb61de5b14020df4/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/eab7bdcdd39af7eec0eb9099a26ae3f2/results.bin b/SpinnerDatePickerLib-release/build/.transforms/eab7bdcdd39af7eec0eb9099a26ae3f2/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/edbfcd4844e87b97ffe19d972548871b/results.bin b/SpinnerDatePickerLib-release/build/.transforms/edbfcd4844e87b97ffe19d972548871b/results.bin
new file mode 100644
index 00000000..c842ce77
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/edbfcd4844e87b97ffe19d972548871b/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release.aar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/edbfcd4844e87b97ffe19d972548871b/transformed/jetified-SpinnerDatePickerLib-release.aar b/SpinnerDatePickerLib-release/build/.transforms/edbfcd4844e87b97ffe19d972548871b/transformed/jetified-SpinnerDatePickerLib-release.aar
new file mode 100644
index 00000000..c43aa7e8
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/edbfcd4844e87b97ffe19d972548871b/transformed/jetified-SpinnerDatePickerLib-release.aar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6.bin b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6.bin
new file mode 100644
index 00000000..e9b05857
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6.bin
@@ -0,0 +1 @@
+o/SpinnerDatePickerLib-release
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/AndroidManifest.xml b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/AndroidManifest.xml
new file mode 100644
index 00000000..91872c26
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/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>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/R.txt b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/R.txt
new file mode 100644
index 00000000..a4cd40bf
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/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
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/jars/classes.jar b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/jars/classes.jar
new file mode 100644
index 00000000..ccf6e3ec
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/jars/classes.jar differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/date_picker.xml b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/date_picker.xml
new file mode 100644
index 00000000..3b80854a
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/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>
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/date_picker_container.xml b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/date_picker_container.xml
new file mode 100644
index 00000000..d0adf06a
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/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>
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml
new file mode 100644
index 00000000..58420ea2
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/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" -->
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml
new file mode 100644
index 00000000..08cd4a09
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/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>
+
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml
new file mode 100644
index 00000000..f5157e55
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/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>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml
new file mode 100644
index 00000000..88fa7445
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/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"
+    />
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/number_picker_year.xml b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/layout/number_picker_year.xml
new file mode 100644
index 00000000..b728394a
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/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"
+    />
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/values/values.xml b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/SpinnerDatePickerLib-release/res/values/values.xml
new file mode 100644
index 00000000..c81f7153
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/ef5f1f676d9459c2eba6540a422dc6c6/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>
\ No newline at end of file
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f00354e7becd3ca7fc3a91e0e8a63138.bin b/SpinnerDatePickerLib-release/build/.transforms/f00354e7becd3ca7fc3a91e0e8a63138.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f36134123bae71d74d8189c28d4fd32f/results.bin b/SpinnerDatePickerLib-release/build/.transforms/f36134123bae71d74d8189c28d4fd32f/results.bin
new file mode 100644
index 00000000..a895d906
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/f36134123bae71d74d8189c28d4fd32f/results.bin
@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-runtime
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f36134123bae71d74d8189c28d4fd32f/transformed/jetified-SpinnerDatePickerLib-release-runtime/classes.dex b/SpinnerDatePickerLib-release/build/.transforms/f36134123bae71d74d8189c28d4fd32f/transformed/jetified-SpinnerDatePickerLib-release-runtime/classes.dex
new file mode 100644
index 00000000..bc718e3f
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/f36134123bae71d74d8189c28d4fd32f/transformed/jetified-SpinnerDatePickerLib-release-runtime/classes.dex differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f45d21c36d668e0cbb7ad5dc958533c1/results.bin b/SpinnerDatePickerLib-release/build/.transforms/f45d21c36d668e0cbb7ad5dc958533c1/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/results.bin b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/results.bin
new file mode 100644
index 00000000..2367e569
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/results.bin
@@ -0,0 +1 @@
+o/com.tsongkha.spinnerdatepicker
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker.xml.flat
new file mode 100644
index 00000000..88515a81
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_container.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_container.xml.flat
new file mode 100644
index 00000000..88ce3aa2
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_container.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog.xml.flat
new file mode 100644
index 00000000..533c1158
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog_container.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog_container.xml.flat
new file mode 100644
index 00000000..3673677e
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog_container.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_range_picker_dialog_container.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_range_picker_dialog_container.xml.flat
new file mode 100644
index 00000000..b991874b
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_date_range_picker_dialog_container.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_day_month.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_day_month.xml.flat
new file mode 100644
index 00000000..038f5723
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_day_month.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_year.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_year.xml.flat
new file mode 100644
index 00000000..794d9198
Binary files /dev/null and b/SpinnerDatePickerLib-release/build/.transforms/f715e7f8dd7f24784b4bbeb8e1437b7c/transformed/com.tsongkha.spinnerdatepicker/layout_number_picker_year.xml.flat differ
diff --git a/SpinnerDatePickerLib-release/build/.transforms/f865edc4bd4f4da8c6c93ff1023f1867/results.bin b/SpinnerDatePickerLib-release/build/.transforms/f865edc4bd4f4da8c6c93ff1023f1867/results.bin
new file mode 100644
index 00000000..c626d1be
--- /dev/null
+++ b/SpinnerDatePickerLib-release/build/.transforms/f865edc4bd4f4da8c6c93ff1023f1867/results.bin
@@ -0,0 +1 @@
+i/jars/classes.jar
diff --git a/SpinnerDatePickerLib-release/build/.transforms/fceb9e1194ddfe47660c0e2d548fa010/results.bin b/SpinnerDatePickerLib-release/build/.transforms/fceb9e1194ddfe47660c0e2d548fa010/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/SpinnerDatePickerLib-release/build/.transforms/fd3aa173bf9a2c6eb8c247b476fe8ce4/results.bin b/SpinnerDatePickerLib-release/build/.transforms/fd3aa173bf9a2c6eb8c247b476fe8ce4/results.bin
new file mode 100644
index 00000000..e69de29b
diff --git a/app/build.gradle b/app/build.gradle
index 81208a24..6b9da7ae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -91,6 +91,8 @@ android {
             buildConfigField 'String', 'BASE_URL', '"https://mobileapi.gmeremit.com:8002/api/"'
             buildConfigField 'String', 'API_VERSION', '"v1"'
             buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
+            buildConfigField 'String', 'ClientId', '"5220224461B37738C528430"'
+
             signingConfig signingConfigs.debug
             debuggable true
             minifyEnabled false
@@ -101,6 +103,8 @@ android {
 //            buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5008/api/"'
             buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5022/api/"'
             buildConfigField 'String', 'API_VERSION', '"v1"'
+            buildConfigField 'String', 'ClientId', '"5220224461B37738C528430"'
+
             buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
             debuggable true
             minifyEnabled false
@@ -110,6 +114,8 @@ android {
             signingConfig signingConfigs.debug
             buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5012/api/"'
             buildConfigField 'String', 'API_VERSION', '"v1"'
+            buildConfigField 'String', 'ClientId', '"5220224461B37738C528430"'
+
             buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
             debuggable true
             minifyEnabled false
@@ -119,6 +125,8 @@ android {
             signingConfig signingConfigs.debug
             buildConfigField 'String', 'BASE_URL', '"http://103.139.152.11:5555/api/"'
             buildConfigField 'String', 'API_VERSION', '"v1"'
+            buildConfigField 'String', 'ClientId', '"5220224461B37738C528430"'
+
             buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
             debuggable true
             minifyEnabled false
@@ -192,7 +200,8 @@ dependencies {
     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.github.bumptech.glide:glide:4.9.0'
+
+    implementation 'com.github.bumptech.glide:glide:4.15.1'
     implementation 'de.hdodenhof:circleimageview:2.2.0'
     implementation 'com.jakewharton:butterknife:10.2.3'
     implementation 'com.android.volley:volley:1.2.1'
diff --git a/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt b/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt
index 59c5dc4a..e44b33f9 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt
+++ b/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt
@@ -23,6 +23,7 @@ import com.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV
 import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3
 import com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity
 import com.remit.jmecustomer.utils.Constants
+import com.zoyi.channel.plugin.android.global.Const
 
 class BeneficiaryDetailActivity : BaseActivity(),
     RecipientListingV3PresenterInterface.RecipientListingV3ContractInterface {
@@ -33,6 +34,7 @@ class BeneficiaryDetailActivity : BaseActivity(),
     private var receiver: Receiver? = null
     var isPaymentSelected: Boolean = false
     var presenter: RecipientListingV3PresenterInterface? = null
+    var transferAmount = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -43,6 +45,7 @@ class BeneficiaryDetailActivity : BaseActivity(),
         binding.toolbar.ivBack.setOnClickListener {
             super.onBackPressed()
         }
+        transferAmount = intent.getStringExtra(Constants.TRANSFER_AMOUNT) ?: ""
         init()
     }
 
@@ -151,15 +154,22 @@ class BeneficiaryDetailActivity : BaseActivity(),
                     }
                 }
                 if (receiverInfoModel?.hasVerifiedOTP == true) {
+
                     val intent = Intent(
                         this@BeneficiaryDetailActivity,
                         SendMoneyV2Activity::class.java
                     )
+
                     val sendMoneyRequiredDataV3 = SendMoneyRequiredDataV3(receiverInfoModel)
                     intent.putExtra(
                         RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3,
                         sendMoneyRequiredDataV3
                     )
+
+                    intent.putExtra(
+                        Constants.TRANSFER_AMOUNT,
+                        transferAmount
+                    )
                     startActivityForResult(
                         intent,
                         RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3
@@ -202,7 +212,7 @@ class BeneficiaryDetailActivity : BaseActivity(),
 
     override fun showAllRecipientToUser(
         recipientInfoModelList: MutableList<Receiver>?,
-        changeLayoutBehavior: Boolean
+        changeLayoutBehavior: Boolean,
     ) {
     }
 
@@ -218,7 +228,7 @@ class BeneficiaryDetailActivity : BaseActivity(),
 
     override fun promptToSendMoney(
         listener: GenericPromptDialog.GenericDialogPromptListener?,
-        message: String?
+        message: String?,
     ) {
     }
 
@@ -242,7 +252,7 @@ class BeneficiaryDetailActivity : BaseActivity(),
 
     override fun promptToEditRecipient(
         genericDialogPromptListener: GenericPromptDialog.GenericDialogPromptListener?,
-        message: String?
+        message: String?,
     ) {
         val genericPromptDialog = GenericPromptDialog()
         genericPromptDialog.setTitleMessage(getString(R.string.important_text))
diff --git a/app/src/main/java/com/remit/jmecustomer/features/customersupport/view/CustomerSupportFragment.java b/app/src/main/java/com/remit/jmecustomer/features/customersupport/view/CustomerSupportFragment.java
index 2dcd82fb..933faa31 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/customersupport/view/CustomerSupportFragment.java
+++ b/app/src/main/java/com/remit/jmecustomer/features/customersupport/view/CustomerSupportFragment.java
@@ -27,7 +27,6 @@ import butterknife.OnClick;
 
 
 public class CustomerSupportFragment extends BottomSheetDialogFragment  {
-
     @BindView(R.id.viewFaceBook)
     View viewFaceBook;
 
diff --git a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt
index cfb15635..c2e6798e 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt
+++ b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt
@@ -100,6 +100,8 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
     lateinit var homeFragmentV3: HomeFragmentV3
     lateinit var myTransfersFragment: MyTransfersFragment
     private var isTransactionComplete: Boolean = false
+    private var transferAmount = ""
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHomeV3Binding.inflate(layoutInflater)
@@ -108,6 +110,11 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
         init()
     }
 
+    //    For passing amount from home fragment
+    fun transferHomeAmount(amount: String) {
+        transferAmount = amount
+    }
+
     private fun init() {
         val homeViewModelFactory = HomeViewModelFactory(
             this,
@@ -120,7 +127,8 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
         viewModel = ViewModelProvider(this, homeViewModelFactory).get(HomeViewModel::class.java)
         viewModel!!.getRequiredData()
         sendMoneyRequiredData = SendMoneyRequiredDataV3(ReceiverInfoV3Model())
-        sendMoneyScreenManager = SendMoneyScreenManager()
+        sendMoneyScreenManager = SendMoneyScreenManager(transferAmount)
+
 
         val factory = SendMoneyViewModelFactory(this, sendMoneyRequiredData)
         presenter = ViewModelProviders.of(this, factory).get(
@@ -134,16 +142,22 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
         binding.vpDashboard.adapter = pagerAdapter
 
         // Add tabs with icons
-        val tab1: TabLayout.Tab = binding.tabLayout.newTab().setIcon(R.drawable.ic_home_selected)
+        val tab1: TabLayout.Tab =
+            binding.tabLayout.newTab().setIcon(R.drawable.ic_home_selected).setText("Home")
         val tab2: TabLayout.Tab =
             binding.tabLayout.newTab().setIcon(R.drawable.ic_transfers_unselected)
+                .setText("Receiver")
         val tab3: TabLayout.Tab =
-            binding.tabLayout.newTab().setIcon(R.drawable.profile_unselected)
+            binding.tabLayout.newTab().setIcon(R.drawable.profile_unselected).setText("Account")
+
+        val tab4: TabLayout.Tab =
+            binding.tabLayout.newTab().setIcon(R.drawable.ic_msg).setText("Help")
 
 // Add tabs to the TabLayout
         binding.tabLayout.addTab(tab1)
         binding.tabLayout.addTab(tab2)
         binding.tabLayout.addTab(tab3)
+        binding.tabLayout.addTab(tab4)
 
         if (isTransactionComplete) {
             resetTabs()
@@ -156,7 +170,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
             override fun onPageScrolled(
                 position: Int,
                 positionOffset: Float,
-                positionOffsetPixels: Int
+                positionOffsetPixels: Int,
             ) {
             }
 
@@ -209,6 +223,15 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
                         tab.setIcon(R.drawable.profile_selected)
                         binding.vpDashboard.currentItem = 2
                     }
+
+                    3 -> {
+                        resetTabs()
+                        tab.setIcon(R.drawable.ic_msg)
+                        val newFragment = CustomerSupportFragment.newInstance()
+                        newFragment.show(supportFragmentManager, "dialog")
+
+//                        binding.vpDashboard.currentItem = 3
+                    }
                 }
             }
 
@@ -230,6 +253,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
         binding.tabLayout.getTabAt(0)?.setIcon(R.drawable.ic_home_unselected)
         binding.tabLayout.getTabAt(1)?.setIcon(R.drawable.ic_transfers_unselected)
         binding.tabLayout.getTabAt(2)?.setIcon(R.drawable.profile_unselected)
+        binding.tabLayout.getTabAt(3)?.setIcon(R.drawable.ic_msg)
     }
 
     override fun getContext(): AppCompatActivity {
@@ -392,7 +416,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
         yearlyLimit: String?,
         walletNumber: String?,
         bankName: String?,
-        contact: String?
+        contact: String?,
     ) {
 //        val txtUserName: TextView = nav_drawer.findViewById<TextView>(R.id.txt_user_name)
 //        val txtUserEmail: TextView = nav_drawer.findViewById<TextView>(R.id.txt_user_email)
@@ -427,7 +451,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
         title: String?,
         disableKYCViewClick: Boolean,
         redirectTo: String?,
-        residenceType: String?
+        residenceType: String?,
     ) {
         if (currentFragment is HomeFragmentV2) (currentFragment as HomeFragmentV2).showNotificationView(
             viewModel!!.constructKYCVerificationRequiredViewNotification(redirectTo, residenceType)
@@ -466,7 +490,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
         isForExistingCustomer: Boolean,
         isKYCSubmitted: Boolean,
         redirectTo: String,
-        residenceType: String?
+        residenceType: String?,
     ) {
         if (isForExistingCustomer) {
             if (redirectTo.equals("EKYC", ignoreCase = true)) ExistingKYCV4Activity.startActivity(
diff --git a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
index beb0cf48..dacc925a 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
+++ b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
@@ -4,7 +4,6 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
-import android.graphics.Color
 import android.graphics.Rect
 import android.os.Bundle
 import android.os.Handler
@@ -66,6 +65,7 @@ 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.utils.Constants
+import com.remit.jmecustomer.utils.Utils
 import java.util.*
 
 class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
@@ -120,7 +120,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         _binding = FragmentHomeNewBinding.inflate(inflater, container, false)
         init()
@@ -251,9 +251,24 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
                 val transfersFragment =
                     requireActivity().supportFragmentManager.findFragmentByTag("android:switcher:" + homeActivityV3.binding.vpDashboard.id + ":" + 1) as MyTransfersFragment
                 transfersFragment.performDefaultAction(Constants.CURRENT_COUNTRY_ID, true)
+
+
+
                 (requireActivity() as HomeActivityV3).binding.vpDashboard.currentItem = 1
+                (requireActivity() as HomeActivityV3).transferHomeAmount(Utils.removeCommaFromAmount(
+                    sendMoneyEditText?.text.toString().trim()))
+
+                val myTransfersFragment: MyTransfersFragment = MyTransfersFragment()
+                val bundle = Bundle()
+                bundle.putString(Constants.TRANSFER_AMOUNT,
+                    sendMoneyEditText?.text.toString().trim())
+                myTransfersFragment.arguments = bundle
+
+
+                (requireActivity() as HomeActivityV3).transferHomeAmount(Utils.removeCommaFromAmount(
+                    sendMoneyEditText?.text.toString().trim()))
             }
-            R.id.countrySelectionSpinner, R.id.recepientCurrencyTextView, R.id.iv_currency_2 -> showCountryListinDialog()
+            R.id.countrySelectionSpinner, R.id.recepientCurrencyTextView, R.id.iv_currency_2, R.id.cl_country -> showCountryListinDialog()
             R.id.exRateCalculateButton -> presenter.calcExrate()
             R.id.lin_upload_slip -> {
                 val unverifiedMessage: String? = homeViewModel?.checkIfUserVerified()
@@ -340,7 +355,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
 
     override fun showSelectedPayoutMode(
         serviceAvailable: MutableList<PaymentMode>,
-        selectedIndex: Int
+        selectedIndex: Int,
     ) {
         serviceAvailable[0].isSelected = true
         sendTypeAdapter?.setData(serviceAvailable)
@@ -361,7 +376,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
         chargeAmount: String?,
         exRate: String?,
         formattedExRate: String?,
-        playAnimation: Boolean
+        playAnimation: Boolean,
     ) {
         try {
             if (playAnimation) {
diff --git a/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyBeneficiaryAllActivity.kt b/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyBeneficiaryAllActivity.kt
index e7eea37f..4449d91d 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyBeneficiaryAllActivity.kt
+++ b/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyBeneficiaryAllActivity.kt
@@ -47,6 +47,7 @@ class MyBeneficiaryAllActivity : BaseActivity(),
         binding.toolbar.ivBack.setOnClickListener {
             super.onBackPressed()
         }
+        var transferAmount = intent?.extras?.getString(Constants.TRANSFER_AMOUNT)
         init()
     }
 
@@ -76,7 +77,7 @@ class MyBeneficiaryAllActivity : BaseActivity(),
 
     override fun showAllRecipientToUser(
         recipientInfoModelList: MutableList<Receiver>,
-        changeLayoutBehavior: Boolean
+        changeLayoutBehavior: Boolean,
     ) {
         adapter?.setData(recipientInfoModelList);
     }
@@ -84,7 +85,7 @@ class MyBeneficiaryAllActivity : BaseActivity(),
     override fun showAllRecipientToUserV5(
         recipientInfoModelList: MutableList<Receiver>?,
         recentTransactionList: MutableList<RecentTransaction>?,
-        changeLayoutBehavior: Boolean
+        changeLayoutBehavior: Boolean,
     ) {
         if (data == null) {
             data = recipientInfoModelList
@@ -133,7 +134,7 @@ class MyBeneficiaryAllActivity : BaseActivity(),
 
     override fun promptToSendMoney(
         listener: GenericPromptDialog.GenericDialogPromptListener?,
-        message: String?
+        message: String?,
     ) {
         val genericPromptDialog = GenericPromptDialog()
         genericPromptDialog.setTitleMessage(getString(R.string.important_text))
@@ -162,6 +163,8 @@ class MyBeneficiaryAllActivity : BaseActivity(),
     override fun proceedToEditRecipient(recipientInfoModel: ReceiverInfoV3Model) {
         val intent = Intent(this, RecipientAddEditV3Activity::class.java)
         intent.putExtra(RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3, recipientInfoModel)
+        intent.putExtra(Constants.TRANSFER_AMOUNT,
+            intent?.extras?.getString(Constants.TRANSFER_AMOUNT) ?: "")
         startActivityForResult(
             intent,
             RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3
@@ -183,7 +186,7 @@ class MyBeneficiaryAllActivity : BaseActivity(),
 
     override fun promptToEditRecipient(
         genericDialogPromptListener: GenericPromptDialog.GenericDialogPromptListener?,
-        message: String?
+        message: String?,
     ) {
         val genericPromptDialog = GenericPromptDialog()
         genericPromptDialog.setTitleMessage(getString(R.string.important_text))
diff --git a/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt b/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt
index 81415e80..81073e40 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt
+++ b/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt
@@ -46,6 +46,7 @@ import com.remit.jmecustomer.utils.Utils
 import com.tsongkha.spinnerdatepicker.DatePicker
 import com.tsongkha.spinnerdatepicker.DateRangePickerDialog.OnRangeDateSetListener
 import com.tsongkha.spinnerdatepicker.SpinnerDateRangePickerDialogBuilder
+import com.zoyi.channel.plugin.android.global.Const
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -86,10 +87,11 @@ class MyTransfersFragment : BaseFragment(),
     var isContinueFromHome = false
     var apiCallCount = 0
     var isLoading = false
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         _binding = FragmentMyTransfersBinding.inflate(inflater, container, false)
         init()
@@ -268,14 +270,14 @@ class MyTransfersFragment : BaseFragment(),
 
     override fun showAllRecipientToUser(
         recipientInfoModelList: MutableList<Receiver>,
-        changeLayoutBehavior: Boolean
+        changeLayoutBehavior: Boolean,
     ) {
     }
 
     override fun showAllRecipientToUserV5(
         recipientInfoModelList: MutableList<Receiver>?,
         recentTransactionList: MutableList<RecentTransaction>?,
-        changeLayoutBehavior: Boolean
+        changeLayoutBehavior: Boolean,
     ) {
         if (isFirstCall) {
             if (data != null) {
@@ -352,6 +354,7 @@ class MyTransfersFragment : BaseFragment(),
 
         binding.tvSeeAll.setOnClickListener {
             val intent = Intent(requireActivity(), MyBeneficiaryAllActivity::class.java)
+
             intent.putParcelableArrayListExtra(
                 "receiver",
                 recipientInfoModelList as ArrayList<out Parcelable>
@@ -431,6 +434,7 @@ class MyTransfersFragment : BaseFragment(),
             BeneficiaryAddEditV3TermsActivity.RECIPIENT_TERMS_BUNDLE_KEY_v3,
             recipientInfoModel
         )
+
         startActivityForResult(
             intent,
             RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3
@@ -440,7 +444,7 @@ class MyTransfersFragment : BaseFragment(),
 
     override fun promptToEditRecipient(
         genericDialogPromptListener: GenericDialogPromptListener?,
-        message: String?
+        message: String?,
     ) {
         val genericPromptDialog = GenericPromptDialog()
         genericPromptDialog.setTitleMessage(getString(R.string.important_text))
@@ -462,6 +466,11 @@ class MyTransfersFragment : BaseFragment(),
 //        }
         val intent = Intent(requireActivity(), BeneficiaryDetailActivity::class.java)
         intent.putExtra("receiverInfoModel", recipientInfoModel)
+        intent.putExtra(
+            Constants.TRANSFER_AMOUNT,
+            arguments?.getString(Constants.TRANSFER_AMOUNT)
+        )
+
         startActivityForResult(intent, Constants.UPDATE_DELETE_CODE)
     }
 
@@ -627,7 +636,7 @@ class MyTransfersFragment : BaseFragment(),
                     datePicker: DatePicker,
                     year: Int,
                     monthOfYear: Int,
-                    dayOfMonth: Int
+                    dayOfMonth: Int,
                 ) {
                     startDate =
                         Integer.toString(year) + "-" + Integer.toString(monthOfYear + 1) + "-" + Integer.toString(
@@ -646,7 +655,7 @@ class MyTransfersFragment : BaseFragment(),
                     datePicker: DatePicker,
                     year: Int,
                     monthOfYear: Int,
-                    dayOfMonth: Int
+                    dayOfMonth: Int,
                 ) {
                     endDate =
                         Integer.toString(year) + "-" + Integer.toString(monthOfYear + 1) + "-" + Integer.toString(
diff --git a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java
index 6f93b84a..607f4d00 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java
+++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java
@@ -23,7 +23,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class RecipientAddEditV3Activity extends BaseActivity implements RecipientAddV3ContractInterface, View.OnClickListener,ViewPager.OnPageChangeListener, WebBrowserFragmentV2.WebBrowserFragmentActionListener {
+public class RecipientAddEditV3Activity extends BaseActivity implements RecipientAddV3ContractInterface, View.OnClickListener, ViewPager.OnPageChangeListener, WebBrowserFragmentV2.WebBrowserFragmentActionListener {
 
 
     public static final String TAG = RecipientAddEditV3Activity.class.getSimpleName();
@@ -75,6 +75,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
 
         beneficiaryAddEditV3Fragment.setArguments(bundle);
 
+
         beneficiaryAddEditV3TermsFragment = new BeneficiaryAddEditV3TermsFragment();
 
         beneficiaryAddEditV3TermsFragment.setArguments(bundle);
@@ -83,7 +84,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
 
         fragments.add(beneficiaryAddEditV3TermsFragment);
 
-        addBeneficiaryV3ViewPagerAdapter = new GenericViewPagerAdapter(getSupportFragmentManager(),fragments);
+        addBeneficiaryV3ViewPagerAdapter = new GenericViewPagerAdapter(getSupportFragmentManager(), fragments);
 
         addBeneficiaryV3ViewPager.setOffscreenPageLimit(2);
 
@@ -95,7 +96,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
     }
 
     private void init() {
-         recipientToBeEdited = getIntent().getParcelableExtra(RECIPIENT_INFO_BUNDLE_KEY_v3);
+        recipientToBeEdited = getIntent().getParcelableExtra(RECIPIENT_INFO_BUNDLE_KEY_v3);
         iv_cancel.setVisibility(View.INVISIBLE);
 
     }
@@ -123,7 +124,6 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
     }
 
 
-
     @Override
     public void onEditSuccess(String recipientIdToBeUpdated) {
         Intent returnIntent = new Intent();
@@ -174,14 +174,14 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
 
     @Override
     public void onPageSelected(int position) {
-        if(position==0){
-            if(recipientToBeEdited!=null){
+        if (position == 0) {
+            if (recipientToBeEdited != null) {
                 toolbarTitle.setText(getString(R.string.editBeneficiary_text));
-            }else{
+            } else {
                 toolbarTitle.setText(getString(R.string.addBeneficiary_text));
             }
 
-        }else{
+        } else {
             toolbarTitle.setText(getString(R.string.terms_and_condition_title_text));
         }
     }
diff --git a/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyScreenManager.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyScreenManager.java
index 30e2010c..1528299d 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyScreenManager.java
+++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyScreenManager.java
@@ -1,5 +1,7 @@
 package com.remit.jmecustomer.features.sendmoney.view;
 
+import android.os.Bundle;
+
 import androidx.annotation.LayoutRes;
 
 import com.remit.jmecustomer.features.sendmoney.view.amountdetail.AmountDetailSendMoneyFragment;
@@ -8,38 +10,46 @@ import com.remit.jmecustomer.features.sendmoney.view.consent.UserConsentSendMone
 import com.remit.jmecustomer.features.sendmoney.view.verification.VerificationSendMoneyFragment;
 import com.remit.jmecustomer.R;
 import com.remit.jmecustomer.base.BaseFragment;
+import com.remit.jmecustomer.utils.Constants;
+import com.zoyi.channel.plugin.android.global.Const;
+
+import org.jetbrains.annotations.NotNull;
 
-public class SendMoneyScreenManager
-{
+public class SendMoneyScreenManager {
     AmountDetailSendMoneyFragment amountDetailSendMoneyFragment;
     VerificationSendMoneyFragment verificationSendMoneyFragment;
     CCDISendMoneyFragment ccdiSendMoneyFragment;
     UserConsentSendMoneyFragment userConsentSendMoneyFragment;
-    public SendMoneyScreenManager() {
+
+    String homeSendamount;
+
+    public SendMoneyScreenManager(String homeAmount) {
+        homeSendamount = homeAmount;
     }
 
     public void prepareFragmentsLazily() {
-        amountDetailSendMoneyFragment= new AmountDetailSendMoneyFragment();
-        ccdiSendMoneyFragment= new CCDISendMoneyFragment();
-        verificationSendMoneyFragment= new VerificationSendMoneyFragment();
+        amountDetailSendMoneyFragment = new AmountDetailSendMoneyFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString(Constants.TRANSFER_AMOUNT, homeSendamount);
+        amountDetailSendMoneyFragment.setArguments(bundle);
+        ccdiSendMoneyFragment = new CCDISendMoneyFragment();
+        verificationSendMoneyFragment = new VerificationSendMoneyFragment();
         userConsentSendMoneyFragment = new UserConsentSendMoneyFragment();
     }
 
-    public  BaseFragment getSendMoneyScreenFromId(@LayoutRes int layoutID )
-    {
-        switch(layoutID)
-        {
+    public BaseFragment getSendMoneyScreenFromId(@LayoutRes int layoutID) {
+        switch (layoutID) {
 //            case R.layout.fragment_payout_mode_send_money_v2:
 //                return new PayoutModeSendMoneyFragment();
             case R.layout.fragment_amount_detail_send_money_v2:
-                return (amountDetailSendMoneyFragment==null)?new AmountDetailSendMoneyFragment():amountDetailSendMoneyFragment;
+                return (amountDetailSendMoneyFragment == null) ? new AmountDetailSendMoneyFragment() : amountDetailSendMoneyFragment;
             case R.layout.fragment_ccdi_send_money_v2:
-                return (ccdiSendMoneyFragment==null)?new CCDISendMoneyFragment():ccdiSendMoneyFragment;
+                return (ccdiSendMoneyFragment == null) ? new CCDISendMoneyFragment() : ccdiSendMoneyFragment;
             case R.layout.fragment_verification_send_money_v2:
-                return (verificationSendMoneyFragment==null)?new VerificationSendMoneyFragment():verificationSendMoneyFragment;
+                return (verificationSendMoneyFragment == null) ? new VerificationSendMoneyFragment() : verificationSendMoneyFragment;
             case R.layout.fragment_user_consent_layout:
-                return (userConsentSendMoneyFragment ==null)?new UserConsentSendMoneyFragment(): userConsentSendMoneyFragment;
-           default:
+                return (userConsentSendMoneyFragment == null) ? new UserConsentSendMoneyFragment() : userConsentSendMoneyFragment;
+            default:
                 return null;
         }
     }
diff --git a/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2Activity.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2Activity.java
index 59d0daab..53ae65dc 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2Activity.java
+++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2Activity.java
@@ -13,7 +13,6 @@ import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProviders;
 
 import com.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3.RecipientAddEditV3Activity;
-import com.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3.RecipientListingV3Activity;
 import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3;
 import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2PresenterInterface;
 import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel;
@@ -23,6 +22,7 @@ import com.remit.jmecustomer.base.BaseActivity;
 import com.remit.jmecustomer.base.BaseFragment;
 import com.remit.jmecustomer.common.view.AnswerInputDialog;
 import com.remit.jmecustomer.features.sendmoney.SendMoneyViewModelFactory;
+import com.remit.jmecustomer.utils.Constants;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -49,6 +49,8 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
 
     private SendMoneyRequiredDataV3 sendMoneyRequiredData;
 
+    private String transferAmount = "";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -57,6 +59,7 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
         fragmentManager = getSupportFragmentManager();
         initialize();
         performDefaultAction(savedInstanceState);
+        transferAmount = getIntent().getStringExtra(Constants.TRANSFER_AMOUNT);
     }
 
 
@@ -86,7 +89,7 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
 
 
     private void initialize() {
-        sendMoneyScreenManager = new SendMoneyScreenManager();
+        sendMoneyScreenManager = new SendMoneyScreenManager("");
     }
 
 
diff --git a/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java
index fa0be0af..825235da 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java
+++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java
@@ -50,6 +50,7 @@ import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog;
 import com.remit.jmecustomer.common.customwidgets.JmeTextView;
 import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper;
 import com.remit.jmecustomer.features.sendmoney.view.SendMoneyActionListener;
+import com.remit.jmecustomer.utils.Constants;
 import com.remit.jmecustomer.utils.Utils;
 
 import butterknife.BindView;
@@ -152,7 +153,15 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
     }
 
     private void setDefaultAmount() {
-        sendMoneyEditText.setText("100000");
+
+        System.out.println("Tranfer amount = "+getArguments());
+//        if (getArguments().getString(Constants.TRANSFER_AMOUNT) != null && !getArguments().getString(Constants.TRANSFER_AMOUNT).isEmpty()) {
+//            sendMoneyEditText.setText(getArguments().getString(Constants.TRANSFER_AMOUNT));
+//
+//        } else {
+            sendMoneyEditText.setText("100000");
+//        }
+
         getForex();
     }
 
diff --git a/app/src/main/java/com/remit/jmecustomer/utils/Constants.java b/app/src/main/java/com/remit/jmecustomer/utils/Constants.java
index 2a850025..44c8cd80 100644
--- a/app/src/main/java/com/remit/jmecustomer/utils/Constants.java
+++ b/app/src/main/java/com/remit/jmecustomer/utils/Constants.java
@@ -72,6 +72,7 @@ public class Constants {
     public static String CancelStatus = "CANCEL";
     public static String RejectStatus = "REJECT";
     public static String AmendStatus = "AMEND";
+    public static String TRANSFER_AMOUNT = "transfer_amount";
 
     public static String PASSWORD_PATTERN = "^(?=.*[A-Z])(?=.*[a-z])(?=.*[~!@+#.=$%^&*()_-\\{\\[\\}\\]\\?])(?=.*[0-9]).{8,24}$";
 
diff --git a/app/src/main/res/drawable/drawable_red_right_radius.xml b/app/src/main/res/drawable/drawable_red_right_radius.xml
new file mode 100644
index 00000000..e79536e0
--- /dev/null
+++ b/app/src/main/res/drawable/drawable_red_right_radius.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/red_membership_color" />
+            <corners
+                android:bottomLeftRadius="0dp"
+                android:bottomRightRadius="@dimen/_10ssp"
+                android:topLeftRadius="0dp"
+                android:topRightRadius="@dimen/_10ssp" />
+        </shape>
+
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_home_v3.xml b/app/src/main/res/layout/activity_home_v3.xml
index ff731ae1..5b562898 100644
--- a/app/src/main/res/layout/activity_home_v3.xml
+++ b/app/src/main/res/layout/activity_home_v3.xml
@@ -22,27 +22,29 @@
       android:id="@+id/cl_bottom_layout"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintBottom_toBottomOf="parent"
-      android:layout_marginLeft="@dimen/_70sdp"
-      android:layout_marginRight="@dimen/_70sdp"
+      android:layout_marginLeft="@dimen/_20sdp"
+      android:layout_marginRight="@dimen/_20sdp"
       android:layout_marginBottom="@dimen/_20sdp"
       android:background="@drawable/rounded_white_border"
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
 
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tab_layout"
-        android:layout_marginHorizontal="@dimen/_10sdp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:tabMode="fixed"
-        app:tabIndicatorGravity="top"
-        app:tabGravity="fill"
-        app:tabIndicatorFullWidth="false"
-        app:tabPaddingStart="10dp"
-        app:tabPaddingEnd="10dp"
-        app:tabIndicatorHeight="2dp"
-        app:tabIndicatorColor="@color/light_blue"
-        />
+      <com.google.android.material.tabs.TabLayout
+          android:id="@+id/tab_layout"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginHorizontal="@dimen/_10sdp"
+          app:tabGravity="fill"
+          style="@style/HomeTablayoutStyle"
+          app:tabIndicatorColor="@color/light_blue"
+          app:tabIndicatorFullWidth="false"
+          app:tabIndicatorGravity="top"
+          app:tabIndicatorHeight="2dp"
+          app:tabMode="fixed"
+          app:tabTextColor="@color/black"
+          app:tabSelectedTextColor="@color/blue"
+          app:tabPaddingEnd="10dp"
+          app:tabPaddingStart="10dp" />
 
   </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_home_new.xml b/app/src/main/res/layout/fragment_home_new.xml
index 98aafe67..dbae3552 100644
--- a/app/src/main/res/layout/fragment_home_new.xml
+++ b/app/src/main/res/layout/fragment_home_new.xml
@@ -12,481 +12,508 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/homeContainerView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/notificationViewContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:visibility="gone"
-            app:cardUseCompatPadding="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/const_home"
+            android:id="@+id/homeContainerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/notificationViewContainer">
+            android:layout_height="wrap_content">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/const_top"
+            <androidx.cardview.widget.CardView
+                android:id="@+id/notificationViewContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/card_bottom_rounded_white"
-                android:elevation="@dimen/_3sdp"
-                android:paddingHorizontal="@dimen/_20sdp"
-                android:paddingVertical="@dimen/_15sdp"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <TextView
-                    android:id="@+id/txt_accountNo"
-                    style="@style/TextStyle.VolteSemiBold12"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/memberShipId_text"
-                    android:textColor="@color/black_opacity_60"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-
-                <TextView
-                    android:id="@+id/tv_acc_no"
-                    style="@style/TextStyle.VolteSemiBold16"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="M0B000010"
-                    android:textColor="@color/black_opacity_87"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/txt_accountNo" />
-
-                <ImageView
-                    android:id="@+id/iv_copy"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/_4sdp"
-                    android:src="@drawable/ic_copy_new"
-                    app:layout_constraintStart_toEndOf="@id/tv_acc_no"
-                    app:layout_constraintTop_toBottomOf="@id/txt_accountNo"
-                    app:tint="@color/black_opacity_60" />
-
-                <TextView
-                    android:id="@+id/tv_avl_balance"
-                    style="@style/TextStyle.VolteSemiBold16"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_20sdp"
-                    android:text="JPY 10,000"
-                    android:textColor="@color/light_green"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_acc_no" />
-
-
-                <TextView
-                    android:id="@+id/txt_avl_balance"
-                    style="@style/TextStyle.VolteSemiBold12"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/available_balance_text"
-                    android:textColor="@color/black_opacity_60"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_avl_balance" />
-
-                <LinearLayout
-                    android:id="@+id/lin_upload_slip"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_20sdp"
-                    android:background="@drawable/green_rounded_background"
-                    android:gravity="center"
-                    android:paddingLeft="@dimen/_20sdp"
-                    android:paddingTop="@dimen/_8sdp"
-                    android:paddingRight="@dimen/_20sdp"
-                    android:paddingBottom="@dimen/_8sdp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_acc_no">
-
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/ic_upload_slip" />
-
-
-                    <TextView
-                        style="@style/TextStyle.VolteSemiBold12"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/_4sdp"
-                        android:text="@string/upload_slip_dashboard_text"
-                        android:textColor="@color/white" />
-
-                </LinearLayout>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                android:background="@color/white"
+                android:visibility="gone"
+                app:cardUseCompatPadding="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/const_home"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingHorizontal="@dimen/_10sdp"
-                app:layout_constraintTop_toBottomOf="@+id/const_top">
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rv_send_type"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_18sdp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/const_send_receive"
-                    app:layout_constraintTop_toBottomOf="@id/rv_send_type"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/notificationViewContainer">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/const_send"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
+                    android:id="@+id/const_top"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_10sdp"
-                    android:background="@drawable/black_rounded_border"
-                    android:paddingStart="@dimen/_13sdp"
-                    >
+                    android:background="@drawable/card_bottom_rounded_white"
+                    android:elevation="@dimen/_3sdp"
+                    android:paddingHorizontal="@dimen/_20sdp"
+                    android:paddingVertical="@dimen/_15sdp"
+                    app:layout_constraintTop_toTopOf="parent">
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:id="@+id/txt_accountNo"
+                        style="@style/TextStyle.VolteSemiBold12"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:hint="@string/you_send_dashbord_text"
-                        android:paddingVertical="@dimen/_5sdp"
-                        app:hintTextAppearance="@style/TextLabelHint"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/sendAmountEdTxt"
-                            style="@style/edt_style"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@null"
-                            android:imeOptions="actionDone"
-                            android:inputType="number" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                        android:text="@string/memberShipId_text"
+                        android:textColor="@color/red_membership_color"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-                    <ImageView
-                        android:id="@+id/iv_currency"
-                        android:layout_width="@dimen/_30sdp"
-                        android:layout_height="@dimen/_30sdp"
-                        android:src="@drawable/flag_japan"
-                        android:layout_marginRight="@dimen/_10sdp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/tv_currency"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.5" />
 
                     <TextView
-                        android:id="@+id/tv_currency"
-                        android:layout_marginRight="@dimen/_50sdp"
+                        android:id="@+id/tv_acc_no"
                         style="@style/TextStyle.VolteSemiBold16"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="JPY"
+                        android:text="M0B000010"
                         android:textColor="@color/black_opacity_87"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/iv_currency"
-                        app:layout_constraintTop_toTopOf="parent"
-                        />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/txt_accountNo" />
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/const_send_2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_10sdp"
-                    android:background="@drawable/black_rounded_border"
-                    android:paddingStart="@dimen/_13sdp"
-                    app:layout_constraintTop_toBottomOf="@id/const_send">
+                    <ImageView
+                        android:id="@+id/iv_copy"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/_4sdp"
+                        android:src="@drawable/ic_copy_new"
+                        app:layout_constraintStart_toEndOf="@id/tv_acc_no"
+                        app:layout_constraintTop_toBottomOf="@id/txt_accountNo"
+                        app:tint="@color/black_opacity_60" />
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:id="@+id/tv_avl_balance"
+                        style="@style/TextStyle.VolteSemiBold16"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:hint="@string/you_receive_dashbord_text"
-                        android:paddingVertical="@dimen/_5sdp"
-                        app:hintTextAppearance="@style/TextLabelHint"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/receiveAmountEdTxt"
-                            style="@style/edt_style"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@null"
-                            android:imeOptions="actionDone"
-                            android:inputType="number" />
+                        android:layout_marginTop="@dimen/_20sdp"
+                        android:text="JPY 10,000"
+                        android:textColor="@color/light_green"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tv_acc_no" />
 
-                    </com.google.android.material.textfield.TextInputLayout>
 
                     <TextView
-                        android:id="@+id/tv_currency_2"
-                        style="@style/TextStyle.VolteSemiBold16"
+                        android:id="@+id/txt_avl_balance"
+                        style="@style/TextStyle.VolteSemiBold12"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginRight="@dimen/_50sdp"
-                        android:text="JPY"
-                        android:textColor="@color/black_opacity_87"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/iv_currency_2"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.5" />
+                        android:text="@string/available_balance_text"
+                        android:textColor="@color/black_opacity_60"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tv_avl_balance" />
 
-                    <ImageView
-                        android:id="@+id/iv_currency_2"
-                        android:layout_width="@dimen/_30sdp"
-                        android:layout_height="@dimen/_30sdp"
-                        android:layout_marginRight="@dimen/_10sdp"
-                        android:src="@drawable/flag_nepal"
-                        app:layout_constraintBottom_toBottomOf="parent"
+                    <LinearLayout
+                        android:id="@+id/lin_upload_slip"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/_20sdp"
+                        android:background="@drawable/green_rounded_background"
+                        android:gravity="center"
+                        android:paddingLeft="@dimen/_20sdp"
+                        android:paddingTop="@dimen/_8sdp"
+                        android:paddingRight="@dimen/_20sdp"
+                        android:paddingBottom="@dimen/_8sdp"
+                        android:visibility="gone"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/tv_currency_2"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.5" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                        app:layout_constraintTop_toBottomOf="@id/tv_acc_no">
 
-                    <RelativeLayout
-                        android:visibility="gone"
-                        android:id="@+id/rel_switch"
-                        android:layout_marginTop="@dimen/_10sdp"
-                        android:layout_marginLeft="@dimen/_20sdp"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        android:background="@drawable/black_border_white_background"
-                        android:layout_width="@dimen/_25sdp"
-                        android:layout_height="@dimen/_25sdp">
 
                         <ImageView
-                            android:id="@+id/img_switch"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_centerInParent="true"
-                            android:src="@drawable/ic_change_field" />
+                            android:src="@drawable/ic_upload_slip" />
 
-                    </RelativeLayout>
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                        <TextView
+                            style="@style/TextStyle.VolteSemiBold12"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/_4sdp"
+                            android:text="@string/upload_slip_dashboard_text"
+                            android:textColor="@color/white" />
 
-                <ImageView
-                    android:id="@+id/iv_transfer_1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_20sdp"
-                    android:src="@drawable/ic_transfer"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/const_send_receive" />
-
-                <TextView
-                    android:id="@+id/tv_transfer_1"
-                    style="@style/TextStyle.VolteSemiBold12"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/_12sdp"
-                    android:text="1500 JPY Transfer fee included"
-                    android:textColor="@color/black_opacity_87"
-                    app:layout_constraintBottom_toBottomOf="@id/iv_transfer_1"
-                    app:layout_constraintStart_toEndOf="@id/iv_transfer_1"
-                    app:layout_constraintTop_toTopOf="@id/iv_transfer_1" />
-
-                <ImageView
-                    android:id="@+id/iv_transfer_2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_10sdp"
-                    android:src="@drawable/ic_currency"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/iv_transfer_1" />
-
-                <TextView
-                    android:id="@+id/tv_transfer_2"
-                    style="@style/TextStyle.VolteSemiBold12"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/_3sdp"
-                    android:text="1500 JPY Transfer fee included"
-                    android:textColor="@color/black_opacity_87"
-                    app:layout_constraintBottom_toBottomOf="@id/iv_transfer_2"
-                    app:layout_constraintStart_toEndOf="@id/iv_transfer_2"
-                    app:layout_constraintTop_toBottomOf="@id/iv_transfer_2"
-                    app:layout_constraintTop_toTopOf="@id/iv_transfer_2" />
+                    </LinearLayout>
 
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/rewardsPointsContainer"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_25sdp"
-                    android:orientation="vertical"
-                    android:visibility="gone"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_transfer_2">
-
-                    <com.remit.jmecustomer.common.customwidgets.JmeTextView
-                        android:id="@+id/pointsAvailableText"
-                        style="@style/TextStyle"
-                        android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingHorizontal="@dimen/_10sdp"
+                    app:layout_constraintTop_toBottomOf="@+id/const_top">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_send_type"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingStart="@dimen/_2sdp"
-                        android:paddingLeft="@dimen/_2sdp"
-                        android:paddingTop="@dimen/_2sdp"
-                        android:text="You have 100 points"
-                        android:textColor="@color/blue"
-                        android:textSize="@dimen/_12ssp"
+                        android:layout_marginTop="@dimen/_18sdp"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:txtfontName="@string/semibold" />
+                        app:layout_constraintTop_toTopOf="parent" />
 
-                    <LinearLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/const_send_receive"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/_15sdp"
-                        android:orientation="horizontal"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
+                        app:layout_constraintTop_toBottomOf="@id/rv_send_type">
 
-                        <com.remit.jmecustomer.common.view.MTextInputLayout
-                            android:id="@+id/iv_rewardsPoint"
-                            style="@style/MTextInputLayoutForm"
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/const_send"
                             android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/_10sdp"
-                            android:hint="@string/rewards_point_placeholder_text"
-                            app:boxStrokeColor="@color/dark_gray"
-                            app:errorEnabled="true"
-                            app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
-                            app:hintTextColor="@color/dark_gray"
+                            android:background="@drawable/black_rounded_border"
+                            android:paddingStart="@dimen/_13sdp"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent">
 
-                            <com.remit.jmecustomer.common.view.MTextInputEditText
-                                android:id="@+id/ed_rewardsPoint"
-                                style="@style/MTextInputEditText"
-                                android:digits="0,1,2,3,4,5,6,7,8,9"
-                                android:imeOptions="actionDone"
-                                android:inputType="textMultiLine|number"
-                                app:endIconMode="clear_text"
-                                app:errorEnabled="true" />
-
-                        </com.remit.jmecustomer.common.view.MTextInputLayout>
-
-                        <!--                        <com.remit.jmecustomer.common.customwidgets.GmeButton-->
-                        <!--                            android:id="@+id/btn_redeem"-->
-                        <!--                            style="@style/MButton"-->
-                        <!--                            android:layout_width="match_parent"-->
-                        <!--                            android:layout_height="@dimen/_40sdp"-->
-                        <!--                            android:layout_gravity="center"-->
-                        <!--                            android:layout_marginLeft="@dimen/_10sdp"-->
-                        <!--                            android:enabled="true"-->
-                        <!--                            android:text="Redeem"-->
-                        <!--                            app:layout_constraintStart_toEndOf="@+id/employerNameWrapper"-->
-                        <!--                            app:layout_constraintTop_toTopOf="parent" />-->
-                    </LinearLayout>
+                            <com.google.android.material.textfield.TextInputLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:hint="@string/you_send_dashbord_text"
+                                android:paddingVertical="@dimen/_5sdp"
+                                app:hintTextAppearance="@style/TextLabelHint"
+                                app:layout_constraintTop_toTopOf="parent">
+
+                                <com.google.android.material.textfield.TextInputEditText
+                                    android:id="@+id/sendAmountEdTxt"
+                                    style="@style/edt_style"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:background="@null"
+                                    android:imeOptions="actionDone"
+                                    android:inputType="number" />
+
+                            </com.google.android.material.textfield.TextInputLayout>
+
+                            <ImageView
+                                android:id="@+id/iv_currency"
+                                android:layout_width="@dimen/_30sdp"
+                                android:layout_height="@dimen/_30sdp"
+                                android:layout_marginRight="@dimen/_10sdp"
+                                android:src="@drawable/flag_japan"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintTop_toBottomOf="@id/tv_currency"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintVertical_bias="0.5" />
+
+                            <TextView
+                                android:id="@+id/tv_currency"
+                                style="@style/TextStyle.VolteSemiBold16"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginRight="@dimen/_50sdp"
+                                android:text="JPY"
+                                android:textColor="@color/black_opacity_87"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintTop_toBottomOf="@id/iv_currency"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/const_send_2"
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_marginTop="@dimen/_10sdp"
+                            android:background="@drawable/black_rounded_border"
+                            android:paddingStart="@dimen/_13sdp"
+                            app:layout_constraintTop_toBottomOf="@id/const_send">
+
+                            <com.google.android.material.textfield.TextInputLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:paddingVertical="@dimen/_5sdp"
+                                android:hint="@string/you_receive_dashbord_text"
+                                app:hintTextAppearance="@style/TextLabelHint"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent">
+
+                                <com.google.android.material.textfield.TextInputEditText
+                                    android:id="@+id/receiveAmountEdTxt"
+                                    style="@style/edt_style"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:background="@null"
+                                    android:imeOptions="actionDone"
+                                    android:inputType="number" />
+
+                            </com.google.android.material.textfield.TextInputLayout>
+
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:id="@+id/cl_country"
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:paddingStart="@dimen/_10ssp"
+                                android:background="@drawable/drawable_red_right_radius"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintTop_toTopOf="parent">
+
+                                <ImageView
+                                    android:id="@+id/iv_currency_2"
+                                    android:layout_width="@dimen/_35sdp"
+                                    android:layout_height="@dimen/_35sdp"
+                                    android:paddingEnd="@dimen/_4sdp"
+                                    android:src="@drawable/flag_nepal"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toStartOf="@+id/tv_currency_2"
+                                    app:layout_constraintTop_toBottomOf="@id/iv_currency_2"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:layout_constraintVertical_bias="0.5" />
+
+                                <TextView
+                                    android:id="@+id/tv_currency_2"
+                                    style="@style/TextStyle.VolteSemiBold16"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginRight="@dimen/_10sdp"
+                                    android:text="JPY"
+                                    android:textColor="@color/black_opacity_87"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintEnd_toStartOf="@+id/iv_drop"
+                                    app:layout_constraintTop_toBottomOf="@id/tv_currency_2"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:layout_constraintVertical_bias="0.5" />
+
+                                <ImageView
+                                    android:id="@+id/iv_drop"
+                                    android:layout_width="@dimen/_14sdp"
+                                    android:layout_height="@dimen/_14sdp"
+                                    android:layout_marginRight="@dimen/_10sdp"
+                                    android:src="@drawable/icv_dropdown"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toStartOf="@+id/tv_currency_2"
+                                    app:layout_constraintTop_toBottomOf="@id/iv_currency_2"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:layout_constraintVertical_bias="0.5"
+                                    app:tint="@color/white" />
+
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <RelativeLayout
+                            android:id="@+id/rel_switch"
+                            android:layout_width="@dimen/_25sdp"
+                            android:layout_height="@dimen/_25sdp"
+                            android:layout_marginLeft="@dimen/_20sdp"
+                            android:layout_marginTop="@dimen/_10sdp"
+                            android:background="@drawable/black_border_white_background"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent">
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                            <ImageView
+                                android:id="@+id/img_switch"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerInParent="true"
+                                android:src="@drawable/ic_change_field" />
 
+                        </RelativeLayout>
 
-                <RelativeLayout
-                    android:id="@+id/agreeButton"
-                    style="@style/newButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_10sdp"
-                    android:gravity="center"
-                    app:layout_constraintTop_toBottomOf="@id/rewardsPointsContainer">
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <ImageView
+                        android:id="@+id/iv_transfer_1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/_20sdp"
+                        android:src="@drawable/ic_transfer"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/const_send_receive" />
 
                     <TextView
-                        android:id="@+id/btn_text"
-                        style="@style/TextStyle.VolteSemiBold20"
+                        android:id="@+id/tv_transfer_1"
+                        style="@style/TextStyle.VolteSemiBold12"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-                        android:drawableTint="@color/white"
-                        android:text="@string/continue_text"
-                        android:textColor="@color/white" />
+                        android:layout_marginStart="@dimen/_12sdp"
+                        android:text="1500 JPY Transfer fee included"
+                        android:textColor="@color/black_opacity_87"
+                        app:layout_constraintBottom_toBottomOf="@id/iv_transfer_1"
+                        app:layout_constraintStart_toEndOf="@id/iv_transfer_1"
+                        app:layout_constraintTop_toTopOf="@id/iv_transfer_1" />
 
                     <ImageView
+                        android:id="@+id/iv_transfer_2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/_10sdp"
-                        android:layout_marginTop="@dimen/_2sdp"
-                        android:layout_toRightOf="@+id/btn_text"
-                        android:src="@drawable/ic_arrow_right" />
-                </RelativeLayout>
+                        android:layout_marginTop="@dimen/_10sdp"
+                        android:src="@drawable/ic_currency"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/iv_transfer_1" />
 
+                    <TextView
+                        android:id="@+id/tv_transfer_2"
+                        style="@style/TextStyle.VolteSemiBold12"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/_3sdp"
+                        android:text="1500 JPY Transfer fee included"
+                        android:textColor="@color/black_opacity_87"
+                        app:layout_constraintBottom_toBottomOf="@id/iv_transfer_2"
+                        app:layout_constraintStart_toEndOf="@id/iv_transfer_2"
+                        app:layout_constraintTop_toBottomOf="@id/iv_transfer_2"
+                        app:layout_constraintTop_toTopOf="@id/iv_transfer_2" />
 
-                <androidx.cardview.widget.CardView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_14sdp"
-                    android:background="@color/white"
-                    android:padding="@dimen/_10sdp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/agreeButton">
 
-                    <LinearLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/rewardsPointsContainer"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/_14sdp"
-                        android:elevation="@dimen/_10sdp"
-                        android:gravity="center_horizontal"
-                        android:orientation="vertical">
+                        android:layout_marginTop="@dimen/_25sdp"
+                        android:orientation="vertical"
+                        android:visibility="gone"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tv_transfer_2">
+
+                        <com.remit.jmecustomer.common.customwidgets.JmeTextView
+                            android:id="@+id/pointsAvailableText"
+                            style="@style/TextStyle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="@dimen/_2sdp"
+                            android:paddingLeft="@dimen/_2sdp"
+                            android:paddingTop="@dimen/_2sdp"
+                            android:text="You have 100 points"
+                            android:textColor="@color/blue"
+                            android:textSize="@dimen/_12ssp"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:txtfontName="@string/semibold" />
 
-                        <androidx.recyclerview.widget.RecyclerView
-                            android:id="@+id/bannerView"
+                        <LinearLayout
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center_horizontal"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/_15sdp"
                             android:orientation="horizontal"
-                            android:paddingLeft="@dimen/_5sdp"
-                            android:paddingRight="@dimen/_5sdp"
-                            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent">
 
-                        <me.relex.circleindicator.CircleIndicator2
-                            android:id="@+id/indicator"
-                            android:layout_width="match_parent"
-                            android:layout_height="@dimen/_16sdp"
-                            android:gravity="center"
-                            android:paddingBottom="@dimen/_4sdp"
-                            app:ci_drawable="@drawable/circle_bullet"
-                            app:ci_drawable_unselected="@drawable/grey_border_dark_indicator" />
+                            <com.remit.jmecustomer.common.view.MTextInputLayout
+                                android:id="@+id/iv_rewardsPoint"
+                                style="@style/MTextInputLayoutForm"
+                                android:layout_width="match_parent"
+                                android:layout_marginTop="@dimen/_10sdp"
+                                android:hint="@string/rewards_point_placeholder_text"
+                                app:boxStrokeColor="@color/dark_gray"
+                                app:errorEnabled="true"
+                                app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
+                                app:hintTextColor="@color/dark_gray"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent">
+
+                                <com.remit.jmecustomer.common.view.MTextInputEditText
+                                    android:id="@+id/ed_rewardsPoint"
+                                    style="@style/MTextInputEditText"
+                                    android:digits="0,1,2,3,4,5,6,7,8,9"
+                                    android:imeOptions="actionDone"
+                                    android:inputType="textMultiLine|number"
+                                    app:endIconMode="clear_text"
+                                    app:errorEnabled="true" />
+
+                            </com.remit.jmecustomer.common.view.MTextInputLayout>
+
+                            <!--                        <com.remit.jmecustomer.common.customwidgets.GmeButton-->
+                            <!--                            android:id="@+id/btn_redeem"-->
+                            <!--                            style="@style/MButton"-->
+                            <!--                            android:layout_width="match_parent"-->
+                            <!--                            android:layout_height="@dimen/_40sdp"-->
+                            <!--                            android:layout_gravity="center"-->
+                            <!--                            android:layout_marginLeft="@dimen/_10sdp"-->
+                            <!--                            android:enabled="true"-->
+                            <!--                            android:text="Redeem"-->
+                            <!--                            app:layout_constraintStart_toEndOf="@+id/employerNameWrapper"-->
+                            <!--                            app:layout_constraintTop_toTopOf="parent" />-->
+                        </LinearLayout>
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    </LinearLayout>
 
-                </androidx.cardview.widget.CardView>
+                    <RelativeLayout
+                        android:id="@+id/agreeButton"
+                        style="@style/newButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/_10sdp"
+                        android:gravity="center"
+                        app:layout_constraintTop_toBottomOf="@id/rewardsPointsContainer">
+
+                        <TextView
+                            android:id="@+id/btn_text"
+                            style="@style/TextStyle.VolteSemiBold20"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true"
+                            android:drawableTint="@color/white"
+                            android:text="@string/send_money_text"
+                            android:textColor="@color/white" />
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/_10sdp"
+                            android:layout_marginTop="@dimen/_2sdp"
+                            android:layout_toRightOf="@+id/btn_text"
+                            android:src="@drawable/ic_arrow_right" />
+                    </RelativeLayout>
+
+
+                    <androidx.cardview.widget.CardView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/_14sdp"
+                        android:background="@color/white"
+                        android:padding="@dimen/_10sdp"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/agreeButton">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/_14sdp"
+                            android:elevation="@dimen/_10sdp"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
+
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/bannerView"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center_horizontal"
+                                android:orientation="horizontal"
+                                android:paddingLeft="@dimen/_5sdp"
+                                android:paddingRight="@dimen/_5sdp"
+                                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+                            <me.relex.circleindicator.CircleIndicator2
+                                android:id="@+id/indicator"
+                                android:layout_width="match_parent"
+                                android:layout_height="@dimen/_16sdp"
+                                android:gravity="center"
+                                android:paddingBottom="@dimen/_4sdp"
+                                app:ci_drawable="@drawable/circle_bullet"
+                                app:ci_drawable_unselected="@drawable/grey_border_dark_indicator" />
+
+                        </LinearLayout>
+
+                    </androidx.cardview.widget.CardView>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <FrameLayout
+                android:id="@+id/overlay_layout"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:background="@android:color/transparent"
+                android:clickable="true"
+                android:focusable="true"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <FrameLayout
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:visibility="gone"
-            android:clickable="true"
-            android:focusable="true"
-            android:id="@+id/overlay_layout"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="@android:color/transparent"/>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
     </com.remit.jmecustomer.common.customwidgets.LockableScrollView>
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toolbar_dashboard_v3.xml b/app/src/main/res/layout/toolbar_dashboard_v3.xml
index e5645460..3f8dbb59 100644
--- a/app/src/main/res/layout/toolbar_dashboard_v3.xml
+++ b/app/src/main/res/layout/toolbar_dashboard_v3.xml
@@ -58,7 +58,7 @@
             android:layout_width="@dimen/_20sdp"
             android:layout_height="@dimen/_20sdp"
             android:layout_marginRight="@dimen/_16sdp"
-
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/cl_notification"
             app:layout_constraintEnd_toStartOf="@+id/cl_notification"
             app:layout_constraintTop_toTopOf="@+id/cl_notification"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1af8c5ec..d0a0c02d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -87,4 +87,5 @@
     <color name="grey_stripe">#e0f4f4f4</color>
     <color name="profile_background_color">#F5F5F5</color>
     <color name="green">#00873C</color>
+    <color name="red_membership_color">#ED1C24</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a4f4efdc..7f75dbe4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -152,6 +152,8 @@
     </style>
 
 
+
+
     <style name="CircularTabTextAppearance" parent="TextAppearance.Design.Tab">
         <item name="android:textSize">@dimen/_11ssp</item>
         <item name="android:textColor">#fff</item>
@@ -357,6 +359,18 @@
     </style>
 
 
+    <style name="HomeTablayoutStyle" parent="Widget.Design.TabLayout">
+        <item name="tabTextAppearance">@style/homeNavigationTextStyle</item>
+    </style>
+
+    <style name="homeNavigationTextStyle" parent="TextAppearance.Design.Tab">
+        <item name="android:textSize">@dimen/_10ssp</item>
+        <item name="android:fontFamily">@font/lato_regular</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="textAllCaps">false</item>
+    </style>
+
+
     <style name="newButton">
         <item name="android:background">@drawable/button_background</item>
         <item name="android:textSize">@dimen/button_text_size</item>
diff --git a/build.gradle b/build.gradle
index cc4eac4e..da7195db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"