Skip to content

Commit 6184de7

Browse files
mikelis135mikelis135
committed
raveconstants and strings.xml refactor update
1 parent f578d87 commit 6184de7

File tree

7 files changed

+58
-31
lines changed

7 files changed

+58
-31
lines changed

‎raveandroid/src/main/java/com/flutterwave/raveandroid/RaveConstants.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,40 @@ public class RaveConstants {
4141
public static String fieldcardNoStripped = "cardNoStripped";
4242
public static String date_of_birth = "Date of Birth";
4343
public static String isInternetBanking = "bankcode";
44+
4445
public static String success = "success";
4546
public static String noResponse = "No response data was returned";
47+
4648
public static String response = "response";
4749
public static String mtn = "mtn";
4850
public static String tigo = "tigo";
4951
public static String vodafone = "vodafone";
52+
5053
public static String tokenNotFound = "token not found";
5154
public static String expired = "expired";
5255
public static String tokenExpired = "Token expired";
56+
public static String cardNoStripped = "cardNoStripped";
57+
public static String validAmountPrompt = "Enter a valid amount";
58+
public static String validPhonePrompt = "Enter a valid number";
59+
public static String validEmailPrompt = "Enter a valid Email";
60+
public static String charge = "You will be charged a total of";
61+
public static String askToContinue = ". Do you want to continue?";
62+
public static String yes = "YES";
63+
public static String no = "NO";
64+
public static String cancel = "CANCEL";
65+
public static String checkStatus = "Checking transaction status. Please wait";
66+
public static String transactionError = "An error occurred while retrieving transaction fee";
67+
public static String validCvvPrompt = "Enter a valid cvv";
68+
public static String validExpiryDatePrompt = "Enter a valid expiry date";
69+
public static String validCreditCardPrompt = "Enter a valid credit card number";
70+
public static String validVoucherPrompt = "Enter a valid voucher code";
71+
public static String validNetworkPrompt = "Select a network";
72+
public static String invalidChargeCode = "Invalid charge response code";
73+
public static String invalidCharge = "Invalid charge card response";
74+
public static String unknownAuthmsg = "Unknown Auth Model";
75+
public static String unknownResCodemsg = "Unknown charge response code";
76+
public static String no_authurl_was_returnedmsg = "No authUrl was returned";
77+
public static String no_response_data_was_returnedmsg = "No response data was returned";
78+
public static String wait = "Please wait...";
79+
public static String cancelPayment = "CANCEL PAYMENT";
5380
}

‎raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountPresenter.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,15 @@ public void onSuccess(ChargeResponse response, String responseAsJSONString) {
136136
String status = response.getStatus();
137137
String message = response.getMessage();
138138

139-
if (status.equalsIgnoreCase(context.getResources().getString(R.string.success))) {
139+
if (status.equalsIgnoreCase(RaveConstants.success)) {
140140
mView.onValidateSuccessful(flwRef, responseAsJSONString);
141141
}
142142
else {
143143
mView.onValidateError(status, responseAsJSONString);
144144
}
145145
}
146146
else {
147-
mView.onPaymentError(context.getResources().getString(R.string.invalidCharge));
147+
mView.onPaymentError(RaveConstants.invalidCharge);
148148
}
149149
}
150150

@@ -253,17 +253,17 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
253253

254254
if (!amountValidator.isAmountValid(amount)) {
255255
valid = false;
256-
mView.showFieldError(amountID, context.getResources().getString(R.string.validAmountPrompt), amountViewType);
256+
mView.showFieldError(amountID, RaveConstants.validAmountPrompt, amountViewType);
257257
}
258258

259259
if (!phoneValidator.isPhoneValid(phone)) {
260260
valid = false;
261-
mView.showFieldError(phoneID, context.getResources().getString(R.string.validPhonePrompt), phoneViewType);
261+
mView.showFieldError(phoneID, RaveConstants.validPhonePrompt, phoneViewType);
262262
}
263263

264264
if (!emailValidator.isEmailValid(email)) {
265265
valid = false;
266-
mView.showFieldError(emailID, context.getResources().getString(R.string.validEmailPrompt), emailViewType);
266+
mView.showFieldError(emailID, RaveConstants.validEmailPrompt, emailViewType);
267267
}
268268

269269
if (account.isEmpty()) {
@@ -278,12 +278,12 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
278278

279279
if (amnt <= 0) {
280280
valid = false;
281-
mView.showToast(context.getResources().getString(R.string.validAmountPrompt));
281+
mView.showToast(RaveConstants.validAmountPrompt);
282282
}
283283
} catch (Exception e) {
284284
e.printStackTrace();
285285
valid = false;
286-
mView.showToast(context.getResources().getString(R.string.validAmountPrompt));
286+
mView.showToast(RaveConstants.validAmountPrompt);
287287
}
288288

