IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

api changes recent filter issue fixes , other minor issue fixes

new_design
Mohan Shiwakoti 1 year ago
parent
7179c17f99
commit
944581c459
17 changed files with 233 additions and 148 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt
  2. 4
      app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/adapters/SendMethodAdapter.kt
  3. 5
      app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt
  4. 87
      app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
  5. 5
      app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt
  6. 54
      app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt
  7. 52
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java
  8. 4
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java
  9. 6
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java
  10. 29
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java
  11. 6
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java
  12. 13
      app/src/main/res/drawable/blue_border_background_20.xml
  13. 106
      app/src/main/res/layout/activity_deposit_info.xml
  14. 5
      app/src/main/res/layout/activity_home_v3.xml
  15. 1
      app/src/main/res/layout/row_recent_transactions.xml
  16. 1
      app/src/main/res/values/colors.xml
  17. 2
      app/src/main/res/values/styles.xml

1
app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt
View File

@ -80,6 +80,7 @@ class BeneficiaryDetailActivity : BaseActivity(),
receiverInfoModel?.countryId = receiver?.countryId
receiverInfoModel?.country = receiver?.country
receiverInfoModel?.state = receiver?.state
receiverInfoModel?.isAccountValidation = receiver?.isAccountValidationReq
receiverInfoModel?.stateId = receiver?.stateId
receiverInfoModel?.city = receiver?.city
receiverInfoModel?.email = receiver?.email

4
app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/adapters/SendMethodAdapter.kt
View File

