From 2824af20a8bfdaebeb649e599e3bd9fd729785af Mon Sep 17 00:00:00 2001
From: Mukesh Dhungana <dhunganamukesh0702@gmail.com>
Date: Sun, 24 Jul 2022 17:00:31 +0545
Subject: [PATCH] add deopsit info page

---
 app/src/main/AndroidManifest.xml              |   5 +
 .../com/remit/jmecustomer/base/PrefKeys.java  |   1 +
 .../depositinfo/view/DepositInfo.java         |  85 ++++++
 .../features/home/gateway/HomeV2Gateway.java  |   1 +
 .../features/home/model/UserInfoModelV2.java  |  12 +
 .../features/home/view/HomeActivityV2.java    |  84 +++---
 .../furikomi_details_white_32.png             | Bin 0 -> 870 bytes
 .../res/drawable-xxhdpi/jp_post_white_32.png  | Bin 0 -> 283 bytes
 .../drawable-xxhdpi/lawson_card_white_32.png  | Bin 0 -> 611 bytes
 .../res/drawable/background_red_gradient.xml  |   7 +
 .../main/res/layout/activity_deposit_info.xml | 248 ++++++++++++++++++
 .../layout/activity_splash_screen_key_0.xml   |   2 +-
 app/src/main/res/values/strings.xml           |   1 +
 13 files changed, 403 insertions(+), 43 deletions(-)
 create mode 100644 app/src/main/java/com/remit/jmecustomer/features/depositinfo/view/DepositInfo.java
 create mode 100644 app/src/main/res/drawable-xxhdpi/furikomi_details_white_32.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/jp_post_white_32.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/lawson_card_white_32.png
 create mode 100644 app/src/main/res/drawable/background_red_gradient.xml
 create mode 100644 app/src/main/res/layout/activity_deposit_info.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9ff1ed30..9095f7ac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -288,6 +288,11 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name="com.remit.jmecustomer.features.depositinfo.view.DepositInfo"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden" />
 
         <service
             android:name="com.remit.jmecustomer.services.JMEFcmMessagingService"
diff --git a/app/src/main/java/com/remit/jmecustomer/base/PrefKeys.java b/app/src/main/java/com/remit/jmecustomer/base/PrefKeys.java
index 4ec1e2cc..a6d5f6b1 100644
--- a/app/src/main/java/com/remit/jmecustomer/base/PrefKeys.java
+++ b/app/src/main/java/com/remit/jmecustomer/base/PrefKeys.java
@@ -66,4 +66,5 @@ public class PrefKeys {
     public static String FINGER_PRINT_LOGIN_ENABLED = "enabled_finger_print_login";
     public static String ID_EXPIRY_DATE = "id_expiry_date";
     public static String ID_STATUS = "id_status";
+    public static String NOTIFICATION_COUNT = "notification_count";
 }
