Merge remote-tracking branch 'origin/UIChanges' into MYNotification

# Conflicts: # app/src/main/AndroidManifest.xml
2 years ago · d956d8c1a1
13 changed files with 403 additions and 43 deletions
--- 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" />
        <activity
            android:name="com.remit.jmecustomer.features.mynotifications.view.MyNotificationActivity"
            android:screenOrientation="portrait"
--- 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";
 }
--- 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
@ -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);
+    }
+}
--- 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());

--- 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;
+    }
 }
--- 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;
@ -245,7 +246,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()) {
@ -277,50 +278,49 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
            case R.id.iv_notification:
                startActivity(new Intent(this, MyNotificationActivity.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;
+//            }
        }
    }

--- a/app/src/main/res/drawable-xxhdpi/furikomi_details_white_32.png
+++ b/app/src/main/res/drawable-xxhdpi/furikomi_details_white_32.png
--- a/app/src/main/res/drawable-xxhdpi/jp_post_white_32.png
+++ b/app/src/main/res/drawable-xxhdpi/jp_post_white_32.png
--- a/app/src/main/res/drawable-xxhdpi/lawson_card_white_32.png
+++ b/app/src/main/res/drawable-xxhdpi/lawson_card_white_32.png
--- a/app/src/main/res/drawable/background_red_gradient.xml
+++ 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>
--- a/app/src/main/res/layout/activity_deposit_info.xml
+++ 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>
--- 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"
--- 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>