merge branch optionalize-display-fee

Author: biodunalfet

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

@@ -50,6 +50,7 @@ public class MainActivity extends AppCompatActivity {
     SwitchCompat accountAchSwitch;
     SwitchCompat addSubAccountsSwitch;
     SwitchCompat isPreAuthSwitch;
+    SwitchCompat shouldDisplayFeeSwitch;
     SwitchCompat shouldShowStagingLabelSwitch;
     List<Meta> meta = new ArrayList<>();
     List<SubAccount> subAccounts = new ArrayList<>();
@@ -77,6 +78,7 @@ protected void onCreate(Bundle savedInstanceState) {
         accountAchSwitch = findViewById(R.id.accountAchSwitch);
         isMpesaSwitch = findViewById(R.id.accountMpesaSwitch);
         isPreAuthSwitch = findViewById(R.id.isPreAuthSwitch);
+        shouldDisplayFeeSwitch = findViewById(R.id.isDisplayFeeSwitch);
         ghMobileMoneySwitch = findViewById(R.id.accountGHMobileMoneySwitch);
         ugMobileMoneySwitch = findViewById(R.id.accountUgMobileMoneySwitch);
         isLiveSwitch = findViewById(R.id.isLiveSwitch);
@@ -205,6 +207,7 @@ private void validateEntries() {
                     .setSubAccounts(subAccounts)
                     .isPreAuth(isPreAuthSwitch.isChecked())
                     .showStagingLabel(shouldShowStagingLabelSwitch.isChecked())
+                    .shouldDisplayFee(shouldDisplayFeeSwitch.isChecked())
 //                    .setMeta(meta)
 //                    .withTheme(R.style.TestNewTheme)
                     .initialize();

raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java

@@ -43,7 +43,7 @@ public RavePayInitializer(String email, double amount, String publicKey,
                               boolean withUgMobileMoney,
                               boolean withAch, int theme,
                               boolean staging, String meta, String subAccounts, String payment_plan, boolean isPreAuth,
-                              boolean showStagingLabel) {
+                              boolean showStagingLabel, boolean displayFee) {
         this.email = email;
         this.amount = amount;
         this.publicKey = publicKey;
@@ -67,6 +67,7 @@ public RavePayInitializer(String email, double amount, String publicKey,
         this.payment_plan = payment_plan;
         this.isPreAuth = isPreAuth;
         this.showStagingLabel = showStagingLabel;
+        this.displayFee = displayFee;
     }
 
     public RavePayInitializer() {

raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java

@@ -40,6 +40,7 @@ public class RavePayManager {
     boolean allowSaveCard = true;
     boolean isPreAuth =  false;
     boolean showStagingLabel = true;
+    boolean displayFee = true;
 
     public RavePayManager allowSaveCardFeature(boolean allowSaveCard) {
         this.allowSaveCard = allowSaveCard;
@@ -180,11 +181,16 @@ public void initialize() {
         }
     }
 
+    public RavePayManager shouldDisplayFee(Boolean displayFee){
+        this.displayFee = displayFee;
+        return this;
+    }
+
     public RavePayInitializer createRavePayInitializer() {
         return new RavePayInitializer(email, amount, publicKey, encryptionKey, txRef, narration,
                 currency, country, fName, lName, withCard, withAccount, withMpesa,
                 withGHMobileMoney, withUgMobileMoney, withAch, theme, staging, meta, subAccounts,
                 payment_plan,
-                isPreAuth, showStagingLabel);
+                isPreAuth, showStagingLabel,displayFee);
        }
 }