Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ipc 293 removable poweredby #500

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ import android.os.Bundle
import android.widget.Toast
import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope
import ch.qos.logback.classic.Logger
import ch.qos.logback.classic.LoggerContext
import ch.qos.logback.classic.android.LogcatAppender
import ch.qos.logback.classic.encoder.PatternLayoutEncoder
import com.google.android.material.tabs.TabLayoutMediator
import kotlinx.coroutines.launch
import net.gini.android.health.sdk.exampleapp.configuration.ConfigurationFragment
import net.gini.android.health.sdk.exampleapp.databinding.ActivityMainBinding
import net.gini.android.health.sdk.exampleapp.invoices.ui.AppCompatThemeInvoicesActivity
Expand All @@ -23,7 +21,6 @@ import net.gini.android.health.sdk.exampleapp.review.ReviewActivity
import net.gini.android.health.sdk.exampleapp.upload.UploadActivity
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.slf4j.LoggerFactory
import java.util.*

class MainActivity : AppCompatActivity() {

Expand All @@ -47,7 +44,7 @@ class MainActivity : AppCompatActivity() {
binding.importFile.setOnClickListener {
if (useTestDocument) {
viewModel.setDocumentForReview(testDocumentId)
startActivity(ReviewActivity.getStartIntent(this))
startActivity(ReviewActivity.getStartIntent(this, paymentComponentConfiguration = viewModel.getPaymentComponentConfiguration()))
} else {
importFile()
}
Expand All @@ -67,7 +64,8 @@ class MainActivity : AppCompatActivity() {
startActivity(
UploadActivity.getStartIntent(
this@MainActivity,
viewModel.pages.value.map { it.uri })
viewModel.pages.value.map { it.uri },
viewModel.getPaymentComponentConfiguration())
)
}

Expand Down Expand Up @@ -114,7 +112,7 @@ class MainActivity : AppCompatActivity() {

private fun importResult(uri: Uri?) {
uri?.let {
startActivity(UploadActivity.getStartIntent(this, listOf(it)))
startActivity(UploadActivity.getStartIntent(this, listOf(it), viewModel.getPaymentComponentConfiguration()))
} ?: run {
Toast.makeText(this, "No document received", Toast.LENGTH_LONG).show()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import android.os.Bundle
import android.view.View
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.IntentCompat
import androidx.core.view.WindowCompat
import androidx.core.view.isGone
import androidx.fragment.app.commit
Expand All @@ -21,9 +22,12 @@ import kotlinx.coroutines.launch
import net.gini.android.core.api.models.Document
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.MainActivity.Companion.PAYMENT_COMPONENT_CONFIG
import net.gini.android.health.sdk.exampleapp.R
import net.gini.android.health.sdk.exampleapp.databinding.ActivityReviewBinding
import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
import net.gini.android.health.sdk.paymentcomponent.PaymentComponentConfiguration
import net.gini.android.health.sdk.paymentcomponent.PaymentProviderAppsState
import net.gini.android.health.sdk.review.ReviewConfiguration
import net.gini.android.health.sdk.review.ReviewFragment
Expand Down Expand Up @@ -85,6 +89,10 @@ class ReviewActivity : AppCompatActivity() {

supportActionBar?.hide()

IntentCompat.getParcelableExtra(intent, MainActivity.PAYMENT_COMPONENT_CONFIG, PaymentComponentConfiguration::class.java)?.let {
viewModel.setPaymentComponentConfig(it)
}

val binding = ActivityReviewBinding.inflate(layoutInflater)
setContentView(binding.root)

Expand Down Expand Up @@ -208,11 +216,12 @@ class ReviewActivity : AppCompatActivity() {

private const val EXTRA_URIS = "EXTRA_URIS"

fun getStartIntent(context: Context, pages: List<Uri> = emptyList()): Intent =
fun getStartIntent(context: Context, pages: List<Uri> = emptyList(), paymentComponentConfiguration: PaymentComponentConfiguration?): Intent =
Intent(context, ReviewActivity::class.java).apply {
putParcelableArrayListExtra(
EXTRA_URIS,
if (pages is ArrayList<Uri>) pages else ArrayList<Uri>().apply { addAll(pages) })
putExtra(PAYMENT_COMPONENT_CONFIG, paymentComponentConfiguration)
}

private val Intent.pageUris: List<Uri>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,10 @@ package net.gini.android.health.sdk.exampleapp.review
import androidx.lifecycle.ViewModel
import net.gini.android.health.sdk.GiniHealth
import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
import net.gini.android.health.sdk.paymentcomponent.PaymentComponentConfiguration

class ReviewViewModel(val giniHealth: GiniHealth, val paymentComponent: PaymentComponent) : ViewModel()
class ReviewViewModel(val giniHealth: GiniHealth, val paymentComponent: PaymentComponent) : ViewModel() {
fun setPaymentComponentConfig(paymentComponentConfiguration: PaymentComponentConfiguration) {
paymentComponent.paymentComponentConfiguration = paymentComponentConfiguration
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ import android.content.Intent
import android.net.Uri
import android.os.Bundle
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 net.gini.android.health.sdk.paymentcomponent.PaymentComponentConfiguration
import org.koin.androidx.viewmodel.ext.android.viewModel

class UploadActivity : AppCompatActivity() {
Expand All @@ -33,7 +37,7 @@ class UploadActivity : AppCompatActivity() {
}

binding.payment.setOnClickListener {
startActivity(ReviewActivity.getStartIntent(this, intent.pageUris))
startActivity(ReviewActivity.getStartIntent(this, intent.pageUris, IntentCompat.getParcelableExtra(intent, PAYMENT_COMPONENT_CONFIG, PaymentComponentConfiguration::class.java)))
}
}

Expand All @@ -50,8 +54,9 @@ class UploadActivity : AppCompatActivity() {

companion object {
private const val EXTRA_URIS = "EXTRA_URIS"
fun getStartIntent(context: Context, pages: List<Uri>): Intent = Intent(context, UploadActivity::class.java).apply {
fun getStartIntent(context: Context, pages: List<Uri>, paymentComponentConfiguration: PaymentComponentConfiguration?): Intent = Intent(context, UploadActivity::class.java).apply {
putParcelableArrayListExtra(EXTRA_URIS, if (pages is ArrayList<Uri>) pages else ArrayList<Uri>().apply { addAll(pages) })
putExtra(PAYMENT_COMPONENT_CONFIG, paymentComponentConfiguration)
}

private val Intent.pageUris: List<Uri>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ 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.health.sdk.paymentcomponent.PaymentComponentConfiguration

class UploadViewModel(
private val giniHealthAPI: GiniHealthAPI,
val giniHealth: GiniHealth,
private val invoicesLocalDataSource: InvoicesLocalDataSource
) : ViewModel() {
private val paymentComponentConfiguration: PaymentComponentConfiguration? = null
private val _uploadState: MutableStateFlow<UploadState> = MutableStateFlow(UploadState.Loading)
val uploadState: StateFlow<UploadState> = _uploadState

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
android:layout_marginTop="@dimen/ghs_small"
android:layout_marginBottom="@dimen/ghs_medium"
android:layout_marginEnd="@dimen/ghs_large"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/ghs_select_bank_picker">
Expand Down
Loading