289289
if (valid){

‎raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchPresenter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.flutterwave.raveandroid.Payload;
66
import com.flutterwave.raveandroid.PayloadBuilder;
77
import com.flutterwave.raveandroid.R;
8+
import com.flutterwave.raveandroid.RaveConstants;
89
import com.flutterwave.raveandroid.RavePayInitializer;
910
import com.flutterwave.raveandroid.Utils;
1011
import com.flutterwave.raveandroid.card.ChargeRequestBody;
@@ -136,7 +137,7 @@ public void onSuccess(ChargeResponse response, String responseAsJSONString) {
136137

137138
}
138139
else {
139-
mView.onPaymentError(context.getResources().getString(R.string.no_response_data_was_returnedmsg));
140+
mView.onPaymentError(RaveConstants.no_response_data_was_returnedmsg);
140141
}
141142

142143
}

‎raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardPresenter.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.flutterwave.raveandroid.FeeCheckRequestBody;
88
import com.flutterwave.raveandroid.Payload;
99
import com.flutterwave.raveandroid.PayloadBuilder;
10-
import com.flutterwave.raveandroid.R;
1110
import com.flutterwave.raveandroid.RaveConstants;
1211
import com.flutterwave.raveandroid.RavePayInitializer;
1312
import com.flutterwave.raveandroid.Utils;
@@ -226,32 +225,32 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
226225
try{
227226
boolean isAmountValidated = amountValidator.isAmountValid(amount);
228227
if (!isAmountValidated) {
229-
valid = false; mView.showFieldError(amountID, context.getResources().getString(R.string.validAmountPrompt), amountViewType);
228+
valid = false; mView.showFieldError(amountID, RaveConstants.validAmountPrompt, amountViewType);
230229
}
231230
} catch (Exception e) {
232231
e.printStackTrace();
233-
valid = false; mView.showFieldError(amountID, context.getResources().getString(R.string.validAmountPrompt), amountViewType);
232+
valid = false; mView.showFieldError(amountID, RaveConstants.validAmountPrompt, amountViewType);
234233
}
235234

236235
boolean isEmailValidated = emailValidator.isEmailValid(email);
237236
if (!isEmailValidated) {
238-
valid = false; mView.showFieldError(emailID, context.getResources().getString(R.string.validPhonePrompt), emailViewType);
237+
valid = false; mView.showFieldError(emailID, RaveConstants.validPhonePrompt, emailViewType);
239238
}
240239

241240
boolean isCVVValidated = cvvValidator.isCvvValid(cvv);
242241
if (!isCVVValidated) {
243-
valid = false; mView.showFieldError(cvvID, context.getResources().getString(R.string.validCvvPrompt), cvvViewType);
242+
valid = false; mView.showFieldError(cvvID, RaveConstants.validCvvPrompt, cvvViewType);
244243
}
245244

246245
boolean isCardExpiryValidated = cardExpiryValidator.isCardExpiryValid(cardExpiry);
247246

248247
if (!isCardExpiryValidated) {
249-
valid = false; mView.showFieldError(cardExpiryID, context.getResources().getString(R.string.validExpiryDatePrompt), cardExpiryViewType);
248+
valid = false; mView.showFieldError(cardExpiryID, RaveConstants.validExpiryDatePrompt, cardExpiryViewType);
250249
}
251250

252251
boolean isCardNoValidator = cardNoValidator.isCardNoStrippedValid(cardNoStripped);
253252
if (!isCardNoValidator) {
254-
valid = false; mView.showFieldError(cardNoStrippedID, context.getResources().getString(R.string.validCreditCardPrompt), cardNoStrippedViewType);
253+
valid = false; mView.showFieldError(cardNoStrippedID, RaveConstants.validCreditCardPrompt, cardNoStrippedViewType);
255254
}
256255

257256
if (valid) {
@@ -349,15 +348,15 @@ else if (authModelUsed.equalsIgnoreCase(RaveConstants.AVS_VBVSECURECODE)){
349348
mView.onAVSVBVSecureCodeModelUsed(response.getData().getAuthurl(), flwRef);
350349
}
351350
else {
352-
mView.onPaymentError(context.getResources().getString(R.string.unknownAuthmsg));
351+
mView.onPaymentError(RaveConstants.unknownAuthmsg);
353352
}
354353
}
355354
else {
356-
mView.onPaymentError(context.getResources().getString(R.string.unknownResCodemsg));
355+
mView.onPaymentError(RaveConstants.unknownResCodemsg);
357356
}
358357
}
359358
else {
360-
mView.onPaymentError(context.getResources().getString(R.string.invalidChargeCode));
359+
mView.onPaymentError(RaveConstants.invalidChargeCode);
361360
}
362361

