diff --git a/README.md b/README.md index f36e44a9..071dd883 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -# Rave's Android Drop In UI +# Rave's Android SDK -Rave's Android Drop-In is a readymade UI that allows you to accept card and bank payments in your Android app. +Rave's Android SDK is Flutterwave's offical android sdk to integrate the Flutterwave payment gateway(Rave) into your android app. It comes with a readymade Drop In UI and non-UI module, depending on your preference. + +The payment methods currenly supported are Cards, USSD, Mpesa, GH Mobile Money, UG Mobile Money, ZM Mobile Money, Rwanda Mobile Money, Franc Mobile Money, US ACH, UK Bank, SA Bank, Nigeria Bank Account, Nigeria Bank Transfer, Barter Mobile Wallet. Screenshot of Drop-In @@ -9,9 +11,8 @@ Rave's Android Drop-In is a readymade UI that allows you to accept card and bank - [Create your Rave live keys from the Rave Dashboard](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-live-keys-from-the-rave-dashboard) ## Requirements - - -The minimum supported SDK version is 15 +- The minimum supported SDK version is 15 +- Rave android sdk 1.0.50 and above only supports projects that have been migrated to [androidx](https://developer.android.com/jetpack/androidx/). For more information, read Google's [migration guide](https://developer.android.com/jetpack/androidx/migrate). ## Adding it to your project @@ -26,9 +27,16 @@ The minimum supported SDK version is 15 } **Step 2.** Add the dependency +If you want to use the default Drop In UI, add the `rave_android` module dependency + + dependencies { + implementation 'com.github.bolaware.rave-android:rave_android:1.2.0 + } + +but if you are not interested in our default UI and you want to use yours and only interact only with our core sdk, use the `rave_presentation` module dependencies { - implementation 'com.github.Flutterwave:rave-android:1.0.49.1' + implementation 'com.github.bolaware.rave-android:rave_presentation:1.2.0 } **Step 3.** Add the `INTERNET` permission to your android manifest @@ -37,11 +45,11 @@ The minimum supported SDK version is 15 ## Usage +### For using the default UI +### 1. Create a `RaveUiManager` instance +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). -### 1. Create a `RavePayManager` instance -Set the public key, encryption key and other required parameters. The `RavePayManager` accepts a mandatory instance of the calling `Activity` (or a `Fragment` that has a parent activity). - - new RavePayManager(activity).setAmount(amount) + new RaveUiManager(activity).setAmount(amount) .setCountry(country) .setCurrency(currency) .setEmail(email) @@ -51,7 +59,7 @@ Set the public key, encryption key and other required parameters. The `RavePayMa .setPublicKey(publicKey) .setEncryptionKey(encryptionKey) .setTxRef(txRef) - .setPhoneNumber(phoneNumber) + .setPhoneNumber(phoneNumber, boolean) .acceptAccountPayments(boolean) .acceptCardPayments(boolean) .acceptMpesaPayments(boolean) @@ -76,45 +84,7 @@ Set the public key, encryption key and other required parameters. The `RavePayMa .showStagingLabel(boolean) .initialize(); -| 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 -| setEmail(email) | This is the email address of the customer | `String` | Required -| setNarration(narration) | This is a custom description added by the merchant. For `Bank Transfer` payments, this becomes the account name of the account to be paid into. See more details [here](https://developer.flutterwave.com/v2.0/reference#pay-with-bank-transfer-nigeria). | `String` | Not Required -| setPublicKey(publicKey) | Merchant's public key. Get your merchant keys here for [ staging](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-staging-keys-from-the-rave-sandbox-environment) and [live](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-live-keys-from-the-rave-dashboard)| `String` | Required -| setEncryptionKey(encryptionKey) | Merchant's encryption key. Get your merchant keys here for [ staging](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-staging-keys-from-the-rave-sandbox-environment) and [live](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-live-keys-from-the-rave-dashboard) | `String` | Required -| setTxRef(txRef) | This is the unique reference, unique to the particular transaction being carried out. It is generated by the merchant for every transaction | `String` | Required -| setPhoneNumber(phoneNumber) | This is the customer's phone number. | `String` | Not Required -| acceptAccountPayments(boolean) | Set to `true` if you want to accept payments via bank accounts, else set to `false`. | `boolean` | Not Required -| acceptCardPayments(boolean) | Set to `true` if you want to accept payments via cards, else set to `false` | `boolean` | Not Required | -| acceptMpesaPayments(boolean) | Set to `true` if you want to accept Mpesa payments, else set to `false` . For this option to work, you should set your country to `KE` and your currency to `KES` | `boolean` | Not Required | -| acceptGHMobileMoneyPayments(boolean) | Set to `true` if you want to accept Ghana mobile money payments, else set to `false` . For this option to work, you should set your country to `GH` and your currency to `GHS`| `boolean` | Not Required | -| acceptUgMobileMoneyPayments(boolean) | Set to `true` if you want to accept Uganda mobile money payments, else set to `false` . For this option to work, you should set your country to `UG` and your currency to `UGX`| `boolean` | Not Required | -| acceptZmMobileMoneyPayments(boolean) | Set to `true` if you want to accept Zambia mobile money payments, else set to `false` . For this option to work, you should set your country to `NG` and your currency to `ZMW`. `MTN` is the only available network at the moment, see more details in the [API documentation](https://developer.flutterwave.com/reference#zambia-mobile-money).| `boolean` | Not Required | -| acceptRwfMobileMoneyPayments(boolean) | Set to `true` if you want to accept Rwanda mobile money payments, else set to `false` . For this option to work, you should set your country to `NG` and your currency to `RWF`. See more details in the [API documentation](https://developer.flutterwave.com/reference#rwanda-mobile-money).| `boolean` | Not Required | -| acceptSaBankPayments(boolean) | Set to `true` if you want to accept South African direct bank account payments, else set to `false` . For this option to work, you should set your country to `ZA` and your currency to `ZAR`.| `boolean` | Not Required | -| acceptUkPayments(boolean) | Set to `true` if you want to accept UK Bank Account payments, else set to `false` . For this option to work, you should set your country to `NG`, set currency to `GBP`, set accountbank `String`, set accountname `String`, set accountnumber `String`, set is_uk_bank_charge2 `true`, set payment_type `account`. `Please use your live credentials for this` | `boolean` | Not Required | -| acceptAchPayments(boolean) | Set to `true` if you want to accept US ACH charges from your customers, else set to `false` . For this option to work, you should set your country to `US` and your currency to `USD`. You also have to set `acceptAccountPayments(true)`| `boolean` | Not Required | -| acceptBankTransferPayments(boolean) | Set to `true` if you want to accept payments via bank transfer from your customers, else set to `false`. This option is currently only available for Nigerian Naira.

