From 4e48a424a556fc09be1784387e9b7c945a2590ae Mon Sep 17 00:00:00 2001 From: taiwoadebayo Date: Sun, 28 Jun 2020 15:29:43 +0100 Subject: [PATCH 1/7] added dark mode adjusted ui controls moved similar styles to styles.xml --- app/build.gradle | 4 +- .../rave_android/MainActivity.java | 11 +- app/src/main/res/layout/activity_main.xml | 9 + app/src/main/res/values/colors.xml | 4 +- app/src/main/res/values/styles.xml | 2 +- build.gradle | 2 +- rave_android/build.gradle | 4 +- rave_android/src/main/AndroidManifest.xml | 2 + .../raveandroid/RavePayActivity.java | 4 +- .../raveandroid/card/CardFragment.java | 26 +- .../raveandroid/card/CardUiPresenter.java | 6 +- .../card/CreditCardTextWatcher.java | 15 +- .../raveandroid/card/CreditCardView.java | 17 +- .../savedcards/SavedCardRecyclerAdapter.java | 21 +- .../zmmobilemoney/ZmMobileMoneyFragment.java | 3 +- .../src/main/res/drawable-hdpi/collapsed.png | Bin 575 -> 0 bytes .../drawable-hdpi/master_card_logo_svg.png | Bin 6462 -> 0 bytes .../src/main/res/drawable-hdpi/padlock.png | Bin 373 -> 0 bytes .../main/res/drawable-hdpi/visa_logo_new.png | Bin 50957 -> 0 bytes .../src/main/res/drawable-mdpi/collapsed.png | Bin 364 -> 0 bytes .../drawable-mdpi/master_card_logo_svg.png | Bin 3484 -> 0 bytes .../src/main/res/drawable-mdpi/padlock.png | Bin 247 -> 0 bytes .../main/res/drawable-mdpi/visa_logo_new.png | Bin 30309 -> 0 bytes .../src/main/res/drawable-xhdpi/collapsed.png | Bin 736 -> 0 bytes .../drawable-xhdpi/master_card_logo_svg.png | Bin 8673 -> 0 bytes .../src/main/res/drawable-xhdpi/padlock.png | Bin 525 -> 0 bytes .../main/res/drawable-xhdpi/visa_logo_new.png | Bin 73148 -> 0 bytes .../main/res/drawable-xxhdpi/collapsed.png | Bin 1054 -> 0 bytes .../drawable-xxhdpi/master_card_logo_svg.png | Bin 14003 -> 0 bytes .../src/main/res/drawable-xxhdpi/padlock.png | Bin 723 -> 0 bytes .../res/drawable-xxhdpi/visa_logo_new.png | Bin 123727 -> 0 bytes .../main/res/drawable-xxxhdpi/collapsed.png | Bin 1325 -> 0 bytes .../drawable-xxxhdpi/master_card_logo_svg.png | Bin 19677 -> 0 bytes .../src/main/res/drawable-xxxhdpi/padlock.png | Bin 937 -> 0 bytes .../res/drawable-xxxhdpi/visa_logo_new.png | Bin 180565 -> 0 bytes rave_android/src/main/res/drawable/amex.png | Bin 20496 -> 0 bytes .../res/drawable/black_background_curved.xml | 2 +- .../src/main/res/drawable/broken_link.png | Bin 856 -> 0 bytes .../src/main/res/drawable/creditcard.png | Bin 20079 -> 0 bytes .../main/res/drawable/flw_icon_coloured.png | Bin 20235 -> 0 bytes .../main/res/drawable/ic_american_express.xml | 78 ++++ .../src/main/res/drawable/ic_arrow_down.xml | 9 + .../src/main/res/drawable/ic_arrow_up.xml | 9 + .../src/main/res/drawable/ic_credit_card.xml | 9 + .../src/main/res/drawable/ic_flw_logo.xml | 9 + .../src/main/res/drawable/ic_lock.xml | 9 + .../drawable/ic_lock_outline_black_24dp.xml | 4 - .../src/main/res/drawable/ic_master_card.xml | 78 ++++ .../src/main/res/drawable/ic_verve_logo.jpg | Bin 0 -> 8647 bytes .../src/main/res/drawable/ic_visa.xml | 10 + .../src/main/res/drawable/rectangle.xml | 12 + rave_android/src/main/res/drawable/verve.png | Bin 21037 -> 0 bytes .../layout/rave_sdk_add_exisiting_bank.xml | 15 +- .../res/layout/rave_sdk_add_vendor_layout.xml | 40 +- .../res/layout/rave_sdk_card_preview_item.xml | 6 +- .../res/layout/rave_sdk_content_rave_pay.xml | 2 +- .../res/layout/rave_sdk_fragment_account.xml | 94 ++-- .../main/res/layout/rave_sdk_fragment_ach.xml | 45 +- .../rave_sdk_fragment_bank_transfer.xml | 48 +-- .../res/layout/rave_sdk_fragment_barter.xml | 5 - .../res/layout/rave_sdk_fragment_card.xml | 407 +++++++++--------- .../layout/rave_sdk_fragment_francophone.xml | 17 +- .../rave_sdk_fragment_gh_mobile_money.xml | 49 ++- .../res/layout/rave_sdk_fragment_mpesa.xml | 102 ++--- .../rave_sdk_fragment_rwf_mobile_money.xml | 9 +- .../rave_sdk_fragment_sa_bank_account.xml | 9 +- .../rave_sdk_fragment_ug_mobile_money.xml | 48 +-- .../main/res/layout/rave_sdk_fragment_uk.xml | 9 +- .../res/layout/rave_sdk_fragment_ussd.xml | 401 ++++++++--------- .../rave_sdk_fragment_zm_mobile_money.xml | 38 +- ..._sdk_payment_fragment_container_layout.xml | 18 +- .../layout/rave_sdk_payment_title_layout.xml | 18 +- .../rave_sdk_payment_type_tile_layout.xml | 48 ++- .../rave_sdk_pick_saved_card_layout.xml | 10 +- .../layout/rave_sdk_recycler_view_item.xml | 36 +- .../layout/rave_sdk_select_bank_list_item.xml | 57 ++- .../src/main/res/values-night/colors.xml | 16 + rave_android/src/main/res/values/colors.xml | 14 +- rave_android/src/main/res/values/dimens.xml | 5 + rave_android/src/main/res/values/strings.xml | 8 +- rave_android/src/main/res/values/styles.xml | 22 +- rave_cache/build.gradle | 1 - .../rave_java_commons/RaveConstants.java | 2 +- rave_logger/build.gradle | 1 - rave_presentation/build.gradle | 5 +- rave_remote/build.gradle | 5 +- rave_utils/build.gradle | 1 - .../src/main/res/drawable-hdpi/ic_lock.xml | 9 + .../res/layout/rave_sdk_avsvbv_layout.xml | 19 +- .../main/res/layout/rave_sdk_otp_layout.xml | 11 +- .../main/res/layout/rave_sdk_pin_layout.xml | 12 +- rave_utils/src/main/res/values/strings.xml | 2 +- 92 files changed, 1126 insertions(+), 897 deletions(-) delete mode 100644 rave_android/src/main/res/drawable-hdpi/collapsed.png delete mode 100644 rave_android/src/main/res/drawable-hdpi/master_card_logo_svg.png delete mode 100644 rave_android/src/main/res/drawable-hdpi/padlock.png delete mode 100644 rave_android/src/main/res/drawable-hdpi/visa_logo_new.png delete mode 100644 rave_android/src/main/res/drawable-mdpi/collapsed.png delete mode 100644 rave_android/src/main/res/drawable-mdpi/master_card_logo_svg.png delete mode 100644 rave_android/src/main/res/drawable-mdpi/padlock.png delete mode 100644 rave_android/src/main/res/drawable-mdpi/visa_logo_new.png delete mode 100644 rave_android/src/main/res/drawable-xhdpi/collapsed.png delete mode 100644 rave_android/src/main/res/drawable-xhdpi/master_card_logo_svg.png delete mode 100644 rave_android/src/main/res/drawable-xhdpi/padlock.png delete mode 100644 rave_android/src/main/res/drawable-xhdpi/visa_logo_new.png delete mode 100644 rave_android/src/main/res/drawable-xxhdpi/collapsed.png delete mode 100644 rave_android/src/main/res/drawable-xxhdpi/master_card_logo_svg.png delete mode 100644 rave_android/src/main/res/drawable-xxhdpi/padlock.png delete mode 100644 rave_android/src/main/res/drawable-xxhdpi/visa_logo_new.png delete mode 100644 rave_android/src/main/res/drawable-xxxhdpi/collapsed.png delete mode 100644 rave_android/src/main/res/drawable-xxxhdpi/master_card_logo_svg.png delete mode 100644 rave_android/src/main/res/drawable-xxxhdpi/padlock.png delete mode 100644 rave_android/src/main/res/drawable-xxxhdpi/visa_logo_new.png delete mode 100644 rave_android/src/main/res/drawable/amex.png delete mode 100644 rave_android/src/main/res/drawable/broken_link.png delete mode 100644 rave_android/src/main/res/drawable/creditcard.png delete mode 100755 rave_android/src/main/res/drawable/flw_icon_coloured.png create mode 100644 rave_android/src/main/res/drawable/ic_american_express.xml create mode 100644 rave_android/src/main/res/drawable/ic_arrow_down.xml create mode 100644 rave_android/src/main/res/drawable/ic_arrow_up.xml create mode 100644 rave_android/src/main/res/drawable/ic_credit_card.xml create mode 100644 rave_android/src/main/res/drawable/ic_flw_logo.xml create mode 100644 rave_android/src/main/res/drawable/ic_lock.xml delete mode 100644 rave_android/src/main/res/drawable/ic_lock_outline_black_24dp.xml create mode 100644 rave_android/src/main/res/drawable/ic_master_card.xml create mode 100644 rave_android/src/main/res/drawable/ic_verve_logo.jpg create mode 100644 rave_android/src/main/res/drawable/ic_visa.xml create mode 100644 rave_android/src/main/res/drawable/rectangle.xml delete mode 100644 rave_android/src/main/res/drawable/verve.png create mode 100644 rave_android/src/main/res/values-night/colors.xml create mode 100644 rave_utils/src/main/res/drawable-hdpi/ic_lock.xml diff --git a/app/build.gradle b/app/build.gradle index c7dd2002..dea9987b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { applicationId "com.flutterwave.rave_android" minSdkVersion 15 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" 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 72bf855e..876db36d 100644 --- a/app/src/main/java/com/flutterwave/rave_android/MainActivity.java +++ b/app/src/main/java/com/flutterwave/rave_android/MainActivity.java @@ -16,6 +16,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.SwitchCompat; import com.flutterwave.raveandroid.RavePayActivity; @@ -49,7 +50,7 @@ public class MainActivity implements FeeCheckListener, // Implement if you want to be able to check fees beforehand SavedCardsListener, // Implement if you want to be able to save cards and charge saved cards - CardPaymentCallback {// Must be implemented to charge cards with custom UI or no-UI + CardPaymentCallback { // Must be implemented to charge cards with custom UI or no-UI EditText emailEt; EditText amountEt; @@ -105,6 +106,8 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + emailEt = findViewById(R.id.emailEt); amountEt = findViewById(R.id.amountEt); publicKeyEt = findViewById(R.id.publicKeyEt); @@ -519,10 +522,10 @@ public void showProgressIndicator(boolean active) { progressDialog = new ProgressDialog(this); progressDialog.setCanceledOnTouchOutside(false); progressDialog.setMessage("Please wait..."); - } - - if (active && !progressDialog.isShowing()) { + } else if (active && !progressDialog.isShowing()) { progressDialog.show(); + } else if (active && !progressDialog.isShowing()) { + } else { progressDialog.dismiss(); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 239fe188..9cacef73 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -297,6 +297,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:hint="@string/email" + android:text="a@b.com" android:inputType="textEmailAddress" android:textSize="14sp" /> @@ -305,6 +306,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" + android:text="1" android:hint="@string/amount_to_charge_required" android:inputType="number" android:textSize="14sp" /> @@ -332,6 +334,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" + android:text="ref" android:hint="@string/txref_required" android:textSize="14sp" /> @@ -340,6 +343,7 @@ android:id="@+id/narrationTV" android:layout_width="match_parent" android:layout_height="wrap_content" + android:text="ravepay" android:layout_marginBottom="10dp" android:hint="@string/narration" android:textSize="14sp" /> @@ -349,6 +353,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" + android:text="NGN" android:hint="@string/currency_code_e_g_ngn" android:textSize="14sp" /> @@ -357,6 +362,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" + android:text="NG" android:hint="@string/country_code_e_g_ng" android:textSize="14sp" /> @@ -366,6 +372,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" + android:text="taiwo" android:hint="@string/first_name" android:textSize="14sp" /> @@ -374,6 +381,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" + android:text="ade" android:hint="@string/last_name" android:textSize="14sp" /> @@ -383,6 +391,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:inputType="phone" + android:text="08012345456" android:hint="@string/phone_number" android:textSize="14sp" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b8bf69c6..4c471ae8 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,5 +2,7 @@ #F99B37 #c16c00 - #FF4081 + #c16c00 + #12122c + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 51ea0803..838ac237 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ - + + - diff --git a/rave_cache/build.gradle b/rave_cache/build.gradle index a2916076..24114e05 100644 --- a/rave_cache/build.gradle +++ b/rave_cache/build.gradle @@ -4,7 +4,6 @@ group = 'com.github.flutterwave' android { compileSdkVersion 29 - buildToolsVersion "29.0.2" defaultConfig { minSdkVersion 15 diff --git a/rave_java_commons/src/main/java/com/flutterwave/raveandroid/rave_java_commons/RaveConstants.java b/rave_java_commons/src/main/java/com/flutterwave/raveandroid/rave_java_commons/RaveConstants.java index 89b72d39..92288468 100644 --- a/rave_java_commons/src/main/java/com/flutterwave/raveandroid/rave_java_commons/RaveConstants.java +++ b/rave_java_commons/src/main/java/com/flutterwave/raveandroid/rave_java_commons/RaveConstants.java @@ -108,7 +108,7 @@ public class RaveConstants { public static String transactionError = "An error occurred while retrieving transaction fee"; public static String validCvvPrompt = "Enter a valid cvv"; public static String validExpiryDatePrompt = "Enter a valid expiry date"; - public static String validCreditCardPrompt = "Enter a valid credit card number"; + public static String validic_credit_cardPrompt = "Enter a valid credit card number"; public static String validVoucherPrompt = "Enter a valid voucher code"; public static String validNetworkPrompt = "Select a network"; public static String invalidChargeCode = "Invalid charge response code"; diff --git a/rave_logger/build.gradle b/rave_logger/build.gradle index 1a44c190..75abb08a 100644 --- a/rave_logger/build.gradle +++ b/rave_logger/build.gradle @@ -4,7 +4,6 @@ group = 'com.github.flutterwave' android { compileSdkVersion 29 - buildToolsVersion "29.0.2" defaultConfig { minSdkVersion 15 diff --git a/rave_presentation/build.gradle b/rave_presentation/build.gradle index e5dbf5ee..bb22b31c 100644 --- a/rave_presentation/build.gradle +++ b/rave_presentation/build.gradle @@ -3,12 +3,11 @@ apply plugin: 'com.github.dcendents.android-maven' group = 'com.github.flutterwave' android { - compileSdkVersion 27 - buildToolsVersion "29.0.2" + compileSdkVersion 29 defaultConfig { minSdkVersion 15 - targetSdkVersion 27 + targetSdkVersion 29 versionCode 1 versionName "1.0" diff --git a/rave_remote/build.gradle b/rave_remote/build.gradle index b533da91..9ed1dd01 100644 --- a/rave_remote/build.gradle +++ b/rave_remote/build.gradle @@ -3,12 +3,11 @@ apply plugin: 'com.github.dcendents.android-maven' group = 'com.github.flutterwave' android { - compileSdkVersion 27 - buildToolsVersion "29.0.2" + compileSdkVersion 29 defaultConfig { minSdkVersion 15 - targetSdkVersion 27 + targetSdkVersion 29 versionCode 1 versionName "1.0" diff --git a/rave_utils/build.gradle b/rave_utils/build.gradle index 98dbfe71..9872f8f9 100644 --- a/rave_utils/build.gradle +++ b/rave_utils/build.gradle @@ -4,7 +4,6 @@ group = 'com.github.flutterwave' android { compileSdkVersion 29 - buildToolsVersion "29.0.3" defaultConfig { minSdkVersion 15 diff --git a/rave_utils/src/main/res/drawable-hdpi/ic_lock.xml b/rave_utils/src/main/res/drawable-hdpi/ic_lock.xml new file mode 100644 index 00000000..b5650bca --- /dev/null +++ b/rave_utils/src/main/res/drawable-hdpi/ic_lock.xml @@ -0,0 +1,9 @@ + + + diff --git a/rave_utils/src/main/res/layout/rave_sdk_avsvbv_layout.xml b/rave_utils/src/main/res/layout/rave_sdk_avsvbv_layout.xml index 00e4da5f..19fb34b2 100644 --- a/rave_utils/src/main/res/layout/rave_sdk_avsvbv_layout.xml +++ b/rave_utils/src/main/res/layout/rave_sdk_avsvbv_layout.xml @@ -2,7 +2,6 @@ @@ -34,7 +33,7 @@ android:text="@string/enter_your_billing_address_details"/> + android:drawableLeft="@drawable/ic_lock" /> diff --git a/rave_utils/src/main/res/layout/rave_sdk_pin_layout.xml b/rave_utils/src/main/res/layout/rave_sdk_pin_layout.xml index 46ba3b44..37b012a8 100644 --- a/rave_utils/src/main/res/layout/rave_sdk_pin_layout.xml +++ b/rave_utils/src/main/res/layout/rave_sdk_pin_layout.xml @@ -1,6 +1,5 @@ + android:drawableLeft="@drawable/ic_lock" /> diff --git a/rave_utils/src/main/res/values/strings.xml b/rave_utils/src/main/res/values/strings.xml index a41b4eef..d8a64069 100644 --- a/rave_utils/src/main/res/values/strings.xml +++ b/rave_utils/src/main/res/values/strings.xml @@ -115,7 +115,7 @@ cardNoStripped Enter a valid cvv Enter a valid expiry date - Enter a valid credit card number + Enter a valid credit card number Enter a valid voucher code Select a network Unknown Auth Model From b03a0a72de98d49c5fa320d2841dd30a89b6533c Mon Sep 17 00:00:00 2001 From: taiwoadebayo Date: Sun, 28 Jun 2020 15:51:14 +0100 Subject: [PATCH 2/7] dark mode enabled --- .../main/java/com/flutterwave/rave_android/MainActivity.java | 3 --- 1 file changed, 3 deletions(-) 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 876db36d..cd9d28a5 100644 --- a/app/src/main/java/com/flutterwave/rave_android/MainActivity.java +++ b/app/src/main/java/com/flutterwave/rave_android/MainActivity.java @@ -16,7 +16,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.SwitchCompat; import com.flutterwave.raveandroid.RavePayActivity; @@ -106,8 +105,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); - emailEt = findViewById(R.id.emailEt); amountEt = findViewById(R.id.amountEt); publicKeyEt = findViewById(R.id.publicKeyEt); From a03c792411747700467e8fe34632e646891742e5 Mon Sep 17 00:00:00 2001 From: taiwoadebayo Date: Sun, 28 Jun 2020 17:22:22 +0100 Subject: [PATCH 3/7] adjusted saved cards page --- app/src/main/res/layout/activity_main.xml | 4 +- rave_android/src/main/AndroidManifest.xml | 1 + .../raveandroid/card/CardFragment.java | 2 - .../savedcards/SavedCardRecyclerAdapter.java | 2 +- .../card/savedcards/SavedCardsActivity.java | 18 ++++++- .../card/savedcards/SavedCardsFragment.java | 29 ++--------- .../src/main/res/drawable-night/ic_visa.xml | 10 ++++ .../src/main/res/drawable/back_grey.xml | 9 ++++ .../res/layout/rave_sdk_card_preview_item.xml | 6 +-- .../res/layout/rave_sdk_fragment_account.xml | 3 +- .../res/layout/rave_sdk_fragment_card.xml | 1 - .../rave_sdk_pick_saved_card_layout.xml | 50 ++----------------- .../src/main/res/values-night/colors.xml | 2 +- .../src/main/res/drawable-hdpi/back_grey.xml | 9 ++++ .../src/main/res/drawable-night/back_grey.xml | 9 ++++ .../rave_sdk_activity_futher_verification.xml | 45 ++++++++++++++--- .../src/main/res/values-night/colors.xml | 10 ++++ rave_utils/src/main/res/values/colors.xml | 1 + 18 files changed, 121 insertions(+), 90 deletions(-) create mode 100644 rave_android/src/main/res/drawable-night/ic_visa.xml create mode 100644 rave_android/src/main/res/drawable/back_grey.xml create mode 100644 rave_utils/src/main/res/drawable-hdpi/back_grey.xml create mode 100644 rave_utils/src/main/res/drawable-night/back_grey.xml create mode 100644 rave_utils/src/main/res/values-night/colors.xml diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9cacef73..dc91874f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -297,7 +297,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:hint="@string/email" - android:text="a@b.com" + android:text="mikelis135@gmail.com" android:inputType="textEmailAddress" android:textSize="14sp" /> @@ -391,7 +391,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:inputType="phone" - android:text="08012345456" + android:text="08132383284" android:hint="@string/phone_number" android:textSize="14sp" /> diff --git a/rave_android/src/main/AndroidManifest.xml b/rave_android/src/main/AndroidManifest.xml index 09aa549f..ef3e901a 100644 --- a/rave_android/src/main/AndroidManifest.xml +++ b/rave_android/src/main/AndroidManifest.xml @@ -15,6 +15,7 @@ android:windowSoftInputMode="adjustPan" /> diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java index 9e1500d8..1872d26c 100644 --- a/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java @@ -91,7 +91,6 @@ public class CardFragment extends Fragment implements View.OnClickListener, Card private static final String RAVEPAY = "ravepay"; private View v; TextView useASavedCardTv; - TextView useAnotherCardTv; private Button payButton; private TextView pcidss_tv; private AlertDialog dialog; @@ -220,7 +219,6 @@ private void initializeViews() { emailEt = v.findViewById(R.id.rave_emailEt); cvvTil = v.findViewById(R.id.rave_cvvTil); cvvTv = v.findViewById(R.id.rave_cvvTv); - useAnotherCardTv = v.findViewById(R.id.rave_use_new_card_tv); useASavedCardTv = v.findViewById(R.id.rave_use_saved_card_tv); useASavedCardTv.setVisibility(GONE); saveCardSwitch = v.findViewById(R.id.rave_saveCardSwitch); diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java index 1082f3db..c707d9ea 100644 --- a/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java @@ -72,7 +72,7 @@ public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickL public void bind(SavedCard card) { this.card = card; - cardTypeTv.setText("YOUR " + card.getCard_brand()); + cardTypeTv.setText(card.getCard_brand()); maskedPanTv.setText(card.getMasked_pan()); if (card.getCard_brand().equalsIgnoreCase("mastercard")) { cardBrandIv diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java index 972a1811..fe544f18 100644 --- a/rave_android/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,11 @@ import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.Fragment; +import android.view.View; + import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.Fragment; import com.flutterwave.raveandroid.R; @@ -14,11 +17,24 @@ public class SavedCardsActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + if (getIntent() != null & getIntent().getIntExtra("theme", 0) != 0) { setTheme(getIntent().getIntExtra("theme", 0)); } setContentView(R.layout.rave_sdk_activity_futher_verification); + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + if (getSupportActionBar() != null) { + getSupportActionBar().setDisplayShowTitleEnabled(false); + } + toolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + onBackPressed(); + } + }); + if (findViewById(R.id.frame_container) != null) { if (savedInstanceState != null) { return; diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java index 4fc7064f..87c484b1 100644 --- a/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java +++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java @@ -2,16 +2,13 @@ import android.content.Intent; import android.os.Bundle; -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; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.TextView; + +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.flutterwave.raveandroid.R; import com.flutterwave.raveandroid.RavePayActivity; @@ -32,7 +29,6 @@ public class SavedCardsFragment extends Fragment { public static final String EXTRA_SAVED_CARDS = "saved_cards"; public static final String SAVED_CARD_MOTIVE = "for_saved_card"; - TextView useAnotherCardTv; private SavedCard savedCardToCharge = null; private List savedCards; @@ -41,27 +37,12 @@ public SavedCardsFragment() { // Required empty public constructor } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment final View v = inflater.inflate(R.layout.rave_sdk_fragment_saved_cards, container, false); - useAnotherCardTv = (TextView) v.findViewById(R.id.rave_use_new_card_tv); - - String s = useAnotherCardTv.getText().toString(); - Spannable spannable = new SpannableString(s); - spannable.setSpan(new UnderlineSpan(), 0, s.length(), 0); - useAnotherCardTv.setText(spannable); - - useAnotherCardTv.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - goBack(); - } - }); - if (getArguments() != null) { if (getArguments().containsKey(EXTRA_SAVED_CARDS)) { Type savedCardsListType = new TypeToken>() { @@ -81,7 +62,7 @@ public void onCardSelected(SavedCard savedCard) { goBack(); } }); - RecyclerView recyclerView = (RecyclerView) v.findViewById(R.id.rave_recycler); + RecyclerView recyclerView = v.findViewById(R.id.rave_recycler); recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); recyclerView.setAdapter(adapter); diff --git a/rave_android/src/main/res/drawable-night/ic_visa.xml b/rave_android/src/main/res/drawable-night/ic_visa.xml new file mode 100644 index 00000000..71230df8 --- /dev/null +++ b/rave_android/src/main/res/drawable-night/ic_visa.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/rave_android/src/main/res/drawable/back_grey.xml b/rave_android/src/main/res/drawable/back_grey.xml new file mode 100644 index 00000000..5d03e8fa --- /dev/null +++ b/rave_android/src/main/res/drawable/back_grey.xml @@ -0,0 +1,9 @@ + + + diff --git a/rave_android/src/main/res/layout/rave_sdk_card_preview_item.xml b/rave_android/src/main/res/layout/rave_sdk_card_preview_item.xml index d392f2e6..44b1e598 100644 --- a/rave_android/src/main/res/layout/rave_sdk_card_preview_item.xml +++ b/rave_android/src/main/res/layout/rave_sdk_card_preview_item.xml @@ -30,8 +30,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingBottom="6dp" - android:text="YOUR " - android:textSize="16sp" /> + android:text="" + android:textSize="14sp" /> + android:textSize="16sp" /> diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_account.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_account.xml index 2e24fba2..53611f4d 100644 --- a/rave_android/src/main/res/layout/rave_sdk_fragment_account.xml +++ b/rave_android/src/main/res/layout/rave_sdk_fragment_account.xml @@ -138,8 +138,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:layout_marginBottom="20dp" - android:text="@string/pay" - android:textColor="#FFF" /> + android:text="@string/pay" /> -