From 8436cfbcc34a4248b4e37d3339ada4b06ba61c1a Mon Sep 17 00:00:00 2001 From: Viktor Shcherbyna Date: Mon, 27 May 2019 16:34:27 +0300 Subject: [PATCH 1/4] HW-53054: Re-organize package structure - core --- build.gradle | 2 +- ui/build.gradle | 2 +- .../transfermethod/ui/BankAccountTest.java | 4 +-- .../transfermethod/ui/BankCardTest.java | 2 +- .../android/transfermethod/ui/PayPalTest.java | 2 +- .../ui/SelectTransferMethodTest.java | 8 +++--- .../android/ui/HyperwalletLocalBroadcast.java | 2 +- ...TransferMethodConfigurationRepository.java | 4 +-- ...sferMethodConfigurationRepositoryImpl.java | 10 +++---- .../repository/TransferMethodRepository.java | 2 +- .../TransferMethodRepositoryImpl.java | 19 +++++++------ .../android/ui/repository/UserRepository.java | 2 +- .../ui/repository/UserRepositoryImpl.java | 2 +- .../AddTransferMethodContract.java | 6 ++-- .../AddTransferMethodFragment.java | 28 +++++++++---------- .../AddTransferMethodPresenter.java | 4 +-- .../ui/transfermethod/FeeFormatter.java | 2 +- .../ListTransferMethodActivity.java | 2 +- .../ListTransferMethodContract.java | 2 +- .../ListTransferMethodFragment.java | 18 ++++++------ .../ListTransferMethodPresenter.java | 2 +- .../SelectTransferMethodPresenter.java | 10 +++---- .../TransferMethodSelectionItem.java | 2 +- .../transfermethod/TransferMethodUtils.java | 18 ++++++------ .../ui/view/widget/AbstractWidget.java | 2 +- .../android/ui/view/widget/DateWidget.java | 2 +- .../ui/view/widget/DefaultAccountWidget.java | 2 +- .../ui/view/widget/ExpiryDateWidget.java | 2 +- .../android/ui/view/widget/NumberWidget.java | 2 +- .../android/ui/view/widget/PhoneWidget.java | 2 +- .../ui/view/widget/SelectionWidget.java | 4 +-- .../android/ui/view/widget/TextWidget.java | 2 +- .../android/ui/view/widget/WidgetFactory.java | 4 +-- ...MethodConfigurationRepositoryImplTest.java | 22 +++++++-------- .../TransferMethodRepositoryImplTest.java | 24 ++++++++-------- .../ui/repository/UserRepositoryImplTest.java | 8 +++--- .../AddTransferMethodPresenterTest.java | 14 +++++----- .../ui/transfermethod/FeeFormatterTest.java | 2 +- .../ListTransferMethodPresenterTest.java | 10 +++---- .../SelectTransferMethodPresenterTest.java | 8 +++--- .../TransferMethodUtilsTest.java | 4 +-- 41 files changed, 135 insertions(+), 134 deletions(-) diff --git a/build.gradle b/build.gradle index 7d443fbbc..bf6055403 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ allprojects { mavenLocal() } - project.version = "1.0.0-beta03-SNAPSHOT" + project.version = "1.0.0-beta04-SNAPSHOT" } task clean(type: Delete) { diff --git a/ui/build.gradle b/ui/build.gradle index 36e57ea3a..3f3ddd983 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -49,7 +49,7 @@ dependencies { implementation "androidx.legacy:legacy-support-v4:1.0.0" implementation "androidx.recyclerview:recyclerview:1.0.0" - api "com.hyperwallet.android:core-sdk:1.0.0-beta03-SNAPSHOT" + api "com.hyperwallet.android:core-sdk:1.0.0-beta04-SNAPSHOT" androidTestImplementation "androidx.test.ext:junit:1.1.0" androidTestImplementation "androidx.test:runner:1.1.1" diff --git a/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/BankAccountTest.java b/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/BankAccountTest.java index 9134735a2..3a6e23137 100644 --- a/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/BankAccountTest.java +++ b/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/BankAccountTest.java @@ -25,7 +25,7 @@ import static java.net.HttpURLConnection.HTTP_OK; import static java.util.concurrent.TimeUnit.SECONDS; -import static com.hyperwallet.android.model.HyperwalletBankAccount.Purpose.SAVINGS; +import static com.hyperwallet.android.model.transfermethod.HyperwalletBankAccount.Purpose.SAVINGS; import static com.hyperwallet.android.util.EspressoUtils.hasEmptyText; import static com.hyperwallet.android.util.EspressoUtils.hasErrorText; import static com.hyperwallet.android.util.EspressoUtils.nestedScrollTo; @@ -47,7 +47,7 @@ import com.hyperwallet.android.Hyperwallet; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import com.hyperwallet.android.rule.HyperwalletExternalResourceManager; import com.hyperwallet.android.rule.HyperwalletMockWebServer; import com.hyperwallet.android.ui.repository.RepositoryFactory; diff --git a/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/BankCardTest.java b/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/BankCardTest.java index e2d2c1003..7ec4d7326 100644 --- a/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/BankCardTest.java +++ b/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/BankCardTest.java @@ -42,7 +42,7 @@ import com.hyperwallet.android.Hyperwallet; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import com.hyperwallet.android.rule.HyperwalletExternalResourceManager; import com.hyperwallet.android.rule.HyperwalletMockWebServer; import com.hyperwallet.android.ui.repository.RepositoryFactory; diff --git a/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/PayPalTest.java b/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/PayPalTest.java index 0133e6a90..6b888844c 100644 --- a/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/PayPalTest.java +++ b/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/PayPalTest.java @@ -44,7 +44,7 @@ import com.hyperwallet.android.Hyperwallet; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import com.hyperwallet.android.rule.HyperwalletExternalResourceManager; import com.hyperwallet.android.rule.HyperwalletMockWebServer; import com.hyperwallet.android.ui.repository.RepositoryFactory; diff --git a/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/SelectTransferMethodTest.java b/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/SelectTransferMethodTest.java index 01aa039f7..346b77ac5 100644 --- a/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/SelectTransferMethodTest.java +++ b/ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/SelectTransferMethodTest.java @@ -21,10 +21,10 @@ import static java.net.HttpURLConnection.HTTP_OK; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD; -import static com.hyperwallet.android.model.HyperwalletUser.ProfileTypes.BUSINESS; -import static com.hyperwallet.android.model.HyperwalletUser.ProfileTypes.INDIVIDUAL; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD; +import static com.hyperwallet.android.model.user.HyperwalletUser.ProfileTypes.BUSINESS; +import static com.hyperwallet.android.model.user.HyperwalletUser.ProfileTypes.INDIVIDUAL; import static com.hyperwallet.android.ui.transfermethod.AddTransferMethodActivity.EXTRA_TRANSFER_METHOD_COUNTRY; import static com.hyperwallet.android.ui.transfermethod.AddTransferMethodActivity.EXTRA_TRANSFER_METHOD_CURRENCY; import static com.hyperwallet.android.ui.transfermethod.AddTransferMethodActivity.EXTRA_TRANSFER_METHOD_PROFILE_TYPE; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/HyperwalletLocalBroadcast.java b/ui/src/main/java/com/hyperwallet/android/ui/HyperwalletLocalBroadcast.java index 35e62f2d0..7eed4cec5 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/HyperwalletLocalBroadcast.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/HyperwalletLocalBroadcast.java @@ -26,7 +26,7 @@ import androidx.annotation.StringDef; import com.hyperwallet.android.model.HyperwalletStatusTransition; -import com.hyperwallet.android.model.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepository.java b/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepository.java index a937b371e..165e21565 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepository.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepository.java @@ -30,8 +30,8 @@ import androidx.annotation.Nullable; import com.hyperwallet.android.model.HyperwalletErrors; -import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationField; -import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationKey; +import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationField; +import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationKey; public interface TransferMethodConfigurationRepository { diff --git a/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepositoryImpl.java b/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepositoryImpl.java index 67f2c2278..6a07b1c6c 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepositoryImpl.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepositoryImpl.java @@ -35,11 +35,11 @@ import com.hyperwallet.android.Hyperwallet; import com.hyperwallet.android.exception.HyperwalletException; import com.hyperwallet.android.listener.HyperwalletListener; -import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationField; -import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationKey; -import com.hyperwallet.android.model.meta.keyed.HyperwalletTransferMethodType; -import com.hyperwallet.android.model.meta.query.HyperwalletTransferMethodConfigurationFieldQuery; -import com.hyperwallet.android.model.meta.query.HyperwalletTransferMethodConfigurationKeysQuery; +import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationField; +import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationKey; +import com.hyperwallet.android.model.graphql.keyed.HyperwalletTransferMethodType; +import com.hyperwallet.android.model.graphql.query.HyperwalletTransferMethodConfigurationFieldQuery; +import com.hyperwallet.android.model.graphql.query.HyperwalletTransferMethodConfigurationKeysQuery; import com.hyperwallet.android.ui.util.EspressoIdlingResource; import java.util.HashMap; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodRepository.java b/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodRepository.java index de222ff69..37baebfc9 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodRepository.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodRepository.java @@ -20,7 +20,7 @@ import com.hyperwallet.android.model.HyperwalletErrors; import com.hyperwallet.android.model.HyperwalletStatusTransition; -import com.hyperwallet.android.model.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import java.util.List; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodRepositoryImpl.java b/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodRepositoryImpl.java index 4becad682..2a17b4aba 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodRepositoryImpl.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodRepositoryImpl.java @@ -16,11 +16,11 @@ */ package com.hyperwallet.android.ui.repository; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TOKEN; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TYPE; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.PAYPAL_ACCOUNT; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TOKEN; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TYPE; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.PAYPAL_ACCOUNT; import android.os.Handler; @@ -31,12 +31,13 @@ import com.hyperwallet.android.Hyperwallet; import com.hyperwallet.android.exception.HyperwalletException; import com.hyperwallet.android.listener.HyperwalletListener; -import com.hyperwallet.android.model.HyperwalletBankAccount; -import com.hyperwallet.android.model.HyperwalletBankCard; import com.hyperwallet.android.model.HyperwalletStatusTransition; -import com.hyperwallet.android.model.HyperwalletTransferMethod; -import com.hyperwallet.android.model.PayPalAccount; import com.hyperwallet.android.model.paging.HyperwalletPageList; +import com.hyperwallet.android.model.transfermethod.HyperwalletBankAccount; +import com.hyperwallet.android.model.transfermethod.HyperwalletBankCard; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.PayPalAccount; + public class TransferMethodRepositoryImpl implements TransferMethodRepository { diff --git a/ui/src/main/java/com/hyperwallet/android/ui/repository/UserRepository.java b/ui/src/main/java/com/hyperwallet/android/ui/repository/UserRepository.java index 902a8d13b..777b7583a 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/repository/UserRepository.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/repository/UserRepository.java @@ -21,7 +21,7 @@ import androidx.annotation.NonNull; import com.hyperwallet.android.model.HyperwalletErrors; -import com.hyperwallet.android.model.HyperwalletUser; +import com.hyperwallet.android.model.user.HyperwalletUser; /** * User Repository Contract diff --git a/ui/src/main/java/com/hyperwallet/android/ui/repository/UserRepositoryImpl.java b/ui/src/main/java/com/hyperwallet/android/ui/repository/UserRepositoryImpl.java index 561d4cf85..524849db2 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/repository/UserRepositoryImpl.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/repository/UserRepositoryImpl.java @@ -27,7 +27,7 @@ import com.hyperwallet.android.Hyperwallet; import com.hyperwallet.android.exception.HyperwalletException; import com.hyperwallet.android.listener.HyperwalletListener; -import com.hyperwallet.android.model.HyperwalletUser; +import com.hyperwallet.android.model.user.HyperwalletUser; public class UserRepositoryImpl implements UserRepository { diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodContract.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodContract.java index eb3e29810..2d0aec1f4 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodContract.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodContract.java @@ -19,9 +19,9 @@ import androidx.annotation.NonNull; import com.hyperwallet.android.model.HyperwalletError; -import com.hyperwallet.android.model.HyperwalletTransferMethod; -import com.hyperwallet.android.model.meta.HyperwalletFee; -import com.hyperwallet.android.model.meta.field.HyperwalletFieldGroup; +import com.hyperwallet.android.model.graphql.HyperwalletFee; +import com.hyperwallet.android.model.graphql.field.HyperwalletFieldGroup; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import java.util.List; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java index 659e6a205..cfe2ef0b8 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java @@ -16,13 +16,13 @@ */ package com.hyperwallet.android.ui.transfermethod; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.PROFILE_TYPE; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_COUNTRY; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_CURRENCY; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TYPE; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.PAYPAL_ACCOUNT; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.PROFILE_TYPE; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_COUNTRY; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_CURRENCY; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TYPE; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.PAYPAL_ACCOUNT; import android.app.Activity; import android.content.Context; @@ -46,14 +46,14 @@ import com.hyperwallet.android.exception.HyperwalletException; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.HyperwalletBankAccount; -import com.hyperwallet.android.model.HyperwalletBankCard; import com.hyperwallet.android.model.HyperwalletError; -import com.hyperwallet.android.model.HyperwalletTransferMethod; -import com.hyperwallet.android.model.PayPalAccount; -import com.hyperwallet.android.model.meta.HyperwalletFee; -import com.hyperwallet.android.model.meta.field.HyperwalletField; -import com.hyperwallet.android.model.meta.field.HyperwalletFieldGroup; +import com.hyperwallet.android.model.graphql.HyperwalletFee; +import com.hyperwallet.android.model.graphql.field.HyperwalletField; +import com.hyperwallet.android.model.graphql.field.HyperwalletFieldGroup; +import com.hyperwallet.android.model.transfermethod.HyperwalletBankAccount; +import com.hyperwallet.android.model.transfermethod.HyperwalletBankCard; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.PayPalAccount; import com.hyperwallet.android.ui.HyperwalletLocalBroadcast; import com.hyperwallet.android.ui.repository.RepositoryFactory; import com.hyperwallet.android.ui.view.WidgetSelectionDialogFragment; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodPresenter.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodPresenter.java index 8373668bd..a2b23bdee 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodPresenter.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodPresenter.java @@ -20,8 +20,8 @@ import androidx.annotation.Nullable; import com.hyperwallet.android.model.HyperwalletErrors; -import com.hyperwallet.android.model.HyperwalletTransferMethod; -import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationField; +import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationField; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import com.hyperwallet.android.ui.repository.TransferMethodConfigurationRepository; import com.hyperwallet.android.ui.repository.TransferMethodRepository; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/FeeFormatter.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/FeeFormatter.java index 095c218c7..9e0c25358 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/FeeFormatter.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/FeeFormatter.java @@ -23,7 +23,7 @@ import androidx.annotation.NonNull; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.meta.HyperwalletFee; +import com.hyperwallet.android.model.graphql.HyperwalletFee; import java.util.List; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodActivity.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodActivity.java index 8ac52f721..daaeafd5a 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodActivity.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodActivity.java @@ -32,7 +32,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.hyperwallet.android.hyperwallet_ui.R; import com.hyperwallet.android.model.HyperwalletError; -import com.hyperwallet.android.model.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import com.hyperwallet.android.ui.view.error.DefaultErrorDialogFragment; import com.hyperwallet.android.ui.view.error.OnNetworkErrorCallback; import com.hyperwallet.android.ui.view.widget.OneClickListener; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodContract.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodContract.java index e3403d5a7..0b2e0e5ad 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodContract.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodContract.java @@ -20,7 +20,7 @@ import com.hyperwallet.android.model.HyperwalletError; import com.hyperwallet.android.model.HyperwalletStatusTransition; -import com.hyperwallet.android.model.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import java.util.List; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodFragment.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodFragment.java index 715ce8eba..385d827a6 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodFragment.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodFragment.java @@ -16,14 +16,14 @@ */ package com.hyperwallet.android.ui.transfermethod; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.BANK_ACCOUNT_ID; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.CARD_NUMBER; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_COUNTRY; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TYPE; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.PREPAID_CARD; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.WIRE_ACCOUNT; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.BANK_ACCOUNT_ID; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.CARD_NUMBER; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_COUNTRY; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TYPE; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.PREPAID_CARD; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.WIRE_ACCOUNT; import static com.hyperwallet.android.ui.transfermethod.TransferMethodUtils.getStringFontIcon; import static com.hyperwallet.android.ui.transfermethod.TransferMethodUtils.getStringResourceByName; @@ -51,7 +51,7 @@ import com.hyperwallet.android.hyperwallet_ui.R; import com.hyperwallet.android.model.HyperwalletError; import com.hyperwallet.android.model.HyperwalletStatusTransition; -import com.hyperwallet.android.model.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import com.hyperwallet.android.ui.HyperwalletLocalBroadcast; import com.hyperwallet.android.ui.repository.RepositoryFactory; import com.hyperwallet.android.ui.view.HorizontalDividerItemDecorator; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodPresenter.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodPresenter.java index 5480e0a2e..4ad64b5d1 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodPresenter.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodPresenter.java @@ -20,7 +20,7 @@ import com.hyperwallet.android.model.HyperwalletErrors; import com.hyperwallet.android.model.HyperwalletStatusTransition; -import com.hyperwallet.android.model.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import com.hyperwallet.android.ui.repository.TransferMethodRepository; import java.util.List; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/SelectTransferMethodPresenter.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/SelectTransferMethodPresenter.java index e5e49cb59..e6cb193bd 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/SelectTransferMethodPresenter.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/SelectTransferMethodPresenter.java @@ -21,11 +21,11 @@ import androidx.annotation.Nullable; import com.hyperwallet.android.model.HyperwalletErrors; -import com.hyperwallet.android.model.HyperwalletUser; -import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationKey; -import com.hyperwallet.android.model.meta.keyed.Country; -import com.hyperwallet.android.model.meta.keyed.Currency; -import com.hyperwallet.android.model.meta.keyed.HyperwalletTransferMethodType; +import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationKey; +import com.hyperwallet.android.model.graphql.keyed.Country; +import com.hyperwallet.android.model.graphql.keyed.Currency; +import com.hyperwallet.android.model.graphql.keyed.HyperwalletTransferMethodType; +import com.hyperwallet.android.model.user.HyperwalletUser; import com.hyperwallet.android.ui.repository.TransferMethodConfigurationRepository; import com.hyperwallet.android.ui.repository.UserRepository; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/TransferMethodSelectionItem.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/TransferMethodSelectionItem.java index c3c7af373..e116f9368 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/TransferMethodSelectionItem.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/TransferMethodSelectionItem.java @@ -18,7 +18,7 @@ import androidx.annotation.NonNull; -import com.hyperwallet.android.model.meta.HyperwalletFee; +import com.hyperwallet.android.model.graphql.HyperwalletFee; import java.util.ArrayList; import java.util.List; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/TransferMethodUtils.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/TransferMethodUtils.java index 7eb96f386..87877cddd 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/TransferMethodUtils.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/TransferMethodUtils.java @@ -16,13 +16,13 @@ */ package com.hyperwallet.android.ui.transfermethod; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TYPE; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.PAPER_CHECK; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.PAYPAL_ACCOUNT; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.PREPAID_CARD; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.WIRE_ACCOUNT; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TYPE; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.PAPER_CHECK; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.PAYPAL_ACCOUNT; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.PREPAID_CARD; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.WIRE_ACCOUNT; import android.content.Context; import android.content.res.Resources; @@ -30,8 +30,8 @@ import androidx.annotation.NonNull; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.HyperwalletTransferMethod; -import com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodType; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodType; import java.util.Locale; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/AbstractWidget.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/AbstractWidget.java index 211e120c6..bad1ae933 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/AbstractWidget.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/AbstractWidget.java @@ -24,7 +24,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.hyperwallet.android.model.meta.field.HyperwalletField; +import com.hyperwallet.android.model.graphql.field.HyperwalletField; public abstract class AbstractWidget { diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateWidget.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateWidget.java index 00746d090..fd2199c83 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateWidget.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateWidget.java @@ -32,7 +32,7 @@ import com.google.android.material.textfield.TextInputLayout; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.meta.field.HyperwalletField; +import com.hyperwallet.android.model.graphql.field.HyperwalletField; public class DateWidget extends AbstractWidget { diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DefaultAccountWidget.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DefaultAccountWidget.java index 9463f308f..99bfabc0b 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DefaultAccountWidget.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DefaultAccountWidget.java @@ -1,6 +1,6 @@ package com.hyperwallet.android.ui.view.widget; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.IS_DEFAULT_TRANSFER_METHOD; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.IS_DEFAULT_TRANSFER_METHOD; import android.graphics.Typeface; import android.view.View; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpiryDateWidget.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpiryDateWidget.java index 9777f2153..63471a56a 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpiryDateWidget.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpiryDateWidget.java @@ -39,7 +39,7 @@ import com.google.android.material.textfield.TextInputLayout; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.meta.field.HyperwalletField; +import com.hyperwallet.android.model.graphql.field.HyperwalletField; public class ExpiryDateWidget extends AbstractWidget { private ViewGroup mContainer; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/NumberWidget.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/NumberWidget.java index 39dcc7eed..2d4e9562c 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/NumberWidget.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/NumberWidget.java @@ -32,7 +32,7 @@ import com.google.android.material.textfield.TextInputLayout; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.meta.field.HyperwalletField; +import com.hyperwallet.android.model.graphql.field.HyperwalletField; public class NumberWidget extends AbstractWidget { private ViewGroup mContainer; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/PhoneWidget.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/PhoneWidget.java index b0d2b8e0f..346c1972c 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/PhoneWidget.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/PhoneWidget.java @@ -32,7 +32,7 @@ import com.google.android.material.textfield.TextInputLayout; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.meta.field.HyperwalletField; +import com.hyperwallet.android.model.graphql.field.HyperwalletField; public class PhoneWidget extends AbstractWidget { private ViewGroup mContainer; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/SelectionWidget.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/SelectionWidget.java index 146de1b65..102eea656 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/SelectionWidget.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/SelectionWidget.java @@ -32,8 +32,8 @@ import com.google.android.material.textfield.TextInputLayout; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.meta.field.HyperwalletField; -import com.hyperwallet.android.model.meta.field.HyperwalletFieldSelectionOption; +import com.hyperwallet.android.model.graphql.field.HyperwalletField; +import com.hyperwallet.android.model.graphql.field.HyperwalletFieldSelectionOption; import com.hyperwallet.android.ui.view.WidgetSelectionDialogFragment; import java.util.Set; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/TextWidget.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/TextWidget.java index f16fd51c0..599b77b9a 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/TextWidget.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/TextWidget.java @@ -32,7 +32,7 @@ import com.google.android.material.textfield.TextInputLayout; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.meta.field.HyperwalletField; +import com.hyperwallet.android.model.graphql.field.HyperwalletField; public class TextWidget extends AbstractWidget { private ViewGroup mContainer; diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/WidgetFactory.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/WidgetFactory.java index 18bd507ca..a633114a6 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/WidgetFactory.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/WidgetFactory.java @@ -22,8 +22,8 @@ import androidx.annotation.Nullable; import com.hyperwallet.android.exception.HyperwalletException; -import com.hyperwallet.android.model.meta.field.EDataType; -import com.hyperwallet.android.model.meta.field.HyperwalletField; +import com.hyperwallet.android.model.graphql.field.EDataType; +import com.hyperwallet.android.model.graphql.field.HyperwalletField; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; diff --git a/ui/src/test/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepositoryImplTest.java b/ui/src/test/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepositoryImplTest.java index 0b99486ff..aec2aad6d 100644 --- a/ui/src/test/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepositoryImplTest.java +++ b/ui/src/test/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepositoryImplTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static com.hyperwallet.android.model.HyperwalletUser.ProfileTypes.INDIVIDUAL; +import static com.hyperwallet.android.model.user.HyperwalletUser.ProfileTypes.INDIVIDUAL; import com.hyperwallet.android.Hyperwallet; import com.hyperwallet.android.exception.HyperwalletException; @@ -23,16 +23,16 @@ import com.hyperwallet.android.model.HyperwalletError; import com.hyperwallet.android.model.HyperwalletErrors; import com.hyperwallet.android.model.TypeReference; -import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationField; -import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationKey; -import com.hyperwallet.android.model.meta.field.HyperwalletFieldGroup; -import com.hyperwallet.android.model.meta.field.HyperwalletTransferMethodConfiguration; -import com.hyperwallet.android.model.meta.field.HyperwalletTransferMethodConfigurationFieldResult; -import com.hyperwallet.android.model.meta.keyed.Country; -import com.hyperwallet.android.model.meta.keyed.Currency; -import com.hyperwallet.android.model.meta.keyed.HyperwalletTransferMethodConfigurationKeyResult; -import com.hyperwallet.android.model.meta.query.HyperwalletTransferMethodConfigurationFieldQuery; -import com.hyperwallet.android.model.meta.query.HyperwalletTransferMethodConfigurationKeysQuery; +import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationField; +import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationKey; +import com.hyperwallet.android.model.graphql.field.HyperwalletFieldGroup; +import com.hyperwallet.android.model.graphql.field.HyperwalletTransferMethodConfiguration; +import com.hyperwallet.android.model.graphql.field.HyperwalletTransferMethodConfigurationFieldResult; +import com.hyperwallet.android.model.graphql.keyed.Country; +import com.hyperwallet.android.model.graphql.keyed.Currency; +import com.hyperwallet.android.model.graphql.keyed.HyperwalletTransferMethodConfigurationKeyResult; +import com.hyperwallet.android.model.graphql.query.HyperwalletTransferMethodConfigurationFieldQuery; +import com.hyperwallet.android.model.graphql.query.HyperwalletTransferMethodConfigurationKeysQuery; import com.hyperwallet.android.ui.rule.HyperwalletExternalResourceManager; import com.hyperwallet.android.util.JsonUtils; diff --git a/ui/src/test/java/com/hyperwallet/android/ui/repository/TransferMethodRepositoryImplTest.java b/ui/src/test/java/com/hyperwallet/android/ui/repository/TransferMethodRepositoryImplTest.java index cfcdb8c96..651cf534c 100644 --- a/ui/src/test/java/com/hyperwallet/android/ui/repository/TransferMethodRepositoryImplTest.java +++ b/ui/src/test/java/com/hyperwallet/android/ui/repository/TransferMethodRepositoryImplTest.java @@ -15,26 +15,26 @@ import static com.hyperwallet.android.model.HyperwalletStatusTransition.StatusDefinition.ACTIVATED; import static com.hyperwallet.android.model.HyperwalletStatusTransition.StatusDefinition.DE_ACTIVATED; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.BANK_ACCOUNT_ID; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.BANK_NAME; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.STATUS; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TOKEN; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_COUNTRY; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_CURRENCY; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TYPE; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.BANK_ACCOUNT_ID; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.BANK_NAME; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.STATUS; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TOKEN; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_COUNTRY; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_CURRENCY; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TYPE; import com.hyperwallet.android.Hyperwallet; import com.hyperwallet.android.exception.HyperwalletException; import com.hyperwallet.android.listener.HyperwalletListener; -import com.hyperwallet.android.model.HyperwalletBankAccount; -import com.hyperwallet.android.model.HyperwalletBankCard; import com.hyperwallet.android.model.HyperwalletError; import com.hyperwallet.android.model.HyperwalletErrors; import com.hyperwallet.android.model.HyperwalletStatusTransition; -import com.hyperwallet.android.model.HyperwalletTransferMethod; -import com.hyperwallet.android.model.HyperwalletTransferMethodPagination; -import com.hyperwallet.android.model.PayPalAccount; import com.hyperwallet.android.model.paging.HyperwalletPageList; +import com.hyperwallet.android.model.transfermethod.HyperwalletBankAccount; +import com.hyperwallet.android.model.transfermethod.HyperwalletBankCard; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethodPagination; +import com.hyperwallet.android.model.transfermethod.PayPalAccount; import org.junit.Before; import org.junit.Rule; diff --git a/ui/src/test/java/com/hyperwallet/android/ui/repository/UserRepositoryImplTest.java b/ui/src/test/java/com/hyperwallet/android/ui/repository/UserRepositoryImplTest.java index 0553f14a0..42aff932e 100644 --- a/ui/src/test/java/com/hyperwallet/android/ui/repository/UserRepositoryImplTest.java +++ b/ui/src/test/java/com/hyperwallet/android/ui/repository/UserRepositoryImplTest.java @@ -11,16 +11,16 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static com.hyperwallet.android.model.HyperwalletUser.ProfileTypes.INDIVIDUAL; -import static com.hyperwallet.android.model.HyperwalletUser.UserStatuses.PRE_ACTIVATED; -import static com.hyperwallet.android.model.HyperwalletUser.VerificationStatuses.NOT_REQUIRED; +import static com.hyperwallet.android.model.user.HyperwalletUser.ProfileTypes.INDIVIDUAL; +import static com.hyperwallet.android.model.user.HyperwalletUser.UserStatuses.PRE_ACTIVATED; +import static com.hyperwallet.android.model.user.HyperwalletUser.VerificationStatuses.NOT_REQUIRED; import com.hyperwallet.android.Hyperwallet; import com.hyperwallet.android.exception.HyperwalletException; import com.hyperwallet.android.listener.HyperwalletListener; import com.hyperwallet.android.model.HyperwalletError; import com.hyperwallet.android.model.HyperwalletErrors; -import com.hyperwallet.android.model.HyperwalletUser; +import com.hyperwallet.android.model.user.HyperwalletUser; import org.junit.Before; import org.junit.Rule; diff --git a/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodPresenterTest.java b/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodPresenterTest.java index 443d6b3a5..695ea3d0a 100644 --- a/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodPresenterTest.java +++ b/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodPresenterTest.java @@ -13,16 +13,16 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static com.hyperwallet.android.model.HyperwalletUser.ProfileTypes.INDIVIDUAL; +import static com.hyperwallet.android.model.user.HyperwalletUser.ProfileTypes.INDIVIDUAL; -import com.hyperwallet.android.model.HyperwalletBankAccount; import com.hyperwallet.android.model.HyperwalletError; import com.hyperwallet.android.model.HyperwalletErrors; -import com.hyperwallet.android.model.HyperwalletTransferMethod; -import com.hyperwallet.android.model.meta.HyperwalletFee; -import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationField; -import com.hyperwallet.android.model.meta.field.HyperwalletFieldGroup; -import com.hyperwallet.android.model.meta.field.HyperwalletTransferMethodConfiguration; +import com.hyperwallet.android.model.graphql.HyperwalletFee; +import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationField; +import com.hyperwallet.android.model.graphql.field.HyperwalletFieldGroup; +import com.hyperwallet.android.model.graphql.field.HyperwalletTransferMethodConfiguration; +import com.hyperwallet.android.model.transfermethod.HyperwalletBankAccount; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import com.hyperwallet.android.ui.repository.TransferMethodConfigurationRepository; import com.hyperwallet.android.ui.repository.TransferMethodRepository; import com.hyperwallet.android.ui.rule.HyperwalletExternalResourceManager; diff --git a/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/FeeFormatterTest.java b/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/FeeFormatterTest.java index 664dac517..b6e46f9f9 100644 --- a/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/FeeFormatterTest.java +++ b/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/FeeFormatterTest.java @@ -9,7 +9,7 @@ import android.content.res.Resources; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.meta.HyperwalletFee; +import com.hyperwallet.android.model.graphql.HyperwalletFee; import com.hyperwallet.android.ui.rule.HyperwalletExternalResourceManager; import org.json.JSONException; diff --git a/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodPresenterTest.java b/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodPresenterTest.java index c4b8564ea..aa674e769 100644 --- a/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodPresenterTest.java +++ b/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/ListTransferMethodPresenterTest.java @@ -29,15 +29,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.BANK_ACCOUNT_ID; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_COUNTRY; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_CURRENCY; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.BANK_ACCOUNT_ID; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_COUNTRY; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_CURRENCY; -import com.hyperwallet.android.model.HyperwalletBankAccount; import com.hyperwallet.android.model.HyperwalletError; import com.hyperwallet.android.model.HyperwalletErrors; import com.hyperwallet.android.model.HyperwalletStatusTransition; -import com.hyperwallet.android.model.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletBankAccount; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import com.hyperwallet.android.ui.repository.TransferMethodRepository; import org.junit.Before; diff --git a/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/SelectTransferMethodPresenterTest.java b/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/SelectTransferMethodPresenterTest.java index 69bbc9d67..e58c7c6f2 100644 --- a/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/SelectTransferMethodPresenterTest.java +++ b/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/SelectTransferMethodPresenterTest.java @@ -13,10 +13,10 @@ import com.hyperwallet.android.model.HyperwalletError; import com.hyperwallet.android.model.HyperwalletErrors; -import com.hyperwallet.android.model.HyperwalletTransferMethod; -import com.hyperwallet.android.model.HyperwalletUser; -import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationKey; -import com.hyperwallet.android.model.meta.keyed.HyperwalletTransferMethodConfigurationKeyResult; +import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationKey; +import com.hyperwallet.android.model.graphql.keyed.HyperwalletTransferMethodConfigurationKeyResult; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; +import com.hyperwallet.android.model.user.HyperwalletUser; import com.hyperwallet.android.ui.repository.TransferMethodConfigurationRepository; import com.hyperwallet.android.ui.repository.TransferMethodConfigurationRepositoryImpl; import com.hyperwallet.android.ui.repository.UserRepository; diff --git a/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/TransferMethodUtilsTest.java b/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/TransferMethodUtilsTest.java index cdb6682c7..6d57d30ff 100644 --- a/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/TransferMethodUtilsTest.java +++ b/ui/src/test/java/com/hyperwallet/android/ui/transfermethod/TransferMethodUtilsTest.java @@ -9,13 +9,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD; +import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD; import android.content.Context; import android.content.res.Resources; import com.hyperwallet.android.hyperwallet_ui.R; -import com.hyperwallet.android.model.HyperwalletTransferMethod; +import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod; import com.hyperwallet.android.ui.rule.HyperwalletExternalResourceManager; import org.json.JSONException; From ebf49e7c3170bc026a7ca2aa07467ac98fa698e3 Mon Sep 17 00:00:00 2001 From: Peter Joseph Olamit Date: Mon, 27 May 2019 13:06:17 -0700 Subject: [PATCH 2/4] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bf6055403..7d443fbbc 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ allprojects { mavenLocal() } - project.version = "1.0.0-beta04-SNAPSHOT" + project.version = "1.0.0-beta03-SNAPSHOT" } task clean(type: Delete) { From f2c370eedcb3aa84eeb6646bbd07e36b73d077e9 Mon Sep 17 00:00:00 2001 From: Peter Joseph Olamit Date: Mon, 27 May 2019 13:07:17 -0700 Subject: [PATCH 3/4] Update build.gradle --- ui/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/build.gradle b/ui/build.gradle index 3f3ddd983..1544467c9 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -49,7 +49,7 @@ dependencies { implementation "androidx.legacy:legacy-support-v4:1.0.0" implementation "androidx.recyclerview:recyclerview:1.0.0" - api "com.hyperwallet.android:core-sdk:1.0.0-beta04-SNAPSHOT" + api "com.hyperwallet.android:core-sdk:1.0.0-beta03-SNAPSHOT" androidTestImplementation "androidx.test.ext:junit:1.1.0" androidTestImplementation "androidx.test:runner:1.1.1" @@ -168,4 +168,4 @@ sonarqube { property "sonar.libraries", libraries property "sonar.projectName", "android-ui-sdk" } -} \ No newline at end of file +} From 6dccd09e3a1527446a0c24a9440f722dde75ee0b Mon Sep 17 00:00:00 2001 From: Peter Olamit Date: Mon, 27 May 2019 13:29:04 -0700 Subject: [PATCH 4/4] code reformat and cleanup --- .../android/ui/view/CountrySelectionDialogFragment.java | 4 ++-- .../android/ui/view/error/DefaultErrorDialogFragment.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/CountrySelectionDialogFragment.java b/ui/src/main/java/com/hyperwallet/android/ui/view/CountrySelectionDialogFragment.java index 52ce63c19..91c35c5e3 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/CountrySelectionDialogFragment.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/CountrySelectionDialogFragment.java @@ -134,8 +134,8 @@ public void onClick(View v) { public void onViewStateRestored(@Nullable Bundle savedInstanceState) { super.onViewStateRestored(savedInstanceState); if (savedInstanceState != null) { - mCountryNameCodeMap = new TreeMap<>( - (Map)savedInstanceState.getSerializable(ARGUMENT_COUNTRY_NAME_CODE_MAP)); + mCountryNameCodeMap = new TreeMap<>( + (Map) savedInstanceState.getSerializable(ARGUMENT_COUNTRY_NAME_CODE_MAP)); mSelectedCountryName = savedInstanceState.getString(ARGUMENT_SELECTED_COUNTRY_NAME); mSearchCountryNameQuery = savedInstanceState.getString(ARGUMENT_SEARCH_COUNTRY_NAME_QUERY); } else { diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/error/DefaultErrorDialogFragment.java b/ui/src/main/java/com/hyperwallet/android/ui/view/error/DefaultErrorDialogFragment.java index 9253875e5..fd1938311 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/error/DefaultErrorDialogFragment.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/error/DefaultErrorDialogFragment.java @@ -73,7 +73,7 @@ public void onCancel(DialogInterface dialog) { /** * Builds Hyperwallet Error Dialogue * - * @param errors List of Errors @see {@link Error} + * @param errors List of Errors @see {@link Error} */ public static DefaultErrorDialogFragment newInstance(@NonNull List errors) { Bundle bundle = new Bundle();