- fix merge conflicts

biodunalfet · biodunalfet · commit dd7df205bd5e · 2019-10-10T02:41:01.000+01:00
diff --git a/app/src/main/java/com/flutterwave/rave_android/MainActivity.java b/app/src/main/java/com/flutterwave/rave_android/MainActivity.java
@@ -46,6 +46,7 @@ public class MainActivity extends AppCompatActivity {
     SwitchCompat ghMobileMoneySwitch;
     SwitchCompat ugMobileMoneySwitch;
     SwitchCompat rwfMobileMoneySwitch;
+    SwitchCompat zmMobileMoneySwitch;
     SwitchCompat bankTransferSwitch;
     SwitchCompat isLiveSwitch;
     SwitchCompat isMpesaSwitch;
@@ -83,6 +84,7 @@ protected void onCreate(Bundle savedInstanceState) {
         shouldDisplayFeeSwitch = findViewById(R.id.isDisplayFeeSwitch);
         ghMobileMoneySwitch = findViewById(R.id.accountGHMobileMoneySwitch);
         ugMobileMoneySwitch = findViewById(R.id.accountUgMobileMoneySwitch);
+        zmMobileMoneySwitch = findViewById(R.id.accountZmMobileMoneySwitch);
         rwfMobileMoneySwitch = findViewById(R.id.accountRwfMobileMoneySwitch);
         bankTransferSwitch = findViewById(R.id.bankTransferSwitch);
         isLiveSwitch = findViewById(R.id.isLiveSwitch);
@@ -208,6 +210,7 @@ private void validateEntries() {
                     .acceptAchPayments(accountAchSwitch.isChecked())
                     .acceptGHMobileMoneyPayments(ghMobileMoneySwitch.isChecked())
                     .acceptUgMobileMoneyPayments(ugMobileMoneySwitch.isChecked())
+                    .acceptZmMobileMoneyPayments(zmMobileMoneySwitch.isChecked())
                     .acceptRwfMobileMoneyPayments(rwfMobileMoneySwitch.isChecked())
                     .acceptBankTransferPayments(bankTransferSwitch.isChecked())
                     .onStagingEnv(!isLiveSwitch.isChecked())
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -102,6 +102,14 @@
                     android:checked="false"
                     android:text="Accept RWF Mobile money payments" />
 
+                <android.support.v7.widget.SwitchCompat
+                    android:id="@+id/accountZmMobileMoneySwitch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:checked="false"
+                    android:text="Accept ZM Mobile money payments" />
+
                 <android.support.v7.widget.SwitchCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/PayloadBuilder.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/PayloadBuilder.java
@@ -251,6 +251,18 @@ public Payload createGhMobileMoneyPayload() {
         return payload;
     }
 
+    public Payload createZmMobileMoneyPayload() {
+        List<Meta> metaObj = Utils.pojofyMetaString(meta);
+        List<SubAccount> subaccountsObj = Utils.pojofySubaccountString(subAccounts);
+        Payload payload = new Payload(phonenumber, metaObj, subaccountsObj, narration, ip, lastname,
+                firstname, currency, country, amount, email, device_fingerprint, txRef, pbfPubKey);
+        payload.setIs_mobile_money_ug("1");
+        payload.setPayment_type("mobilemoneyzambia");
+        payload.setVoucher(voucher);
+        payload.setNetwork(network);
+        return payload;
+    }
+
     public Payload createUgMobileMoneyPayload() {
         List<Meta> metaObj = Utils.pojofyMetaString(meta);
         List<SubAccount> subaccountsObj = Utils.pojofySubaccountString(subAccounts);
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RaveConstants.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RaveConstants.java
@@ -24,6 +24,7 @@ public class RaveConstants {
     public static String RWF = "RWF";
     public static String NOAUTH = "NOAUTH";
     public static String PIN = "PIN";
+    public static String selectNetwork = "Select network";
     public static String AVS_VBVSECURECODE = "AVS_VBVSECURECODE";
     public static String enterOTP = "Enter your one time password (OTP)";
     public static String NOAUTH_INTERNATIONAL = "NOAUTH_INTERNATIONAL";
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java
@@ -27,6 +27,7 @@
 import com.flutterwave.raveandroid.mpesa.MpesaFragment;
 import com.flutterwave.raveandroid.rwfmobilemoney.RwfMobileMoneyFragment;
 import com.flutterwave.raveandroid.ugmobilemoney.UgMobileMoneyFragment;
+import com.flutterwave.raveandroid.zmmobilemoney.ZmMobileMoneyFragment;
 
 import org.parceler.Parcels;
 
@@ -118,6 +119,10 @@ else if (ravePayInitializer.getCountry().equalsIgnoreCase("ng") && ravePayInitia
             raveFragments.add(new RaveFragment(new GhMobileMoneyFragment(), "GHANA MOBILE MONEY"));
         }
 
+        if (ravePayInitializer.isWithZmMobileMoney()) {
+            raveFragments.add(new RaveFragment(new ZmMobileMoneyFragment(), "ZAMBIA MOBILE MONEY"));
+        }
+
         if (ravePayInitializer.isWithUgMobileMoney()) {
             raveFragments.add(new RaveFragment(new UgMobileMoneyFragment(), "UGANDA MOBILE MONEY"));
         }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java
@@ -28,6 +28,7 @@ public class RavePayInitializer {
     boolean withGHMobileMoney = false;
     boolean withUgMobileMoney = false;
     boolean withRwfMobileMoney = false;
+    boolean withZmMobileMoney = false;
     boolean withBankTransfer = false;
     int theme;
     boolean staging = true;
@@ -40,7 +41,7 @@ public RavePayInitializer(String email, double amount, String publicKey,
                               String currency, String country, String fName,
                               String lName, boolean withCard,
                               boolean withAccount, boolean withMpesa, boolean withGHMobileMoney,
-                              boolean withUgMobileMoney, boolean withRwfMobileMoney,
+                              boolean withUgMobileMoney, boolean withRwfMobileMoney, boolean withZmMobileMoney,
                               boolean withAch, boolean withBankTransfer, int theme,
                               boolean staging, String meta, String subAccounts, String payment_plan, boolean isPreAuth,
                               boolean showStagingLabel, boolean displayFee) {
@@ -58,6 +59,7 @@ public RavePayInitializer(String email, double amount, String publicKey,
         this.withGHMobileMoney = withGHMobileMoney;
         this.withUgMobileMoney = withUgMobileMoney;
         this.withRwfMobileMoney = withRwfMobileMoney;
+        this.withZmMobileMoney = withZmMobileMoney;
         this.withBankTransfer = withBankTransfer;
         this.withMpesa = withMpesa;
         this.withCard = withCard;
@@ -139,6 +141,9 @@ public boolean isWithRwfMobileMoney() {
         return withRwfMobileMoney;
     }
 
+    public boolean isWithZmMobileMoney() {
+        return withZmMobileMoney;
+    }
 
     public boolean isWithBankTransfer() {
         return withBankTransfer;
@@ -259,6 +264,7 @@ public void setPreAuth(boolean isPreAuth) {
     public boolean getIsDisplayFee() {
         return displayFee;
     }
+
     public void setIsDisplayFee() {
         this.displayFee = displayFee;
     }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java
@@ -36,6 +36,7 @@ public class RavePayManager {
     boolean withGHMobileMoney = false;
     boolean withUgMobileMoney = false;
     boolean withRwfMobileMoney = false;
+    boolean withZmMobileMoney = false;
     boolean withBankTransfer = false;
     private int theme = R.style.DefaultTheme;
     boolean staging = true;
@@ -98,6 +99,11 @@ public RavePayManager acceptRwfMobileMoneyPayments(boolean withRwfMobileMoney) {
         return this;
     }
 
+    public RavePayManager acceptZmMobileMoneyPayments(boolean withZmMobileMoney) {
+        this.withZmMobileMoney = withZmMobileMoney;
+        return this;
+    }
+
     public RavePayManager acceptBankTransferPayments(boolean withBankTransfer) {
         this.withBankTransfer = withBankTransfer;
         return this;
@@ -199,10 +205,33 @@ public RavePayManager shouldDisplayFee(boolean displayFee) {
     }
 
     public RavePayInitializer createRavePayInitializer() {
-        return new RavePayInitializer(email, amount, publicKey, encryptionKey, txRef, narration,
-                currency, country, fName, lName, withCard, withAccount, withMpesa,
-                withGHMobileMoney, withUgMobileMoney, withRwfMobileMoney, withAch, withBankTransfer, theme, staging, meta, subAccounts,
+        return new RavePayInitializer(
+                email,
+                amount,
+                publicKey,
+                encryptionKey,
+                txRef,
+                narration,
+                currency,
+                country,
+                fName,
+                lName,
+                withCard,
+                withAccount,
+                withMpesa,
+                withGHMobileMoney,
+                withUgMobileMoney,
+                withRwfMobileMoney,
+                withZmMobileMoney,
+                withAch,
+                withBankTransfer,
+                theme,
+                staging,
+                meta,
+                subAccounts,
                 payment_plan,
-                isPreAuth, showStagingLabel,displayFee);
+                isPreAuth,
+                showStagingLabel,
+                displayFee);
        }
 }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/AppComponent.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/AppComponent.java
@@ -12,6 +12,7 @@
 import com.flutterwave.raveandroid.di.modules.NetworkModule;
 import com.flutterwave.raveandroid.di.modules.RwandaModule;
 import com.flutterwave.raveandroid.di.modules.UgandaModule;
+import com.flutterwave.raveandroid.di.modules.ZambiaModule;
 
 import javax.inject.Singleton;
 
@@ -33,6 +34,8 @@ public interface AppComponent {
 
     GhanaComponent plus(GhanaModule ghanaModule);
 
+    ZambiaComponent plus(ZambiaModule zambiaModule);
+
     CardComponent plus(CardModule cardModule);
 
     BankTransferComponent plus(BankTransferModule bankTransferModule);
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/ZambiaComponent.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/ZambiaComponent.java
@@ -0,0 +1,14 @@
+package com.flutterwave.raveandroid.di.components;
+
+
+import com.flutterwave.raveandroid.di.modules.ZambiaModule;
+import com.flutterwave.raveandroid.di.scopes.ZambiaScope;
+import com.flutterwave.raveandroid.zmmobilemoney.ZmMobileMoneyFragment;
+
+import dagger.Subcomponent;
+
+@ZambiaScope
+@Subcomponent(modules = {ZambiaModule.class})
+public interface ZambiaComponent {
+    void inject(ZmMobileMoneyFragment zmMobileMoneyFragment);
+}
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/ZambiaModule.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/ZambiaModule.java
@@ -0,0 +1,24 @@
+package com.flutterwave.raveandroid.di.modules;
+
+import com.flutterwave.raveandroid.zmmobilemoney.ZmMobileMoneyContract;
+
+import javax.inject.Inject;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class ZambiaModule {
+
+    private ZmMobileMoneyContract.View view;
+
+    @Inject
+    public ZambiaModule(ZmMobileMoneyContract.View view) {
+        this.view = view;
+    }
+
+    @Provides
+    public ZmMobileMoneyContract.View providesContract() {
+        return view;
+    }
+}
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/ZambiaScope.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/ZambiaScope.java
@@ -0,0 +1,11 @@
+package com.flutterwave.raveandroid.di.scopes;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Scope;
+
+@Scope
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ZambiaScope {
+}
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/NullZmMobileMoneyView.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/NullZmMobileMoneyView.java
@@ -0,0 +1,69 @@
+package com.flutterwave.raveandroid.zmmobilemoney;
+
+import com.flutterwave.raveandroid.Payload;
+import com.flutterwave.raveandroid.ViewObject;
+
+import java.util.HashMap;
+
+public class NullZmMobileMoneyView implements ZmMobileMoneyContract.View {
+
+    @Override
+    public void showToast(String message) {
+
+    }
+
+    @Override
+    public void showFetchFeeFailed(String s) {
+
+    }
+
+    @Override
+    public void onPaymentError(String message) {
+
+    }
+
+    @Override
+    public void showPollingIndicator(boolean active) {
+
+    }
+
+    @Override
+    public void showProgressIndicator(boolean active) {
+
+    }
+
+    @Override
+    public void onAmountValidationSuccessful(String valueOf) {
+
+    }
+
+    @Override
+    public void displayFee(String charge_amount, Payload payload) {
+
+    }
+
+    @Override
+    public void onPaymentFailed(String message, String responseAsJSONString) {
+
+    }
+
+    @Override
+    public void showFieldError(int viewID, String message, Class<?> viewtype) {
+
+    }
+
+    @Override
+    public void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
+
+    }
+
+    @Override
+    public void onPollingRoundComplete(String flwRef, String txRef, String publicKey) {
+
+    }
+
+    @Override
+    public void onPaymentSuccessful(String status, String flwRef, String responseAsString) {
+
+    }
+}
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyContract.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyContract.java
@@ -0,0 +1,59 @@
+package com.flutterwave.raveandroid.zmmobilemoney;
+
+import com.flutterwave.raveandroid.Payload;
+import com.flutterwave.raveandroid.RavePayInitializer;
+import com.flutterwave.raveandroid.ViewObject;
+
+import java.util.HashMap;
+
+/**
+ * Created by hfetuga on 28/06/2018.
+ */
+
+public interface ZmMobileMoneyContract {
+
+    interface View {
+        void showToast(String message);
+
+        void showFetchFeeFailed(String s);
+
+        void onPaymentError(String message);
+
+        void showPollingIndicator(boolean active);
+
+        void showProgressIndicator(boolean active);
+
+        void onAmountValidationSuccessful(String valueOf);
+
+        void displayFee(String charge_amount, Payload payload);
+
+        void onPaymentFailed(String message, String responseAsJSONString);
+
+        void showFieldError(int viewID, String message, Class<?> viewtype);
+
+        void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap);
+
+        void onPollingRoundComplete(String flwRef, String txRef, String publicKey);
+
+        void onPaymentSuccessful(String status, String flwRef, String responseAsString);
+
+    }
+
+    interface UserActionsListener {
+        void fetchFee(Payload payload);
+
+        void init(RavePayInitializer ravePayInitializer);
+
+        void onDataCollected(HashMap<String, ViewObject> dataHashMap);
+
+        void requeryTx(String flwRef, String txRef, String publicKey);
+
+        void chargeZmMobileMoney(Payload payload, String encryptionKey);
+
+        void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayInitializer ravePayInitializer);
+
+        void onAttachView(View view);
+
+        void onDetachView();
+    }
+}
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java
diff --git a/raveandroid/src/main/res/layout/fragment_zm_mobile_money.xml b/raveandroid/src/main/res/layout/fragment_zm_mobile_money.xml
diff --git a/raveandroid/src/main/res/values/strings.xml b/raveandroid/src/main/res/values/strings.xml
