Skip to content

Commit adcc774

Browse files
vshcherbyna-epamfmattos-hw
vshcherbyna-epam
authored and
fmattos-hw
committed
HW-53054 Re-organize package structure - core (#28)
* HW-53054: Re-organize package structure
1 parent 37f66aa commit adcc774

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+137
-136
lines changed

‎ui/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,4 @@ sonarqube {
168168
property "sonar.libraries", libraries
169169
property "sonar.projectName", "android-ui-sdk"
170170
}
171-
}
171+
}

‎ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/BankAccountTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import static java.net.HttpURLConnection.HTTP_OK;
2626
import static java.util.concurrent.TimeUnit.SECONDS;
2727

28-
import static com.hyperwallet.android.model.HyperwalletBankAccount.Purpose.SAVINGS;
28+
import static com.hyperwallet.android.model.transfermethod.HyperwalletBankAccount.Purpose.SAVINGS;
2929
import static com.hyperwallet.android.util.EspressoUtils.hasEmptyText;
3030
import static com.hyperwallet.android.util.EspressoUtils.hasErrorText;
3131
import static com.hyperwallet.android.util.EspressoUtils.nestedScrollTo;
@@ -47,7 +47,7 @@
4747

4848
import com.hyperwallet.android.Hyperwallet;
4949
import com.hyperwallet.android.hyperwallet_ui.R;
50-
import com.hyperwallet.android.model.HyperwalletTransferMethod;
50+
import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod;
5151
import com.hyperwallet.android.rule.HyperwalletExternalResourceManager;
5252
import com.hyperwallet.android.rule.HyperwalletMockWebServer;
5353
import com.hyperwallet.android.ui.repository.RepositoryFactory;

‎ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/BankCardTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
import com.hyperwallet.android.Hyperwallet;
4444
import com.hyperwallet.android.hyperwallet_ui.R;
45-
import com.hyperwallet.android.model.HyperwalletTransferMethod;
45+
import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod;
4646
import com.hyperwallet.android.rule.HyperwalletExternalResourceManager;
4747
import com.hyperwallet.android.rule.HyperwalletMockWebServer;
4848
import com.hyperwallet.android.ui.repository.RepositoryFactory;

‎ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/PayPalTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
import com.hyperwallet.android.Hyperwallet;
4646
import com.hyperwallet.android.hyperwallet_ui.R;
47-
import com.hyperwallet.android.model.HyperwalletTransferMethod;
47+
import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod;
4848
import com.hyperwallet.android.rule.HyperwalletExternalResourceManager;
4949
import com.hyperwallet.android.rule.HyperwalletMockWebServer;
5050
import com.hyperwallet.android.ui.repository.RepositoryFactory;

‎ui/src/androidTest/java/com/hyperwallet/android/transfermethod/ui/SelectTransferMethodTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
import static java.net.HttpURLConnection.HTTP_OK;
2323

24-
import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT;
25-
import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD;
26-
import static com.hyperwallet.android.model.HyperwalletUser.ProfileTypes.BUSINESS;
27-
import static com.hyperwallet.android.model.HyperwalletUser.ProfileTypes.INDIVIDUAL;
24+
import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT;
25+
import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD;
26+
import static com.hyperwallet.android.model.user.HyperwalletUser.ProfileTypes.BUSINESS;
27+
import static com.hyperwallet.android.model.user.HyperwalletUser.ProfileTypes.INDIVIDUAL;
2828
import static com.hyperwallet.android.ui.transfermethod.AddTransferMethodActivity.EXTRA_TRANSFER_METHOD_COUNTRY;
2929
import static com.hyperwallet.android.ui.transfermethod.AddTransferMethodActivity.EXTRA_TRANSFER_METHOD_CURRENCY;
3030
import static com.hyperwallet.android.ui.transfermethod.AddTransferMethodActivity.EXTRA_TRANSFER_METHOD_PROFILE_TYPE;

‎ui/src/main/java/com/hyperwallet/android/ui/HyperwalletLocalBroadcast.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import androidx.annotation.StringDef;
2727

