From 944581c4599a08e044965f059b29e3e27e129a9e Mon Sep 17 00:00:00 2001 From: Mohan Shiwakoti Date: Fri, 26 May 2023 16:21:09 +0545 Subject: [PATCH] api changes recent filter issue fixes , other minor issue fixes --- .../BeneficiaryDetailActivity.kt | 1 + .../adapters/SendMethodAdapter.kt | 4 +- .../features/homeV3/view/HomeActivityV3.kt | 5 +- .../features/homeV3/view/HomeFragmentV3.kt | 87 ++++++++------ .../adapters/RecentTransactionsAdapter.kt | 5 +- .../myTransfers/view/MyTransfersFragment.kt | 54 +++++++-- .../RecipientAddEditV3Gateway.java | 52 +++++---- .../RecipientAddEditV3GatewayInterface.java | 4 +- .../add/RecipientAddV3ViewModel.java | 6 +- .../edit/RecipientEditV3ViewModel.java | 29 ++--- .../RecipientAddEditV3Activity.java | 6 + .../drawable/blue_border_background_20.xml | 13 +++ .../main/res/layout/activity_deposit_info.xml | 106 ++++++++---------- app/src/main/res/layout/activity_home_v3.xml | 5 +- .../res/layout/row_recent_transactions.xml | 1 - app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/styles.xml | 2 +- 17 files changed, 233 insertions(+), 148 deletions(-) create mode 100644 app/src/main/res/drawable/blue_border_background_20.xml diff --git a/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt b/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt index 6a310ea6..3f0ece1c 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt +++ b/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt @@ -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 diff --git a/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/adapters/SendMethodAdapter.kt b/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/adapters/SendMethodAdapter.kt index 876c815d..bce8eb22 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/adapters/SendMethodAdapter.kt +++ b/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/adapters/SendMethodAdapter.kt @@ -39,7 +39,9 @@ class SendMethodAdapter(private val items: List) : @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) diff --git a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt index a609a994..cfb15635 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt +++ b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt @@ -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) } diff --git a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt index 674b61bc..d5893087 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt +++ b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt @@ -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) { - 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() } } diff --git a/app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt b/app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt index d7cfebc3..67642bc4 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt +++ b/app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt @@ -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) : RecyclerView.Adapter() { @@ -40,6 +41,8 @@ class RecentTransactionsAdapter(private var items: MutableList 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() { diff --git a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java index c4fe0f73..bdb26152 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java @@ -74,32 +74,42 @@ public class RecipientAddEditV3Gateway extends PrivilegedGateway implements Reci @Override public Observable 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); diff --git a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java index 3a4cc2a8..70920dc1 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java @@ -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); diff --git a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java index cbef6d7a..d6ed3b09 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java @@ -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()) diff --git a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java index 4309b177..1eedd5bf 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java @@ -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()) diff --git a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java index dec972f7..4f3e1eac 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java @@ -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); + } } diff --git a/app/src/main/res/drawable/blue_border_background_20.xml b/app/src/main/res/drawable/blue_border_background_20.xml new file mode 100644 index 00000000..6f2be263 --- /dev/null +++ b/app/src/main/res/drawable/blue_border_background_20.xml @@ -0,0 +1,13 @@ + + + + + + + + \ 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 index d7560fbc..435f867a 100644 --- a/app/src/main/res/layout/activity_deposit_info.xml +++ b/app/src/main/res/layout/activity_deposit_info.xml @@ -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"> + app:cardCornerRadius="@dimen/_10sdp"> - - + app:cardCornerRadius="@dimen/_10sdp"> + app:cardCornerRadius="@dimen/_10sdp"> - + app:cardCornerRadius="@dimen/_10sdp"> + app:cardCornerRadius="@dimen/_10sdp"> + tools:ignore="ContentDescription" + app:tint="@color/black_opacity_87" /> - + app:cardCornerRadius="@dimen/_10sdp"> + app:cardCornerRadius="@dimen/_10sdp"> - + app:cardCornerRadius="@dimen/_10sdp"> + app:cardCornerRadius="@dimen/_10sdp"> - + app:cardCornerRadius="@dimen/_10sdp"> + app:cardCornerRadius="@dimen/_10sdp"> - - - + + diff --git a/app/src/main/res/layout/row_recent_transactions.xml b/app/src/main/res/layout/row_recent_transactions.xml index 12238331..557d9499 100644 --- a/app/src/main/res/layout/row_recent_transactions.xml +++ b/app/src/main/res/layout/row_recent_transactions.xml @@ -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" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a124acef..1af8c5ec 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -78,6 +78,7 @@ #00CC99 #0A0052FF #660052FF + #330052FF #1A0052FF #0D0052FF #0000001F diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 126ee28f..a4f4efdc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -257,7 +257,7 @@ @dimen/text_small wrap_content match_parent - @font/san_francisco_text_regular + @font/volte_medium