Zambia Mobile Money Update

Author: mikelis135

raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java

@@ -53,8 +53,6 @@ public class ZmMobileMoneyFragment extends Fragment implements ZmMobileMoneyCont
     private TextInputLayout amountTil;
     private TextInputEditText phoneEt;
     private TextInputEditText amountEt;
-    private TextInputLayout voucherTil;
-    private TextInputEditText voucherEt;
     private ProgressDialog progressDialog;
     private ProgressDialog pollingProgressDialog;
 
@@ -132,13 +130,6 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
                     if (network.equalsIgnoreCase(RaveConstants.mtn)) {
                         validateInstructions = getResources().getString(R.string.mtn_validate_instructions);
                         showInstructionsAndVoucher(false);
-                    } else if (network.equalsIgnoreCase(RaveConstants.tigo)) {
-                        validateInstructions = getResources().getString(R.string.tigo_validate_instructions);
-                        showInstructionsAndVoucher(false);
-                    } else if (network.equalsIgnoreCase(RaveConstants.vodafone)) {
-                        validateInstructions = getResources().getString(R.string.checkStatus);
-                        showInstructionsAndVoucher(true);
-                        instructionsTv.setText(Html.fromHtml(getResources().getString(R.string.vodafone_msg)));
                     }
                 }
             }
@@ -162,7 +153,6 @@ public void onClick(View view) {
     private void clearErrors() {
         amountTil.setError(null);
         phoneTil.setError(null);
-        voucherTil.setError(null);
     }
 
     private void collectData() {
@@ -199,10 +189,8 @@ public void onAmountValidationSuccessful(String amountToPay) {
     private void showInstructionsAndVoucher(boolean show) {
 
         if (show) {
-            voucherTil.setVisibility(View.VISIBLE);
             instructionsTv.setVisibility(View.VISIBLE);
         } else {
-            voucherTil.setVisibility(View.GONE);
             instructionsTv.setVisibility(View.GONE);
         }
     }

raveandroid/src/main/res/layout/fragment_zm_mobile_money.xml

@@ -6,7 +6,7 @@
     android:descendantFocusability="beforeDescendants"
     android:focusableInTouchMode="true"
     android:orientation="vertical"
-    tools:context="com.flutterwave.raveandroid.zmmobilemoney.ZmMobileMoneyFragment">
+    tools:context="com.flutterwave.raveandroid.ghmobilemoney.GhMobileMoneyFragment">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -32,13 +32,21 @@
                 android:layout_marginBottom="15dp"
                 android:text="@string/pay" />
 
-
             <Spinner
                 android:id="@+id/rave_networkSpinner"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_marginBottom="10dp" />
 
+
+            <TextView
+                android:id="@+id/instructionsTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="20dp"
+                android:gravity="left"
+                tools:text="@string/vodafone_msg" />
+
             <android.support.design.widget.TextInputLayout
                 android:id="@+id/rave_phoneTil"
                 android:layout_width="match_parent"
@@ -47,8 +55,8 @@
 
                 <android.support.design.widget.TextInputEditText
                     android:id="@+id/rave_phoneEt"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                     android:layout_below="@+id/rave_card1"
                     android:hint="Phone no"
                     android:inputType="phone" />
@@ -62,9 +70,9 @@
                 android:layout_marginBottom="10dp">
 
                 <android.support.design.widget.TextInputEditText
-                    android:id="@+id/rave_amountTV"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:id="@+id/rave_amountTV"
                     android:layout_below="@+id/rave_card1"
                     android:hint="@string/amount"
                     android:inputType="numberDecimal" />