diff --git a/app/src/main/java/com/remit/jmecustomer/features/depositinfo/view/DepositInfo.java b/app/src/main/java/com/remit/jmecustomer/features/depositinfo/view/DepositInfo.java
new file mode 100644
index 00000000..fd5c2ca1
--- /dev/null
+++ b/app/src/main/java/com/remit/jmecustomer/features/depositinfo/view/DepositInfo.java
@@ -0,0 +1,85 @@
+package com.remit.jmecustomer.features.depositinfo.view;
+
+import static com.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY;
+import static com.remit.jmecustomer.utils.Constants.FURIKOMI_DETAILS_URL;
+import static com.remit.jmecustomer.utils.Constants.JP_POST_FURIKOMI_URL;
+import static com.remit.jmecustomer.utils.Constants.LAWSON_CASH_DEPOSIT_URL;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.cardview.widget.CardView;
+
+import com.remit.jmecustomer.R;
+import com.remit.jmecustomer.RemitApplication;
+import com.remit.jmecustomer.base.BaseActivity;
+import com.remit.jmecustomer.common.customwidgets.JmeTextView;
+import com.remit.jmecustomer.features.atmcashdeposit.view.ATMCashDepositActivity;
+import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class DepositInfo extends BaseActivity implements View.OnClickListener {
+    @BindView(R.id.toolbar_title)
+    JmeTextView toolBarTitle;
+
+    @BindView(R.id.jpPostCardContainer)
+    CardView jpPostCardContainer;
+
+    @BindView(R.id.lawsonCardContainer)
+    CardView lawsonCardContainer;
+
+    @BindView(R.id.furikomiCardContainer)
+    CardView furikomiCardContainer;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_deposit_info);
+        ButterKnife.bind(this);
+        toolBarTitle.setText(getString(R.string.payment_method_text));
+    }
+
+    @Override
+    @OnClick({R.id.iv_back, R.id.iv_cancel, R.id.jpPostCardContainer, R.id.lawsonCardContainer, R.id.furikomiCardContainer})
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.iv_back:
+                onBackPressed();
+                break;
+
+            case R.id.iv_cancel:
+                finish();
+                break;
+            case R.id.lawsonCardContainer: {
+                WebRequestModel requestModel = new WebRequestModel(getStringfromStringId(R.string.lawson_card_deposit_text), LAWSON_CASH_DEPOSIT_URL + "?account=123456789", null);
+                Intent intent = new Intent(this.getContext(), ATMCashDepositActivity.class);
+                intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, requestModel);
+                startActivity(intent);
+                break;
+            }
+            case R.id.jpPostCardContainer: {
+                WebRequestModel requestModel = new WebRequestModel(getStringfromStringId(R.string.jp_post_furikomi_text), JP_POST_FURIKOMI_URL, null);
+                Intent intent = new Intent(this.getContext(), ATMCashDepositActivity.class);
+                intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, requestModel);
+                startActivity(intent);
+                break;
+            }
+
+            case R.id.furikomiCardContainer: {
+                WebRequestModel requestModel = new WebRequestModel(getStringfromStringId(R.string.jp_bank_details_text), FURIKOMI_DETAILS_URL, null);
+                Intent intent = new Intent(this.getContext(), ATMCashDepositActivity.class);
+                intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, requestModel);
+                startActivity(intent);
+                break;
+            }
+        }
+    }
+
+    public String getStringfromStringId(int id) {
+        return RemitApplication.getStringExtractor().getStringFromStringId(id);
+    }
+}
diff --git a/app/src/main/java/com/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java
index ee5ea2e0..7b37d26a 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java
+++ b/app/src/main/java/com/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java
@@ -83,6 +83,7 @@ public class HomeV2Gateway extends PrivilegedGateway implements HomeV2Interactor
                 sharedPreferenceEditor.putString(PrefKeys.HAS_UPDATED_CREDENTIALS, loginApiResponseModelV2.getHasUpdatedDefaultCredentials());
                 sharedPreferenceEditor.putString(PrefKeys.ID_EXPIRY_DATE, loginApiResponseModelV2.getIdExpiryDate());
                 sharedPreferenceEditor.putString(PrefKeys.ID_STATUS, loginApiResponseModelV2.getIdStatus());
+                sharedPreferenceEditor.putString(PrefKeys.NOTIFICATION_COUNT, loginApiResponseModelV2.getNotificationCount());
                 sharedPreferenceEditor.commit();
                 userStateCache = new UserCachedState(loginApiResponseModelV2.getKyc(), loginApiResponseModelV2.isVerified(), loginApiResponseModelV2.getEmail(), loginApiResponseModelV2.getUserDob());
 