Note: By default, the account numbers generated are dynamic. This method has been overloaded for more options as shown below:
You can get more details in the [API documentation](https://developer.flutterwave.com/v2.0/reference#pay-with-bank-transfer-nigeria).| `boolean`

Optional overloads:
`boolean`, `boolean`

`boolean`, `int`, `int` | Not Required | -| acceptUssdPayments(boolean) | Set to `true` if you want to accept payments via USSD transfer from your customers, else set to `false` . This option is currently only available for the Nigerian Naira.| `boolean` | Not Required | -| acceptBarterPayments(boolean) | Set to `true` if you want to accept payments via Barter from your customers, else set to `false`.| `boolean` | Not Required | -| acceptFrancMobileMoneyPayments(boolean) | Set to `true` if you want to accept Francophone mobile money payments, else set to `false` . For this option to work, you should set your country to `NG` and your currency to `XOF` for West African CFA franc like `Ivory Coast` OR `XAF` for Central African CFA franc like `Cameroon` . See more details in the [API documentation](https://developer.flutterwave.com/reference#mobile-money-francophone).| `boolean` | Not Required | -| allowSaveCardFeature(boolean) | Set to `true` if you want to give the user the option to save their cards for future transactions. This option helps them avoid retyping their card details for every transaction. Defaults to `true`.| `boolean` | Not Required | -| onStagingEnv(boolean) | Set to `true` if you want your transactions to run in the staging environment otherwise set to `false`. Defaults to false | `boolean` | Not Required -| setMeta(`List`) | Pass in any other custom data you wish to pass. It takes in a `List` of `Meta` objects | List | Not Required -| setSubAccounts(`List`) | Pass in a `List` of `SubAccount`,if you want to split transaction fee with other people. Subaccounts are your vendors' accounts that you want to settle per transaction. To initialize a `SubAccount` class, do `SubAccount(String subAccountId,String transactionSplitRatio)` or `SubAccount(String subAccountId,String transactionSplitRatio,String transactionChargeType, String transactionCharge)` to also charge the subaccount a fee. [Learn more about split payments and subaccounts](https://developer.flutterwave.com/docs/split-payment).| `List`| Not Required -| setIsPreAuth(boolean) | Set to `true` to preauthorise the transaction amount. [Learn more about preauthourization](https://developer.flutterwave.com/v2.0/reference#introduction-1). | `int` | Not Required -| withTheme(styleId) | Sets the theme of the UI. | `int` | Not Required -| setPaymentPlan(payment_plan) | If you want to do recurrent payment, this is the payment plan ID to use for the recurring payment, you can see how to create payment plans [here](https://flutterwavedevelopers.readme.io/v2.0/reference#create-payment-plan) and [here](https://flutterwavedevelopers.readme.io/docs/recurring-billing). This is only available for card payments | `String` | Not Required -| shouldDisplayFee(boolean) | Set to `false` to not display a dialog for confirming total amount(including charge fee) that Rave will charge. By default this is set to `true` | `boolean` | Not Required -| showStagingLabel(boolean) | Set to `false` to not display a staging label when in staging environment. By default this is set to `true` | `boolean` | Not Required -| initialize() | Launch the Rave Payment UI | N/A | Required -> Note: The order in which you call the methods for accepting different payment types is the order in which they will show in the UI. ### 2. Handle the response In the calling activity, override the `onActivityResult` method to receive the payment response as shown below @@ -165,8 +135,8 @@ First specify the theme in your `styles.xml` file. In this theme, you can edit t @style/myPaymentTileTextStyle @style/myPaymentTileDividerStyle - - + + Then in your RavePayManager setup, add `.withTheme()` anywhere before calling the `initialize()` function. e.g. ```java new RavePayManager(activity).setAmount(amount) @@ -176,6 +146,87 @@ First specify the theme in your `styles.xml` file. In this theme, you can edit t .withTheme(R.Style.MyCustomTheme) .initialize(); ``` + +### For using the non UI module +### 1. Create a `RaveNonUIManager` instance +Set the public key, encryption key and other required parameters. + + RaveNonUIManager raveNonUIManager = + new RaveNonUIManager() + .setAmount(amount) + .setCountry(country) + .setCurrency(currency) + .setEmail(email) + .setfName(fName) + .setlName(lName) + .setNarration(narration) + .setPublicKey(publicKey) + .setEncryptionKey(encryptionKey) + .setTxRef(txRef) + .setPhoneNumber(phoneNumber, boolean) + .onStagingEnv(boolean) + .setMeta(List) + .isPreAuth(boolean) + .setSubAccounts(List) + .shouldDisplayFee(boolean) + .showStagingLabel(boolean) + .initialize(); + +### 2. Use the payment method's managers to charge +For example to charge cards, use the `CardPaymentManager` + + CardPaymentManager cardPayManager = new CardPaymentManager( + raveNonUIManager, CardPaymentCallback, SavedCardsListener); + Card card = new Card( + "5531886652142950") + "12", + "22", + "123" + ); // Test MasterCard PIN + + cardPayManager.chargeCard(card); + +> To see a more practical way of using the sdk, head to our sample app in the repository [here](https://github.com/Flutterwave/rave-android/tree/master/app) +## Functions definition +| 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 +| setEmail(email) | This is the email address of the customer | `String` | Required +| setNarration(narration) | This is a custom description added by the merchant. For `Bank Transfer` payments, this becomes the account name of the account to be paid into. See more details [here](https://developer.flutterwave.com/v2.0/reference#pay-with-bank-transfer-nigeria). | `String` | Not Required +| setPublicKey(publicKey) | Merchant's public key. Get your merchant keys here for [ staging](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-staging-keys-from-the-rave-sandbox-environment) and [live](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-live-keys-from-the-rave-dashboard)| `String` | Required +| setEncryptionKey(encryptionKey) | Merchant's encryption key. Get your merchant keys here for [ staging](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-staging-keys-from-the-rave-sandbox-environment) and [live](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-live-keys-from-the-rave-dashboard) | `String` | Required +| setTxRef(txRef) | This is the unique reference, unique to the particular transaction being carried out. It is generated by the merchant for every transaction | `String` | Required +| setPhoneNumber(phoneNumber) | This sets the customer's phone number. This functions is also overloaded to allow you specify whether the customer can edit their phone number as such: `setPhoneNumber(phoneNumber,false)`. When set to false, the user will not be able to change the number you set here.| `String`

Optional overloads:
`String`, `boolean` | Not Required +| acceptAccountPayments(boolean) | Set to `true` if you want to accept payments via bank accounts, else set to `false`. | `boolean` | Not Required +| acceptCardPayments(boolean) | Set to `true` if you want to accept payments via cards, else set to `false` | `boolean` | Not Required | +| acceptMpesaPayments(boolean) | Set to `true` if you want to accept Mpesa payments, else set to `false` . For this option to work, you should set your country to `KE` and your currency to `KES` | `boolean` | Not Required | +| acceptGHMobileMoneyPayments(boolean) | Set to `true` if you want to accept Ghana mobile money payments, else set to `false` . For this option to work, you should set your country to `GH` and your currency to `GHS`| `boolean` | Not Required | +| acceptUgMobileMoneyPayments(boolean) | Set to `true` if you want to accept Uganda mobile money payments, else set to `false` . For this option to work, you should set your country to `UG` and your currency to `UGX`| `boolean` | Not Required | +| acceptZmMobileMoneyPayments(boolean) | Set to `true` if you want to accept Zambia mobile money payments, else set to `false` . For this option to work, you should set your country to `NG` and your currency to `ZMW`. `MTN` is the only available network at the moment, see more details in the [API documentation](https://developer.flutterwave.com/reference#zambia-mobile-money).| `boolean` | Not Required | +| acceptRwfMobileMoneyPayments(boolean) | Set to `true` if you want to accept Rwanda mobile money payments, else set to `false` . For this option to work, you should set your country to `NG` and your currency to `RWF`. See more details in the [API documentation](https://developer.flutterwave.com/reference#rwanda-mobile-money).| `boolean` | Not Required | +| acceptSaBankPayments(boolean) | Set to `true` if you want to accept South African direct bank account payments, else set to `false` . For this option to work, you should set your country to `ZA` and your currency to `ZAR`.| `boolean` | Not Required | +| acceptUkPayments(boolean) | Set to `true` if you want to accept UK Bank Account payments, else set to `false` . For this option to work, you should set your country to `NG`, set currency to `GBP`, set accountbank `String`, set accountname `String`, set accountnumber `String`, set is_uk_bank_charge2 `true`, set payment_type `account`. `Please use your live credentials for this` | `boolean` | Not Required | +| acceptAchPayments(boolean) | Set to `true` if you want to accept US ACH charges from your customers, else set to `false` . For this option to work, you should set your country to `US` and your currency to `USD`. You also have to set `acceptAccountPayments(true)`| `boolean` | Not Required | +| acceptBankTransferPayments(boolean) | Set to `true` if you want to accept payments via bank transfer from your customers, else set to `false`. This option is currently only available for Nigerian Naira.

Note: By default, the account numbers generated are dynamic. This method has been overloaded for more options as shown below:
  • To generate static (permanent) accounts instead, pass in `true` as a second parameter. E.g.
    ```acceptBankTransferPayments(true, true)```
  • To generate accounts that expire at a certain date, or after a certain number of payments, pass in integer values for `duration` and `frequency` as such:
    ```acceptBankTransferPayments(true, duration, frequency)```
You can get more details in the [API documentation](https://developer.flutterwave.com/v2.0/reference#pay-with-bank-transfer-nigeria).| `boolean`

Optional overloads:
`boolean`, `boolean`

`boolean`, `int`, `int` | Not Required | +| acceptUssdPayments(boolean) | Set to `true` if you want to accept payments via USSD transfer from your customers, else set to `false` . This option is currently only available for the Nigerian Naira.| `boolean` | Not Required | +| acceptBarterPayments(boolean) | Set to `true` if you want to accept payments via Barter from your customers, else set to `false`.| `boolean` | Not Required | +| acceptFrancMobileMoneyPayments(boolean) | Set to `true` if you want to accept Francophone mobile money payments, else set to `false` . For this option to work, you should set your country to `NG` and your currency to `XOF` for West African CFA franc like `Ivory Coast` OR `XAF` for Central African CFA franc like `Cameroon` . See more details in the [API documentation](https://developer.flutterwave.com/reference#mobile-money-francophone).| `boolean` | Not Required | +| allowSaveCardFeature(boolean) | Set to `true` if you want to give the user the option to save their cards for future transactions. This option helps them avoid retyping their card details for every transaction. Defaults to `true`.| `boolean` | Not Required | +| onStagingEnv(boolean) | Set to `true` if you want your transactions to run in the staging environment otherwise set to `false`. Defaults to false | `boolean` | Not Required +| setMeta(`List`) | Pass in any other custom data you wish to pass. It takes in a `List` of `Meta` objects | List | Not Required +| setSubAccounts(`List`) | Pass in a `List` of `SubAccount`,if you want to split transaction fee with other people. Subaccounts are your vendors' accounts that you want to settle per transaction. To initialize a `SubAccount` class, do `SubAccount(String subAccountId,String transactionSplitRatio)` or `SubAccount(String subAccountId,String transactionSplitRatio,String transactionChargeType, String transactionCharge)` to also charge the subaccount a fee. [Learn more about split payments and subaccounts](https://developer.flutterwave.com/docs/split-payment).| `List`| Not Required +| setIsPreAuth(boolean) | Set to `true` to preauthorise the transaction amount. [Learn more about preauthourization](https://developer.flutterwave.com/v2.0/reference#introduction-1). | `int` | Not Required +| withTheme(styleId) | Sets the theme of the UI. | `int` | Not Required +| setPaymentPlan(payment_plan) | If you want to do recurrent payment, this is the payment plan ID to use for the recurring payment, you can see how to create payment plans [here](https://flutterwavedevelopers.readme.io/v2.0/reference#create-payment-plan) and [here](https://flutterwavedevelopers.readme.io/docs/recurring-billing). This is only available for card payments | `String` | Not Required +| shouldDisplayFee(boolean) | Set to `false` to not display a dialog for confirming total amount(including charge fee) that Rave will charge. By default this is set to `true` | `boolean` | Not Required +| showStagingLabel(boolean) | Set to `false` to not display a staging label when in staging environment. By default this is set to `true` | `boolean` | Not Required +| initialize() | Launch the Rave Payment UI for when using the UI module, | N/A | Required + +> Note: The order in which you call the methods for accepting different payment types is the order in which they will show in the UI. ## Configuring Proguard To configure Proguard, add the following lines to your proguard configuration file. These will keep files related to this sdk ``` @@ -197,10 +248,10 @@ Feel free to create issues and pull requests. The more concise the pull requests ## License ``` -Rave's Android DropIn UI +Rave's Android SDK MIT License -Copyright (c) 2017 +Copyright (c) 2020 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/app/build.gradle b/app/build.gradle index 16a79f31..b518e77b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.flutterwave.rave_android" minSdkVersion 15 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -27,12 +27,12 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:support-v4:27.1.1' - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' - implementation project(':raveandroid') + implementation project(':rave_android') } diff --git a/app/src/androidTest/java/com/flutterwave/rave_android/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/flutterwave/rave_android/ExampleInstrumentedTest.java index b18fa80f..87534839 100644 --- a/app/src/androidTest/java/com/flutterwave/rave_android/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/flutterwave/rave_android/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.flutterwave.rave_android; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/com/flutterwave/rave_android/MainActivity.java b/app/src/main/java/com/flutterwave/rave_android/MainActivity.java index 525225f9..c60ae395 100644 --- a/app/src/main/java/com/flutterwave/rave_android/MainActivity.java +++ b/app/src/main/java/com/flutterwave/rave_android/MainActivity.java @@ -3,10 +3,11 @@ import android.app.ProgressDialog; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.SwitchCompat; + +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.SwitchCompat; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 24df1120..239fe188 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index aac7c9b4..9e6fce10 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/raveandroid/.gitignore b/rave_android/.gitignore similarity index 100% rename from raveandroid/.gitignore rename to rave_android/.gitignore diff --git a/raveandroid/build.gradle b/rave_android/build.gradle similarity index 70% rename from raveandroid/build.gradle rename to rave_android/build.gradle index 7dc0a8f3..fdba4e39 100644 --- a/raveandroid/build.gradle +++ b/rave_android/build.gradle @@ -3,15 +3,15 @@ apply plugin: 'com.github.dcendents.android-maven' group = 'com.github.flutterwave' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 15 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0.43" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -28,37 +28,38 @@ android { lintOptions { abortOnError false } + + useLibrary 'android.test.mock' } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - // Todo: check and optimize gradle dependencies - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support:support-v4:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.squareup.retrofit2:retrofit:2.4.0' implementation 'com.squareup.retrofit2:converter-gson:2.3.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1' - implementation 'org.parceler:parceler-api:1.1.9' - annotationProcessor 'org.parceler:parceler:1.1.9' + implementation 'org.parceler:parceler-api:1.1.12' + annotationProcessor 'org.parceler:parceler:1.1.12' implementation 'com.squareup.retrofit2:converter-scalars:2.1.0' implementation 'com.scottyab:aescrypt:0.0.1' testImplementation 'junit:junit:4.12' // dagger 2 implementation 'com.google.dagger:dagger:2.17' annotationProcessor 'com.google.dagger:dagger-compiler:2.17' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'com.google.dagger:dagger:2.17' testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.17' testImplementation 'org.mockito:mockito-core:2.25.0' testImplementation 'org.mockito:mockito-inline:2.13.0' - implementation 'com.android.support:cardview-v7:27.1.1' + implementation 'androidx.cardview:cardview:1.0.0' api project(':rave_remote') api project(path: ':rave_core') api project(path: ':rave_cache') diff --git a/raveandroid/proguard-rules.pro b/rave_android/proguard-rules.pro similarity index 100% rename from raveandroid/proguard-rules.pro rename to rave_android/proguard-rules.pro diff --git a/raveandroid/src/androidTest/java/com/flutterwave/raveandroid/ExampleInstrumentedTest.java b/rave_android/src/androidTest/java/com/flutterwave/raveandroid/ExampleInstrumentedTest.java similarity index 85% rename from raveandroid/src/androidTest/java/com/flutterwave/raveandroid/ExampleInstrumentedTest.java rename to rave_android/src/androidTest/java/com/flutterwave/raveandroid/ExampleInstrumentedTest.java index 7731b498..e6ef47b1 100644 --- a/raveandroid/src/androidTest/java/com/flutterwave/raveandroid/ExampleInstrumentedTest.java +++ b/rave_android/src/androidTest/java/com/flutterwave/raveandroid/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.flutterwave.raveandroid; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/raveandroid/src/main/AndroidManifest.xml b/rave_android/src/main/AndroidManifest.xml similarity index 100% rename from raveandroid/src/main/AndroidManifest.xml rename to rave_android/src/main/AndroidManifest.xml diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/PaymentTile.java b/rave_android/src/main/java/com/flutterwave/raveandroid/PaymentTile.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/PaymentTile.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/PaymentTile.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java b/rave_android/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java similarity index 98% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java index 90d7fdbc..fca511a0 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java @@ -7,14 +7,14 @@ import android.graphics.Typeface; import android.os.Build; import android.os.Bundle; -import android.support.constraint.ConstraintLayout; -import android.support.constraint.ConstraintSet; -import android.support.constraint.Guideline; -import android.support.transition.AutoTransition; -import android.support.transition.TransitionManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.view.ViewCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.constraintlayout.widget.ConstraintSet; +import androidx.constraintlayout.widget.Guideline; +import androidx.transition.AutoTransition; +import androidx.transition.TransitionManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.core.view.ViewCompat; +import androidx.appcompat.app.AppCompatActivity; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.style.StyleSpan; @@ -61,7 +61,7 @@ import javax.inject.Inject; -import static android.support.constraint.ConstraintLayout.LayoutParams.HORIZONTAL; +import static androidx.constraintlayout.widget.ConstraintLayout.LayoutParams.HORIZONTAL; import static com.flutterwave.raveandroid.rave_java_commons.RaveConstants.LIVE_URL; import static com.flutterwave.raveandroid.rave_java_commons.RaveConstants.PAYMENT_TYPE_ACCOUNT; import static com.flutterwave.raveandroid.rave_java_commons.RaveConstants.PAYMENT_TYPE_ACH; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java b/rave_android/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java index 6eb932dd..80caef6c 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java @@ -13,6 +13,7 @@ @Parcel public class RavePayInitializer { private final ArrayList orderedPaymentTypesList = new ArrayList<>(); + private boolean isPhoneEditable = true; String phoneNumber = ""; private boolean saveCardFeatureAllowed = true; String email; @@ -40,7 +41,7 @@ public class RavePayInitializer { public RavePayInitializer(String email, double amount, String publicKey, String encryptionKey, String txRef, String narration, String currency, String country, String fName, - String lName, int theme, String phoneNumber, boolean saveCardFeatureAllowed, + String lName, int theme, String phoneNumber, boolean isPhoneEditable, boolean saveCardFeatureAllowed, boolean isPermanent, int duration, int frequency, boolean staging, String meta, String subAccounts, String payment_plan, boolean isPreAuth, boolean showStagingLabel, boolean displayFee, ArrayList orderedPaymentTypesList) { @@ -64,6 +65,7 @@ public RavePayInitializer(String email, double amount, String publicKey, this.payment_plan = payment_plan; this.isPreAuth = isPreAuth; this.phoneNumber = phoneNumber; + this.isPhoneEditable = isPhoneEditable; this.saveCardFeatureAllowed = saveCardFeatureAllowed; this.showStagingLabel = showStagingLabel; this.displayFee = displayFee; @@ -223,6 +225,10 @@ public boolean getIsDisplayFee() { return displayFee; } + public boolean getIsPhoneEditable() { + return isPhoneEditable; + } + public void setIsDisplayFee(boolean displayFee) { this.displayFee = displayFee; } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RaveUiManager.java b/rave_android/src/main/java/com/flutterwave/raveandroid/RaveUiManager.java similarity index 97% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/RaveUiManager.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/RaveUiManager.java index 27e022f4..84feb593 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/RaveUiManager.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/RaveUiManager.java @@ -2,9 +2,10 @@ import android.app.Activity; import android.content.Intent; -import android.support.v4.app.Fragment; import android.util.Log; +import androidx.fragment.app.Fragment; + import com.flutterwave.raveandroid.rave_java_commons.Meta; import com.flutterwave.raveandroid.rave_java_commons.SubAccount; import com.flutterwave.raveandroid.rave_presentation.RavePayManager; @@ -40,6 +41,7 @@ public class RaveUiManager extends RavePayManager { private int theme = R.style.DefaultTheme; private boolean allowSaveCard = true; protected boolean showStagingLabel = true; + private Boolean allowEditPhone = true; private ArrayList orderedPaymentTypesList = new ArrayList<>(); @@ -126,6 +128,12 @@ public RaveUiManager setPhoneNumber(String phoneNumber) { return this; } + public RavePayManager setPhoneNumber(String phoneNumber, Boolean isEditable) { + this.phoneNumber = phoneNumber; + this.allowEditPhone = isEditable; + return this; + } + public RaveUiManager setPaymentPlan(String payment_plan) { this.payment_plan = payment_plan; return this; @@ -294,6 +302,7 @@ private RavePayInitializer createRavePayInitializer() { getlName(), theme, getPhoneNumber(), + allowEditPhone, allowSaveCard, isPermanent(), getDuration(), diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ViewObject.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ViewObject.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ViewObject.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ViewObject.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/WebFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/WebFragment.java similarity index 99% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/WebFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/WebFragment.java index 2d69f0ec..4b7e95c1 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/WebFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/WebFragment.java @@ -7,7 +7,7 @@ import android.graphics.Bitmap; import android.os.Build; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java similarity index 97% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java index c7f92280..bc939dae 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java @@ -7,13 +7,11 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.BottomSheetDialog; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; import android.view.View; @@ -40,6 +38,9 @@ import com.flutterwave.raveandroid.verification.OTPFragment; import com.flutterwave.raveandroid.verification.VerificationActivity; import com.flutterwave.raveandroid.verification.web.WebFragment; +import com.google.android.material.bottomsheet.BottomSheetDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; import java.util.Calendar; import java.util.HashMap; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/account/AccountUiContract.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/account/AccountUiContract.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountUiPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/account/AccountUiPresenter.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountUiPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/account/AccountUiPresenter.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/BanksRecyclerAdapter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/account/BanksRecyclerAdapter.java similarity index 97% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/account/BanksRecyclerAdapter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/account/BanksRecyclerAdapter.java index 7ffc3de4..4b64eb20 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/BanksRecyclerAdapter.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/account/BanksRecyclerAdapter.java @@ -1,7 +1,7 @@ package com.flutterwave.raveandroid.account; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/NullAccountView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/account/NullAccountView.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/account/NullAccountView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/account/NullAccountView.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java similarity index 97% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java index df65a91c..1b4d29b1 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ach/AchPresenter.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ach/AchPresenter.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ach/AchUiContract.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ach/AchUiContract.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ach/NullAchView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ach/NullAchView.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ach/NullAchView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ach/NullAchView.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java similarity index 97% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java index 0f5b0547..7fbbc09e 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java @@ -5,12 +5,12 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.constraint.ConstraintLayout; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferPresenter.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferPresenter.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferUiContract.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferUiContract.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/NullBankTransferView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/banktransfer/NullBankTransferView.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/NullBankTransferView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/banktransfer/NullBankTransferView.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/barter/BarterFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/barter/BarterFragment.java similarity index 98% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/barter/BarterFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/barter/BarterFragment.java index 5a17c7f0..4ca359f0 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/barter/BarterFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/barter/BarterFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/barter/BarterPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/barter/BarterPresenter.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/barter/BarterPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/barter/BarterPresenter.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/barter/BarterUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/barter/BarterUiContract.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/barter/BarterUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/barter/BarterUiContract.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/barter/NullBarterView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/barter/NullBarterView.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/barter/NullBarterView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/barter/NullBarterView.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java similarity index 99% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java index 3f066de7..8ea5fccc 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java @@ -6,11 +6,11 @@ import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.SwitchCompat; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.SwitchCompat; import android.text.Editable; import android.text.TextWatcher; import android.text.method.LinkMovementMethod; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiContract.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiContract.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardUiPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiPresenter.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardUiPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiPresenter.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CreditCardTextWatcher.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardTextWatcher.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/card/CreditCardTextWatcher.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardTextWatcher.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java similarity index 98% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java index a4467042..22a3dfee 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java @@ -3,7 +3,7 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.design.widget.TextInputEditText; +import com.google.android.material.textfield.TextInputEditText; import android.text.InputType; import android.util.AttributeSet; import android.util.Log; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/NullUiCardView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/NullUiCardView.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/card/NullUiCardView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/card/NullUiCardView.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java similarity index 98% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java index 767c2407..2d6633b0 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java @@ -1,7 +1,7 @@ package com.flutterwave.raveandroid.card.savedcards; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java similarity index 93% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java index 13e08db8..e612977e 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java @@ -2,8 +2,8 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AppCompatActivity; import com.flutterwave.raveandroid.R; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java similarity index 95% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java index 30fb5aba..4fc7064f 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java @@ -2,9 +2,9 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Spannable; import android.text.SpannableString; import android.text.style.UnderlineSpan; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/DeviceIdGetter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/DeviceIdGetter.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/DeviceIdGetter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/DeviceIdGetter.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/PaymentTypesCurrencyChecker.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/PaymentTypesCurrencyChecker.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/PaymentTypesCurrencyChecker.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/PaymentTypesCurrencyChecker.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/PhoneNumberObfuscator.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/PhoneNumberObfuscator.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/PhoneNumberObfuscator.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/PhoneNumberObfuscator.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/Utils.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/Utils.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/Utils.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/Utils.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/FeeDisplayResponseEvent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/events/FeeDisplayResponseEvent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/FeeDisplayResponseEvent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/events/FeeDisplayResponseEvent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/InstructionsDisplayedEvent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/events/InstructionsDisplayedEvent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/InstructionsDisplayedEvent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/events/InstructionsDisplayedEvent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/ListItemSelectedEvent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/events/ListItemSelectedEvent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/ListItemSelectedEvent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/events/ListItemSelectedEvent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/RedirectEvent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/events/RedirectEvent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/RedirectEvent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/events/RedirectEvent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/RequeryCancelledEvent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/events/RequeryCancelledEvent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/RequeryCancelledEvent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/events/RequeryCancelledEvent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/ScreenLaunchEvent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/events/ScreenLaunchEvent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/ScreenLaunchEvent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/events/ScreenLaunchEvent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/ScreenMinimizeEvent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/events/ScreenMinimizeEvent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/ScreenMinimizeEvent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/events/ScreenMinimizeEvent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/SessionFinishedEvent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/events/SessionFinishedEvent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/SessionFinishedEvent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/events/SessionFinishedEvent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/StartTypingEvent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/events/StartTypingEvent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/StartTypingEvent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/events/StartTypingEvent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/StopTypingEvent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/events/StopTypingEvent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/StopTypingEvent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/events/StopTypingEvent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/SubmitEvent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/data/events/SubmitEvent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/data/events/SubmitEvent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/data/events/SubmitEvent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/AccountComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/AccountComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/AccountComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/AccountComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/AchComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/AchComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/AchComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/AchComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/BankTransferComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/BankTransferComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/BankTransferComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/BankTransferComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/BarterComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/BarterComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/BarterComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/BarterComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/CardUiComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/CardUiComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/CardUiComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/CardUiComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/FrancComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/FrancComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/FrancComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/FrancComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/GhanaComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/GhanaComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/GhanaComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/GhanaComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/MpesaComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/MpesaComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/MpesaComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/MpesaComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/RaveUiComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/RaveUiComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/RaveUiComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/RaveUiComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/RwandaComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/RwandaComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/RwandaComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/RwandaComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/SaBankComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/SaBankComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/SaBankComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/SaBankComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/UgandaComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/UgandaComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/UgandaComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/UgandaComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/UkComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/UkComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/UkComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/UkComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/UssdComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/UssdComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/UssdComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/UssdComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/WebComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/WebComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/WebComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/WebComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/ZambiaComponent.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/components/ZambiaComponent.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/ZambiaComponent.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/components/ZambiaComponent.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/AccountModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/AccountModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/AccountModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/AccountModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/AchModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/AchModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/AchModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/AchModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/AndroidModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/AndroidModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/AndroidModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/AndroidModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/BankTransferModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/BankTransferModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/BankTransferModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/BankTransferModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/BarterModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/BarterModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/BarterModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/BarterModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/CardUiModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/CardUiModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/CardUiModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/CardUiModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/FrancModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/FrancModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/FrancModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/FrancModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/GhanaModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/GhanaModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/GhanaModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/GhanaModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/MpesaModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/MpesaModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/MpesaModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/MpesaModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/RwandaModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/RwandaModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/RwandaModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/RwandaModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/SaBankModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/SaBankModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/SaBankModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/SaBankModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/UgandaModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/UgandaModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/UgandaModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/UgandaModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/UkModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/UkModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/UkModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/UkModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/UssdModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/UssdModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/UssdModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/UssdModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/WebModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/WebModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/WebModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/WebModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/ZambiaModule.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/ZambiaModule.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/ZambiaModule.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/modules/ZambiaModule.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/AchScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/AchScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/AchScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/AchScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/ActivityScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/ActivityScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/ActivityScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/ActivityScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/BankTransferScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/BankTransferScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/BankTransferScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/BankTransferScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/BarterScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/BarterScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/BarterScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/BarterScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/FrancScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/FrancScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/FrancScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/FrancScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/GhanaScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/GhanaScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/GhanaScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/GhanaScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/MpesaScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/MpesaScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/MpesaScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/MpesaScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/RwandaScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/RwandaScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/RwandaScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/RwandaScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/SaBankScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/SaBankScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/SaBankScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/SaBankScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/UgandaScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/UgandaScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/UgandaScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/UgandaScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/UkScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/UkScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/UkScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/UkScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/UssdScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/UssdScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/UssdScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/UssdScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/WebScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/WebScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/WebScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/WebScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/ZambiaScope.java b/rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/ZambiaScope.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/di/scopes/ZambiaScope.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/di/scopes/ZambiaScope.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java index 1a2e10f6..cc6583ae 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -159,6 +159,12 @@ public void onAmountValidationSuccessful(String amountToPay) { amountEt.setText(amountToPay); } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyPresenter.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyPresenter.java index c746027a..19ed8bb6 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyPresenter.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyPresenter.java @@ -132,6 +132,9 @@ public void init(RavePayInitializer ravePayInitializer) { if (isAmountValid) { mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount())); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyUiContract.java similarity index 94% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyUiContract.java index 3a4b3e24..4fd3c684 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyUiContract.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyUiContract.java @@ -17,6 +17,8 @@ interface View extends FrancMobileMoneyContract.Interactor { void onValidationSuccessful(HashMap dataHashMap); + void onPhoneValidated(String phoneToSet, boolean isEditable); + void showFieldError(int viewID, String message, Class viewType); void onPaymentSuccessful(String status, String flwRef, String responseAsString); diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/NullfrancMobileMoneyView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/NullfrancMobileMoneyView.java similarity index 92% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/NullfrancMobileMoneyView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/NullfrancMobileMoneyView.java index 2d005682..41d63fc9 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/NullfrancMobileMoneyView.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/NullfrancMobileMoneyView.java @@ -22,6 +22,11 @@ public void showPollingIndicator(boolean active) { } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java similarity index 97% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java index d46725c1..14e322b5 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.text.Html; import android.view.LayoutInflater; import android.view.View; @@ -217,6 +217,12 @@ public void onAmountValidationSuccessful(String amountToPay) { amountEt.setText(amountToPay); } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } + private void showInstructionsAndVoucher(boolean show) { if (show) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java index ed7c51d0..07a2f585 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java @@ -167,6 +167,9 @@ public void init(RavePayInitializer ravePayInitializer) { if (isAmountValid) { mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount())); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyUiContract.java similarity index 94% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyUiContract.java index c9a8af23..28ed26dc 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyUiContract.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyUiContract.java @@ -17,6 +17,8 @@ interface View extends GhMobileMoneyContract.Interactor { void showFetchFeeFailed(String s); + void onPhoneValidated(String phoneToSet, boolean isEditable); + void onAmountValidationSuccessful(String valueOf); void onPaymentFailed(String message, String responseAsJSONString); diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/NullGhMobileMoneyView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/NullGhMobileMoneyView.java similarity index 92% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/NullGhMobileMoneyView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/NullGhMobileMoneyView.java index b074f169..38670723 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/NullGhMobileMoneyView.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/NullGhMobileMoneyView.java @@ -27,6 +27,11 @@ public void showPollingIndicator(boolean active) { } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java index 22e30609..626f2784 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -160,6 +160,12 @@ public void onAmountValidationSuccessful(String amountToPay) { amountEt.setText(amountToPay); } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java similarity index 95% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java index 00bea066..06946b82 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java @@ -133,6 +133,9 @@ public void init(RavePayInitializer ravePayInitializer) { if (isAmountValid) { mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount())); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaUiContract.java similarity index 93% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaUiContract.java index 36807955..5414a4ef 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaUiContract.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaUiContract.java @@ -17,6 +17,8 @@ interface View extends MpesaContract.Interactor { void onValidationSuccessful(HashMap dataHashMap); + void onPhoneValidated(String phoneToSet, boolean isEditable); + void showFieldError(int viewID, String message, Class viewType); } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/NullMpesaView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/NullMpesaView.java similarity index 92% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/NullMpesaView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/NullMpesaView.java index 6791148b..b57156d2 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/NullMpesaView.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/NullMpesaView.java @@ -22,6 +22,11 @@ public void showPollingIndicator(boolean active) { } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/NullRwfMobileMoneyView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/NullRwfMobileMoneyView.java similarity index 92% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/NullRwfMobileMoneyView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/NullRwfMobileMoneyView.java index 33328003..d6737a42 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/NullRwfMobileMoneyView.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/NullRwfMobileMoneyView.java @@ -22,6 +22,11 @@ public void showPollingIndicator(boolean active) { } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java index 57c632aa..9f7d9dd3 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.text.Html; import android.view.LayoutInflater; import android.view.View; @@ -149,6 +149,12 @@ public void onAmountValidationSuccessful(String amountToPay) { amountEt.setText(amountToPay); } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenter.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenter.java index c09df7b5..e7a42615 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenter.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenter.java @@ -139,6 +139,9 @@ public void init(RavePayInitializer ravePayInitializer) { if (isAmountValid) { mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount())); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyUiContract.java similarity index 93% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyUiContract.java index 2ce823b5..d6640698 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyUiContract.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyUiContract.java @@ -14,6 +14,8 @@ interface View extends RwfMobileMoneyContract.Interactor { void showFieldError(int viewID, String message, Class viewType); + void onPhoneValidated(String phoneToSet, boolean isEditable); + void onValidationSuccessful(HashMap dataHashMap); } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/NullSaBankAccountView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/sabankaccount/NullSaBankAccountView.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/NullSaBankAccountView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/sabankaccount/NullSaBankAccountView.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountFragment.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountFragment.java index 51c89b9f..cb1b7756 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountFragment.java @@ -5,12 +5,12 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountPresenter.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountPresenter.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountUiContract.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountUiContract.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/NullUgMobileMoneyView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/NullUgMobileMoneyView.java similarity index 92% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/NullUgMobileMoneyView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/NullUgMobileMoneyView.java index 68e48b02..d78d8ac7 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/NullUgMobileMoneyView.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/NullUgMobileMoneyView.java @@ -23,6 +23,11 @@ public void showPollingIndicator(boolean active) { } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java index b3071e22..2fac204d 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.text.Html; import android.view.LayoutInflater; import android.view.View; @@ -165,6 +165,12 @@ public void onAmountValidationSuccessful(String amountToPay) { amountEt.setText(amountToPay); } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java index 897d0f2f..e0481313 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java @@ -138,6 +138,9 @@ public void init(RavePayInitializer ravePayInitializer) { if (isAmountValid) { mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount())); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyUiContract.java similarity index 93% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyUiContract.java index a284b6c1..c5cf6712 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyUiContract.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyUiContract.java @@ -15,6 +15,8 @@ public interface UgMobileMoneyUiContract { interface View extends UgMobileMoneyContract.Interactor { void onAmountValidationSuccessful(String amountToPay); + void onPhoneValidated(String phoneToSet, boolean isEditable); + void showFieldError(int viewID, String message, Class viewType); void onValidationSuccessful(HashMap dataHashMap); diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/uk/NullUkView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/uk/NullUkView.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/uk/NullUkView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/uk/NullUkView.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java similarity index 98% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java index e4d8a312..d5ee3193 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java @@ -6,10 +6,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/uk/UkPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/uk/UkPresenter.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/uk/UkPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/uk/UkPresenter.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/uk/UkUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/uk/UkUiContract.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/uk/UkUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/uk/UkUiContract.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/NullUssdView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ussd/NullUssdView.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/NullUssdView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ussd/NullUssdView.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ussd/UssdFragment.java similarity index 98% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ussd/UssdFragment.java index 0cff385f..dabaca8b 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/ussd/UssdFragment.java @@ -8,12 +8,12 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.constraint.ConstraintLayout; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.AppCompatSpinner; +import androidx.constraintlayout.widget.ConstraintLayout; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.AppCompatSpinner; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ussd/UssdPresenter.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ussd/UssdPresenter.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/ussd/UssdUiContract.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/ussd/UssdUiContract.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/AccountNoValidator.java b/rave_android/src/main/java/com/flutterwave/raveandroid/validators/AccountNoValidator.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/validators/AccountNoValidator.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/validators/AccountNoValidator.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/AmountValidator.java b/rave_android/src/main/java/com/flutterwave/raveandroid/validators/AmountValidator.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/validators/AmountValidator.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/validators/AmountValidator.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/BankCodeValidator.java b/rave_android/src/main/java/com/flutterwave/raveandroid/validators/BankCodeValidator.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/validators/BankCodeValidator.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/validators/BankCodeValidator.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/BanksMinimum100AccountPaymentValidator.java b/rave_android/src/main/java/com/flutterwave/raveandroid/validators/BanksMinimum100AccountPaymentValidator.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/validators/BanksMinimum100AccountPaymentValidator.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/validators/BanksMinimum100AccountPaymentValidator.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/BvnValidator.java b/rave_android/src/main/java/com/flutterwave/raveandroid/validators/BvnValidator.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/validators/BvnValidator.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/validators/BvnValidator.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/CardExpiryValidator.java b/rave_android/src/main/java/com/flutterwave/raveandroid/validators/CardExpiryValidator.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/validators/CardExpiryValidator.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/validators/CardExpiryValidator.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/CvvValidator.java b/rave_android/src/main/java/com/flutterwave/raveandroid/validators/CvvValidator.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/validators/CvvValidator.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/validators/CvvValidator.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/DateOfBirthValidator.java b/rave_android/src/main/java/com/flutterwave/raveandroid/validators/DateOfBirthValidator.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/validators/DateOfBirthValidator.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/validators/DateOfBirthValidator.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/EmailValidator.java b/rave_android/src/main/java/com/flutterwave/raveandroid/validators/EmailValidator.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/validators/EmailValidator.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/validators/EmailValidator.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/NetworkValidator.java b/rave_android/src/main/java/com/flutterwave/raveandroid/validators/NetworkValidator.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/validators/NetworkValidator.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/validators/NetworkValidator.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/PhoneValidator.java b/rave_android/src/main/java/com/flutterwave/raveandroid/validators/PhoneValidator.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/validators/PhoneValidator.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/validators/PhoneValidator.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/AVSVBVFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/AVSVBVFragment.java similarity index 97% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/verification/AVSVBVFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/verification/AVSVBVFragment.java index 3e3ee84a..3ccc3544 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/AVSVBVFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/AVSVBVFragment.java @@ -3,9 +3,9 @@ import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/OTPFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/OTPFragment.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/verification/OTPFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/verification/OTPFragment.java index 90835bc8..da8578d8 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/OTPFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/OTPFragment.java @@ -3,9 +3,9 @@ import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/PinFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/PinFragment.java similarity index 95% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/verification/PinFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/verification/PinFragment.java index bbbf7e99..1cd32045 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/PinFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/PinFragment.java @@ -3,9 +3,9 @@ import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/VerificationActivity.java b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/VerificationActivity.java similarity index 98% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/verification/VerificationActivity.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/verification/VerificationActivity.java index dac45638..e964d017 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/VerificationActivity.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/VerificationActivity.java @@ -2,8 +2,8 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import com.flutterwave.raveandroid.R; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/NullWebView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/web/NullWebView.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/NullWebView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/verification/web/NullWebView.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/WebContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/web/WebContract.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/WebContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/verification/web/WebContract.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/WebFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/web/WebFragment.java similarity index 99% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/WebFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/verification/web/WebFragment.java index 3deec7f3..80bb5b6b 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/WebFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/web/WebFragment.java @@ -7,7 +7,7 @@ import android.graphics.Bitmap; import android.os.Build; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/WebPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/verification/web/WebPresenter.java similarity index 100% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/WebPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/verification/web/WebPresenter.java diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/NullZmMobileMoneyView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/NullZmMobileMoneyView.java similarity index 92% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/NullZmMobileMoneyView.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/NullZmMobileMoneyView.java index ed9f3485..eb36efb9 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/NullZmMobileMoneyView.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/NullZmMobileMoneyView.java @@ -27,6 +27,11 @@ public void showPollingIndicator(boolean active) { } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java index 4bf84d9b..cdaa1119 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.text.Html; import android.view.LayoutInflater; import android.view.View; @@ -214,6 +214,11 @@ public void showProgressIndicator(boolean active) { } } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } @Override public void onValidationSuccessful(HashMap dataHashMap) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java similarity index 96% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java index 40971bc4..967080d9 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java @@ -145,6 +145,9 @@ public void init(RavePayInitializer ravePayInitializer) { if (isAmountValid) { mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount())); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyUiContract.java b/rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyUiContract.java similarity index 93% rename from raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyUiContract.java rename to rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyUiContract.java index 10388eb2..9310f633 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyUiContract.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyUiContract.java @@ -17,6 +17,8 @@ interface View extends ZmMobileMoneyContract.Interactor { void showFieldError(int viewID, String message, Class viewtype); + void onPhoneValidated(String phoneToSet, boolean isEditable); + void onValidationSuccessful(HashMap dataHashMap); void showToast(String validNetworkPrompt); diff --git a/raveandroid/src/main/res/drawable-hdpi/collapsed.png b/rave_android/src/main/res/drawable-hdpi/collapsed.png similarity index 100% rename from raveandroid/src/main/res/drawable-hdpi/collapsed.png rename to rave_android/src/main/res/drawable-hdpi/collapsed.png diff --git a/raveandroid/src/main/res/drawable-hdpi/master_card_logo_svg.png b/rave_android/src/main/res/drawable-hdpi/master_card_logo_svg.png similarity index 100% rename from raveandroid/src/main/res/drawable-hdpi/master_card_logo_svg.png rename to rave_android/src/main/res/drawable-hdpi/master_card_logo_svg.png diff --git a/raveandroid/src/main/res/drawable-hdpi/otp.png b/rave_android/src/main/res/drawable-hdpi/otp.png similarity index 100% rename from raveandroid/src/main/res/drawable-hdpi/otp.png rename to rave_android/src/main/res/drawable-hdpi/otp.png diff --git a/raveandroid/src/main/res/drawable-hdpi/padlock.png b/rave_android/src/main/res/drawable-hdpi/padlock.png similarity index 100% rename from raveandroid/src/main/res/drawable-hdpi/padlock.png rename to rave_android/src/main/res/drawable-hdpi/padlock.png diff --git a/raveandroid/src/main/res/drawable-hdpi/visa_logo_new.png b/rave_android/src/main/res/drawable-hdpi/visa_logo_new.png similarity index 100% rename from raveandroid/src/main/res/drawable-hdpi/visa_logo_new.png rename to rave_android/src/main/res/drawable-hdpi/visa_logo_new.png diff --git a/raveandroid/src/main/res/drawable-mdpi/collapsed.png b/rave_android/src/main/res/drawable-mdpi/collapsed.png similarity index 100% rename from raveandroid/src/main/res/drawable-mdpi/collapsed.png rename to rave_android/src/main/res/drawable-mdpi/collapsed.png diff --git a/raveandroid/src/main/res/drawable-mdpi/master_card_logo_svg.png b/rave_android/src/main/res/drawable-mdpi/master_card_logo_svg.png similarity index 100% rename from raveandroid/src/main/res/drawable-mdpi/master_card_logo_svg.png rename to rave_android/src/main/res/drawable-mdpi/master_card_logo_svg.png diff --git a/raveandroid/src/main/res/drawable-mdpi/otp.png b/rave_android/src/main/res/drawable-mdpi/otp.png similarity index 100% rename from raveandroid/src/main/res/drawable-mdpi/otp.png rename to rave_android/src/main/res/drawable-mdpi/otp.png diff --git a/raveandroid/src/main/res/drawable-mdpi/padlock.png b/rave_android/src/main/res/drawable-mdpi/padlock.png similarity index 100% rename from raveandroid/src/main/res/drawable-mdpi/padlock.png rename to rave_android/src/main/res/drawable-mdpi/padlock.png diff --git a/raveandroid/src/main/res/drawable-mdpi/visa_logo_new.png b/rave_android/src/main/res/drawable-mdpi/visa_logo_new.png similarity index 100% rename from raveandroid/src/main/res/drawable-mdpi/visa_logo_new.png rename to rave_android/src/main/res/drawable-mdpi/visa_logo_new.png diff --git a/raveandroid/src/main/res/drawable-xhdpi/collapsed.png b/rave_android/src/main/res/drawable-xhdpi/collapsed.png similarity index 100% rename from raveandroid/src/main/res/drawable-xhdpi/collapsed.png rename to rave_android/src/main/res/drawable-xhdpi/collapsed.png diff --git a/raveandroid/src/main/res/drawable-xhdpi/master_card_logo_svg.png b/rave_android/src/main/res/drawable-xhdpi/master_card_logo_svg.png similarity index 100% rename from raveandroid/src/main/res/drawable-xhdpi/master_card_logo_svg.png rename to rave_android/src/main/res/drawable-xhdpi/master_card_logo_svg.png diff --git a/raveandroid/src/main/res/drawable-xhdpi/otp.png b/rave_android/src/main/res/drawable-xhdpi/otp.png similarity index 100% rename from raveandroid/src/main/res/drawable-xhdpi/otp.png rename to rave_android/src/main/res/drawable-xhdpi/otp.png diff --git a/raveandroid/src/main/res/drawable-xhdpi/padlock.png b/rave_android/src/main/res/drawable-xhdpi/padlock.png similarity index 100% rename from raveandroid/src/main/res/drawable-xhdpi/padlock.png rename to rave_android/src/main/res/drawable-xhdpi/padlock.png diff --git a/raveandroid/src/main/res/drawable-xhdpi/visa_logo_new.png b/rave_android/src/main/res/drawable-xhdpi/visa_logo_new.png similarity index 100% rename from raveandroid/src/main/res/drawable-xhdpi/visa_logo_new.png rename to rave_android/src/main/res/drawable-xhdpi/visa_logo_new.png diff --git a/raveandroid/src/main/res/drawable-xxhdpi/collapsed.png b/rave_android/src/main/res/drawable-xxhdpi/collapsed.png similarity index 100% rename from raveandroid/src/main/res/drawable-xxhdpi/collapsed.png rename to rave_android/src/main/res/drawable-xxhdpi/collapsed.png diff --git a/raveandroid/src/main/res/drawable-xxhdpi/master_card_logo_svg.png b/rave_android/src/main/res/drawable-xxhdpi/master_card_logo_svg.png similarity index 100% rename from raveandroid/src/main/res/drawable-xxhdpi/master_card_logo_svg.png rename to rave_android/src/main/res/drawable-xxhdpi/master_card_logo_svg.png diff --git a/raveandroid/src/main/res/drawable-xxhdpi/otp.png b/rave_android/src/main/res/drawable-xxhdpi/otp.png similarity index 100% rename from raveandroid/src/main/res/drawable-xxhdpi/otp.png rename to rave_android/src/main/res/drawable-xxhdpi/otp.png diff --git a/raveandroid/src/main/res/drawable-xxhdpi/padlock.png b/rave_android/src/main/res/drawable-xxhdpi/padlock.png similarity index 100% rename from raveandroid/src/main/res/drawable-xxhdpi/padlock.png rename to rave_android/src/main/res/drawable-xxhdpi/padlock.png diff --git a/raveandroid/src/main/res/drawable-xxhdpi/visa_logo_new.png b/rave_android/src/main/res/drawable-xxhdpi/visa_logo_new.png similarity index 100% rename from raveandroid/src/main/res/drawable-xxhdpi/visa_logo_new.png rename to rave_android/src/main/res/drawable-xxhdpi/visa_logo_new.png diff --git a/raveandroid/src/main/res/drawable-xxxhdpi/collapsed.png b/rave_android/src/main/res/drawable-xxxhdpi/collapsed.png similarity index 100% rename from raveandroid/src/main/res/drawable-xxxhdpi/collapsed.png rename to rave_android/src/main/res/drawable-xxxhdpi/collapsed.png diff --git a/raveandroid/src/main/res/drawable-xxxhdpi/master_card_logo_svg.png b/rave_android/src/main/res/drawable-xxxhdpi/master_card_logo_svg.png similarity index 100% rename from raveandroid/src/main/res/drawable-xxxhdpi/master_card_logo_svg.png rename to rave_android/src/main/res/drawable-xxxhdpi/master_card_logo_svg.png diff --git a/raveandroid/src/main/res/drawable-xxxhdpi/otp.png b/rave_android/src/main/res/drawable-xxxhdpi/otp.png similarity index 100% rename from raveandroid/src/main/res/drawable-xxxhdpi/otp.png rename to rave_android/src/main/res/drawable-xxxhdpi/otp.png diff --git a/raveandroid/src/main/res/drawable-xxxhdpi/padlock.png b/rave_android/src/main/res/drawable-xxxhdpi/padlock.png similarity index 100% rename from raveandroid/src/main/res/drawable-xxxhdpi/padlock.png rename to rave_android/src/main/res/drawable-xxxhdpi/padlock.png diff --git a/raveandroid/src/main/res/drawable-xxxhdpi/visa_logo_new.png b/rave_android/src/main/res/drawable-xxxhdpi/visa_logo_new.png similarity index 100% rename from raveandroid/src/main/res/drawable-xxxhdpi/visa_logo_new.png rename to rave_android/src/main/res/drawable-xxxhdpi/visa_logo_new.png diff --git a/raveandroid/src/main/res/drawable/amex.png b/rave_android/src/main/res/drawable/amex.png similarity index 100% rename from raveandroid/src/main/res/drawable/amex.png rename to rave_android/src/main/res/drawable/amex.png diff --git a/raveandroid/src/main/res/drawable/black_background_curved.xml b/rave_android/src/main/res/drawable/black_background_curved.xml similarity index 100% rename from raveandroid/src/main/res/drawable/black_background_curved.xml rename to rave_android/src/main/res/drawable/black_background_curved.xml diff --git a/raveandroid/src/main/res/drawable/black_pin_bg.xml b/rave_android/src/main/res/drawable/black_pin_bg.xml similarity index 100% rename from raveandroid/src/main/res/drawable/black_pin_bg.xml rename to rave_android/src/main/res/drawable/black_pin_bg.xml diff --git a/raveandroid/src/main/res/drawable/blue_btn_curved.xml b/rave_android/src/main/res/drawable/blue_btn_curved.xml similarity index 100% rename from raveandroid/src/main/res/drawable/blue_btn_curved.xml rename to rave_android/src/main/res/drawable/blue_btn_curved.xml diff --git a/raveandroid/src/main/res/drawable/broken_link.png b/rave_android/src/main/res/drawable/broken_link.png similarity index 100% rename from raveandroid/src/main/res/drawable/broken_link.png rename to rave_android/src/main/res/drawable/broken_link.png diff --git a/raveandroid/src/main/res/drawable/creditcard.png b/rave_android/src/main/res/drawable/creditcard.png similarity index 100% rename from raveandroid/src/main/res/drawable/creditcard.png rename to rave_android/src/main/res/drawable/creditcard.png diff --git a/raveandroid/src/main/res/drawable/flw_icon_coloured.png b/rave_android/src/main/res/drawable/flw_icon_coloured.png similarity index 100% rename from raveandroid/src/main/res/drawable/flw_icon_coloured.png rename to rave_android/src/main/res/drawable/flw_icon_coloured.png diff --git a/raveandroid/src/main/res/drawable/green_btn_curved.xml b/rave_android/src/main/res/drawable/green_btn_curved.xml similarity index 100% rename from raveandroid/src/main/res/drawable/green_btn_curved.xml rename to rave_android/src/main/res/drawable/green_btn_curved.xml diff --git a/raveandroid/src/main/res/drawable/ic_arrow_back_black_24dp.xml b/rave_android/src/main/res/drawable/ic_arrow_back_black_24dp.xml similarity index 100% rename from raveandroid/src/main/res/drawable/ic_arrow_back_black_24dp.xml rename to rave_android/src/main/res/drawable/ic_arrow_back_black_24dp.xml diff --git a/raveandroid/src/main/res/drawable/ic_check_circle_black_24dp.xml b/rave_android/src/main/res/drawable/ic_check_circle_black_24dp.xml similarity index 100% rename from raveandroid/src/main/res/drawable/ic_check_circle_black_24dp.xml rename to rave_android/src/main/res/drawable/ic_check_circle_black_24dp.xml diff --git a/raveandroid/src/main/res/drawable/ic_content_copy_black_24dp.xml b/rave_android/src/main/res/drawable/ic_content_copy_black_24dp.xml similarity index 100% rename from raveandroid/src/main/res/drawable/ic_content_copy_black_24dp.xml rename to rave_android/src/main/res/drawable/ic_content_copy_black_24dp.xml diff --git a/raveandroid/src/main/res/drawable/ic_error_black_24dp.xml b/rave_android/src/main/res/drawable/ic_error_black_24dp.xml similarity index 100% rename from raveandroid/src/main/res/drawable/ic_error_black_24dp.xml rename to rave_android/src/main/res/drawable/ic_error_black_24dp.xml diff --git a/raveandroid/src/main/res/drawable/ic_lock_outline_black_24dp.xml b/rave_android/src/main/res/drawable/ic_lock_outline_black_24dp.xml similarity index 100% rename from raveandroid/src/main/res/drawable/ic_lock_outline_black_24dp.xml rename to rave_android/src/main/res/drawable/ic_lock_outline_black_24dp.xml diff --git a/raveandroid/src/main/res/drawable/ic_rave_logo.xml b/rave_android/src/main/res/drawable/ic_rave_logo.xml similarity index 100% rename from raveandroid/src/main/res/drawable/ic_rave_logo.xml rename to rave_android/src/main/res/drawable/ic_rave_logo.xml diff --git a/raveandroid/src/main/res/drawable/orange_button_curved.xml b/rave_android/src/main/res/drawable/orange_button_curved.xml similarity index 100% rename from raveandroid/src/main/res/drawable/orange_button_curved.xml rename to rave_android/src/main/res/drawable/orange_button_curved.xml diff --git a/raveandroid/src/main/res/drawable/otp_button_curved.xml b/rave_android/src/main/res/drawable/otp_button_curved.xml similarity index 100% rename from raveandroid/src/main/res/drawable/otp_button_curved.xml rename to rave_android/src/main/res/drawable/otp_button_curved.xml diff --git a/raveandroid/src/main/res/drawable/verve.png b/rave_android/src/main/res/drawable/verve.png similarity index 100% rename from raveandroid/src/main/res/drawable/verve.png rename to rave_android/src/main/res/drawable/verve.png diff --git a/raveandroid/src/main/res/layout/rave_sdk_activity_futher_verification.xml b/rave_android/src/main/res/layout/rave_sdk_activity_futher_verification.xml similarity index 100% rename from raveandroid/src/main/res/layout/rave_sdk_activity_futher_verification.xml rename to rave_android/src/main/res/layout/rave_sdk_activity_futher_verification.xml diff --git a/raveandroid/src/main/res/layout/rave_sdk_activity_rave_pay.xml b/rave_android/src/main/res/layout/rave_sdk_activity_rave_pay.xml similarity index 61% rename from raveandroid/src/main/res/layout/rave_sdk_activity_rave_pay.xml rename to rave_android/src/main/res/layout/rave_sdk_activity_rave_pay.xml index d611b559..856c9f0b 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_activity_rave_pay.xml +++ b/rave_android/src/main/res/layout/rave_sdk_activity_rave_pay.xml @@ -1,9 +1,9 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/raveandroid/src/main/res/layout/rave_sdk_add_exisiting_bank.xml b/rave_android/src/main/res/layout/rave_sdk_add_exisiting_bank.xml similarity index 95% rename from raveandroid/src/main/res/layout/rave_sdk_add_exisiting_bank.xml rename to rave_android/src/main/res/layout/rave_sdk_add_exisiting_bank.xml index 79c8dd4b..dbc58b27 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_add_exisiting_bank.xml +++ b/rave_android/src/main/res/layout/rave_sdk_add_exisiting_bank.xml @@ -18,7 +18,7 @@ android:id="@+id/rave_payment_type_title_textView" /> - @@ -32,7 +33,8 @@ android:layout_marginBottom="5dp" android:text="@string/enter_your_billing_address_details"/> - - - + - - - + - - - + - - - + - - - +