refactor(health-sdk): Changed classes in example app to use internal-sdk

gini · Oct 4, 2024 · e5fdabb · e5fdabb
1 parent a331be6
commit e5fdabb
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 deletions.
diff --git a/...-app/src/main/java/net/gini/android/health/sdk/exampleapp/invoices/ui/InvoicesActivity.kt b/...-app/src/main/java/net/gini/android/health/sdk/exampleapp/invoices/ui/InvoicesActivity.kt
@@ -20,22 +20,21 @@ import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import net.gini.android.health.sdk.GiniHealth
-import net.gini.android.health.sdk.bankselection.BankSelectionBottomSheet
 import net.gini.android.health.sdk.exampleapp.MainActivity
 import net.gini.android.health.sdk.exampleapp.R
 import net.gini.android.health.sdk.exampleapp.databinding.ActivityInvoicesBinding
 import net.gini.android.health.sdk.exampleapp.invoices.data.UploadHardcodedInvoicesState.Failure
 import net.gini.android.health.sdk.exampleapp.invoices.data.UploadHardcodedInvoicesState.Loading
 import net.gini.android.health.sdk.exampleapp.invoices.ui.model.InvoiceItem
-import net.gini.android.health.sdk.moreinformation.MoreInformationFragment
-import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
-import net.gini.android.health.sdk.paymentcomponent.PaymentComponentView
-import net.gini.android.health.sdk.paymentcomponent.PaymentProviderAppsState.Error
 import net.gini.android.health.sdk.review.ReviewFragment
 import net.gini.android.health.sdk.review.ReviewFragmentListener