@ -39,7 +39,9 @@ class SendMethodAdapter(private val items: List<PaymentMethodV3Model>) :
@SuppressLint("NotifyDataSetChanged")
override fun onBindViewHolder(holder: ViewHolder, @SuppressLint("RecyclerView") position: Int) {
val item = items[position]
itemClickListener?.onItemClicked(items[0])
if(lastPosition == 0) {
itemClickListener?.onItemClicked(items[0])
}
holder.itemView.setOnClickListener {
items[lastPosition].isSelected = false
itemClickListener?.onItemClicked(item)

5
app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt
View File

@ -355,8 +355,9 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
}
this.notificationViewBoundry = notificationViewBoundry
isNotificaitonViewActive = action
viewModel?.notificationViewActive = isNotificaitonViewActive()
if (isNotificaitonViewActive()) {
viewModel?.notificationViewActive = true
}
if (viewModel?.notificationViewActive == true) {
homeFragmentV3.focusHome(false)
}

87
app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
View File

@ -158,6 +158,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
this.homeViewRelatedDTOV2 = homeViewRelatedDTOV2
showNotificationView(homeViewRelatedDTOV2.homeNotificationViewDTO)
} else {
homeViewModel?.notificationViewActive = false
removeNotification()
}
homeViewModel?.showChangedNotification(homeViewRelatedDTOV2.notificationCount)
@ -177,6 +178,9 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
override fun onResume() {
super.onResume()
if (timer != null) {
}
homeViewModel?.getRequiredData()
}
@ -401,7 +405,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
val transfersFragment =
requireActivity().supportFragmentManager.findFragmentByTag("android:switcher:" + homeActivityV3.binding.vpDashboard.id + ":" + 1) as MyTransfersFragment
if (homeViewModel?.checkIfUserVerified() == null) {
transfersFragment.performDefaultAction(Constants.CURRENT_COUNTRY_ID, true)
// transfersFragment.performDefaultAction(Constants.CURRENT_COUNTRY_ID, true)
}
presenter.onExRateViewLoadedSuccessfully()
}
@ -516,45 +520,58 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
var timer: Timer? = null;
fun setBannerData(bannerImages: MutableList<BannerImage>) {
try {
val bannerViewAdapter = BannerViewAdapter(bannerImages)
val lm = LinearLayoutManager(
binding.bannerView.getContext(),
LinearLayoutManager.HORIZONTAL,
false
)
binding.bannerView.layoutManager = lm
binding.bannerView.adapter = bannerViewAdapter
binding.bannerView.setOnFlingListener(null)
val snapHelper = PagerSnapHelper()
snapHelper.attachToRecyclerView(binding.bannerView)
if (!bannerImages.isNullOrEmpty()) {
try {
val bannerViewAdapter = BannerViewAdapter(bannerImages)
val lm = LinearLayoutManager(
binding.bannerView.getContext(),
LinearLayoutManager.HORIZONTAL,
false
)
binding.bannerView.layoutManager = lm
binding.bannerView.adapter = bannerViewAdapter
binding.bannerView.setOnFlingListener(null)
val snapHelper = PagerSnapHelper()
snapHelper.attachToRecyclerView(binding.bannerView)
if (bannerImages.size > 1) {
if (bannerImages.size > 1) {
// bannerView.addItemDecoration(new LinePagerIndicatorDecoration());
binding.indicator.attachToRecyclerView(binding.bannerView, snapHelper)
}
binding.indicator.attachToRecyclerView(binding.bannerView, snapHelper)
}
if (timer != null) return
timer = Timer()
timer!!.scheduleAtFixedRate(object : TimerTask() {
override fun run() {
if (scrollPosition >= bannerImages.size) scrollPosition = 0
binding.bannerView.post { // scrollPosition = lm.findFirstVisibleItemPosition();
scrollPosition =
binding.indicator.getSnapPosition(binding.bannerView.layoutManager);
++scrollPosition
if (scrollPosition > bannerImages.size - 1) {
scrollPosition = 0
binding.bannerView.scrollToPosition(scrollPosition)
} else {
binding.bannerView.smoothScrollToPosition(scrollPosition)
if (timer != null) return
timer = Timer()
timer!!.scheduleAtFixedRate(object : TimerTask() {
override fun run() {
try {
if (scrollPosition >= bannerImages.size) scrollPosition = 0
binding.bannerView.post { // scrollPosition = lm.findFirstVisibleItemPosition();
scrollPosition =
binding.indicator.getSnapPosition(binding.bannerView.layoutManager);
++scrollPosition
if (scrollPosition > bannerImages.size - 1) {
scrollPosition = 0
binding.bannerView.scrollToPosition(scrollPosition)
} else {
binding.bannerView.smoothScrollToPosition(scrollPosition)
}
}
} catch (ex: java.lang.NullPointerException) {
ex.printStackTrace()
}
}
}
}, 500, 3500)
} catch (ex: java.lang.Exception) {
ex.printStackTrace()
}, 500, 3500)
} catch (ex: java.lang.Exception) {
ex.printStackTrace()
}
}
}
override fun onDestroy() {
super.onDestroy()
if (timer != null) {
timer?.cancel()
}
}

5
app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt
View File

@ -11,6 +11,7 @@ import com.remit.jmecustomer.databinding.RowRecentTransactionsBinding
import com.remit.jmecustomer.features.recipientmanagement.model.recipientModelV5.RecentTransaction
import com.remit.jmecustomer.features.support.view.SupportActivityV2
import com.remit.jmecustomer.utils.Constants
import java.util.*
class RecentTransactionsAdapter(private var items: MutableList<RecentTransaction>) :
RecyclerView.Adapter<RecentTransactionsAdapter.ViewHolder>() {
@ -40,6 +41,8 @@ class RecentTransactionsAdapter(private var items: MutableList<RecentTransaction
holder.bindings.tvInitial.text = getInitials(item.user)
holder.bindings.tvName.text = item.user
holder.bindings.tvUpdated.text = item.sendDate
holder.bindings.tvTextline1.text =
item.payoutAmt + " " + item.pCurr + " " + item.payoutMode.uppercase(Locale.ROOT)
holder.bindings.tvStatus.setOnClickListener {
listener?.navigateToChangeTransactionScreen(item)
}
@ -64,7 +67,7 @@ class RecentTransactionsAdapter(private var items: MutableList<RecentTransaction
if (item.displayActions != null) {
if (item.displayActions.contains(Constants.CancelStatus)) {
holder.bindings.tvResend.visibility = View.VISIBLE
holder.bindings.tvResend.text =mContext?.getString(R.string.request_to_cancel_text)
holder.bindings.tvResend.text = mContext?.getString(R.string.request_to_cancel_text)
}
if (item.displayActions.contains(Constants.AmendStatus)) {
holder.bindings.tvResend.visibility = View.GONE

54
app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt
View File

@ -46,6 +46,9 @@ import com.remit.jmecustomer.utils.Utils
import com.tsongkha.spinnerdatepicker.DatePicker
import com.tsongkha.spinnerdatepicker.DateRangePickerDialog.OnRangeDateSetListener
import com.tsongkha.spinnerdatepicker.SpinnerDateRangePickerDialogBuilder
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import java.util.*
import kotlin.collections.ArrayList
@ -73,6 +76,7 @@ class MyTransfersFragment : BaseFragment(),
private var homeViewModel: HomeViewModel? = null
var currentPage = 1
var lastPage = 0
var totalPages = 100
var scrollListener: EndlessRecyclerViewScrollListener? = null
var startDate = ""
@ -80,6 +84,8 @@ class MyTransfersFragment : BaseFragment(),
var isRecentEmpty = false
var isFirstCall = false;
var isContinueFromHome = false
var apiCallCount = 0
var isLoading = false
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
@ -142,10 +148,15 @@ class MyTransfersFragment : BaseFragment(),
view.bottom - (binding.nestedScrollView.height + binding.nestedScrollView.scrollY)
// Check if the user has reached the bottom of the scroll view
if (diff <= 0 && binding.nestedScrollView.scrollY > 0) {
if (!isRecentEmpty) {
isFirstCall = false
Handler().postDelayed({
if (diff <= 0 && binding.nestedScrollView.scrollY > 0 && !isLoading && currentPage > lastPage) {
// Check if the user has reached the bottom of the scroll view
isLoading = true
isFirstCall = false
lastPage = currentPage
// Call your API to fetch more data
// For example, using a coroutine
CoroutineScope(Dispatchers.Main).launch {
try {
presenter?.getAllRecipientListV5(
null,
"",
@ -153,14 +164,34 @@ class MyTransfersFragment : BaseFragment(),
this@MyTransfersFragment.endDate,
this@MyTransfersFragment.currentPage.toString()
)
}, 1000)
} catch (e: Exception) {
// Handle any errors that occur during the API call
} finally {
isLoading = false
}
}
// if (!isRecentEmpty) {
// isFirstCall = false
// Handler().postDelayed({
// presenter?.getAllRecipientListV5(
// null,
// "",
// this@MyTransfersFragment.startDate,
// this@MyTransfersFragment.endDate,
// this@MyTransfersFragment.currentPage.toString()
// )
// }, 1000)
// }
}
}
binding.swiperefresh.setOnRefreshListener {
startDate = ""
endDate = ""
performDefaultAction("", true)
binding.dateContainer.visibility = View.GONE
lastPage = 0
currentPage = 1
}
}
@ -219,7 +250,14 @@ class MyTransfersFragment : BaseFragment(),
if (isFirstCall) {
isRecentEmpty = false
}
if (data.isNullOrEmpty()) {
data?.clear()
lastPage = 0
currentPage = 1
recentAdapter?.setData(data)
}
currentPage = 1
lastPage = 0
presenter!!.getAllRecipientListV5(null, countryId, startDate, endDate, "")
}
@ -457,13 +495,7 @@ class MyTransfersFragment : BaseFragment(),
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == Constants.UPDATE_DELETE_CODE) {
if (!this@MyTransfersFragment.data.isNullOrEmpty()) {
this@MyTransfersFragment.data?.clear()
}
performDefaultAction("", true)
}
}
inner class SearchEditTextTextWatcher : TextWatcherAdapter() {

52
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java
View File

@ -74,32 +74,42 @@ public class RecipientAddEditV3Gateway extends PrivilegedGateway implements Reci
@Override
public Observable<AccountValidationApiResponse> validateAccountFromServer(String auth, String idType, String idNumber, String customerFirstName,
String customerLastName, String receiverFirstName, String receiverLastName,
String customerLastName, String receiverFirstName, String receiverMiddleName, String receiverLastName,
String country, String accountType, String issuerCode, String accountNo,
String amount, String bankCode, String payoutPartner, String processId, String bankId, String receiverCountryID,
String deliveryMethodID ) {
String deliveryMethodID, String paymentMode) {
JsonObject jsonObject=new JsonObject();
jsonObject.addProperty("idType",idType);
jsonObject.addProperty("idNumber",idNumber);
jsonObject.addProperty("customerFirstName",customerFirstName);
jsonObject.addProperty("customerLastName",customerLastName);
jsonObject.addProperty("receiverFirstName",receiverFirstName);
jsonObject.addProperty("receiverLastName",receiverLastName);
jsonObject.addProperty("country",country);
jsonObject.addProperty("accountType",accountType);
jsonObject.addProperty("issuerCode",issuerCode);
jsonObject.addProperty("accountNo",accountNo);
jsonObject.addProperty("amount",amount);
jsonObject.addProperty("bankCode",bankCode);
jsonObject.addProperty("payoutPartner",payoutPartner);
jsonObject.addProperty("processId",processId);
jsonObject.addProperty("bankId",bankId);
jsonObject.addProperty("receiverCountryId",receiverCountryID);
jsonObject.addProperty("deliveryMethodId",deliveryMethodID);
// jsonObject.addProperty("idType",idType);
// jsonObject.addProperty("idNumber",idNumber);
// jsonObject.addProperty("FirstName",customerFirstName);
// jsonObject.addProperty("customerLastName",customerLastName);
// jsonObject.addProperty("receiverFirstName",receiverFirstName);
// jsonObject.addProperty("receiverLastName",receiverLastName);
// jsonObject.addProperty("country",country);
// jsonObject.addProperty("accountType",accountType);
// jsonObject.addProperty("issuerCode",issuerCode);
//
// jsonObject.addProperty("AccountNumber",accountNo);
// jsonObject.addProperty("amount",amount);
// jsonObject.addProperty("BankCode",bankCode);
// jsonObject.addProperty("payoutPartner",payoutPartner);
// jsonObject.addProperty("processId",processId);
//
// jsonObject.addProperty("bankId",bankId);
// jsonObject.addProperty("receiverCountryId",receiverCountryID);
// jsonObject.addProperty("deliveryMethodId",deliveryMethodID);
jsonObject.addProperty("AccountNumber", accountNo);
jsonObject.addProperty("BankCode", bankCode);
jsonObject.addProperty("FirstName", receiverFirstName);
jsonObject.addProperty("MiddleName", receiverMiddleName);
jsonObject.addProperty("LastName", receiverLastName);
jsonObject.addProperty("BankCountry", country);
jsonObject.addProperty("UserName", getUserID());
jsonObject.addProperty("ProviderId", payoutPartner);
jsonObject.addProperty("PaymentMode", paymentMode);
jsonObject.addProperty("SessionId", processId);
return HttpClientV2.getInstance().accountValidationV2(auth,jsonObject);

4
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java
View File

@ -37,6 +37,7 @@ public interface RecipientAddEditV3GatewayInterface extends PrivilegedGatewayInt
String customerFirstName,
String customerLastName,
String receiverFirstName,
String receiverMiddleName,
String receiverLastName,
String country,
String accountType,
@ -48,7 +49,8 @@ public interface RecipientAddEditV3GatewayInterface extends PrivilegedGatewayInt
String processId,
String bankID,
String receiverCountryID,
String deliveryMethodID);
String deliveryMethodID,
String paymentMode);
String getMobilePrefixFromCountryCode(String code);

6
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java
View File

@ -183,6 +183,8 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel {
String customerFirstName = gateway.getUserFirstName();
String customerLastName = gateway.getUserLastName();
String receiverFirstName = validator.getRecipientDetail().getFirstName();
String middleName = validator.getRecipientDetail().getMiddleName();
String paymentMode = validator.getRecipientDetail().getPaymentMethod().getName();
String receiverLastName = validator.getRecipientDetail().getLastName();
String country = validator.getRecipientDetail().getCountryCode();
String accountType = "1";
@ -221,8 +223,8 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel {
if (receiverLastName == null)
receiverLastName = "";
compositeDisposable.add(gateway.validateAccountFromServer(gateway.getAuth(), idType, idNumber, customerFirstName, customerLastName, receiverFirstName, receiverLastName, country,
accountType, issuerCode, accountNumber, amount, bankCode, payoutPartner, processId, bankId, receiverCountryId, deliveryMethodID)
compositeDisposable.add(gateway.validateAccountFromServer(gateway.getAuth(), idType, idNumber, customerFirstName, customerLastName, receiverFirstName, middleName , receiverLastName,
country, accountType, issuerCode, accountNumber, amount, bankCode, payoutPartner, processId, bankId, receiverCountryId, deliveryMethodID, paymentMode)
.doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
.doFinally(() -> view.showProgressBar(false, ""))
.subscribeOn(Schedulers.io())

29
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java
View File

@ -118,13 +118,13 @@ public class RecipientEditV3ViewModel extends RecipientAddEditBaseV3ViewModel {
@Override
public void onSubmitBtnPressed() {
if (validator.requiresAccountValidation())
performAccountValidation(validator.getRecipientDetail().getAgent().getAccountNo());
else {
requestForOtp();
//updateRecipientInfo();
}
// if (validator.requiresAccountValidation())
// performAccountValidation(validator.getRecipientDetail().getAgent().getAccountNo());
// else {
// requestForOtp();
// //updateRecipientInfo();
// }
requestForOtp();
}
public void updateRecipientInfo() {
@ -137,10 +137,10 @@ public class RecipientEditV3ViewModel extends RecipientAddEditBaseV3ViewModel {
}
compositeDisposable.add(
this.gateway.editRecipient(
gateway.getAuth(),
gateway.getUserIDNumber(),
validator.getRecipientDetail().getReceiverId(),
validator.getRecipientDetailForPost())
gateway.getAuth(),
gateway.getUserIDNumber(),
validator.getRecipientDetail().getReceiverId(),
validator.getRecipientDetailForPost())
.doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
.doFinally(() -> view.showProgressBar(false, ""))
.subscribeOn(Schedulers.io())
@ -154,6 +154,7 @@ public class RecipientEditV3ViewModel extends RecipientAddEditBaseV3ViewModel {
if (validator.requiresAccountValidation())
performAccountValidation(validator.getRecipientDetail().getAgent().getAccountNo());
}
/**
* 1. Get CountryService Detail
*/
@ -189,6 +190,8 @@ public class RecipientEditV3ViewModel extends RecipientAddEditBaseV3ViewModel {
String customerFirstName = gateway.getUserFirstName();
String customerLastName = gateway.getUserLastName();
String receiverFirstName = validator.getRecipientDetail().getFirstName();
String middleName = validator.getRecipientDetail().getMiddleName();
String paymentMode = validator.getRecipientDetail().getPaymentMethod().getName();
String receiverLastName = validator.getRecipientDetail().getLastName();
String country = validator.getRecipientDetail().getCountryCode();
String accountType = "1";
@ -227,8 +230,8 @@ public class RecipientEditV3ViewModel extends RecipientAddEditBaseV3ViewModel {
String receiverCountryId = validator.getRecipientDetail().getCountryId();
String deliveryMethodID = validator.getRecipientDetail().getPaymentMethod().getId();
compositeDisposable.add(gateway.validateAccountFromServer(gateway.getAuth(), idType, idNumber, customerFirstName, customerLastName, receiverFirstName, receiverLastName, country,
accountType, issuerCode, accountNumber, amount, bankCode, payoutPartner, processId, bankId, receiverCountryId, deliveryMethodID)
compositeDisposable.add(gateway.validateAccountFromServer(gateway.getAuth(), idType, idNumber, customerFirstName, customerLastName, receiverFirstName, middleName, receiverLastName,
country, accountType, issuerCode, accountNumber, amount, bankCode, payoutPartner, processId, bankId, receiverCountryId, deliveryMethodID, paymentMode)
.doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
.doFinally(() -> view.showProgressBar(false, ""))
.subscribeOn(Schedulers.io())

6
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java
View File

@ -206,4 +206,10 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
super.finish();
setResult(Constants.UPDATE_DELETE_CODE);
}
@Override
protected void onDestroy() {
super.onDestroy();
setResult(Constants.UPDATE_DELETE_CODE);
}
}

13
app/src/main/res/drawable/blue_border_background_20.xml
View File

@ -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/_1sdp"
android:color="@color/light_blue"/>
<solid
android:color="@color/light_blue_20" />
</shape>

106
app/src/main/res/layout/activity_deposit_info.xml
View File

@ -33,21 +33,20 @@
android:layout_height="match_parent"
android:layout_margin="@dimen/_8sdp"
android:layout_weight="1"
app:cardCornerRadius="@dimen/_8sdp">
app:cardCornerRadius="@dimen/_10sdp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/light_blue_border_rounded"
android:background="@drawable/blue_border_background_20"
android:orientation="horizontal"
android:paddingVertical="@dimen/_15sdp"
app:cardCornerRadius="@dimen/_8sdp">
app:cardCornerRadius="@dimen/_10sdp">
<TextView
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/jmeTextView"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/MLabelTextView"
android:layout_width="0dp"
android:gravity="start"
android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp"
@ -59,11 +58,10 @@
app:txtfontName="@string/bold"
tools:ignore="HardcodedText" />
<TextView
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/jmeDepositTextView"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/MLabelTextView"
android:layout_width="0dp"
android:gravity="start"
android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp"
@ -79,7 +77,6 @@
<ImageView
android:layout_width="@dimen/_30sdp"
android:layout_height="@dimen/_25sdp"
app:tint="@color/black_opacity_87"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
app:layout_constraintBottom_toBottomOf="parent"
@ -101,19 +98,19 @@
<androidx.cardview.widget.CardView
android:id="@+id/jpPostCardContainer"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/_8sdp"
android:layout_weight="1"
app:cardCornerRadius="@dimen/_8sdp">
app:cardCornerRadius="@dimen/_10sdp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/light_blue_border_rounded"
android:background="@drawable/blue_border_background_20"
android:orientation="horizontal"
android:paddingVertical="@dimen/_15sdp"
app:cardCornerRadius="@dimen/_8sdp">
app:cardCornerRadius="@dimen/_10sdp">
<ImageView
@ -130,11 +127,10 @@
tools:ignore="ContentDescription"
app:tint="@color/black_opacity_87" />
<TextView
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/jpPostTextView"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/MLabelTextView"
android:layout_width="0dp"
android:gravity="start"
android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp"
@ -152,23 +148,22 @@
<androidx.cardview.widget.CardView
android:id="@+id/lawsonCardContainer"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/_8sdp"
android:layout_weight="1"
app:cardCornerRadius="@dimen/_8sdp">
app:cardCornerRadius="@dimen/_10sdp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/light_blue_border_rounded"
android:background="@drawable/blue_border_background_20"
android:orientation="horizontal"
android:paddingVertical="@dimen/_15sdp"
app:cardCornerRadius="@dimen/_8sdp">
app:cardCornerRadius="@dimen/_10sdp">
<ImageView
app:tint="@color/black_opacity_87"
android:id="@+id/lawsonCardIcon"
android:layout_width="@dimen/_30sdp"
android:layout_height="@dimen/_30sdp"
@ -179,13 +174,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/lawson_card_white"
tools:ignore="ContentDescription" />
tools:ignore="ContentDescription"
app:tint="@color/black_opacity_87" />
<TextView
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/lawsonCardTextView"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/MLabelTextView"
android:layout_width="0dp"
android:gravity="start"
android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp"
@ -211,40 +206,39 @@
<androidx.cardview.widget.CardView
android:id="@+id/eBankingCardContainer"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/_8sdp"
android:layout_weight="1"
app:cardCornerRadius="@dimen/_8sdp">
app:cardCornerRadius="@dimen/_10sdp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/light_blue_border_rounded"
android:background="@drawable/blue_border_background_20"
android:orientation="horizontal"
android:paddingVertical="@dimen/_15sdp"
app:cardCornerRadius="@dimen/_8sdp">
app:cardCornerRadius="@dimen/_10sdp">
<ImageView
app:tint="@color/black_opacity_87"
android:id="@+id/eBankingIcon"
android:layout_width="@dimen/_30sdp"
android:layout_height="@dimen/_30sdp"
android:layout_marginStart="@dimen/_15sdp"
android:layout_marginEnd="@dimen/_15sdp"
android:scaleType="centerCrop"
app:tint="@color/black_opacity_87"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ebanking_white"
tools:ignore="ContentDescription" />
<TextView
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/eBankingTextView"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/MLabelTextView"
android:layout_width="0dp"
android:gravity="start"
android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp"
@ -262,27 +256,27 @@
<androidx.cardview.widget.CardView
android:id="@+id/cashDepositCardContainer"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/_8sdp"
android:layout_weight="1"
app:cardCornerRadius="@dimen/_8sdp">
app:cardCornerRadius="@dimen/_10sdp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/light_blue_border_rounded"
android:background="@drawable/blue_border_background_20"
android:orientation="horizontal"
android:paddingVertical="@dimen/_15sdp"
app:cardCornerRadius="@dimen/_8sdp">
app:cardCornerRadius="@dimen/_10sdp">
<ImageView
app:tint="@color/black_opacity_87"
android:id="@+id/cashDepositCardIcon"
android:layout_width="@dimen/_30sdp"
android:layout_height="@dimen/_30sdp"
android:layout_marginStart="@dimen/_15sdp"
app:tint="@color/black_opacity_87"
android:layout_marginEnd="@dimen/_15sdp"
android:scaleType="centerCrop"
app:layout_constraintHorizontal_bias="0.5"
@ -291,11 +285,10 @@
app:srcCompat="@drawable/cash_deposit_white"
tools:ignore="ContentDescription" />
<TextView
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/cashDepositTextView"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/MLabelTextView"
android:layout_width="0dp"
android:gravity="start"
android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp"
@ -322,28 +315,28 @@
<androidx.cardview.widget.CardView
android:id="@+id/furikomiCardContainer"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/_8sdp"
android:layout_weight="1"
app:cardCornerRadius="@dimen/_8sdp">
app:cardCornerRadius="@dimen/_10sdp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/light_blue_border_rounded"
android:background="@drawable/blue_border_background_20"
android:orientation="horizontal"
android:paddingVertical="@dimen/_15sdp"
app:cardCornerRadius="@dimen/_8sdp">
app:cardCornerRadius="@dimen/_10sdp">
<ImageView
app:tint="@color/black_opacity_87"
android:id="@+id/furikomiIcon"
android:layout_width="@dimen/_30sdp"
android:layout_height="@dimen/_30sdp"
android:layout_marginStart="@dimen/_15sdp"
android:layout_marginEnd="@dimen/_15sdp"
app:tint="@color/black_opacity_87"
android:scaleType="centerCrop"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
@ -351,11 +344,10 @@
app:srcCompat="@drawable/furikomi_details_white"
tools:ignore="ContentDescription" />
<TextView
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/furikomiTextView"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/MLabelTextView"
android:layout_width="0dp"
android:gravity="start"
android:paddingStart="@dimen/_15sdp"
android:paddingEnd="@dimen/_15sdp"

5
app/src/main/res/layout/activity_home_v3.xml
View File

@ -17,7 +17,7 @@
app:layout_constraintTop_toBottomOf="@+id/toolbar_head" />
<LinearLayout
<RelativeLayout
android:elevation="@dimen/_10sdp"
android:id="@+id/cl_bottom_layout"
app:layout_constraintStart_toStartOf="parent"
@ -44,7 +44,8 @@
app:tabIndicatorColor="@color/light_blue"
/>
</LinearLayout>
</RelativeLayout>

1
app/src/main/res/layout/row_recent_transactions.xml
View File

@ -70,7 +70,6 @@
android:layout_marginLeft="@dimen/_8sdp"
android:id="@+id/tv_textline1"
android:text="Text line 2"
android:visibility="gone"
android:layout_marginTop="@dimen/_6sdp"
android:textColor="@color/black_opacity_38"
style="@style/TextStyle.VolteSemiBold14"

1
app/src/main/res/values/colors.xml
View File

@ -78,6 +78,7 @@
<color name="light_green">#00CC99</color>
<color name="light_transparent_blue">#0A0052FF</color>
<color name="light_blue_40">#660052FF</color>
<color name="light_blue_20">#330052FF</color>
<color name="light_blue_10">#1A0052FF</color>
<color name="light_blue_5">#0D0052FF</color>
<color name="light_grey">#0000001F</color>

2
app/src/main/res/values/styles.xml
View File

@ -257,7 +257,7 @@
<item name="android:textSize">@dimen/text_small</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:fontFamily">@font/san_francisco_text_regular</item>
<item name="android:fontFamily">@font/volte_medium</item>
</style>
<style name="MFormLink">

Write Preview
Loading…
Cancel
Save