diff --git a/app/src/main/java/com/remit/jmecustomer/features/home/model/UserInfoModelV2.java b/app/src/main/java/com/remit/jmecustomer/features/home/model/UserInfoModelV2.java
index ea2bca72..3b60a8bd 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/home/model/UserInfoModelV2.java
+++ b/app/src/main/java/com/remit/jmecustomer/features/home/model/UserInfoModelV2.java
@@ -128,6 +128,10 @@ public class UserInfoModelV2 {
     @Expose
     protected String IdStatus;
 
+    @SerializedName("notificationCount")
+    @Expose
+    protected String NotificationCount;
+
     @SerializedName("appUpdate")
     @Expose
     private List<AppUpdateModel> appUpdate = null;
@@ -552,4 +556,12 @@ public class UserInfoModelV2 {
     public void setIdStatus(String idStatus) {
         IdStatus = idStatus;
     }
+
+    public String getNotificationCount() {
+        return NotificationCount;
+    }
+
+    public void setNotificationCount(String count) {
+        NotificationCount = NotificationCount;
+    }
 }
diff --git a/app/src/main/java/com/remit/jmecustomer/features/home/view/HomeActivityV2.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/HomeActivityV2.java
index ce39534d..848dca14 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/home/view/HomeActivityV2.java
+++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/HomeActivityV2.java
@@ -39,6 +39,7 @@ import com.remit.jmecustomer.features.changepassNPin.view.ChangePassNPinActivity
 import com.remit.jmecustomer.features.changepassword.view.UserPasswordChangeV2Activity;
 import com.remit.jmecustomer.features.changetxnpin.view.ChangeTxnPinActivity;
 import com.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment;
+import com.remit.jmecustomer.features.depositinfo.view.DepositInfo;
 import com.remit.jmecustomer.features.depositslip.view.DepositSlipActivity;
 import com.remit.jmecustomer.features.exrate.view.ExchangeRateActivity;
 import com.remit.jmecustomer.features.home.gateway.HomeV2Gateway;
@@ -242,7 +243,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
         viewModel.getRequiredData();
     }
 