+import net.gini.android.internal.payment.bankselection.BankSelectionBottomSheet
+import net.gini.android.internal.payment.moreinformation.MoreInformationFragment
+import net.gini.android.internal.payment.paymentComponent.PaymentComponent
+import net.gini.android.internal.payment.paymentComponent.PaymentComponentConfiguration
+import net.gini.android.internal.payment.paymentComponent.PaymentComponentView
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.slf4j.LoggerFactory
-import net.gini.android.health.sdk.paymentcomponent.PaymentProviderAppsState.Loading as LoadingBankApp
 
 open class InvoicesActivity : AppCompatActivity() {
 

diff --git a/...example-app/src/main/java/net/gini/android/health/sdk/exampleapp/upload/UploadActivity.kt b/...example-app/src/main/java/net/gini/android/health/sdk/exampleapp/upload/UploadActivity.kt
@@ -8,14 +8,13 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.IntentCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.flow.collect
-import net.gini.android.health.sdk.exampleapp.MainActivity
 import net.gini.android.health.sdk.exampleapp.MainActivity.Companion.PAYMENT_COMPONENT_CONFIG
 import net.gini.android.health.sdk.exampleapp.R
 import net.gini.android.health.sdk.exampleapp.databinding.ActivityUploadBinding
 import net.gini.android.health.sdk.exampleapp.review.ReviewActivity
 import net.gini.android.health.sdk.exampleapp.upload.UploadViewModel.UploadState
 import org.koin.androidx.viewmodel.ext.android.viewModel
+import net.gini.android.internal.payment.paymentComponent.PaymentComponentConfiguration
 
 class UploadActivity : AppCompatActivity() {
 

diff --git a/...xample-app/src/main/java/net/gini/android/health/sdk/exampleapp/upload/UploadViewModel.kt b/...xample-app/src/main/java/net/gini/android/health/sdk/exampleapp/upload/UploadViewModel.kt
@@ -15,6 +15,7 @@ import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.exampleapp.invoices.data.InvoicesLocalDataSource
 import net.gini.android.health.sdk.exampleapp.invoices.data.model.DocumentWithExtractions
 import net.gini.android.health.sdk.exampleapp.util.getBytes
+import net.gini.android.internal.payment.paymentComponent.PaymentComponentConfiguration
 
 class UploadViewModel(
     private val giniHealthAPI: GiniHealthAPI,

diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewViewModel.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewViewModel.kt
@@ -28,7 +28,6 @@ import net.gini.android.health.sdk.review.model.ResultWrapper
 import net.gini.android.health.sdk.review.model.withFeedback
 import net.gini.android.health.sdk.review.pager.DocumentPageAdapter
 import net.gini.android.health.sdk.util.adjustToLocalDecimalSeparation
-import net.gini.android.health.sdk.util.extensions.createTempPdfFile
 import net.gini.android.health.sdk.util.toBackendFormat
 import net.gini.android.health.sdk.util.withPrev
 import net.gini.android.internal.payment.api.model.PaymentRequest

diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/model/PaymentRequest.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/model/PaymentRequest.kt
@@ -1,6 +1,6 @@
 package net.gini.android.health.sdk.review.model
 
-import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.internal.payment.paymentProvider.PaymentProviderApp
 
 /**
  * A payment request used for starting the bank app. Only the id is sent, but it is associated with a bank.

diff --git a/...dk/sdk/src/test/java/net/gini/android/health/sdk/paymentComponent/PaymentComponentTest.kt b/...dk/sdk/src/test/java/net/gini/android/health/sdk/paymentComponent/PaymentComponentTest.kt
@@ -26,17 +26,17 @@ import net.gini.android.health.api.GiniHealthAPI
 import net.gini.android.health.api.HealthApiDocumentManager
 import net.gini.android.health.api.models.PaymentProvider
 import net.gini.android.health.sdk.GiniHealth
-import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
-import net.gini.android.health.sdk.paymentcomponent.PaymentProviderAppsState
-import net.gini.android.health.sdk.paymentcomponent.SelectedPaymentProviderAppState
-import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
-import net.gini.android.health.sdk.paymentprovider.PaymentProviderAppColors
-import net.gini.android.health.sdk.paymentprovider.getInstalledPaymentProviderApps
-import net.gini.android.health.sdk.paymentprovider.getPaymentProviderApps
 import net.gini.android.health.sdk.review.ReviewConfiguration
 import net.gini.android.health.sdk.review.ReviewFragment
 import net.gini.android.health.sdk.test.ViewModelTestCoroutineRule
-import net.gini.android.health.sdk.util.extensions.generateBitmapDrawableIcon
+import net.gini.android.internal.payment.paymentComponent.PaymentComponent
+import net.gini.android.internal.payment.paymentComponent.PaymentComponentPreferences
+import net.gini.android.internal.payment.paymentComponent.PaymentProviderAppsState
+import net.gini.android.internal.payment.paymentComponent.SelectedPaymentProviderAppState
+import net.gini.android.internal.payment.paymentProvider.PaymentProviderApp
+import net.gini.android.internal.payment.paymentProvider.PaymentProviderAppColors
+import net.gini.android.internal.payment.paymentProvider.getInstalledPaymentProviderApps
+import net.gini.android.internal.payment.paymentProvider.getPaymentProviderApps
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -376,7 +376,8 @@ class PaymentComponentTest {
         paymentComponent.selectedPaymentProviderAppFlow.test {
             val noPaymentProviderSelectedValidation = awaitItem()
 
-            assertThat(noPaymentProviderSelectedValidation).isInstanceOf(SelectedPaymentProviderAppState.NothingSelected::class.java)
+            assertThat(noPaymentProviderSelectedValidation).isInstanceOf(
+                SelectedPaymentProviderAppState.NothingSelected::class.java)
             assertThat(paymentComponent.paymentProviderAppsFlow.value).isInstanceOf(PaymentProviderAppsState.Success::class.java)
 
             //When

diff --git a/...in/java/net/gini/android/internal/payment/paymentComponent/PaymentComponentPreferences.kt b/...in/java/net/gini/android/internal/payment/paymentComponent/PaymentComponentPreferences.kt
@@ -14,7 +14,7 @@ private val Context.dataStore by preferencesDataStore(name = "payment-component-
 private val KEY_SELECTED_PAYMENT_PROVIDER_ID = stringPreferencesKey("selected-payment-provider-id")
 private val KEY_RETURNING_USER = booleanPreferencesKey("returning-user")
 
-internal class PaymentComponentPreferences(private val context: Context) {
+class PaymentComponentPreferences(private val context: Context) {
 
     suspend fun saveSelectedPaymentProviderId(id: String) {
         context.dataStore.edit { preferences ->

diff --git a/...sdk/src/main/java/net/gini/android/internal/payment/paymentProvider/PaymentProviderApp.kt b/...sdk/src/main/java/net/gini/android/internal/payment/paymentProvider/PaymentProviderApp.kt
@@ -17,14 +17,14 @@ internal const val Scheme = "ginipay" // It has to match the scheme in query tag
 private const val PaymentPath = "payment"
 internal const val QueryUri = "$Scheme://$PaymentPath/id"
 
-internal fun getPaymentProviderAppUri(requestId: String) = "$Scheme://$PaymentPath/$requestId"
+fun getPaymentProviderAppUri(requestId: String) = "$Scheme://$PaymentPath/$requestId"
 
-internal fun PackageManager.getInstalledPaymentProviderApps(): List<InstalledPaymentProviderApp> =
+fun PackageManager.getInstalledPaymentProviderApps(): List<InstalledPaymentProviderApp> =
     queryIntentActivities(getPaymentProviderAppQueryIntent(), 0)
         .map { InstalledPaymentProviderApp.fromResolveInfo(it, this) }
 
 
-internal fun PackageManager.getPaymentProviderApps(
+fun PackageManager.getPaymentProviderApps(
     paymentProviders: List<PaymentProvider>,
     context: Context
 ): List<PaymentProviderApp> =

diff --git a/...rc/test/java/net/gini/android/internal/payment/review/openWith/OpenWithBottomSheetTest.kt b/...rc/test/java/net/gini/android/internal/payment/review/openWith/OpenWithBottomSheetTest.kt
@@ -24,7 +24,8 @@ class OpenWithBottomSheetTest {
         launchFragmentInContainer(themeResId = R.style.GiniPaymentTheme) {
             OpenWithBottomSheet.newInstance(
                 mockk(relaxed = true),
-                listener
+                paymentComponent = mockk(relaxed = true),
+                listener = listener
             )
         }