Merge pull request #206 from jeremiahVaris/wrapCurrencySetting

Map country codes to currencies internally

Author: jeremiahAI

README.md

@@ -49,7 +49,6 @@ but if you are not interested in our default UI and you want to use yours and on
 Set the public key, encryption key and other required parameters. The `RaveUiManager` accepts a mandatory instance of  the calling `Activity` (or a `Fragment` that has a parent activity).
 
         new RaveUiManager(activity).setAmount(amount)
-                        .setCountry(country)
                         .setCurrency(currency)
                         .setEmail(email)
                         .setfName(fName)
@@ -139,7 +138,6 @@ First specify the theme in your `styles.xml` file. In this theme, you can edit t
  Then in your RavePayManager setup, add `.withTheme(<Reference to your style>)` anywhere before calling the `initialize()` function. e.g.
  ```java
   new RavePayManager(activity).setAmount(amount)
-                    .setCountry(country)
                     //...
                     //...
                     .withTheme(R.Style.MyCustomTheme)
@@ -153,7 +151,6 @@ Set the public key, encryption key and other required parameters.
         RaveNonUIManager raveNonUIManager =
                         new RaveNonUIManager()
                         .setAmount(amount)
-                        .setCountry(country)
                         .setCurrency(currency)
                         .setEmail(email)
                         .setfName(fName)
@@ -192,7 +189,6 @@ For example to charge cards, use the `CardPaymentManager`
 | function        | parameter           | type | required  |
 | ------------- |:-------------:| -----:| -----:|
 | setAmount(amount)      |  This is the amount to be charged from card/account | `double` | Required
-| setCountry(country)     | This is the route country for the transaction with respect to the currency. You can find a list of supported countries and currencies [here](https://flutterwavedevelopers.readme.io/docs/multicurrency-payments) | `String` | Required
 | setCurrency(currency) | This is the specified currency to charge the card in | `String` | Required
 | setfName(fName) | This is the first name of the card holder or the customer  | `String` | Required
 | setlName(lName) | This is the last name of the card holder or the customer | `String` | Required

app/src/main/java/com/flutterwave/rave_android/MainActivity.java

@@ -242,7 +242,6 @@ private void validateEntries() {
         String txRef = txRefEt.getText().toString();
         String narration = narrationEt.getText().toString();
         String currency = currencyEt.getText().toString();
-        String country = countryEt.getText().toString();
         String fName = fNameEt.getText().toString();
         String lName = lNameEt.getText().toString();
         String phoneNumber = phoneNumberEt.getText().toString();
@@ -281,11 +280,6 @@ private void validateEntries() {
             currencyEt.setError("A valid currency code is required");
         }
 
-        if (country.length() < 1) {
-            valid = false;
-            countryEt.setError("A valid country code is required");
-        }
-
         if (setExpirySwitch.isChecked()) {
             if (accountDuration.isEmpty()) {
                 valid = false;
@@ -322,7 +316,6 @@ private void validateEntries() {
                         //                    .withTheme(R.style.TestNewTheme)
                         .showStagingLabel(shouldShowStagingLabelSwitch.isChecked())
                         .setAmount(Double.parseDouble(amount))
-                        .setCountry(country)
                         .setCurrency(currency)
                         .setEmail(email)
                         .setfName(fName)
@@ -358,7 +351,6 @@ private void validateEntries() {
 
             } else {
                 raveManager = new RaveNonUIManager().setAmount(Double.parseDouble(amount))
-                        .setCountry(country)
                         .setCurrency(currency)
                         .setEmail(email)
                         .setfName(fName)

app/src/main/res/layout/activity_main.xml

@@ -356,6 +356,7 @@
                 android:id="@+id/countryEt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:visibility="gone"
                 android:layout_marginBottom="10dp"
                 android:hint="@string/country_code_e_g_ng"
                 android:textSize="14sp" />

rave_android/src/main/java/com/flutterwave/raveandroid/RaveUiManager.java

@@ -107,9 +107,27 @@ public RaveUiManager setNarration(String narration) {
 
     public RaveUiManager setCurrency(String currency) {
         this.currency = currency;
+        switch (currency) {
+            case "KES":
+                country = "KE";
+                break;
+            case "GHS":
+                country = "GH";
+                break;
+            case "ZAR":
+                country = "ZA";
+                break;
+            case "TZS":
+                country = "TZ";
+                break;
+            default:
+                country = "NG";
+                break;
+        }
         return this;
     }
 
+    @Deprecated
     public RaveUiManager setCountry(String country) {
         this.country = country;
         return this;

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/RaveNonUIManager.java

@@ -71,9 +71,27 @@ public RaveNonUIManager setNarration(String narration) {
 
     public RaveNonUIManager setCurrency(String currency) {
         this.currency = currency;
+        switch (currency) {
+            case "KES":
+                country = "KE";
+                break;
+            case "GHS":
+                country = "GH";
+                break;
+            case "ZAR":
+                country = "ZA";
+                break;
+            case "TZS":
+                country = "TZ";
+                break;
+            default:
+                country = "NG";
+                break;
+        }
         return this;
     }
 
+    @Deprecated
     public RaveNonUIManager setCountry(String country) {
         this.country = country;
         return this;