2828
import com.hyperwallet.android.model.HyperwalletStatusTransition;
29-
import com.hyperwallet.android.model.HyperwalletTransferMethod;
29+
import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod;
3030

3131
import java.lang.annotation.Retention;
3232
import java.lang.annotation.RetentionPolicy;

‎ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepository.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import androidx.annotation.Nullable;
3131

3232
import com.hyperwallet.android.model.HyperwalletErrors;
33-
import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationField;
34-
import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationKey;
33+
import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationField;
34+
import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationKey;
3535

3636
public interface TransferMethodConfigurationRepository {
3737

‎ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodConfigurationRepositoryImpl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
import com.hyperwallet.android.Hyperwallet;
3636
import com.hyperwallet.android.exception.HyperwalletException;
3737
import com.hyperwallet.android.listener.HyperwalletListener;
38-
import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationField;
39-
import com.hyperwallet.android.model.meta.HyperwalletTransferMethodConfigurationKey;
40-
import com.hyperwallet.android.model.meta.keyed.HyperwalletTransferMethodType;
41-
import com.hyperwallet.android.model.meta.query.HyperwalletTransferMethodConfigurationFieldQuery;
42-
import com.hyperwallet.android.model.meta.query.HyperwalletTransferMethodConfigurationKeysQuery;
38+
import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationField;
39+
import com.hyperwallet.android.model.graphql.HyperwalletTransferMethodConfigurationKey;
40+
import com.hyperwallet.android.model.graphql.keyed.HyperwalletTransferMethodType;
41+
import com.hyperwallet.android.model.graphql.query.HyperwalletTransferMethodConfigurationFieldQuery;
42+
import com.hyperwallet.android.model.graphql.query.HyperwalletTransferMethodConfigurationKeysQuery;
4343
import com.hyperwallet.android.ui.util.EspressoIdlingResource;
4444

4545
import java.util.HashMap;

‎ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodRepository.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import com.hyperwallet.android.model.HyperwalletErrors;
2222
import com.hyperwallet.android.model.HyperwalletStatusTransition;
23-
import com.hyperwallet.android.model.HyperwalletTransferMethod;
23+
import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod;
2424

2525
import java.util.List;
2626

‎ui/src/main/java/com/hyperwallet/android/ui/repository/TransferMethodRepositoryImpl.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
*/
1717
package com.hyperwallet.android.ui.repository;
1818

19-
import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TOKEN;
20-
import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TYPE;
21-
import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT;
22-
import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD;
23-
import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodTypes.PAYPAL_ACCOUNT;
19+
import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TOKEN;
20+
import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodFields.TYPE;
21+
import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_ACCOUNT;
22+
import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.BANK_CARD;
23+
import static com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod.TransferMethodTypes.PAYPAL_ACCOUNT;
2424

2525
import android.os.Handler;
2626

@@ -31,12 +31,13 @@
3131
import com.hyperwallet.android.Hyperwallet;
3232
import com.hyperwallet.android.exception.HyperwalletException;
3333
import com.hyperwallet.android.listener.HyperwalletListener;
34-
import com.hyperwallet.android.model.HyperwalletBankAccount;
35-
import com.hyperwallet.android.model.HyperwalletBankCard;
3634
import com.hyperwallet.android.model.HyperwalletStatusTransition;
37-
import com.hyperwallet.android.model.HyperwalletTransferMethod;
38-
import com.hyperwallet.android.model.PayPalAccount;
3935
import com.hyperwallet.android.model.paging.HyperwalletPageList;
36+
import com.hyperwallet.android.model.transfermethod.HyperwalletBankAccount;
37+
import com.hyperwallet.android.model.transfermethod.HyperwalletBankCard;
38+
import com.hyperwallet.android.model.transfermethod.HyperwalletTransferMethod;
39+
import com.hyperwallet.android.model.transfermethod.PayPalAccount;
40+
4041

4142
public class TransferMethodRepositoryImpl implements TransferMethodRepository {
4243

0 commit comments

Comments
 (0)