Browse Source

ui changes

new_design
Mohan Shiwakoti 1 year ago
parent
commit
adb39e966c
  1. 12
      app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/adapters/SendMethodAdapter.kt
  2. 4
      app/src/main/java/com/remit/jmecustomer/features/homeV3/adpaters/BannerViewAdapter.kt
  3. 13
      app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
  4. 25
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java
  5. 9
      app/src/main/java/com/remit/jmecustomer/features/userprofile/view/ProfileFragment.kt
  6. 37
      app/src/main/res/drawable/ic_profile_kyc_unverified.xml
  7. 13
      app/src/main/res/drawable/light_blue_border_rounded.xml
  8. 71
      app/src/main/res/layout/activity_deposit_info.xml
  9. 20
      app/src/main/res/layout/fragment_home_new.xml
  10. 20
      app/src/main/res/layout/row_send_method.xml
  11. 2
      app/src/main/res/values/colors.xml

12
app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/adapters/SendMethodAdapter.kt

@ -20,7 +20,10 @@ class SendMethodAdapter(private val items: List<PaymentMethodV3Model>) :
val bindings: RowSendMethodBinding = binding val bindings: RowSendMethodBinding = binding
fun bind(item: PaymentMethodV3Model) { fun bind(item: PaymentMethodV3Model) {
binding.rdBtn.isChecked = item.isSelected binding.rdBtn.isChecked = item.isSelected
binding.tvName.text = item.name
if (item.agent != null) {
binding.tvName.text = item.agent.name
}
} }
} }
@ -45,6 +48,13 @@ class SendMethodAdapter(private val items: List<PaymentMethodV3Model>) :
lastPosition = position lastPosition = position
notifyDataSetChanged() notifyDataSetChanged()
} }
if (item.agent != null) {
if(item.agent.branch != null)
holder.bindings.tvBranch.text = "Branch" + ":" + item.agent.branch.name
}
if (item.agent != null && item.agent.accountNo.isNotEmpty()) {
holder.bindings.tvAccountNumber.text = "Ac Number" + ":" + item.agent.accountNo
}
holder.bindings.ivIcon.setImageResource( holder.bindings.ivIcon.setImageResource(
PaymentModeMapper.getPaymentModeImageFromId( PaymentModeMapper.getPaymentModeImageFromId(
item.id item.id

4
app/src/main/java/com/remit/jmecustomer/features/homeV3/adpaters/BannerViewAdapter.kt

@ -47,13 +47,15 @@ class BannerViewAdapter(
.load(imageURl).diskCacheStrategy(DiskCacheStrategy.ALL) .load(imageURl).diskCacheStrategy(DiskCacheStrategy.ALL)
.transform(CenterCrop(), RoundedCorners(dpToPx(8, mContext!!))) .transform(CenterCrop(), RoundedCorners(dpToPx(8, mContext!!)))
.into(holder.bindings.offerItemImgView) .into(holder.bindings.offerItemImgView)
holder.itemView.setOnClickListener {
holder.bindings.offerItemImgView.setOnClickListener {
val url = data[position].redirectURL val url = data[position].redirectURL
if (!url.isNullOrEmpty()) {
val intent = Intent(Intent.ACTION_VIEW) val intent = Intent(Intent.ACTION_VIEW)
intent.data = Uri.parse(url) intent.data = Uri.parse(url)
mContext?.startActivity(intent) mContext?.startActivity(intent)
} }
} }
}
override fun getItemCount(): Int { override fun getItemCount(): Int {

13
app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt

@ -1,5 +1,6 @@
package com.remit.jmecustomer.features.homeV3.view package com.remit.jmecustomer.features.homeV3.view
import android.content.Intent
import android.graphics.Rect import android.graphics.Rect
import android.os.Bundle import android.os.Bundle
import android.text.Editable import android.text.Editable
@ -23,9 +24,11 @@ import com.google.android.material.textfield.TextInputLayout
import com.remit.jmecustomer.R import com.remit.jmecustomer.R
import com.remit.jmecustomer.base.BaseFragment import com.remit.jmecustomer.base.BaseFragment
import com.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher import com.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher
import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog
import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper
import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.ExchangeRateCurrencyListingDialog import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.ExchangeRateCurrencyListingDialog
import com.remit.jmecustomer.databinding.FragmentHomeNewBinding import com.remit.jmecustomer.databinding.FragmentHomeNewBinding
import com.remit.jmecustomer.features.depositslip.view.DepositSlipActivity
import com.remit.jmecustomer.features.exrate.adapter.PaymentModeRvAdapter import com.remit.jmecustomer.features.exrate.adapter.PaymentModeRvAdapter
import com.remit.jmecustomer.features.exrate.gateway.ExchangeRateGateway import com.remit.jmecustomer.features.exrate.gateway.ExchangeRateGateway
import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService
@ -172,6 +175,15 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
} }
R.id.countrySelectionSpinner, R.id.recepientCurrencyTextView, R.id.iv_currency_2 -> showCountryListinDialog() R.id.countrySelectionSpinner, R.id.recepientCurrencyTextView, R.id.iv_currency_2 -> showCountryListinDialog()
R.id.exRateCalculateButton -> presenter.calcExrate() R.id.exRateCalculateButton -> presenter.calcExrate()
R.id.lin_upload_slip -> {
val unverifiedMessage: String? = homeViewModel?.checkIfUserVerified()
if (unverifiedMessage == null) startActivity(
Intent(
requireContext(),
DepositSlipActivity::class.java
)
) else showPopUpMessage(unverifiedMessage, CustomAlertDialog.AlertType.ALERT, null)
}
} }
} }
@ -301,6 +313,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
recepientCurrencyTextView!!.setOnClickListener(this) recepientCurrencyTextView!!.setOnClickListener(this)
recepientFlagImageView?.setOnClickListener(this) recepientFlagImageView?.setOnClickListener(this)
binding.agreeButton.setOnClickListener(this) binding.agreeButton.setOnClickListener(this)
binding.linUploadSlip.setOnClickListener(this)
} }
override fun onEditorAction(v: TextView, actionId: Int, event: KeyEvent?): Boolean { override fun onEditorAction(v: TextView, actionId: Int, event: KeyEvent?): Boolean {

25
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java

@ -3,6 +3,7 @@ package com.remit.jmecustomer.features.recipientmanagement.model.recipientlistin
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import com.remit.jmecustomer.features.recipientmanagement.model.recipientModelV5.Agent;
import com.remit.jmecustomer.utils.Utils; import com.remit.jmecustomer.utils.Utils;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
@ -14,16 +15,23 @@ public class PaymentMethodV3Model implements Parcelable {
@SerializedName("id") @SerializedName("id")
@Expose @Expose
private String id; private String id;
@SerializedName("name") @SerializedName("name")
@Expose @Expose
private String name; private String name;
@SerializedName("localizedName") @SerializedName("localizedName")
@Expose @Expose
private String localizedName; private String localizedName;
@SerializedName("currency") @SerializedName("currency")
@Expose @Expose
private List<String> currency; private List<String> currency;
@SerializedName("agent")
@Expose
private Agent agent;
boolean selected; boolean selected;
public String getId() { public String getId() {
@ -66,6 +74,14 @@ public class PaymentMethodV3Model implements Parcelable {
this.selected = selected; this.selected = selected;
} }
public Agent getAgent() {
return agent;
}
public void setAgent(Agent agent) {
this.agent = agent;
}
public PaymentMethodV3Model() { public PaymentMethodV3Model() {
} }
@ -81,7 +97,6 @@ public class PaymentMethodV3Model implements Parcelable {
return this.localizedName; return this.localizedName;
} }
@Override @Override
public int describeContents() { public int describeContents() {
return 0; return 0;
@ -93,6 +108,7 @@ public class PaymentMethodV3Model implements Parcelable {
dest.writeString(this.name); dest.writeString(this.name);
dest.writeString(this.localizedName); dest.writeString(this.localizedName);
dest.writeStringList(this.currency); dest.writeStringList(this.currency);
dest.writeParcelable(this.agent, flags);
} }
protected PaymentMethodV3Model(Parcel in) { protected PaymentMethodV3Model(Parcel in) {
@ -100,6 +116,7 @@ public class PaymentMethodV3Model implements Parcelable {
this.name = in.readString(); this.name = in.readString();
this.localizedName = in.readString(); this.localizedName = in.readString();
this.currency = in.createStringArrayList(); this.currency = in.createStringArrayList();
this.agent = in.readParcelable(Agent.class.getClassLoader());
} }
public static final Creator<PaymentMethodV3Model> CREATOR = new Creator<PaymentMethodV3Model>() { public static final Creator<PaymentMethodV3Model> CREATOR = new Creator<PaymentMethodV3Model>() {
@ -123,3 +140,9 @@ public class PaymentMethodV3Model implements Parcelable {
); );
} }
} }

9
app/src/main/java/com/remit/jmecustomer/features/userprofile/view/ProfileFragment.kt

@ -36,6 +36,7 @@ import com.remit.jmecustomer.features.aboutscreen.view.AboutJMERemit
import com.remit.jmecustomer.features.changetxnpin.view.ChangeTxnPinActivity import com.remit.jmecustomer.features.changetxnpin.view.ChangeTxnPinActivity
import com.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment import com.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment
import com.remit.jmecustomer.features.depositinfo.view.DepositInfo import com.remit.jmecustomer.features.depositinfo.view.DepositInfo
import com.remit.jmecustomer.features.home.presenter.HomeViewModel
import com.remit.jmecustomer.features.homeV3.view.HomeActivityV3 import com.remit.jmecustomer.features.homeV3.view.HomeActivityV3
import com.remit.jmecustomer.features.loyaltypoints.view.LoyaltyPointsActivity import com.remit.jmecustomer.features.loyaltypoints.view.LoyaltyPointsActivity
import com.remit.jmecustomer.features.mynotifications.view.MyNotificationActivity import com.remit.jmecustomer.features.mynotifications.view.MyNotificationActivity
@ -90,6 +91,7 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
var remitAuthManager1: RemitAuthManager1? = null var remitAuthManager1: RemitAuthManager1? = null
var remitAuthManagerGateway: RemitAuthManagerGateway? = null var remitAuthManagerGateway: RemitAuthManagerGateway? = null
val STORAGE_INTENT_REQUEST = 9992 val STORAGE_INTENT_REQUEST = 9992
private var homeViewModel: HomeViewModel? = null
override fun onCreateView( override fun onCreateView(
@ -108,6 +110,7 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
viewModel = ViewModelProvider(this, UserProfileViewModelFactory(this)).get( viewModel = ViewModelProvider(this, UserProfileViewModelFactory(this)).get(
UserProfilePresenterV2::class.java UserProfilePresenterV2::class.java
) )
homeViewModel = ViewModelProvider(requireActivity()).get(HomeViewModel::class.java)
binding.llPaymentLayout.setOnClickListener(this) binding.llPaymentLayout.setOnClickListener(this)
binding.llAboutUsLayout.setOnClickListener(this) binding.llAboutUsLayout.setOnClickListener(this)
binding.llFaqLayout.setOnClickListener(this) binding.llFaqLayout.setOnClickListener(this)
@ -138,6 +141,12 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
} else { } else {
view_fingerprint.setChecked(remitAuthManager.isBiometricEnabledOnTheApp()); view_fingerprint.setChecked(remitAuthManager.isBiometricEnabledOnTheApp());
}*/ }*/
val unverifiedMessage: String? = homeViewModel?.checkIfUserVerified()
if (unverifiedMessage == null) {
binding.ivKycStatus.setImageResource(R.drawable.ic_verified_doc)
} else {
binding.ivKycStatus.setImageResource(R.drawable.ic_profile_kyc_unverified)
}
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

37
app/src/main/res/drawable/ic_profile_kyc_unverified.xml

@ -0,0 +1,37 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:pathData="M7.988,1a1.05,1.05 0,1 0,0 2.1,4.9 4.9,0 1,1 0,9.8 1.05,1.05 0,1 0,0 2.1,7 7,0 1,0 0,-14Z"
android:fillColor="#f60"/>
<path
android:pathData="M7.282,10.8a0.7,0.7 0,0 1,-0.5 -0.205l-2.1,-2.1a0.7,0.7 0,0 1,0.991 -0.99L7.282,9.11l3.01,-3.005a0.7,0.7 0,0 1,0.991 0.99l-3.506,3.5A0.7,0.7 0,0 1,7.282 10.8Z"
android:fillColor="#f60"/>
<path
android:pathData="M1,8.072a1.052,1.05 0,1 0,2.104 0a1.052,1.05 0,1 0,-2.104 0z"
android:strokeAlpha="0.35"
android:fillColor="#f60"
android:fillAlpha="0.35"/>
<path
android:pathData="M1.815,10.964a1.052,1.05 0,1 0,2.104 0a1.052,1.05 0,1 0,-2.104 0z"
android:strokeAlpha="0.35"
android:fillColor="#f60"
android:fillAlpha="0.35"/>
<path
android:pathData="M4.006,13.125a1.052,1.05 0,1 0,2.104 0a1.052,1.05 0,1 0,-2.104 0z"
android:strokeAlpha="0.35"
android:fillColor="#f60"
android:fillAlpha="0.35"/>
<path
android:pathData="M4.015,2.84a1.052,1.05 0,1 0,2.104 0a1.052,1.05 0,1 0,-2.104 0z"
android:strokeAlpha="0.35"
android:fillColor="#f60"
android:fillAlpha="0.35"/>
<path
android:pathData="M1.779,5.026a1.052,1.05 0,1 0,2.104 0a1.052,1.05 0,1 0,-2.104 0z"
android:strokeAlpha="0.35"
android:fillColor="#f60"
android:fillAlpha="0.35"/>
</vector>

13
app/src/main/res/drawable/light_blue_border_rounded.xml

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:radius="@dimen/_10sdp" />
<stroke android:width="@dimen/_2sdp"
android:color="@color/light_blue_40"/>
<solid
android:color="@color/light_blue_5" />
</shape>

71
app/src/main/res/layout/activity_deposit_info.xml

@ -38,15 +38,16 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/light_blue_grey_border"
android:background="@drawable/light_blue_border_rounded"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingVertical="@dimen/_15sdp" android:paddingVertical="@dimen/_15sdp"
app:cardCornerRadius="@dimen/_8sdp"> app:cardCornerRadius="@dimen/_8sdp">
<com.remit.jmecustomer.common.customwidgets.JmeTextView
<TextView
android:id="@+id/jmeTextView" android:id="@+id/jmeTextView"
style="@style/MLabelTextView"
android:layout_width="0dp"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
android:paddingStart="@dimen/_15sdp" android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp" android:paddingEnd="@dimen/_15sdp"
@ -58,10 +59,11 @@
app:txtfontName="@string/bold" app:txtfontName="@string/bold"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
<com.remit.jmecustomer.common.customwidgets.JmeTextView
<TextView
android:id="@+id/jmeDepositTextView" android:id="@+id/jmeDepositTextView"
style="@style/MLabelTextView"
android:layout_width="0dp"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
android:paddingStart="@dimen/_15sdp" android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp" android:paddingEnd="@dimen/_15sdp"
@ -99,7 +101,7 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/jpPostCardContainer" android:id="@+id/jpPostCardContainer"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="@dimen/_8sdp" android:layout_margin="@dimen/_8sdp"
android:layout_weight="1" android:layout_weight="1"
@ -108,7 +110,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/light_blue_grey_border"
android:background="@drawable/light_blue_border_rounded"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingVertical="@dimen/_15sdp" android:paddingVertical="@dimen/_15sdp"
app:cardCornerRadius="@dimen/_8sdp"> app:cardCornerRadius="@dimen/_8sdp">
@ -128,10 +130,11 @@
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
app:tint="@color/black_opacity_87" /> app:tint="@color/black_opacity_87" />
<com.remit.jmecustomer.common.customwidgets.JmeTextView
<TextView
android:id="@+id/jpPostTextView" android:id="@+id/jpPostTextView"
style="@style/MLabelTextView"
android:layout_width="0dp"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
android:paddingStart="@dimen/_15sdp" android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp" android:paddingEnd="@dimen/_15sdp"
@ -149,7 +152,7 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/lawsonCardContainer" android:id="@+id/lawsonCardContainer"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="@dimen/_8sdp" android:layout_margin="@dimen/_8sdp"
android:layout_weight="1" android:layout_weight="1"
@ -158,7 +161,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/light_blue_grey_border"
android:background="@drawable/light_blue_border_rounded"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingVertical="@dimen/_15sdp" android:paddingVertical="@dimen/_15sdp"
app:cardCornerRadius="@dimen/_8sdp"> app:cardCornerRadius="@dimen/_8sdp">
@ -178,10 +181,11 @@
app:srcCompat="@drawable/lawson_card_white" app:srcCompat="@drawable/lawson_card_white"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<com.remit.jmecustomer.common.customwidgets.JmeTextView
<TextView
android:id="@+id/lawsonCardTextView" android:id="@+id/lawsonCardTextView"
style="@style/MLabelTextView"
android:layout_width="0dp"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
android:paddingStart="@dimen/_15sdp" android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp" android:paddingEnd="@dimen/_15sdp"
@ -207,7 +211,7 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/eBankingCardContainer" android:id="@+id/eBankingCardContainer"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="@dimen/_8sdp" android:layout_margin="@dimen/_8sdp"
android:layout_weight="1" android:layout_weight="1"
@ -216,7 +220,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/light_blue_grey_border"
android:background="@drawable/light_blue_border_rounded"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingVertical="@dimen/_15sdp" android:paddingVertical="@dimen/_15sdp"
app:cardCornerRadius="@dimen/_8sdp"> app:cardCornerRadius="@dimen/_8sdp">
@ -236,10 +240,11 @@
app:srcCompat="@drawable/ebanking_white" app:srcCompat="@drawable/ebanking_white"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<com.remit.jmecustomer.common.customwidgets.JmeTextView
<TextView
android:id="@+id/eBankingTextView" android:id="@+id/eBankingTextView"
style="@style/MLabelTextView"
android:layout_width="0dp"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
android:paddingStart="@dimen/_15sdp" android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp" android:paddingEnd="@dimen/_15sdp"
@ -257,7 +262,7 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/cashDepositCardContainer" android:id="@+id/cashDepositCardContainer"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="@dimen/_8sdp" android:layout_margin="@dimen/_8sdp"
android:layout_weight="1" android:layout_weight="1"
@ -266,7 +271,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/light_blue_grey_border"
android:background="@drawable/light_blue_border_rounded"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingVertical="@dimen/_15sdp" android:paddingVertical="@dimen/_15sdp"
app:cardCornerRadius="@dimen/_8sdp"> app:cardCornerRadius="@dimen/_8sdp">
@ -286,10 +291,11 @@
app:srcCompat="@drawable/cash_deposit_white" app:srcCompat="@drawable/cash_deposit_white"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<com.remit.jmecustomer.common.customwidgets.JmeTextView
<TextView
android:id="@+id/cashDepositTextView" android:id="@+id/cashDepositTextView"
style="@style/MLabelTextView"
android:layout_width="0dp"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
android:paddingStart="@dimen/_15sdp" android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp" android:paddingEnd="@dimen/_15sdp"
@ -316,7 +322,7 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/furikomiCardContainer" android:id="@+id/furikomiCardContainer"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="@dimen/_8sdp" android:layout_margin="@dimen/_8sdp"
android:layout_weight="1" android:layout_weight="1"
@ -325,7 +331,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/light_blue_grey_border"
android:background="@drawable/light_blue_border_rounded"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingVertical="@dimen/_15sdp" android:paddingVertical="@dimen/_15sdp"
app:cardCornerRadius="@dimen/_8sdp"> app:cardCornerRadius="@dimen/_8sdp">
@ -345,10 +351,11 @@
app:srcCompat="@drawable/furikomi_details_white" app:srcCompat="@drawable/furikomi_details_white"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<com.remit.jmecustomer.common.customwidgets.JmeTextView
<TextView
android:id="@+id/furikomiTextView" android:id="@+id/furikomiTextView"
style="@style/MLabelTextView"
android:layout_width="0dp"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
android:paddingStart="@dimen/_15sdp" android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp" android:paddingEnd="@dimen/_15sdp"

20
app/src/main/res/layout/fragment_home_new.xml

@ -16,7 +16,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/card_bottom_rounded_white" android:background="@drawable/card_bottom_rounded_white"
android:elevation="@dimen/_20sdp"
android:elevation="@dimen/_10sdp"
android:padding="@dimen/_10sdp" android:padding="@dimen/_10sdp"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
@ -33,16 +33,16 @@
<TextView <TextView
android:id="@+id/tv_acc_no" android:id="@+id/tv_acc_no"
style="@style/TextStyle.VolteSemiBold12"
style="@style/TextStyle.VolteSemiBold16"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="M0B000010" android:text="M0B000010"
android:textColor="@color/black_opacity_87" android:textColor="@color/black_opacity_87"
android:textSize="20dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txt_accountNo" /> app:layout_constraintTop_toBottomOf="@+id/txt_accountNo" />
<ImageView <ImageView
android:layout_marginStart="@dimen/_4sdp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/baseline_file_copy_24" android:src="@drawable/baseline_file_copy_24"
@ -73,6 +73,7 @@
app:layout_constraintTop_toBottomOf="@id/tv_avl_balance" /> app:layout_constraintTop_toBottomOf="@id/tv_avl_balance" />
<LinearLayout <LinearLayout
android:id="@+id/lin_upload_slip"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/_20sdp" android:layout_marginTop="@dimen/_20sdp"
@ -364,12 +365,19 @@
</RelativeLayout> </RelativeLayout>
<LinearLayout
<androidx.cardview.widget.CardView
android:layout_marginTop="@dimen/_14sdp"
android:background="@color/white"
android:padding="@dimen/_10sdp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/agreeButton" app:layout_constraintTop_toBottomOf="@id/agreeButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:layout_marginTop="@dimen/_14sdp" android:layout_marginTop="@dimen/_14sdp"
android:elevation="@dimen/_10sdp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
@ -394,7 +402,7 @@
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

20
app/src/main/res/layout/row_send_method.xml

@ -55,5 +55,25 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView
app:layout_constraintTop_toBottomOf="@id/tv_name"
app:layout_constraintStart_toEndOf="@id/iv_icon"
android:layout_marginLeft="@dimen/_8sdp"
android:id="@+id/tv_account_number"
android:textColor="@color/black_opacity_50"
style="@style/TextStyle.VolteSemiBold12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
app:layout_constraintTop_toBottomOf="@id/tv_account_number"
app:layout_constraintStart_toEndOf="@id/iv_icon"
android:layout_marginLeft="@dimen/_8sdp"
android:id="@+id/tv_branch"
android:textColor="@color/black_opacity_50"
style="@style/TextStyle.VolteSemiBold12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values/colors.xml

@ -77,7 +77,9 @@
<color name="dark_blue">#0052FF</color> <color name="dark_blue">#0052FF</color>
<color name="light_green">#00CC99</color> <color name="light_green">#00CC99</color>
<color name="light_transparent_blue">#0A0052FF</color> <color name="light_transparent_blue">#0A0052FF</color>
<color name="light_blue_40">#660052FF</color>
<color name="light_blue_10">#1A0052FF</color> <color name="light_blue_10">#1A0052FF</color>
<color name="light_blue_5">#0D0052FF</color>
<color name="light_grey">#0000001F</color> <color name="light_grey">#0000001F</color>
<color name="round_button_color">#CC0000</color> <color name="round_button_color">#CC0000</color>
<color name="buttonRippleColor">#70e2cecf</color> <color name="buttonRippleColor">#70e2cecf</color>

Loading…
Cancel
Save