diff --git a/android-library.gradle b/android-library.gradle index 620173287..0d8012de0 100644 --- a/android-library.gradle +++ b/android-library.gradle @@ -56,7 +56,7 @@ task sourcesJar(type: Jar) { dependencies { implementation "com.google.android.material:material:$androidMaterialVersion" - api "com.hyperwallet.android:core-sdk:$hyperwalletCoreVersion" + implementation "com.hyperwallet.android:core-sdk:$hyperwalletCoreVersion" implementation "androidx.test.espresso:espresso-idling-resource:$espressoVersion" @@ -66,7 +66,4 @@ dependencies { testImplementation group: 'org.mockito', name: 'mockito-core', version: "$mockitoVersion" testImplementation group: 'pl.pragmatists', name: 'JUnitParams', version: "$junitParamsVersion" -} - - - +} \ No newline at end of file diff --git a/receiptrepository/build.gradle b/receiptrepository/build.gradle new file mode 100644 index 000000000..a1207b8f1 --- /dev/null +++ b/receiptrepository/build.gradle @@ -0,0 +1,15 @@ +apply from: "$rootProject.projectDir/android-library.gradle" +apply from: "$rootProject.projectDir/publish.gradle" + +dependencies { + implementation project(":common") + implementation "androidx.legacy:legacy-support-v4:$legacySupportV4Version" + implementation "androidx.paging:paging-runtime:$pagingRuntimeVersion" + + testImplementation "org.robolectric:robolectric:$robolectricVersion" + + androidTestImplementation "androidx.test:rules:$testRulesVersion" + androidTestImplementation "com.squareup.okhttp3:mockwebserver:$mockServerVersion" + androidTestImplementation "com.squareup.leakcanary:leakcanary-android-instrumentation:$leakcanaryVersion" + androidTestImplementation "com.squareup.leakcanary:leakcanary-support-fragment:$leakcanaryVersion" +} \ No newline at end of file diff --git a/receiptrepository/config/jacoco-settings.gradle b/receiptrepository/config/jacoco-settings.gradle new file mode 100644 index 000000000..bb4ffa228 --- /dev/null +++ b/receiptrepository/config/jacoco-settings.gradle @@ -0,0 +1,79 @@ +apply plugin: 'jacoco' + +final def jacocoVersion = "0.8.2" + +jacoco { + toolVersion = jacocoVersion +} + +android { + testOptions { + unitTests { + includeAndroidResources = true + returnDefaultValues = true + } + unitTests.all { + jacoco { + includeNoLocationClasses = true + } + } + } +} + +def fileFilter = ['**/BuildConfig.*' +] + +def debugClassPaths = [ + '**/intermediates/javac/debug/*/classes/**' +] + +final def coverageSourceDirs = ["$project.projectDir/src/main/java/*"] + +task jacocoTestReport(type: JacocoReport, dependsOn: 'testDebugUnitTest') { + + group = 'Reporting' + description = 'Generate Jacoco coverage reports.' + reports { + html { + enabled = true + destination file("$project.buildDir/reports/jacoco") + } + } + + classDirectories = fileTree( + dir: "${buildDir}", + includes: debugClassPaths, + excludes: fileFilter + ) + + additionalSourceDirs = files(coverageSourceDirs) + sourceDirectories = files(coverageSourceDirs) + executionData = files("${project.buildDir}/jacoco/testDebugUnitTest.exec") +} + +task jacocoTestCoverageVerification(type: JacocoCoverageVerification, dependsOn: 'jacocoTestReport') { + + group = 'Verification' + classDirectories = fileTree( + dir: "${buildDir}", + includes: debugClassPaths, + excludes: fileFilter + ) + additionalSourceDirs = files(coverageSourceDirs) + sourceDirectories = files(coverageSourceDirs) + executionData = files("${project.buildDir}/jacoco/testDebugUnitTest.exec") + + violationRules { + setFailOnViolation(true) + + rule { + element = 'CLASS' + limit { + value = 'COVEREDRATIO' + counter = 'BRANCH' + minimum = 0.65 + } + } + } +} + diff --git a/receipt/config/lint.xml b/receiptrepository/config/lint.xml similarity index 100% rename from receipt/config/lint.xml rename to receiptrepository/config/lint.xml diff --git a/receiptrepository/src/main/AndroidManifest.xml b/receiptrepository/src/main/AndroidManifest.xml new file mode 100644 index 000000000..25d33e545 --- /dev/null +++ b/receiptrepository/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSource.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSource.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSource.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSource.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactory.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactory.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactory.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactory.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepository.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepository.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepository.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepository.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImpl.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImpl.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImpl.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImpl.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSource.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSource.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSource.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSource.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactory.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactory.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactory.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactory.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepository.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepository.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepository.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepository.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImpl.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImpl.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImpl.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImpl.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactoryTest.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactoryTest.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactoryTest.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactoryTest.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceTest.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceTest.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceTest.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceTest.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImplTest.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImplTest.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImplTest.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImplTest.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactoryTest.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactoryTest.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactoryTest.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactoryTest.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceTest.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceTest.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceTest.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceTest.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImplTest.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImplTest.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImplTest.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImplTest.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/rule/HyperwalletExternalResourceManager.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/rule/HyperwalletExternalResourceManager.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/rule/HyperwalletExternalResourceManager.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/rule/HyperwalletExternalResourceManager.java diff --git a/receipt/src/test/resources/authentication_token_response.json b/receiptrepository/src/test/resources/authentication_token_response.json similarity index 100% rename from receipt/src/test/resources/authentication_token_response.json rename to receiptrepository/src/test/resources/authentication_token_response.json diff --git a/receipt/src/test/resources/prepaid_card_receipt_credit_response.json b/receiptrepository/src/test/resources/prepaid_card_receipt_credit_response.json similarity index 100% rename from receipt/src/test/resources/prepaid_card_receipt_credit_response.json rename to receiptrepository/src/test/resources/prepaid_card_receipt_credit_response.json diff --git a/receipt/src/test/resources/prepaid_card_receipt_debit_response.json b/receiptrepository/src/test/resources/prepaid_card_receipt_debit_response.json similarity index 100% rename from receipt/src/test/resources/prepaid_card_receipt_debit_response.json rename to receiptrepository/src/test/resources/prepaid_card_receipt_debit_response.json diff --git a/receipt/src/test/resources/prepaid_card_receipt_list_response.json b/receiptrepository/src/test/resources/prepaid_card_receipt_list_response.json similarity index 100% rename from receipt/src/test/resources/prepaid_card_receipt_list_response.json rename to receiptrepository/src/test/resources/prepaid_card_receipt_list_response.json diff --git a/receipt/src/test/resources/prepaid_card_receipt_unknown_type_response.json b/receiptrepository/src/test/resources/prepaid_card_receipt_unknown_type_response.json similarity index 100% rename from receipt/src/test/resources/prepaid_card_receipt_unknown_type_response.json rename to receiptrepository/src/test/resources/prepaid_card_receipt_unknown_type_response.json diff --git a/receipt/src/test/resources/receipt_credit_response.json b/receiptrepository/src/test/resources/receipt_credit_response.json similarity index 100% rename from receipt/src/test/resources/receipt_credit_response.json rename to receiptrepository/src/test/resources/receipt_credit_response.json diff --git a/receipt/src/test/resources/receipt_debit_response.json b/receiptrepository/src/test/resources/receipt_debit_response.json similarity index 100% rename from receipt/src/test/resources/receipt_debit_response.json rename to receiptrepository/src/test/resources/receipt_debit_response.json diff --git a/receipt/src/test/resources/receipt_list_date_grouping_response.json b/receiptrepository/src/test/resources/receipt_list_date_grouping_response.json similarity index 100% rename from receipt/src/test/resources/receipt_list_date_grouping_response.json rename to receiptrepository/src/test/resources/receipt_list_date_grouping_response.json diff --git a/receipt/src/test/resources/receipt_list_paged_last_response.json b/receiptrepository/src/test/resources/receipt_list_paged_last_response.json similarity index 100% rename from receipt/src/test/resources/receipt_list_paged_last_response.json rename to receiptrepository/src/test/resources/receipt_list_paged_last_response.json diff --git a/receipt/src/test/resources/receipt_list_paged_response.json b/receiptrepository/src/test/resources/receipt_list_paged_response.json similarity index 100% rename from receipt/src/test/resources/receipt_list_paged_response.json rename to receiptrepository/src/test/resources/receipt_list_paged_response.json diff --git a/receipt/src/test/resources/receipt_list_paged_second_response.json b/receiptrepository/src/test/resources/receipt_list_paged_second_response.json similarity index 100% rename from receipt/src/test/resources/receipt_list_paged_second_response.json rename to receiptrepository/src/test/resources/receipt_list_paged_second_response.json diff --git a/receipt/src/test/resources/receipt_list_paged_third_response.json b/receiptrepository/src/test/resources/receipt_list_paged_third_response.json similarity index 100% rename from receipt/src/test/resources/receipt_list_paged_third_response.json rename to receiptrepository/src/test/resources/receipt_list_paged_third_response.json diff --git a/receipt/src/test/resources/receipt_list_response.json b/receiptrepository/src/test/resources/receipt_list_response.json similarity index 100% rename from receipt/src/test/resources/receipt_list_response.json rename to receiptrepository/src/test/resources/receipt_list_response.json diff --git a/receipt/src/test/resources/receipt_unknown_type_response.json b/receiptrepository/src/test/resources/receipt_unknown_type_response.json similarity index 100% rename from receipt/src/test/resources/receipt_unknown_type_response.json rename to receiptrepository/src/test/resources/receipt_unknown_type_response.json diff --git a/receipt/.gitignore b/receiptui/.gitignore similarity index 100% rename from receipt/.gitignore rename to receiptui/.gitignore diff --git a/receipt/build.gradle b/receiptui/build.gradle similarity index 92% rename from receipt/build.gradle rename to receiptui/build.gradle index c6118c864..b6836a649 100644 --- a/receipt/build.gradle +++ b/receiptui/build.gradle @@ -2,7 +2,8 @@ apply from: "$rootProject.projectDir/android-library.gradle" apply from: "$rootProject.projectDir/publish.gradle" dependencies { - api project(":common") + implementation project(":common") + implementation project(":receiptrepository") implementation "com.google.android.material:material:$androidMaterialVersion" implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion" @@ -11,8 +12,6 @@ dependencies { implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleExtensionsVersion" implementation "androidx.paging:paging-runtime:$pagingRuntimeVersion" - testImplementation "org.robolectric:robolectric:$robolectricVersion" - androidTestImplementation "androidx.test:rules:$testRulesVersion" androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion" androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion" diff --git a/receipt/config/jacoco-settings.gradle b/receiptui/config/jacoco-settings.gradle similarity index 95% rename from receipt/config/jacoco-settings.gradle rename to receiptui/config/jacoco-settings.gradle index e0bb22486..7dbc462e6 100644 --- a/receipt/config/jacoco-settings.gradle +++ b/receiptui/config/jacoco-settings.gradle @@ -22,8 +22,7 @@ android { def fileFilter = ['**/BuildConfig.*', '**/com/hyperwallet/android/ui/receipt/view/*.*', - '**/com/hyperwallet/android/ui/receipt/viewmodel/*.*', - '**/com/hyperwallet/android/ui/receipt/repository/ReceiptRepositoryImpl.*' + '**/com/hyperwallet/android/ui/receipt/viewmodel/*.*' ] def debugClassPaths = [ diff --git a/receiptui/config/lint.xml b/receiptui/config/lint.xml new file mode 100644 index 000000000..ff446fa9e --- /dev/null +++ b/receiptui/config/lint.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/receipt/proguard-rules.pro b/receiptui/proguard-rules.pro similarity index 100% rename from receipt/proguard-rules.pro rename to receiptui/proguard-rules.pro diff --git a/receipt/src/androidTest/AndroidManifest.xml b/receiptui/src/androidTest/AndroidManifest.xml similarity index 100% rename from receipt/src/androidTest/AndroidManifest.xml rename to receiptui/src/androidTest/AndroidManifest.xml diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/HyperwalletInstrumentedTestApplication.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/HyperwalletInstrumentedTestApplication.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/HyperwalletInstrumentedTestApplication.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/HyperwalletInstrumentedTestApplication.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletExternalResourceManager.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletExternalResourceManager.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletExternalResourceManager.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletExternalResourceManager.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletMockWebServer.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletMockWebServer.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletMockWebServer.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletMockWebServer.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/EspressoUtils.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/EspressoUtils.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/EspressoUtils.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/EspressoUtils.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/NestedScrollToAction.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/NestedScrollToAction.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/NestedScrollToAction.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/NestedScrollToAction.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/RecyclerViewCountAssertion.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/RecyclerViewCountAssertion.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/RecyclerViewCountAssertion.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/RecyclerViewCountAssertion.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/TestAuthenticationProvider.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/TestAuthenticationProvider.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/TestAuthenticationProvider.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/TestAuthenticationProvider.java diff --git a/receipt/src/main/AndroidManifest.xml b/receiptui/src/main/AndroidManifest.xml similarity index 100% rename from receipt/src/main/AndroidManifest.xml rename to receiptui/src/main/AndroidManifest.xml diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ListPrepaidCardReceiptActivity.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ListPrepaidCardReceiptActivity.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ListPrepaidCardReceiptActivity.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ListPrepaidCardReceiptActivity.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ListReceiptFragment.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ListReceiptFragment.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ListReceiptFragment.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ListReceiptFragment.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ListUserReceiptActivity.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ListUserReceiptActivity.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ListUserReceiptActivity.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ListUserReceiptActivity.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailActivity.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailActivity.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailActivity.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailActivity.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptItemDividerDecorator.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptItemDividerDecorator.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptItemDividerDecorator.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptItemDividerDecorator.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptViewModel.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptViewModel.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptViewModel.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptViewModel.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptViewModel.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptViewModel.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptViewModel.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptViewModel.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptDetailViewModel.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptDetailViewModel.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptDetailViewModel.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptDetailViewModel.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptViewModel.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptViewModel.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptViewModel.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptViewModel.java diff --git a/receipt/src/main/res/drawable/circle_negative.xml b/receiptui/src/main/res/drawable/circle_negative.xml similarity index 100% rename from receipt/src/main/res/drawable/circle_negative.xml rename to receiptui/src/main/res/drawable/circle_negative.xml diff --git a/receipt/src/main/res/drawable/circle_positive.xml b/receiptui/src/main/res/drawable/circle_positive.xml similarity index 100% rename from receipt/src/main/res/drawable/circle_positive.xml rename to receiptui/src/main/res/drawable/circle_positive.xml diff --git a/receipt/src/main/res/drawable/item_view_border.xml b/receiptui/src/main/res/drawable/item_view_border.xml similarity index 100% rename from receipt/src/main/res/drawable/item_view_border.xml rename to receiptui/src/main/res/drawable/item_view_border.xml diff --git a/receipt/src/main/res/drawable/item_view_border_header.xml b/receiptui/src/main/res/drawable/item_view_border_header.xml similarity index 100% rename from receipt/src/main/res/drawable/item_view_border_header.xml rename to receiptui/src/main/res/drawable/item_view_border_header.xml diff --git a/receipt/src/main/res/layout/activity_list_prepaid_card_receipt.xml b/receiptui/src/main/res/layout/activity_list_prepaid_card_receipt.xml similarity index 100% rename from receipt/src/main/res/layout/activity_list_prepaid_card_receipt.xml rename to receiptui/src/main/res/layout/activity_list_prepaid_card_receipt.xml diff --git a/receipt/src/main/res/layout/activity_list_user_receipt.xml b/receiptui/src/main/res/layout/activity_list_user_receipt.xml similarity index 100% rename from receipt/src/main/res/layout/activity_list_user_receipt.xml rename to receiptui/src/main/res/layout/activity_list_user_receipt.xml diff --git a/receipt/src/main/res/layout/activity_receipt_detail.xml b/receiptui/src/main/res/layout/activity_receipt_detail.xml similarity index 100% rename from receipt/src/main/res/layout/activity_receipt_detail.xml rename to receiptui/src/main/res/layout/activity_receipt_detail.xml diff --git a/receipt/src/main/res/layout/fragment_list_receipt.xml b/receiptui/src/main/res/layout/fragment_list_receipt.xml similarity index 100% rename from receipt/src/main/res/layout/fragment_list_receipt.xml rename to receiptui/src/main/res/layout/fragment_list_receipt.xml diff --git a/receipt/src/main/res/layout/fragment_receipt_detail.xml b/receiptui/src/main/res/layout/fragment_receipt_detail.xml similarity index 100% rename from receipt/src/main/res/layout/fragment_receipt_detail.xml rename to receiptui/src/main/res/layout/fragment_receipt_detail.xml diff --git a/receipt/src/main/res/layout/item_receipt.xml b/receiptui/src/main/res/layout/item_receipt.xml similarity index 100% rename from receipt/src/main/res/layout/item_receipt.xml rename to receiptui/src/main/res/layout/item_receipt.xml diff --git a/receipt/src/main/res/layout/item_receipt_with_header.xml b/receiptui/src/main/res/layout/item_receipt_with_header.xml similarity index 100% rename from receipt/src/main/res/layout/item_receipt_with_header.xml rename to receiptui/src/main/res/layout/item_receipt_with_header.xml diff --git a/receipt/src/main/res/layout/receipt.xml b/receiptui/src/main/res/layout/receipt.xml similarity index 100% rename from receipt/src/main/res/layout/receipt.xml rename to receiptui/src/main/res/layout/receipt.xml diff --git a/receipt/src/main/res/values/colors.xml b/receiptui/src/main/res/values/colors.xml similarity index 100% rename from receipt/src/main/res/values/colors.xml rename to receiptui/src/main/res/values/colors.xml diff --git a/receipt/src/main/res/values/dimens.xml b/receiptui/src/main/res/values/dimens.xml similarity index 100% rename from receipt/src/main/res/values/dimens.xml rename to receiptui/src/main/res/values/dimens.xml diff --git a/receipt/src/main/res/values/strings.xml b/receiptui/src/main/res/values/strings.xml similarity index 100% rename from receipt/src/main/res/values/strings.xml rename to receiptui/src/main/res/values/strings.xml diff --git a/receipt/src/main/res/values/styles.xml b/receiptui/src/main/res/values/styles.xml similarity index 100% rename from receipt/src/main/res/values/styles.xml rename to receiptui/src/main/res/values/styles.xml diff --git a/receipt/src/main/res/xml/network_security_config.xml b/receiptui/src/main/res/xml/network_security_config.xml similarity index 100% rename from receipt/src/main/res/xml/network_security_config.xml rename to receiptui/src/main/res/xml/network_security_config.xml diff --git a/settings.gradle b/settings.gradle index 3f286eb1e..541265fa1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -include ':ui', ':common', ':receipt', ':userrepository', ':transfermethodrepository' +include ':ui', ':common', ':receiptui', ':receiptrepository', ':userrepository', ':transfermethodrepository' //add libraries here diff --git a/ui/build.gradle b/ui/build.gradle index 99aa02b2b..89945f32d 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -9,10 +9,11 @@ dependencies { implementation "androidx.recyclerview:recyclerview:$recycleViewVersion" api project(":common") - api project(":receipt") + api project(':receiptui') api project(":userrepository") api project(":transfermethodrepository") + androidTestImplementation "androidx.test:rules:$testRulesVersion" androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion" androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"