Skip to content

Commit

Permalink
Feature/rules UI (eu-digital-green-certificates#131)
Browse files Browse the repository at this point in the history 
* Updated UI for rules

* Update

* Update

* Update

* Version update

* update
  • Loading branch information
@oleksandrsarapulovgl
oleksandrsarapulovgl authored Jul 6, 2021
1 parent 578828a commit 51734e7
Show file tree
Hide file tree
Showing 41 changed files with 386 additions and 526 deletions.
154 changes: 119 additions & 35 deletions app/src/main/java/dgca/verifier/app/android/verification/VerificationDialogFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ import android.app.Dialog
import android.content.res.ColorStateList
import android.os.Bundle
import android.util.DisplayMetrics
import android.util.TypedValue
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
import androidx.core.content.ContextCompat
import androidx.core.content.res.ResourcesCompat
import androidx.core.view.isVisible
import androidx.fragment.app.viewModels
import androidx.lifecycle.MutableLiveData
Expand All @@ -40,17 +42,19 @@ import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import com.google.android.material.button.MaterialButton
import dagger.hilt.android.AndroidEntryPoint
import dgca.verifier.app.android.*
import dgca.verifier.app.android.databinding.DialogFragmentVerificationBinding
import dgca.verifier.app.android.model.CertificateData
import dgca.verifier.app.android.model.CertificateModel
import dgca.verifier.app.android.model.TestResult
import dgca.verifier.app.android.verification.certs.RecoveryViewHolder
import dgca.verifier.app.android.verification.certs.TestViewHolder
import dgca.verifier.app.android.verification.certs.VaccinationViewHolder
import dgca.verifier.app.android.verification.rules.RuleValidationResultCard
import dgca.verifier.app.android.verification.rules.RuleValidationResultsAdapter
import dgca.verifier.app.android.verification.rules.toRuleValidationResultCard


@ExperimentalUnsignedTypes
@AndroidEntryPoint
class VerificationDialogFragment : BottomSheetDialogFragment() {
Expand Down Expand Up @@ -87,25 +91,73 @@ class VerificationDialogFragment : BottomSheetDialogFragment() {
dismiss()
})

val layoutManager = LinearLayoutManager(requireContext())
binding.recyclerView.layoutManager = layoutManager
binding.rulesList.layoutManager = LinearLayoutManager(requireContext())
binding.actionBtn.setOnClickListener { dismiss() }

viewModel.verificationData.observe(viewLifecycleOwner, {
if (it.verificationResult == null) {
hideLiveData.value = null
} else {
setCertStatusUI(it.verificationResult.isValid())
setCertDataVisibility(it.verificationResult.isValid())
setCertStatusUI(it.verificationResult.getGeneralResult())
setCertDataVisibility(it.verificationResult.getGeneralResult())
it.certificateModel?.let { certificateModel ->
binding.personFullName.text = certificateModel.getFullName()
toggleButton(certificateModel)
if (it.verificationResult.isValid()) {


// TODO remove before release
if (it.verificationResult.getGeneralResult() == GeneralVerificationResult.SUCCESS) {
val ruleValidationResultCards = mutableListOf<RuleValidationResultCard>()
val context = requireContext()
binding.rulesList.visibility = View.VISIBLE
viewModel.validationResults.value?.forEach {
ruleValidationResultCards.add(
it.toRuleValidationResultCard(context)
)
}
binding.rulesList.adapter =
RuleValidationResultsAdapter(layoutInflater, ruleValidationResultCards)
}

if (it.verificationResult.getGeneralResult() != GeneralVerificationResult.FAILED) {
showUserData(certificateModel)

val list = getCertificateListData(certificateModel)
binding.recyclerView.adapter =
CertListAdapter(layoutInflater).apply { update(list) }
if (binding.greenCertificate.parent != null) {
when {
certificateModel.vaccinations?.size == 1 -> {
binding.greenCertificate.layoutResource =
R.layout.item_vaccination
binding.greenCertificate.setOnInflateListener { stub, inflated ->
VaccinationViewHolder.create(
inflated as ViewGroup
).bind(certificateModel.vaccinations.first())
}
binding.greenCertificate.inflate()
}
certificateModel.recoveryStatements?.size == 1 -> {
binding.greenCertificate.layoutResource = R.layout.item_recovery

binding.greenCertificate.setOnInflateListener { stub, inflated ->
RecoveryViewHolder.create(
inflated as ViewGroup
).bind(certificateModel.recoveryStatements.first())
}
binding.greenCertificate.inflate()
}
certificateModel.tests?.size == 1 -> {
binding.greenCertificate.layoutResource = R.layout.item_test

binding.greenCertificate.setOnInflateListener { stub, inflated ->
TestViewHolder.create(
inflated as ViewGroup
).bind(certificateModel.tests.first())
}
binding.greenCertificate.inflate()
}
}
}


}
}
startTimer()
Expand All @@ -126,18 +178,24 @@ class VerificationDialogFragment : BottomSheetDialogFragment() {
_binding = null
}

private fun setCertStatusUI(isValid: Boolean) {
private fun setCertStatusUI(generalVerificationResult: GeneralVerificationResult) {
val text: String
val imageId: Int
val statusColor: ColorStateList
val actionBtnText: String

if (isValid) {
if (generalVerificationResult == GeneralVerificationResult.SUCCESS) {
text = getString(R.string.cert_valid)
imageId = R.drawable.check
statusColor =
ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.green))
actionBtnText = getString(R.string.done)
} else if (generalVerificationResult == GeneralVerificationResult.RULES_VALIDATION_FAILED) {
text = getString(R.string.cert_limited_validity)
imageId = R.drawable.check
statusColor =
ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.yellow))
actionBtnText = getString(R.string.retry)
} else {
text = getString(R.string.cert_invalid)
imageId = R.drawable.error
Expand Down Expand Up @@ -182,29 +240,55 @@ class VerificationDialogFragment : BottomSheetDialogFragment() {
val ruleValidationResultCards = mutableListOf<RuleValidationResultCard>()
val context = requireContext()
viewModel.validationResults.value?.forEach {
ruleValidationResultCards.add(it.toRuleValidationResultCard(context))
ruleValidationResultCards.add(
it.toRuleValidationResultCard(context)
)

}
binding.recyclerView.adapter =
binding.rulesList.adapter =
RuleValidationResultsAdapter(layoutInflater, ruleValidationResultCards)
binding.reasonForCertificateInvalidityName.setOnClickListener {
binding.rulesList.visibility =
if (binding.rulesList.visibility == View.VISIBLE) View.GONE else View.VISIBLE
binding.reasonForCertificateInvalidityName.setCompoundDrawablesRelativeWithIntrinsicBounds(
null,
null,
ResourcesCompat.getDrawable(
resources,
if (binding.rulesList.visibility == View.VISIBLE) R.drawable.icon_collapsed else R.drawable.icon_expanded,
null
),
null
)
}
binding.reasonForCertificateInvalidityTitle.text =
getString(R.string.possible_limitation)
val outValue = TypedValue()
requireContext().theme.resolveAttribute(
android.R.attr.selectableItemBackground,
outValue,
true
)
binding.reasonForCertificateInvalidityName.setBackgroundResource(outValue.resourceId)
binding.reasonForCertificateInvalidityName.setCompoundDrawablesRelativeWithIntrinsicBounds(
null,
null,
ResourcesCompat.getDrawable(resources, R.drawable.icon_expanded, null),
null
)
}
}

private fun setCertDataVisibility(isValid: Boolean) {
binding.errorDetails.visibility = if (isValid) View.GONE else View.VISIBLE
if (isValid) {
private fun setCertDataVisibility(generalVerificationResult: GeneralVerificationResult) {
binding.errorDetails.visibility =
if (generalVerificationResult == GeneralVerificationResult.SUCCESS) View.GONE else View.VISIBLE
if (generalVerificationResult == GeneralVerificationResult.SUCCESS) {
binding.errorTestResult.visibility = View.GONE
}
binding.sucessDetails.visibility = if (isValid) View.VISIBLE else View.GONE
binding.sucessDetails.visibility =
if (generalVerificationResult != GeneralVerificationResult.FAILED) View.VISIBLE else View.GONE
}

private fun getCertificateListData(certificate: CertificateModel): List<CertificateData> {
val list = mutableListOf<CertificateData>()
list.addAll(certificate.vaccinations ?: emptyList())
list.addAll(certificate.tests ?: emptyList())
list.addAll(certificate.recoveryStatements ?: emptyList())

return list
}

private fun showUserData(certificate: CertificateModel) {
binding.personStandardisedFamilyName.text = certificate.person.standardisedFamilyName
Expand Down Expand Up @@ -235,16 +319,16 @@ class VerificationDialogFragment : BottomSheetDialogFragment() {
}

private fun toggleButton(certificate: CertificateModel) {
when {
certificate.vaccinations?.isNotEmpty() == true -> enableToggleBtn(binding.vacToggle)
certificate.recoveryStatements?.isNotEmpty() == true -> enableToggleBtn(binding.recToggle)
certificate.tests?.isNotEmpty() == true -> enableToggleBtn(binding.testToggle)
binding.certificateTypeText.text = when {
certificate.vaccinations?.isNotEmpty() == true -> getString(
R.string.type_vaccination,
certificate.vaccinations.first().doseNumber
)
certificate.recoveryStatements?.isNotEmpty() == true -> getString(R.string.type_recovered)
certificate.tests?.isNotEmpty() == true -> getString(R.string.type_test)
else -> getString(R.string.type_test)
}
}

private fun enableToggleBtn(button: MaterialButton) {
button.toggle()
button.setTextColor(ContextCompat.getColor(requireContext(), R.color.black))
binding.generalInfo.visibility = View.VISIBLE
}

private fun startTimer() {
Expand Down
17 changes: 14 additions & 3 deletions app/src/main/java/dgca/verifier/app/android/verification/VerificationViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import dagger.hilt.android.lifecycle.HiltViewModel
import dgca.verifier.app.android.data.VerifierRepository
import dgca.verifier.app.android.model.CertificateModel
import dgca.verifier.app.android.model.toCertificateModel
import dgca.verifier.app.decoder.JSON_SCHEMA_V1
import dgca.verifier.app.decoder.base45.Base45Service
import dgca.verifier.app.decoder.cbor.CborService
import dgca.verifier.app.decoder.cbor.GreenCertificateData
Expand All @@ -46,7 +45,6 @@ import dgca.verifier.app.decoder.schema.SchemaValidator
import dgca.verifier.app.decoder.toBase64
import dgca.verifier.app.engine.*
import dgca.verifier.app.engine.data.CertificateType
import dgca.verifier.app.engine.data.RuleCertificateType
import dgca.verifier.app.engine.data.ExternalParameter
import dgca.verifier.app.engine.data.source.valuesets.ValueSetsRepository
import dgca.verifier.app.engine.domain.rules.GetRulesUseCase
Expand All @@ -57,8 +55,21 @@ import timber.log.Timber
import java.time.ZoneId
import java.time.ZoneOffset
import java.time.ZonedDateTime
import java.util.*
import javax.inject.Inject

enum class GeneralVerificationResult {
SUCCESS, FAILED, RULES_VALIDATION_FAILED
}

fun VerificationResult.getGeneralResult(): GeneralVerificationResult {
return when {
isValid() -> GeneralVerificationResult.SUCCESS
rulesValidationFailed -> GeneralVerificationResult.RULES_VALIDATION_FAILED
else -> GeneralVerificationResult.FAILED
}
}

data class VerificationData(
val verificationResult: VerificationResult?,
val certificateModel: CertificateModel?
Expand Down Expand Up @@ -154,7 +165,7 @@ class VerificationViewModel @Inject constructor(
if (this.issuingCountry?.isNotBlank() == true && this.issuingCountry != null) this.issuingCountry!! else this.greenCertificate.getIssuingCountry()
val rules = getRulesUseCase.invoke(
countryIsoCode,
issuingCountry,
issuingCountry.toLowerCase(Locale.ROOT),
engineCertificateType
)
val valueSetsMap = mutableMapOf<String, List<String>>()
Expand Down
104 changes: 0 additions & 104 deletions app/src/main/java/dgca/verifier/app/android/verification/certs/CertListAdapter.kt
View file

This file was deleted.

Loading

0 comments on commit 51734e7

Please sign in to comment.