-
BIN.idea/caches/build_file_checksums.ser
-
5app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGateway.java
-
1app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGatewayInterface.java
-
8app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java
-
2app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java
-
20app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java
-
12app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/adapter/rewardlisting/OrderListingRvAdapter.java
-
24app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/adapter/rewardlisting/RewardListingRvAdapter.java
-
16app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/gateway/rewardredeem/RewardRedeemV2Gateway.java
-
64app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/model/rewardlisting/RewardOrderedProductItemModel.java
-
41app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/model/rewardlisting/RewardProductItemModel.java
-
90app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/model/rewardredeem/BranchInfoModel.java
-
118app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/model/rewardredeem/RewardRedeemRequestBody.java
-
6app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardredeem/RewardRedeemV2InteractorInterface.java
-
167app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardredeem/RewardRedeemV2Presenter.java
-
18app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardredeem/RewardRedeemV2PresenterInterface.java
-
77app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardlisting/OrderHistoryFragment.java
-
57app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardlisting/RewardListFragment.java
-
19app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardlisting/RewardListingV2Activity.java
-
74app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardorderdetail/RewardOrderDetailActivity.java
-
136app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardredeem/RewardRedeemV2Activity.java
-
2app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java
-
4app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java
-
22app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
-
2app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java
-
2app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
-
2app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java
-
9app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java
-
BINapp/src/main/res/drawable-hdpi/grid_view_selected.png
-
BINapp/src/main/res/drawable-hdpi/grid_view_unselected.png
-
BINapp/src/main/res/drawable-hdpi/ico_color_gift.png
-
BINapp/src/main/res/drawable-hdpi/list_view_selected.png
-
BINapp/src/main/res/drawable-hdpi/list_view_unselected.png
-
BINapp/src/main/res/drawable-mdpi/grid_view_selected.png
-
BINapp/src/main/res/drawable-mdpi/grid_view_unselected.png
-
BINapp/src/main/res/drawable-mdpi/ico_color_gift.png
-
BINapp/src/main/res/drawable-mdpi/list_view_selected.png
-
BINapp/src/main/res/drawable-mdpi/list_view_unselected.png
-
BINapp/src/main/res/drawable-xhdpi/grid_view_selected.png
-
BINapp/src/main/res/drawable-xhdpi/grid_view_unselected.png
-
BINapp/src/main/res/drawable-xhdpi/ico_color_gift.png
-
BINapp/src/main/res/drawable-xhdpi/list_view_selected.png
-
BINapp/src/main/res/drawable-xhdpi/list_view_unselected.png
-
BINapp/src/main/res/drawable-xxhdpi/grid_view_selected.png
-
BINapp/src/main/res/drawable-xxhdpi/grid_view_unselected.png
-
BINapp/src/main/res/drawable-xxhdpi/list_view_selected.png
-
BINapp/src/main/res/drawable-xxhdpi/list_view_unselected.png
-
43app/src/main/res/drawable-xxhdpi/radiobutton_listview_selector.xml
-
BINapp/src/main/res/drawable-xxxhdpi/grid_view_selected.png
-
BINapp/src/main/res/drawable-xxxhdpi/grid_view_unselected.png
-
BINapp/src/main/res/drawable-xxxhdpi/list_view_selected.png
-
BINapp/src/main/res/drawable-xxxhdpi/list_view_unselected.png
-
9app/src/main/res/drawable/control_switch_background_border.xml
-
43app/src/main/res/drawable/radiobutton_gridview_selector.xml
-
70app/src/main/res/layout/activity_reward_order_detail.xml
-
69app/src/main/res/layout/activity_reward_redeem_v2.xml
-
6app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
-
2app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml
-
4app/src/main/res/layout/fragment_home_v2.xml
-
25app/src/main/res/layout/fragment_order_history.xml
-
58app/src/main/res/layout/fragment_reward_list.xml
-
21app/src/main/res/layout/reward_list_item.xml
@ -0,0 +1,90 @@ |
|||||
|
package com.gmeremit.online.gmeremittance_native.rewardV2.model.rewardredeem; |
||||
|
|
||||
|
import com.google.gson.annotations.Expose; |
||||
|
import com.google.gson.annotations.SerializedName; |
||||
|
|
||||
|
public class BranchInfoModel { |
||||
|
|
||||
|
@SerializedName("agentId") |
||||
|
@Expose |
||||
|
private String agentId; |
||||
|
@SerializedName("agentName") |
||||
|
@Expose |
||||
|
private String agentName; |
||||
|
@SerializedName("agentState") |
||||
|
@Expose |
||||
|
private String agentState; |
||||
|
@SerializedName("agentCity") |
||||
|
@Expose |
||||
|
private String agentCity; |
||||
|
@SerializedName("agentAddress") |
||||
|
@Expose |
||||
|
private String agentAddress; |
||||
|
@SerializedName("agentZip") |
||||
|
@Expose |
||||
|
private String agentZip; |
||||
|
@SerializedName("agentPhone") |
||||
|
@Expose |
||||
|
private String agentPhone; |
||||
|
|
||||
|
public String getAgentId() { |
||||
|
return agentId; |
||||
|
} |
||||
|
|
||||
|
public void setAgentId(String agentId) { |
||||
|
this.agentId = agentId; |
||||
|
} |
||||
|
|
||||
|
public String getAgentName() { |
||||
|
return agentName; |
||||
|
} |
||||
|
|
||||
|
public void setAgentName(String agentName) { |
||||
|
this.agentName = agentName; |
||||
|
} |
||||
|
|
||||
|
public String getAgentState() { |
||||
|
return agentState; |
||||
|
} |
||||
|
|
||||
|
public void setAgentState(String agentState) { |
||||
|
this.agentState = agentState; |
||||
|
} |
||||
|
|
||||
|
public String getAgentCity() { |
||||
|
return agentCity; |
||||
|
} |
||||
|
|
||||
|
public void setAgentCity(String agentCity) { |
||||
|
this.agentCity = agentCity; |
||||
|
} |
||||
|
|
||||
|
public String getAgentAddress() { |
||||
|
return agentAddress; |
||||
|
} |
||||
|
|
||||
|
public void setAgentAddress(String agentAddress) { |
||||
|
this.agentAddress = agentAddress; |
||||
|
} |
||||
|
|
||||
|
public String getAgentZip() { |
||||
|
return agentZip; |
||||
|
} |
||||
|
|
||||
|
public void setAgentZip(String agentZip) { |
||||
|
this.agentZip = agentZip; |
||||
|
} |
||||
|
|
||||
|
public String getAgentPhone() { |
||||
|
return agentPhone; |
||||
|
} |
||||
|
|
||||
|
public void setAgentPhone(String agentPhone) { |
||||
|
this.agentPhone = agentPhone; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public String toString() { |
||||
|
return agentAddress; |
||||
|
} |
||||
|
} |
@ -0,0 +1,118 @@ |
|||||
|
package com.gmeremit.online.gmeremittance_native.rewardV2.model.rewardredeem; |
||||
|
|
||||
|
import com.google.gson.annotations.Expose; |
||||
|
import com.google.gson.annotations.SerializedName; |
||||
|
|
||||
|
public class RewardRedeemRequestBody { |
||||
|
|
||||
|
@SerializedName("userId") |
||||
|
@Expose |
||||
|
private String userId; |
||||
|
@SerializedName("productCode") |
||||
|
@Expose |
||||
|
private String productCode; |
||||
|
@SerializedName("usePoint") |
||||
|
@Expose |
||||
|
private String usePoint; |
||||
|
@SerializedName("orderType") |
||||
|
@Expose |
||||
|
private String orderType; |
||||
|
@SerializedName("recvType") |
||||
|
@Expose |
||||
|
private String recvType; |
||||
|
@SerializedName("branchCode") |
||||
|
@Expose |
||||
|
private String branchCode; |
||||
|
@SerializedName("recvAddress") |
||||
|
@Expose |
||||
|
private String recvAddress; |
||||
|
@SerializedName("recvZipCode") |
||||
|
@Expose |
||||
|
private String recvZipCode; |
||||
|
@SerializedName("recvPhoneNumber") |
||||
|
@Expose |
||||
|
private String recvPhoneNumber; |
||||
|
@SerializedName("recvName") |
||||
|
@Expose |
||||
|
private String recvName; |
||||
|
|
||||
|
public String getUserId() { |
||||
|
return userId; |
||||
|
} |
||||
|
|
||||
|
public void setUserId(String userId) { |
||||
|
this.userId = userId; |
||||
|
} |
||||
|
|
||||
|
public String getProductCode() { |
||||
|
return productCode; |
||||
|
} |
||||
|
|
||||
|
public void setProductCode(String productCode) { |
||||
|
this.productCode = productCode; |
||||
|
} |
||||
|
|
||||
|
public String getUsePoint() { |
||||
|
return usePoint; |
||||
|
} |
||||
|
|
||||
|
public void setUsePoint(String usePoint) { |
||||
|
this.usePoint = usePoint; |
||||
|
} |
||||
|
|
||||
|
public String getOrderType() { |
||||
|
return orderType; |
||||
|
} |
||||
|
|
||||
|
public void setOrderType(String orderType) { |
||||
|
this.orderType = orderType; |
||||
|
} |
||||
|
|
||||
|
public String getRecvType() { |
||||
|
return recvType; |
||||
|
} |
||||
|
|
||||
|
public void setRecvType(String recvType) { |
||||
|
this.recvType = recvType; |
||||
|
} |
||||
|
|
||||
|
public String getBranchCode() { |
||||
|
return branchCode; |
||||
|
} |
||||
|
|
||||
|
public void setBranchCode(String branchCode) { |
||||
|
this.branchCode = branchCode; |
||||
|
} |
||||
|
|
||||
|
public String getRecvAddress() { |
||||
|
return recvAddress; |
||||
|
} |
||||
|
|
||||
|
public void setRecvAddress(String recvAddress) { |
||||
|
this.recvAddress = recvAddress; |
||||
|
} |
||||
|
|
||||
|
public String getRecvZipCode() { |
||||
|
return recvZipCode; |
||||
|
} |
||||
|
|
||||
|
public void setRecvZipCode(String recvZipCode) { |
||||
|
this.recvZipCode = recvZipCode; |
||||
|
} |
||||
|
|
||||
|
public String getRecvPhoneNumber() { |
||||
|
return recvPhoneNumber; |
||||
|
} |
||||
|
|
||||
|
public void setRecvPhoneNumber(String recvPhoneNumber) { |
||||
|
this.recvPhoneNumber = recvPhoneNumber; |
||||
|
} |
||||
|
|
||||
|
public String getRecvName() { |
||||
|
return recvName; |
||||
|
} |
||||
|
|
||||
|
public void setRecvName(String recvName) { |
||||
|
this.recvName = recvName; |
||||
|
} |
||||
|
} |
@ -1,15 +1,172 @@ |
|||||
package com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardredeem; |
package com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardredeem; |
||||
|
|
||||
|
import com.bumptech.glide.Glide; |
||||
|
import com.gmeremit.online.gmeremittance_native.R; |
||||
import com.gmeremit.online.gmeremittance_native.base.BasePresenter; |
import com.gmeremit.online.gmeremittance_native.base.BasePresenter; |
||||
|
import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog; |
||||
import com.gmeremit.online.gmeremittance_native.rewardV2.gateway.rewardredeem.RewardRedeemV2Gateway; |
import com.gmeremit.online.gmeremittance_native.rewardV2.gateway.rewardredeem.RewardRedeemV2Gateway; |
||||
|
import com.gmeremit.online.gmeremittance_native.rewardV2.model.rewardlisting.RewardProductItemModel; |
||||
|
import com.gmeremit.online.gmeremittance_native.rewardV2.model.rewardredeem.BranchInfoModel; |
||||
|
import com.gmeremit.online.gmeremittance_native.rewardV2.model.rewardredeem.RewardRedeemRequestBody; |
||||
|
import com.gmeremit.online.gmeremittance_native.utils.Constants; |
||||
|
import com.gmeremit.online.gmeremittance_native.utils.Utils; |
||||
|
import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponseV2; |
||||
|
import com.gmeremit.online.gmeremittance_native.utils.https.GenericResponseDataModel; |
||||
|
import com.google.gson.reflect.TypeToken; |
||||
|
|
||||
public class RewardRedeemV2Presenter extends BasePresenter implements RewardRedeemV2PresenterInterface,RewardRedeemV2InteractorInterface { |
|
||||
|
import java.lang.reflect.Type; |
||||
|
import java.util.ArrayList; |
||||
|
import java.util.List; |
||||
|
|
||||
RewardRedeemV2PresenterInterface.RewardRedeemV2ContractInterface view; |
|
||||
RewardRedeemV2InteractorInterface.RewardRedeemV2GatewayInterface gateway; |
|
||||
|
import io.reactivex.android.schedulers.AndroidSchedulers; |
||||
|
import io.reactivex.schedulers.Schedulers; |
||||
|
|
||||
public RewardRedeemV2Presenter(RewardRedeemV2PresenterInterface.RewardRedeemV2ContractInterface view) { |
|
||||
|
public class RewardRedeemV2Presenter extends BasePresenter implements RewardRedeemV2PresenterInterface, RewardRedeemV2InteractorInterface { |
||||
|
|
||||
|
private final RewardProductItemModel selectedReward; |
||||
|
RewardRedeemV2ContractInterface view; |
||||
|
RewardRedeemV2GatewayInterface gateway; |
||||
|
private List<BranchInfoModel> branchList; |
||||
|
private BranchInfoModel selectedBranch; |
||||
|
|
||||
|
|
||||
|
public RewardRedeemV2Presenter(RewardRedeemV2ContractInterface view, RewardProductItemModel selectedReward) { |
||||
this.view = view; |
this.view = view; |
||||
this.gateway=new RewardRedeemV2Gateway(this); |
|
||||
|
this.gateway = new RewardRedeemV2Gateway(this); |
||||
|
this.selectedReward = selectedReward; |
||||
|
branchList = new ArrayList<>(); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public void getRelatedData() { |
||||
|
this.gateway.getBranchInfo(gateway.getAuth()) |
||||
|
.doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) |
||||
|
.doFinally(() -> view.showProgressBar(false, "")) |
||||
|
.subscribeOn(Schedulers.io()) |
||||
|
.observeOn(AndroidSchedulers.mainThread()) |
||||
|
.subscribe(new BranchInfoListObserver()); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public List<BranchInfoModel> getBranchRelatedData() { |
||||
|
return this.branchList; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public void proceedToRewardRedeem() { |
||||
|
if (!validate()) |
||||
|
return; |
||||
|
RewardRedeemRequestBody rewardRedeemRequestBody = new RewardRedeemRequestBody(); |
||||
|
rewardRedeemRequestBody.setBranchCode(selectedBranch.getAgentId()); |
||||
|
rewardRedeemRequestBody.setOrderType("1"); |
||||
|
rewardRedeemRequestBody.setProductCode(selectedReward.getProductCode()); |
||||
|
rewardRedeemRequestBody.setRecvAddress(selectedBranch.getAgentAddress()); |
||||
|
rewardRedeemRequestBody.setRecvName(gateway.getUserFirstName()); |
||||
|
rewardRedeemRequestBody.setRecvPhoneNumber(gateway.getUserMsisdn()); |
||||
|
rewardRedeemRequestBody.setRecvType("2"); |
||||
|
rewardRedeemRequestBody.setRecvZipCode(""); |
||||
|
rewardRedeemRequestBody.setUsePoint(selectedReward.getPointPrice()); |
||||
|
rewardRedeemRequestBody.setUserId(gateway.getUserID()); |
||||
|
|
||||
|
this.gateway.redeemReward(gateway.getAuth(), rewardRedeemRequestBody) |
||||
|
.doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) |
||||
|
.doFinally(() -> view.showProgressBar(false, "")) |
||||
|
.subscribeOn(Schedulers.io()) |
||||
|
.observeOn(AndroidSchedulers.mainThread()) |
||||
|
.subscribe(new RewardRedeemOperationObserver()); |
||||
|
} |
||||
|
|
||||
|
private boolean validate() { |
||||
|
if (selectedBranch == null) { |
||||
|
view.showToastMessage(getStringfromStringId(R.string.branch_empty_error)); |
||||
|
return false; |
||||
|
} |
||||
|
return true; |
||||
|
} |
||||
|
|
||||
|
public void setSelectedBranch(BranchInfoModel selectedBranch) { |
||||
|
this.selectedBranch = selectedBranch; |
||||
|
} |
||||
|
|
||||
|
|
||||
|
public class BranchInfoListObserver extends GenericApiObserverResponseV2<List<BranchInfoModel>> { |
||||
|
|
||||
|
@Override |
||||
|
protected Type getDataType() { |
||||
|
return TypeToken.getParameterized(List.class, BranchInfoModel.class).getType(); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
protected void onSuccess(GenericResponseDataModel<List<BranchInfoModel>> t) { |
||||
|
if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { |
||||
|
branchList = t.getData(); |
||||
|
view.showUserName(gateway.getUserFirstName()); |
||||
|
view.showMobileNumber(gateway.getUserMsisdn()); |
||||
|
view.showRewardFooter(prepareFooterNote()); |
||||
|
Glide.with(view.getRewardImageView().getContext()) |
||||
|
.load(selectedReward.getProductImgPath()) |
||||
|
.error(R.drawable.ico_color_gift) |
||||
|
.into(view.getRewardImageView()); |
||||
|
} else { |
||||
|
view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public void onFailed(String message) { |
||||
|
view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
protected void onConnectionNotEstablished(String message) { |
||||
|
view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, alertType -> view.exitView()); |
||||
|
|
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
protected void unauthorizedAccess(String message) { |
||||
|
gateway.clearAllUserData(); |
||||
|
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
private String prepareFooterNote() { |
||||
|
return "Redeem "+selectedReward.getProductName()+", "+ Utils.formatCurrencyWithoutTruncatingDecimal(selectedReward.getPointPrice())+" Points will be deducted from your reward point"; |
||||
|
} |
||||
|
|
||||
|
public class RewardRedeemOperationObserver extends GenericApiObserverResponseV2<List<Object>> { |
||||
|
|
||||
|
@Override |
||||
|
protected Type getDataType() { |
||||
|
return TypeToken.getParameterized(List.class,Object.class).getType(); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
protected void onSuccess(GenericResponseDataModel<List<Object>> data) { |
||||
|
if (data.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { |
||||
|
view.showPopUpMessage(data.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> { |
||||
|
view.exitView(); |
||||
|
}); |
||||
|
} else { |
||||
|
view.showPopUpMessage(data.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public void onFailed(String message) { |
||||
|
view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
protected void onConnectionNotEstablished(String message) { |
||||
|
view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, alertType -> view.exitView()); |
||||
|
|
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
protected void unauthorizedAccess(String message) { |
||||
|
gateway.clearAllUserData(); |
||||
|
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout()); |
||||
|
} |
||||
} |
} |
||||
} |
} |
@ -1,12 +1,30 @@ |
|||||
package com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardredeem; |
package com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardredeem; |
||||
|
|
||||
|
import android.widget.ImageView; |
||||
|
|
||||
import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface; |
import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface; |
||||
import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface; |
import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface; |
||||
|
import com.gmeremit.online.gmeremittance_native.rewardV2.model.rewardredeem.BranchInfoModel; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
public interface RewardRedeemV2PresenterInterface extends BasePresenterInterface { |
public interface RewardRedeemV2PresenterInterface extends BasePresenterInterface { |
||||
|
|
||||
|
void getRelatedData(); |
||||
|
|
||||
|
List<BranchInfoModel> getBranchRelatedData(); |
||||
|
|
||||
|
void proceedToRewardRedeem(); |
||||
|
|
||||
interface RewardRedeemV2ContractInterface extends BaseContractInterface |
interface RewardRedeemV2ContractInterface extends BaseContractInterface |
||||
{ |
{ |
||||
|
|
||||
|
void showUserName(String userFirstName); |
||||
|
|
||||
|
void showMobileNumber(String userMsisdn); |
||||
|
|
||||
|
ImageView getRewardImageView(); |
||||
|
|
||||
|
void showRewardFooter(String message); |
||||
} |
} |
||||
} |
} |
@ -1,15 +1,89 @@ |
|||||
package com.gmeremit.online.gmeremittance_native.rewardV2.view.rewardorderdetail; |
package com.gmeremit.online.gmeremittance_native.rewardV2.view.rewardorderdetail; |
||||
|
|
||||
|
import android.content.Intent; |
||||
|
import android.os.Parcelable; |
||||
import android.support.v7.app.AppCompatActivity; |
import android.support.v7.app.AppCompatActivity; |
||||
import android.os.Bundle; |
import android.os.Bundle; |
||||
|
import android.widget.TextView; |
||||
|
|
||||
import com.gmeremit.online.gmeremittance_native.R; |
import com.gmeremit.online.gmeremittance_native.R; |
||||
|
import com.gmeremit.online.gmeremittance_native.homeV2.view.HomeActivityV2; |
||||
|
import com.gmeremit.online.gmeremittance_native.rewardV2.model.rewardlisting.RewardOrderedProductItemModel; |
||||
|
import com.gmeremit.online.gmeremittance_native.utils.Utils; |
||||
|
|
||||
|
import butterknife.BindView; |
||||
|
import butterknife.ButterKnife; |
||||
|
import butterknife.OnClick; |
||||
|
|
||||
public class RewardOrderDetailActivity extends AppCompatActivity { |
public class RewardOrderDetailActivity extends AppCompatActivity { |
||||
|
|
||||
|
@BindView(R.id.tv_receiver) |
||||
|
TextView tv_receiver; |
||||
|
@BindView(R.id.tv_address) |
||||
|
TextView tv_address; |
||||
|
@BindView(R.id.tv_mobile_no) |
||||
|
TextView tv_mobile_no; |
||||
|
@BindView(R.id.tv_product_name) |
||||
|
TextView tv_product_name; |
||||
|
@BindView(R.id.tv_product_point) |
||||
|
TextView tv_product_point; |
||||
|
@BindView(R.id.tv_order_date) |
||||
|
TextView tv_order_date; |
||||
|
@BindView(R.id.tv_order_receive_date_text) |
||||
|
TextView tv_order_receive_date_text; |
||||
|
@BindView(R.id.tv_order_no) |
||||
|
TextView tv_order_no; |
||||
|
@BindView(R.id.tv_order_type) |
||||
|
TextView tv_order_type; |
||||
|
|
||||
|
|
||||
|
@BindView(R.id.transfer_label) |
||||
|
TextView transfer_label; |
||||
|
|
||||
|
@BindView(R.id.transfer_detail) |
||||
|
TextView transfer_detail; |
||||
|
|
||||
|
|
||||
|
|
||||
|
public static final String ORDER_DETAIL_BUNDLE_KEY="orderDetailBundleKey"; |
||||
|
|
||||
@Override |
@Override |
||||
protected void onCreate(Bundle savedInstanceState) { |
protected void onCreate(Bundle savedInstanceState) { |
||||
super.onCreate(savedInstanceState); |
super.onCreate(savedInstanceState); |
||||
setContentView(R.layout.activity_reward_order_detail); |
setContentView(R.layout.activity_reward_order_detail); |
||||
|
ButterKnife.bind(this); |
||||
|
performDefaultAction(savedInstanceState); |
||||
|
} |
||||
|
|
||||
|
private void performDefaultAction(Bundle savedInstanceState) { |
||||
|
if(savedInstanceState==null) |
||||
|
{ |
||||
|
showOrderDetail(getIntent().getParcelableExtra(ORDER_DETAIL_BUNDLE_KEY)); |
||||
|
} |
||||
|
else |
||||
|
{ |
||||
|
|
||||
|
} |
||||
|
} |
||||
|
|
||||
|
private void showOrderDetail(RewardOrderedProductItemModel data) { |
||||
|
transfer_label.setText(data.getOrderStatus().equalsIgnoreCase("1")?"Congratulations":"Order Canceled"); |
||||
|
transfer_detail.setText(data.getOrderStatus().equalsIgnoreCase("1")?"Your order has been completed. Take it from the branch of your choice.":"Your order has been canceled"); |
||||
|
tv_receiver.setText(data.getRecvName()); |
||||
|
tv_address.setText(data.getRecvAddress()); |
||||
|
tv_mobile_no.setText(data.getRecvPhoneNumber()); |
||||
|
tv_product_name.setText(data.getProductName()); |
||||
|
tv_product_point.setText(Utils.formatCurrencyWithoutTruncatingDecimal(data.getUsePoint()) + "Points"); |
||||
|
tv_order_date.setText(data.getCreatedDate()); |
||||
|
tv_order_receive_date_text.setText(data.getRecvDate()); |
||||
|
tv_order_no.setText(data.getOrderId()); |
||||
|
tv_order_type.setText(data.getOrderType().equalsIgnoreCase("1")?"Order":"Cancel"); |
||||
|
} |
||||
|
|
||||
|
@OnClick(R.id.btn_submit) |
||||
|
void onDone() |
||||
|
{ |
||||
|
Intent intent=new Intent(this, HomeActivityV2.class); |
||||
|
startActivity(intent); |
||||
} |
} |
||||
} |
} |
After Width: 31 | Height: 31 | Size: 926 B |
After Width: 31 | Height: 31 | Size: 1.6 KiB |
After Width: 192 | Height: 192 | Size: 9.8 KiB |
After Width: 31 | Height: 31 | Size: 644 B |
After Width: 31 | Height: 31 | Size: 1.0 KiB |
After Width: 21 | Height: 21 | Size: 562 B |
After Width: 21 | Height: 21 | Size: 952 B |
After Width: 128 | Height: 128 | Size: 5.5 KiB |
After Width: 21 | Height: 21 | Size: 455 B |
After Width: 21 | Height: 21 | Size: 721 B |
After Width: 42 | Height: 42 | Size: 571 B |
After Width: 42 | Height: 42 | Size: 644 B |
After Width: 256 | Height: 256 | Size: 6.6 KiB |
After Width: 42 | Height: 42 | Size: 391 B |
After Width: 42 | Height: 42 | Size: 1.3 KiB |
After Width: 63 | Height: 63 | Size: 1.8 KiB |
After Width: 63 | Height: 63 | Size: 3.8 KiB |
After Width: 63 | Height: 63 | Size: 1.3 KiB |
After Width: 63 | Height: 63 | Size: 2.7 KiB |
@ -0,0 +1,43 @@ |
|||||
|
<?xml version="1.0" encoding="utf-8"?> |
||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android"> |
||||
|
|
||||
|
|
||||
|
|
||||
|
<item android:state_checked="true"> |
||||
|
<layer-list> |
||||
|
<item> |
||||
|
<shape android:shape="rectangle"> |
||||
|
<!--<gradient android:angle="270" android:endColor="#a0a67637" android:startColor="#a0e0b071" />--> |
||||
|
<!--<stroke android:width="1dp" android:color="#5c3708" />--> |
||||
|
<solid android:color="@color/colorPrimary"/> |
||||
|
<corners android:radius="5dp" /> |
||||
|
<padding android:left="10dp" android:right="10dp" /> |
||||
|
|
||||
|
</shape> |
||||
|
</item> |
||||
|
<item> |
||||
|
<bitmap android:gravity="center" android:src="@drawable/list_view_selected" /> |
||||
|
</item> |
||||
|
</layer-list> |
||||
|
</item> |
||||
|
|
||||
|
<!--<item android:drawable="@drawable/flag_south_korea" android:state_checked="true" />--> |
||||
|
<!--<item android:drawable="@drawable/flag_north_korea" android:state_checked="false" />--> |
||||
|
|
||||
|
<item android:state_checked="false"> |
||||
|
<layer-list> |
||||
|
<item> |
||||
|
<shape android:shape="rectangle"> |
||||
|
<!--<gradient android:angle="270" android:endColor="#a0a67637" android:startColor="#a0e0b071" />--> |
||||
|
<!--<stroke android:width="1dp" android:color="#5c3708" />--> |
||||
|
<!--<solid android:color="@color/colorPrimary"/>--> |
||||
|
<corners android:radius="5dp" /> |
||||
|
<padding android:left="10dp" android:right="10dp" /> |
||||
|
</shape> |
||||
|
</item> |
||||
|
<item > |
||||
|
<bitmap android:gravity="center" android:src="@drawable/list_view_unselected" android:tileMode="disabled"/> |
||||
|
</item> |
||||
|
</layer-list> |
||||
|
</item> |
||||
|
</selector> |
After Width: 84 | Height: 84 | Size: 2.9 KiB |
After Width: 84 | Height: 84 | Size: 6.2 KiB |
After Width: 84 | Height: 84 | Size: 1.9 KiB |
After Width: 84 | Height: 84 | Size: 4.0 KiB |
@ -0,0 +1,9 @@ |
|||||
|
<?xml version="1.0" encoding="utf-8"?> |
||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android" |
||||
|
android:shape="rectangle"> |
||||
|
<corners android:radius="5dp" /> |
||||
|
<solid android:color="@android:color/transparent" /> |
||||
|
<stroke |
||||
|
android:width="3dp" |
||||
|
android:color="@color/colorPrimary" /> |
||||
|
</shape> |
@ -0,0 +1,43 @@ |
|||||
|
<?xml version="1.0" encoding="utf-8"?> |
||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android"> |
||||
|
|
||||
|
|
||||
|
|
||||
|
<item android:state_checked="true"> |
||||
|
<layer-list> |
||||
|
<item> |
||||
|
<shape android:shape="rectangle"> |
||||
|
<!--<gradient android:angle="270" android:endColor="#a0a67637" android:startColor="#a0e0b071" />--> |
||||
|
<!--<stroke android:width="1dp" android:color="#5c3708" />--> |
||||
|
<solid android:color="@color/colorPrimary"/> |
||||
|
<corners android:radius="5dp" /> |
||||
|
<padding android:left="10dp" android:right="10dp" /> |
||||
|
|
||||
|
</shape> |
||||
|
</item> |
||||
|
<item> |
||||
|
<bitmap android:gravity="center" android:src="@drawable/grid_view_selected" /> |
||||
|
</item> |
||||
|
</layer-list> |
||||
|
</item> |
||||
|
|
||||
|
<!--<item android:drawable="@drawable/flag_south_korea" android:state_checked="true" />--> |
||||
|
<!--<item android:drawable="@drawable/flag_north_korea" android:state_checked="false" />--> |
||||
|
|
||||
|
<item android:state_checked="false"> |
||||
|
<layer-list> |
||||
|
<item> |
||||
|
<shape android:shape="rectangle"> |
||||
|
<!--<gradient android:angle="270" android:endColor="#a0a67637" android:startColor="#a0e0b071" />--> |
||||
|
<!--<stroke android:width="1dp" android:color="#5c3708" />--> |
||||
|
<!--<solid android:color="@color/colorPrimary"/>--> |
||||
|
<corners android:radius="5dp" /> |
||||
|
<padding android:left="10dp" android:right="10dp" /> |
||||
|
</shape> |
||||
|
</item> |
||||
|
<item > |
||||
|
<bitmap android:gravity="center" android:src="@drawable/grid_view_unselected" android:tileMode="disabled"/> |
||||
|
</item> |
||||
|
</layer-list> |
||||
|
</item> |
||||
|
</selector> |