-    @OnClick({R.id.iv_help, R.id.iv_nav, R.id.btn_withdraw, R.id.view_about_jme, R.id.view_setting, R.id.view_logout, R.id.iv_close, R.id.iv_notification, R.id.view_account_statement, R.id.view_lawson_card_deposit, R.id.view_payment_method, R.id.view_jp_post_furikomi, R.id.view_furikomi_details})
+    @OnClick({R.id.iv_help, R.id.iv_nav, R.id.btn_withdraw, R.id.view_about_jme, R.id.view_setting, R.id.view_logout, R.id.iv_close, R.id.iv_notification, R.id.view_account_statement, R.id.view_payment_method})
     public void onClick(View view) {
 
         switch (view.getId()) {
@@ -272,50 +273,49 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
             case R.id.view_account_statement:
                 startActivity(new Intent(this, WalletStatementV2Activity.class));
                 break;
-            case R.id.view_lawson_card_deposit: {
-                WebRequestModel requestModel = new WebRequestModel(getStringfromStringId(R.string.lawson_card_deposit_text), LAWSON_CASH_DEPOSIT_URL, null);
-                Intent intent = new Intent(this.getContext(), ATMCashDepositActivity.class);
-                intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, requestModel);
-                startActivity(intent);
-                //startActivity(new Intent(this, ATMCashDepositActivity.class));
-                //boolean isGone = card_deposit_container.getVisibility() == View.GONE;
-                //card_deposit_container.clearAnimation();
-                // card_deposit_container.setVisibility(isGone ? View.VISIBLE : View.GONE);
-//                ValueAnimator anim = ValueAnimator.ofInt(card_deposit_container.getMeasuredHeight(), -100);
-//                anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-//                    @Override
-//                    public void onAnimationUpdate(ValueAnimator valueAnimator) {
-//                        int val = (Integer) valueAnimator.getAnimatedValue();
-//                        ViewGroup.LayoutParams layoutParams = card_deposit_container.getLayoutParams();
-//                        layoutParams.height = val;
-//                        card_deposit_container.setLayoutParams(layoutParams);
-//                    }
-//
-//                });
-//                anim.setDuration(1000);
-//                anim.start();
-                break;
-            }
+//            case R.id.view_lawson_card_deposit: {
+//                WebRequestModel requestModel = new WebRequestModel(getStringfromStringId(R.string.lawson_card_deposit_text), LAWSON_CASH_DEPOSIT_URL, null);
+//                Intent intent = new Intent(this.getContext(), ATMCashDepositActivity.class);
+//                intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, requestModel);
+//                startActivity(intent);
+//                //startActivity(new Intent(this, ATMCashDepositActivity.class));
+//                //boolean isGone = card_deposit_container.getVisibility() == View.GONE;
+//                //card_deposit_container.clearAnimation();
+//                // card_deposit_container.setVisibility(isGone ? View.VISIBLE : View.GONE);
+////                ValueAnimator anim = ValueAnimator.ofInt(card_deposit_container.getMeasuredHeight(), -100);
+////                anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+////                    @Override
+////                    public void onAnimationUpdate(ValueAnimator valueAnimator) {
+////                        int val = (Integer) valueAnimator.getAnimatedValue();
+////                        ViewGroup.LayoutParams layoutParams = card_deposit_container.getLayoutParams();
+////                        layoutParams.height = val;
+////                        card_deposit_container.setLayoutParams(layoutParams);
+////                    }
+////
+////                });
+////                anim.setDuration(1000);
+////                anim.start();
+//                break;
+//            }
 
             case R.id.view_payment_method:
-                boolean isGone = card_deposit_container.getVisibility() == View.GONE;
-                card_deposit_container.setVisibility(isGone ? View.VISIBLE : View.GONE);
+                startActivity(new Intent(this, DepositInfo.class));
                 break;
-            case R.id.view_jp_post_furikomi: {
-                WebRequestModel requestModel = new WebRequestModel(getStringfromStringId(R.string.jp_post_furikomi_text), JP_POST_FURIKOMI_URL, null);
-                Intent intent = new Intent(this.getContext(), ATMCashDepositActivity.class);
-                intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, requestModel);
-                startActivity(intent);
-                break;
-            }
-
-            case R.id.view_furikomi_details: {
-                WebRequestModel requestModel = new WebRequestModel(getStringfromStringId(R.string.jp_bank_details_text), FURIKOMI_DETAILS_URL, null);
-                Intent intent = new Intent(this.getContext(), ATMCashDepositActivity.class);
-                intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, requestModel);
-                startActivity(intent);
-                break;
-            }
+//            case R.id.view_jp_post_furikomi: {
+//                WebRequestModel requestModel = new WebRequestModel(getStringfromStringId(R.string.jp_post_furikomi_text), JP_POST_FURIKOMI_URL, null);
+//                Intent intent = new Intent(this.getContext(), ATMCashDepositActivity.class);
+//                intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, requestModel);
+//                startActivity(intent);
+//                break;
+//            }
+//
+//            case R.id.view_furikomi_details: {
+//                WebRequestModel requestModel = new WebRequestModel(getStringfromStringId(R.string.jp_bank_details_text), FURIKOMI_DETAILS_URL, null);
+//                Intent intent = new Intent(this.getContext(), ATMCashDepositActivity.class);
+//                intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, requestModel);
+//                startActivity(intent);
+//                break;
+//            }
         }
     }
 