363362
}

‎raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,22 +206,22 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
206206

207207
if (!amountValidator.isAmountValid(amount)) {
208208
valid = false;
209-
mView.showFieldError(amountID, context.getResources().getString(R.string.validAmountPrompt), amountViewType);
209+
mView.showFieldError(amountID, RaveConstants.validAmountPrompt, amountViewType);
210210
}
211211

212212
if (!phoneValidator.isPhoneValid(phone)) {
213213
valid = false;
214-
mView.showFieldError(phoneID, context.getResources().getString(R.string.validPhonePrompt), phoneViewType);
214+
mView.showFieldError(phoneID, RaveConstants.validPhonePrompt, phoneViewType);
215215
}
216216

217217
if (network == 0) {
218218
valid = false;
219-
mView.showToast(context.getResources().getString(R.string.validNetworkPrompt));
219+
mView.showToast(RaveConstants.validNetworkPrompt);
220220
}
221221

222222
if (!voucher.isEmpty()) {
223223
valid = false;
224-
mView.showFieldError(voucherID, context.getResources().getString(R.string.validVoucherPrompt), voucherViewType);
224+
mView.showFieldError(voucherID, RaveConstants.validVoucherPrompt, voucherViewType);
225225
}
226226

227227
if (valid) {

‎raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ public void onSuccess(FeeCheckResponse response) {
5858
}
5959
catch (Exception e) {
6060
e.printStackTrace();
61-
mView.showFetchFeeFailed(context.getResources().getString(R.string.transactionError));
61+
mView.showFetchFeeFailed(RaveConstants.transactionError);
6262
}
6363
}
6464

6565
@Override
6666
public void onError(String message) {
6767
mView.showProgressIndicator(false);
6868
Log.e(RaveConstants.RAVEPAY, message);
69-
mView.showFetchFeeFailed(context.getResources().getString(R.string.transactionError));
69+
mView.showFetchFeeFailed(RaveConstants.transactionError);
7070
}
7171
});
7272
}
@@ -165,12 +165,12 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
165165

166166
if (!amountValidator.isAmountValid(amount)) {
167167
valid = false;
168-
mView.showFieldError(amountID, context.getResources().getString(R.string.validAmountPrompt), amountViewType);
168+
mView.showFieldError(amountID, RaveConstants.validAmountPrompt, amountViewType);
169169
}
170170

171171
if (!phoneValidator.isPhoneValid(phone)) {
172172
valid = false;
173-
mView.showFieldError(phoneID, context.getResources().getString(R.string.validPhonePrompt), phoneViewType);
173+
mView.showFieldError(phoneID, RaveConstants.validPhonePrompt, phoneViewType);
174174
}
175175

176176
if (valid) {

‎raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ public void onSuccess(FeeCheckResponse response) {
5656
}
5757
catch (Exception e) {
5858
e.printStackTrace();
59-
mView.showFetchFeeFailed(context.getResources().getString(R.string.transactionError));
59+
mView.showFetchFeeFailed(RaveConstants.transactionError);
6060
}
6161
}
6262

6363
@Override
6464
public void onError(String message) {
6565
mView.showProgressIndicator(false);
6666
Log.e(RaveConstants.RAVEPAY, message);
67-
mView.showFetchFeeFailed(context.getResources().getString(R.string.transactionError));
67+
mView.showFetchFeeFailed(RaveConstants.transactionError);
6868
}
6969
});
7070
}
@@ -95,7 +95,7 @@ public void onSuccess(GhChargeResponse response, String responseAsJSONString) {
9595
requeryTx(flwRef, txRef, payload.getPBFPubKey());
9696
}
9797
else {
98-
mView.onPaymentError(context.getResources().getString(R.string.noResponse));
98+
mView.onPaymentError(RaveConstants.noResponse);
9999
}
100100

101101
}
@@ -159,12 +159,12 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
159159

160160
if (!amountValidator.isAmountValid(amount)) {
161161
valid = false;
162-
mView.showFieldError(amountID, context.getResources().getString(R.string.validAmountPrompt), amountViewType);
162+
mView.showFieldError(amountID, RaveConstants.validAmountPrompt, amountViewType);
163163
}
164164

165165
if (phone.length() < 1) {
166166
valid = false;
167-
mView.showFieldError(phoneID, context.getResources().getString(R.string.validPhonePrompt), phoneViewType);
167+
mView.showFieldError(phoneID, RaveConstants.validPhonePrompt, phoneViewType);
168168
}
169169

170170
if (valid) {

0 commit comments

Comments
 (0)