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

Partner info added in receipt

master
Preyea Regmi 4 years ago
parent
5ea220d50f
commit
dcef4366df
5 changed files with 61 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2Presenter.java
  3. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java
  4. 38
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java
  5. 61
      app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml

BIN
.idea/caches/build_file_checksums.ser
View File

4
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2Presenter.java
View File

@ -56,11 +56,11 @@ public class SendMoneyTransactionCompleteV2Presenter extends BasePresenter imple
view.showReceiptData(data); view.showReceiptData(data);
if("Y".equalsIgnoreCase(data.getShowPartnerLogo())) if("Y".equalsIgnoreCase(data.getShowPartnerLogo()))
{ {
view.showPartnerInfo(true,data.getLogoText(),data.getLogoUrl());
view.showPartnerInfo(true,data.getLogoText(),data.getLogoUrl(),"* "+data.getNote());
} }
else else
{ {
view.showPartnerInfo(false,"","");
view.showPartnerInfo(false,"","","");
} }
} }

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java
View File

@ -15,7 +15,7 @@ public interface SendMoneyTransactionCompleteV2PresenterInterface extends BasePr
void showReceiptData(SendMoneyTransactionCompleteModel recieptData); void showReceiptData(SendMoneyTransactionCompleteModel recieptData);
void showPartnerInfo(boolean action,String partnerText,String partnerLogoUrl);
void showPartnerInfo(boolean action,String partnerText,String partnerLogoUrl,String note);
} }
} }

38
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java
View File

@ -4,19 +4,23 @@ import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.request.RequestListener; 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.target.Target;
import com.bumptech.glide.request.transition.Transition;
import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.R;
import com.gmeremit.online.gmeremittance_native.base.BaseActivity; import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView; import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView;
@ -105,9 +109,13 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
@BindView(R.id.container_partner_info) @BindView(R.id.container_partner_info)
ViewGroup container_partner_info; ViewGroup container_partner_info;
@BindView(R.id.txt_partner_info) @BindView(R.id.txt_partner_info)
TextView txt_partner_info; TextView txt_partner_info;
@BindView(R.id.txt_note)
TextView txt_note;
@BindView(R.id.img_partner_info) @BindView(R.id.img_partner_info)
ImageView 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"; public static final String IS_TRANSACTION_DETAIL_REQUEST_FROM_SEND_MONEY_BUNDLE_KEY = "bundleKeyTransactionDetailRequest";
private boolean isRequestedBySendMoney = false; private boolean isRequestedBySendMoney = false;
private String controlId; private String controlId;
private String TAG="TranssactionReceipt";
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -235,36 +244,37 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
} }
@Override @Override
public void showPartnerInfo(boolean action, String partnerText, String partnerLogoUrl) {
public void showPartnerInfo(boolean action, String partnerText, String partnerLogoUrl,String note) {
if(true) if(true)
{ {
img_partner_info.setImageResource(0);
txt_partner_info.setText(partnerText); txt_partner_info.setText(partnerText);
txt_note.setText(note);
progressbar_partner_info.setVisibility(View.VISIBLE); progressbar_partner_info.setVisibility(View.VISIBLE);
container_partner_info.setVisibility(View.VISIBLE); container_partner_info.setVisibility(View.VISIBLE);
Glide.with(img_partner_info.getContext()).asBitmap().load(partnerLogoUrl) .listener(new RequestListener<Bitmap>() {
Glide.with(img_partner_info.getContext()).asBitmap().load(partnerLogoUrl).into(new CustomTarget<Bitmap>() {
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
Log.d(TAG,"Resource load success");
progressbar_partner_info.setVisibility(View.GONE); 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 @Override
public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
public void onLoadCleared(@Nullable Drawable placeholder) {
Log.d(TAG,"Resource load failed");
progressbar_partner_info.setVisibility(View.GONE); 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 else
{ {
container_partner_info.setVisibility(View.GONE); container_partner_info.setVisibility(View.GONE);
progressbar_partner_info.setVisibility(View.GONE);
img_partner_info.setImageResource(0);
txt_partner_info.setText("");
} }
} }

61
app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
View File

@ -571,7 +571,7 @@
android:id="@+id/progressbar_partner_info" android:id="@+id/progressbar_partner_info"
android:layout_width="@dimen/_18sdp" android:layout_width="@dimen/_18sdp"
android:layout_height="@dimen/_18sdp" android:layout_height="@dimen/_18sdp"
android:layout_marginBottom="@dimen/_20sdp"
android:layout_marginBottom="@dimen/_27sdp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
@ -580,7 +580,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/txt_note"
app:layout_constraintTop_toBottomOf="@+id/img_partner_info" app:layout_constraintTop_toBottomOf="@+id/img_partner_info"
android:layout_width="match_parent" android:layout_width="match_parent"
tools:text="ASdf" tools:text="ASdf"
@ -590,6 +590,21 @@
android:textColor="@color/darkgray" android:textColor="@color/darkgray"
android:textSize="@dimen/_9ssp" /> android:textSize="@dimen/_9ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txt_partner_info"
android:layout_marginStart="@dimen/_16sdp"
android:layout_marginEnd="@dimen/_16sdp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:id="@+id/txt_note"
android:layout_marginTop="@dimen/_10sdp"
android:textColor="@color/darkgray"
android:textSize="@dimen/_9ssp" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
@ -613,50 +628,42 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="1"> android:weightSum="1">
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".5"
android:paddingLeft="@dimen/_8sdp"
android:paddingRight="@dimen/_8sdp">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:layout_marginStart="@dimen/_5sdp"
android:layout_marginEnd="@dimen/_5sdp"
android:paddingStart="@dimen/_5sdp"
android:paddingEnd="@dimen/_5sdp"
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
style="@style/gme_button" style="@style/gme_button"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:layout_marginBottom="30dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".5"
android:background="@drawable/ic_rounded_background_red_coloured" android:background="@drawable/ic_rounded_background_red_coloured"
android:inputType="textMultiLine" android:inputType="textMultiLine"
android:minHeight="45dp"
android:padding="@dimen/_4sdp"
android:text="@string/request_to_cancel_text" android:text="@string/request_to_cancel_text"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/_12ssp" />
</FrameLayout>
android:textSize="@dimen/_10ssp" />
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".5"
android:paddingLeft="@dimen/_8sdp"
android:paddingRight="@dimen/_8sdp">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:layout_marginStart="@dimen/_5sdp"
android:layout_marginEnd="@dimen/_5sdp"
android:paddingStart="@dimen/_5sdp"
android:paddingEnd="@dimen/_5sdp"
android:id="@+id/btn_change" android:id="@+id/btn_change"
style="@style/gme_button" style="@style/gme_button"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="20dp"
android:layout_marginBottom="30dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".5"
android:background="@drawable/ic_rounded_background_red_coloured" android:background="@drawable/ic_rounded_background_red_coloured"
android:minHeight="45dp"
android:padding="@dimen/_4sdp"
android:text="@string/request_to_change_text" android:text="@string/request_to_change_text"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/_12ssp" />
</FrameLayout>
android:textSize="@dimen/_10ssp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

Write Preview
Loading…
Cancel
Save