diff --git a/app/src/main/res/drawable-xxhdpi/furikomi_details_white_32.png b/app/src/main/res/drawable-xxhdpi/furikomi_details_white_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c55875e7b39f825f91ed3928c93223fa2d61cab
GIT binary patch
literal 870
zcmV-s1DX7ZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0{clsK~#7F#aHcd
z;xG_hGW<U}z^Nck1vV8xDzL8tk_xyEoU4GO0=Nq7Q~({|tH7iJ-M;84Ry@XhoSD3t
z#j>>0KJBhoLgWC9F(Z|+N~AJZ2~}3?U$p2$FH=b{PyPp7ETLf-9C@T5NkcbRsYqbS
z_VOYkG?1O3lhE)E9&sc&9*}@Ji-;<2x|E&!xkDI_y|D$!<ZcZT$-Mrk%XsAP;#9*N
z&q#j8uvN{q=&>CoX)}-=Fzm-SY|&ZK)geiaIR}KME&4u@sq35`*!hA6T0KLZ85fJ3
z7x|tY2`7kDLoOc3VQdG3!T!*oj;*nMZLU=c6|A?{{wL|i8+32<2P|JZ6azT|HTFjz
z_aKY4^!;9r!+O<p6b@$b&Rh=}jNEm_xItvfHu7T5cEI+E?UcHKCwPz9-nh9~d#DnN
zjbB%sOB-f+XB)bRb4h~l?j6S59B%`7?6mK1b1rhAEB;pp2;dW($v0uBu6Q-Jc#OI}
zw`<{sPk7+&i0+dTETm^336U_rU5Bv;MoLod>nK$U9jjFLjeWg%Yv>t<v5bbdH1I&<
z8<KfZy+W)v`XfN&xk^aG?$B9!x-p+A#&yo54-zg1u=7&oR_ZST<#gf+@IW2tE~Ezx
zS&?E03k7mu>lYG0`w^Bg5>eYfwT<ew_HyDf0%CXK;)}k32J?n4!tx8H*6V|}K;Q?~
zF!oGw_s8b>5^()57@#)m6Q^0pzPZ>WZ0;-~IafJhAXN|Cl58O7;lty?Q|XhfvA3C|
zsm((s_ujE1BNxEfi|U7s8~J7+2TGMko>Bl}ICICP2jl>D?Xn-^2$e95p_~VJGynk{
z#Ym>2VQk+*U@vv7XPgU6q^_E$B2dW({Oqt$$j>m<cB1Wxug&;B<N8JKxLvO=F#btm
zz{OFBVwFcO_99=8=n)O2Vng<<QsClg8vhZ_MD1l}KTvtHGxeR&^_i9$(GQIMA7FTI
wt9S>D*k19O$u(i>|8pB}*Bf)>kH)3=2fjL*YVJb-9smFU07*qoM6N<$f{?6@&j0`b

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/jp_post_white_32.png b/app/src/main/res/drawable-xxhdpi/jp_post_white_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..a192d7a04f336351fafbd329c4851bcdd1e31ebc
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~z5e}kusV@L(#+iARf%?doN_ov-W-mU4L;C|!m
z9o{c&qFYpsBqUA!CH!0Un8fMV%}yE#5|S=Y4qcuk7kK-;>h~@3>rxcX{^3<^`li0t
z<>hmRDKno{dNnQG=zZ)to0Z&>s3x21R}M_S|6kz7g1S#DW|q_!JI*stK79YGmw;*H
z?L^J$_l?d5%xMp**i_tuk2>U@Il%2C#~AYDi)zGO<tgv#3{A>TMt{8FbWPb~;@!W;
ba$hov2r>R&exc_n(CrMKu6{1-oD!M<r-p6x

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/lawson_card_white_32.png b/app/src/main/res/drawable-xxhdpi/lawson_card_white_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7777c7bd72d38a939530d7f3095781f0f534e04
GIT binary patch
literal 611
zcmV-p0-XJcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0r*KoK~#7F?N;Gg
z!Y~lM`te^zs1t}2$Og&;WCPs**Z?Q6P9RJ`od7nlP9RQD@6i_sp{2AI@CWbv?z=RX
z=3bJ!OGGX>GlDctpHx4}c@Tj>DrZECI#PL))1t3pEP*5lf|$qAmgD0^<sJ=7K-76h
z)mTo058GH1&>dJP38T%SN+{W}Bq|_=AYG_TIQ)_Q6ZV(E&XK5$x!bE9z{-Jll|E(8
zzAo*C->-HywAt4`z_~ler{f1c)0VTM(p1#(h>vTjk5ICmT>}J+O4sQF5jPNH{xnpX
z(}wXK+NvP&{)u-+=qhLK5qLI>0ri6%0Ots1zO5zIkWh!ze@@w|1nwk@fnlDJk=<2U
zs!TN6zoZ0LQVocKMS*i<NlbF6C&?jMQk6g`Ior+(Y9w1ZoJTZ`nK^~18v{NJbq_^`
zq~I7Cg<bfOCJ5-{H=O)dw$sqA5(Q@9{nl=bfCEDU5Cj@Z^0RDq!UgJnSTs@97_ev;
z=sfIwZ`9oZA06rm$t-2NVm5vRMZitBx@z6aYai+!fe(94M=aBDZaiBq8rcC|^@tA|
zq}|Xl8C1i4&(698Mv~QpsY9Ztjz9n@dT=SuBal!(l)RW@IP->l%ceGjY75!Er(Q}K
xaG|8f!_M6h6p&awnWZ^k<&hrAR4({$_yve=YgDlg@@D`5002ovPDHLkV1k`!0_^|*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/background_red_gradient.xml b/app/src/main/res/drawable/background_red_gradient.xml
new file mode 100644
index 00000000..5b0fbb1e
--- /dev/null
+++ b/app/src/main/res/drawable/background_red_gradient.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="0"
+        android:startColor="#500b28"
+        android:endColor="#e21c35"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_deposit_info.xml b/app/src/main/res/layout/activity_deposit_info.xml
new file mode 100644
index 00000000..54f218aa
--- /dev/null
+++ b/app/src/main/res/layout/activity_deposit_info.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/m_layout_bg_color"
+    android:orientation="vertical">
+
+    <include layout="@layout/layout_sendmoney_toolbar" />
+
+    <LinearLayout
+        android:id="@+id/jmeDepositLayout"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/_8sdp"
+        android:paddingTop="@dimen/_8sdp">
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/jmeDepositCardContainer"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_margin="@dimen/_8sdp"
+            android:layout_weight="1"
+            app:cardCornerRadius="@dimen/_8sdp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/background_red_gradient"
+                android:orientation="horizontal"
+                android:paddingVertical="@dimen/_15sdp"
+                app:cardCornerRadius="@dimen/_8sdp">
+
+                <com.remit.jmecustomer.common.customwidgets.JmeTextView
+                    android:id="@+id/jmeTextView"
+                    style="@style/MLabelTextView"
+                    android:layout_width="0dp"
+                    android:gravity="start"
+                    android:paddingStart="@dimen/_20sdp"
+                    android:paddingEnd="@dimen/_10sdp"
+                    android:text="@string/app_name"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/_20sdp"
+                    app:layout_constraintBottom_toTopOf="@+id/jmeDepositTextView"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:txtfontName="@string/bold"
+                    tools:ignore="HardcodedText" />
+
+                <com.remit.jmecustomer.common.customwidgets.JmeTextView
+                    android:id="@+id/jmeDepositTextView"
+                    style="@style/MLabelTextView"
+                    android:layout_width="0dp"
+                    android:gravity="start"
+                    android:paddingStart="@dimen/_20sdp"
+                    android:paddingEnd="@dimen/_20sdp"
+                    android:text="Deposit Service"
+                    android:textColor="@color/white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintVertical_bias="0.0"
+                    tools:ignore="HardcodedText" />
+
+                <ImageView
+                    android:layout_width="@dimen/_30sdp"
+                    android:layout_height="@dimen/_25sdp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/jmeTextView"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/vd_jme_logo_only" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/form1"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/_8sdp">
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/jpPostCardContainer"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_margin="@dimen/_8sdp"
+            android:layout_weight="1"
+            app:cardCornerRadius="@dimen/_8sdp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/background_red_gradient"
+                android:orientation="horizontal"
+                android:paddingVertical="@dimen/_15sdp"
+                app:cardCornerRadius="@dimen/_8sdp">
+
+
+                <ImageView
+                    android:id="@+id/jpPostIcon"
+                    android:layout_width="@dimen/_20sdp"
+                    android:layout_height="@dimen/_20sdp"
+                    android:layout_marginStart="@dimen/_20sdp"
+                    android:layout_marginEnd="@dimen/_20sdp"
+                    android:scaleType="centerCrop"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/jp_post_white_32"
+                    tools:ignore="ContentDescription" />
+
+                <com.remit.jmecustomer.common.customwidgets.JmeTextView
+                    android:id="@+id/jpPostTextView"
+                    style="@style/MLabelTextView"
+                    android:layout_width="0dp"
+                    android:gravity="start"
+                    android:paddingStart="@dimen/_20sdp"
+                    android:paddingEnd="@dimen/_20sdp"
+                    android:text="@string/jp_post_furikomi_text"
+                    android:textColor="@color/white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintVertical_bias="0.0"
+                    tools:ignore="HardcodedText" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/lawsonCardContainer"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_margin="@dimen/_8sdp"
+            android:layout_weight="1"
+            app:cardCornerRadius="@dimen/_8sdp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/background_red_gradient"
+                android:orientation="horizontal"
+                android:paddingVertical="@dimen/_15sdp"
+                app:cardCornerRadius="@dimen/_8sdp">
+
+
+                <ImageView
+                    android:id="@+id/lawsonCardIcon"
+                    android:layout_width="@dimen/_20sdp"
+                    android:layout_height="@dimen/_20sdp"
+                    android:layout_marginStart="@dimen/_20sdp"
+                    android:layout_marginEnd="@dimen/_20sdp"
+                    android:scaleType="centerCrop"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/lawson_card_white_32"
+                    tools:ignore="ContentDescription" />
+
+                <com.remit.jmecustomer.common.customwidgets.JmeTextView
+                    android:id="@+id/lawsonCardTextView"
+                    style="@style/MLabelTextView"
+                    android:layout_width="0dp"
+                    android:gravity="start"
+                    android:paddingStart="@dimen/_20sdp"
+                    android:paddingEnd="@dimen/_20sdp"
+                    android:text="@string/lawson_card_deposit_text"
+                    android:textColor="@color/white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintVertical_bias="0.0"
+                    tools:ignore="HardcodedText" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/furikomiLayout"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/_8sdp"
+        android:paddingBottom="@dimen/_8sdp">
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/furikomiCardContainer"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_margin="@dimen/_8sdp"
+            android:layout_weight="1"
+            app:cardCornerRadius="@dimen/_8sdp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/background_red_gradient"
+                android:orientation="horizontal"
+                android:paddingVertical="@dimen/_15sdp"
+                app:cardCornerRadius="@dimen/_8sdp">
+
+
+                <ImageView
+                    android:id="@+id/furikomiIcon"
+                    android:layout_width="@dimen/_20sdp"
+                    android:layout_height="@dimen/_20sdp"
+                    android:layout_marginStart="@dimen/_20sdp"
+                    android:layout_marginEnd="@dimen/_20sdp"
+                    android:scaleType="centerCrop"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/furikomi_details_white_32"
+                    tools:ignore="ContentDescription" />
+
+                <com.remit.jmecustomer.common.customwidgets.JmeTextView
+                    android:id="@+id/furikomiTextView"
+                    style="@style/MLabelTextView"
+                    android:layout_width="0dp"
+                    android:gravity="start"
+                    android:paddingStart="@dimen/_20sdp"
+                    android:paddingEnd="@dimen/_20sdp"
+                    android:text="@string/jp_bank_details_text"
+                    android:textColor="@color/white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintVertical_bias="0.0"
+                    tools:ignore="HardcodedText" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_splash_screen_key_0.xml b/app/src/main/res/layout/activity_splash_screen_key_0.xml
index 372d1e31..39e89acc 100644
--- a/app/src/main/res/layout/activity_splash_screen_key_0.xml
+++ b/app/src/main/res/layout/activity_splash_screen_key_0.xml
@@ -491,7 +491,7 @@
             android:layout_marginEnd="@dimen/_8sdp"
             android:background="@drawable/ic_blue_button_with_white_border"
             android:enabled="true"
-            android:text="@string/new_user_text"
+            android:text="@string/new_user_registration_text"
             android:textAllCaps="false"
             android:textColor="@color/white"
             app:layout_constraintEnd_toStartOf="@+id/btn_lgn"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 27ab86ba..156a5074 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,6 +32,7 @@
 
     <!--About Screen-->
     <string name="app_name" translatable="false">JME Remit</string>  <!--common-->
+    <string name="app_name_italic" translatable="false"><i>JME Remit</i></string>  <!--common-->
     <string name="about_me_description_text">Japan Money Express (JME) is a registered money transfer company with Kanto Local Financial Bureau under the Payment Services Act. JME provides easy, speedy, safe and reliable way to transfer money in many parts of the world.</string>
     <string name="terms_and_condition_title_text1"><u>Terms and Conditions</u></string>
     <string name="privacyAndPolicy1_text"><u>Privacy Policy</u></string>