diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 85c14892..317760de 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2Presenter.java index 4fb93863..40c613ee 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2Presenter.java @@ -56,11 +56,11 @@ public class SendMoneyTransactionCompleteV2Presenter extends BasePresenter imple view.showReceiptData(data); if("Y".equalsIgnoreCase(data.getShowPartnerLogo())) { - view.showPartnerInfo(true,data.getLogoText(),data.getLogoUrl()); + view.showPartnerInfo(true,data.getLogoText(),data.getLogoUrl(),"* "+data.getNote()); } else { - view.showPartnerInfo(false,"",""); + view.showPartnerInfo(false,"","",""); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java index 4f68184d..ef4809a7 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java @@ -15,7 +15,7 @@ public interface SendMoneyTransactionCompleteV2PresenterInterface extends BasePr void showReceiptData(SendMoneyTransactionCompleteModel recieptData); - void showPartnerInfo(boolean action,String partnerText,String partnerLogoUrl); + void showPartnerInfo(boolean action,String partnerText,String partnerLogoUrl,String note); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java index 26496b9e..4e6360e2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java @@ -4,19 +4,23 @@ import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.request.RequestListener; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.Target; +import com.bumptech.glide.request.transition.Transition; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.base.BaseActivity; import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView; @@ -105,9 +109,13 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme @BindView(R.id.container_partner_info) ViewGroup container_partner_info; + @BindView(R.id.txt_partner_info) TextView txt_partner_info; + @BindView(R.id.txt_note) + TextView txt_note; + @BindView(R.id.img_partner_info) ImageView img_partner_info; @@ -122,6 +130,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme public static final String IS_TRANSACTION_DETAIL_REQUEST_FROM_SEND_MONEY_BUNDLE_KEY = "bundleKeyTransactionDetailRequest"; private boolean isRequestedBySendMoney = false; private String controlId; + private String TAG="TranssactionReceipt"; @Override protected void onCreate(Bundle savedInstanceState) { @@ -235,36 +244,37 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme } @Override - public void showPartnerInfo(boolean action, String partnerText, String partnerLogoUrl) { + public void showPartnerInfo(boolean action, String partnerText, String partnerLogoUrl,String note) { if(true) { - img_partner_info.setImageResource(0); txt_partner_info.setText(partnerText); + txt_note.setText(note); progressbar_partner_info.setVisibility(View.VISIBLE); container_partner_info.setVisibility(View.VISIBLE); - Glide.with(img_partner_info.getContext()).asBitmap().load(partnerLogoUrl) .listener(new RequestListener() { + Glide.with(img_partner_info.getContext()).asBitmap().load(partnerLogoUrl).into(new CustomTarget() { @Override - public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { - + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + Log.d(TAG,"Resource load success"); progressbar_partner_info.setVisibility(View.GONE); - img_partner_info.setVisibility(View.GONE); - return false; + img_partner_info.setVisibility(View.VISIBLE); + img_partner_info.setImageBitmap(resource); } @Override - public boolean onResourceReady(Bitmap resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { + public void onLoadCleared(@Nullable Drawable placeholder) { + Log.d(TAG,"Resource load failed"); + progressbar_partner_info.setVisibility(View.GONE); - img_partner_info.setVisibility(View.VISIBLE); - return false; + img_partner_info.setVisibility(View.GONE); } - }).into(img_partner_info); + }); + + } else { container_partner_info.setVisibility(View.GONE); - progressbar_partner_info.setVisibility(View.GONE); - img_partner_info.setImageResource(0); - txt_partner_info.setText(""); + } } diff --git a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml index 1e664c3e..bd2bcfec 100644 --- a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml +++ b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml @@ -571,7 +571,7 @@ android:id="@+id/progressbar_partner_info" android:layout_width="@dimen/_18sdp" android:layout_height="@dimen/_18sdp" - android:layout_marginBottom="@dimen/_20sdp" + android:layout_marginBottom="@dimen/_27sdp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -580,7 +580,7 @@ + + - + - + android:textSize="@dimen/_10ssp" /> - - + android:textSize="@dimen/_10ssp" />