Skip to content

Commit 7168841

Browse files
committed
Refactor view and presenter
1 parent 3f202e5 commit 7168841

File tree

3 files changed

+32
-25
lines changed

3 files changed

+32
-25
lines changed

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferContract.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ interface View {
1919
void displayFee(String charge_amount, Payload payload);
2020
void showFetchFeeFailed(String s);
2121
void onPaymentFailed(String message, String responseAsJSONString);
22-
void onTransferDetailsReceived(ChargeResponse response);
22+
void onTransferDetailsReceived(String amount, String accountNumber, String bankName, String beneficiaryName);
2323
void onPollingTimeout(String flwRef, String txRef, String responseAsJSONString);
2424
void onAmountValidationSuccessful(String valueOf);
2525
void showFieldError(int viewID, String message, Class<?> viewType);

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,7 @@ private void clearErrors() {
188188

189189
}
190190

191-
@Override
192-
public void onTransferDetailsReceived(ChargeResponse response) {
193-
showTransferDetails(response);
194-
}
191+
195192

196193
@Override
197194
public void onPollingTimeout(String flwRef, String txRef, final String responseAsJSONString) {
@@ -212,25 +209,6 @@ public void onClick(View view) {
212209
});
213210
}
214211

215-
private void showTransferDetails(ChargeResponse response) {
216-
String beneficiaryName = response.getData().getNote().substring(
217-
response.getData().getNote().indexOf("to ") + 3
218-
);
219-
220-
amountTv.setText(response.getData().getAmount());
221-
beneficiaryNameTv.setText(beneficiaryName);
222-
bankNameTv.setText(response.getData().getBankname());
223-
accountNumberTv.setText(response.getData().getAccountnumber());
224-
transferInstructionTv.setText(
225-
transferInstructionTv.getText() + " " + beneficiaryName
226-
);
227-
228-
initiateChargeLayout.setVisibility(GONE);
229-
transferDetailsLayout.setVisibility(View.VISIBLE);
230-
231-
232-
}
233-
234212

235213
@Override
236214
public void showProgressIndicator(boolean active) {
@@ -287,6 +265,28 @@ public void onPaymentFailed(String message, final String responseAsJSONString) {
287265

288266
}
289267

268+
@Override
269+
public void onTransferDetailsReceived(String amount, String accountNumber, String bankName, String beneficiaryName) {
270+
showTransferDetails(amount, accountNumber, bankName, beneficiaryName);
271+
}
272+
273+
private void showTransferDetails(String amount, String accountNumber, String bankName, String beneficiaryName) {
274+
275+
276+
amountTv.setText(amount);
277+
beneficiaryNameTv.setText(beneficiaryName);
278+
bankNameTv.setText(bankName);
279+
accountNumberTv.setText(accountNumber);
280+
transferInstructionTv.setText(
281+
transferInstructionTv.getText() + " " + beneficiaryName
282+
);
283+
284+
initiateChargeLayout.setVisibility(GONE);
285+
transferDetailsLayout.setVisibility(View.VISIBLE);
286+
287+
288+
}
289+
290290
@Override
291291
public void displayFee(String charge_amount, final Payload payload) {
292292
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferPresenter.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,14 @@ public void onSuccess(ChargeResponse response, String responseAsJSONString) {
9494
flwRef = response.getData().getFlw_reference();
9595
txRef = response.getData().getTx_ref();
9696
publicKey = payload.getPBFPubKey();
97-
mView.onTransferDetailsReceived(response);
97+
String beneficiaryName = response.getData().getNote().substring(
98+
response.getData().getNote().indexOf("to ") + 3
99+
);
100+
mView.onTransferDetailsReceived(
101+
response.getData().getAmount(),
102+
response.getData().getAccountnumber(),
103+
response.getData().getBankname(),
104+
beneficiaryName);
98105
} else {
99106
mView.onPaymentError("No response data was returned");
100107
}

0 commit comments

Comments
 (0)