Feature/os alignment new (#89)

* Updated wallet texts displaying * Added certificate type to claim certificate page * Implemented manufacturer check up * Updated * Update * Update * Update * Update * Update * Update
eu-digital-green-certificates · Jul 23, 2021 · fbb2ffc · fbb2ffc
1 parent b8d23c5
commit fbb2ffc
Show file tree

Hide file tree

Showing 21 changed files with 505 additions and 259 deletions.
diff --git a/.idea/sonarIssues.xml b/.idea/sonarIssues.xml
diff --git a/.../19ce0fd1a612f464942365b703899170a83ca69c → .../0223df1f55766185176f6d7c6c73166998c9b604 b/.../19ce0fd1a612f464942365b703899170a83ca69c → .../0223df1f55766185176f6d7c6c73166998c9b604
diff --git a/.../1b91abc18e5933645a5c49601bf7a7c50d860768 → .../4774f218010287c0da4585eacc9ffd61e11503ce b/.../1b91abc18e5933645a5c49601bf7a7c50d860768 → .../4774f218010287c0da4585eacc9ffd61e11503ce
diff --git a/.../4f60981f36816db5bcc34a01c29b496f009b43b7 → .../76dac2609fb4a81960df30700eef5f1189545226 b/.../4f60981f36816db5bcc34a01c29b496f009b43b7 → .../76dac2609fb4a81960df30700eef5f1189545226
diff --git a/.../a5f5b6bca6a2efb76a4c5fa919d43eb5353e6a03 → .../a506d20ab76082e565759f0570e17bdd3438fe20 b/.../a5f5b6bca6a2efb76a4c5fa919d43eb5353e6a03 → .../a506d20ab76082e565759f0570e17bdd3438fe20
diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb
diff --git a/app/src/main/java/dgca/wallet/app/android/certificate/CertificateCardsAdapter.kt b/app/src/main/java/dgca/wallet/app/android/certificate/CertificateCardsAdapter.kt
@@ -47,7 +47,8 @@ class CertificateCardsAdapter(
             binding.titleView.text = when {
                 certificateCard.certificate.vaccinations?.first() != null -> binding.root.resources.getString(
                     R.string.vaccination,
-                    certificateCard.certificate.vaccinations.first().doseNumber.toString()
+                    certificateCard.certificate.vaccinations.first().doseNumber.toString(),
+                    certificateCard.certificate.vaccinations.first().totalSeriesOfDoses.toString()
                 )
                 certificateCard.certificate.recoveryStatements?.isNotEmpty() == true -> binding.root.resources.getString(R.string.recovery)
                 certificateCard.certificate.tests?.isNotEmpty() == true -> binding.root.resources.getString(R.string.test)

diff --git a/app/src/main/java/dgca/wallet/app/android/certificate/claim/ClaimCertificateFragment.kt b/app/src/main/java/dgca/wallet/app/android/certificate/claim/ClaimCertificateFragment.kt
@@ -34,13 +34,10 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
-import dgca.wallet.app.android.FORMATTED_YEAR_MONTH_DAY
 import dgca.wallet.app.android.R
-import dgca.wallet.app.android.YEAR_MONTH_DAY
 import dgca.wallet.app.android.data.CertificateModel
 import dgca.wallet.app.android.data.getCertificateListData
 import dgca.wallet.app.android.databinding.FragmentCertificateClaimBinding
-import dgca.wallet.app.android.parseFromTo
 
 @AndroidEntryPoint
 class ClaimCertificateFragment : Fragment() {
@@ -88,31 +85,31 @@ class ClaimCertificateFragment : Fragment() {
         _binding = null
     }
 
+    private fun CertificateModel.getType() = when {
+        this.vaccinations?.isNotEmpty() == true -> getString(
+            R.string.vaccination,
+            this.vaccinations.first().doseNumber.toString(),
+            this.vaccinations.first().totalSeriesOfDoses.toString()
+        )
+        this.recoveryStatements?.isNotEmpty() == true -> getString(R.string.recovery)
+        this.tests?.isNotEmpty() == true -> getString(R.string.test)
+        else -> ""
+    }
+
     private fun showUserData(certificate: CertificateModel) {
-        binding.personFullName.text = certificate.getFullName()
-        binding.personStandardisedFamilyName.text = certificate.person.standardisedFamilyName
-        binding.personStandardisedFamilyNameTitle.isVisible = true
-        val standardisedGivenName = certificate.person.standardisedGivenName
-        if (standardisedGivenName?.isNotBlank() == true) {
-            binding.personStandardisedGivenName.text = standardisedGivenName
-            View.VISIBLE
-        } else {
-            View.GONE
-        }.apply {
-            binding.personStandardisedGivenNameTitle.visibility = this
-            binding.personStandardisedGivenName.visibility = this
-        }
+        certificate.getType().bindText(binding.certificateTypeTitle, binding.certificateTypeValue)
+        certificate.getFullName().bindText(binding.nameTitle, binding.personFullName)
 
-        val dateOfBirth = certificate.dateOfBirth.parseFromTo(YEAR_MONTH_DAY, FORMATTED_YEAR_MONTH_DAY)
-        if (dateOfBirth.isNotBlank()) {
-            binding.dateOfBirth.text = dateOfBirth
-            View.VISIBLE
-        } else {
-            View.GONE
-        }.apply {
-            binding.dateOfBirthTitle.visibility = this
-            binding.dateOfBirth.visibility = this
-        }
+//        val dateOfBirth = certificate.dateOfBirth.parseFromTo(YEAR_MONTH_DAY, FORMATTED_YEAR_MONTH_DAY)
+//        if (dateOfBirth.isNotBlank()) {
+//            binding.dateOfBirth.text = dateOfBirth
+//            View.VISIBLE
+//        } else {
+//            View.GONE
+//        }.apply {
+//            binding.dateOfBirthTitle.visibility = this
+//            binding.dateOfBirth.visibility = this
+//        }
     }
 
     private fun onViewModelEvent(event: ClaimCertificateViewModel.ClaimCertEvent) {

diff --git a/app/src/main/java/dgca/wallet/app/android/certificate/claim/RecoveryViewHolder.kt b/app/src/main/java/dgca/wallet/app/android/certificate/claim/RecoveryViewHolder.kt
@@ -35,10 +35,13 @@ class RecoveryViewHolder(private val binding: ItemRecoveryBinding) : RecyclerVie
 
     fun bind(data: RecoveryModel) {
         binding.diseaseValue.text = data.disease.value
-        binding.validFromValue.text = data.certificateValidFrom.parseFromTo(YEAR_MONTH_DAY, FORMATTED_YEAR_MONTH_DAY)
-        binding.validUntilValue.text = data.certificateValidUntil.parseFromTo(YEAR_MONTH_DAY, FORMATTED_YEAR_MONTH_DAY)
+        val validFrom = data.certificateValidFrom.parseFromTo(YEAR_MONTH_DAY, FORMATTED_YEAR_MONTH_DAY)
+        val validTo = data.certificateValidUntil.parseFromTo(YEAR_MONTH_DAY, FORMATTED_YEAR_MONTH_DAY)
+        val validFromTo = if (validFrom.isNotBlank() && validTo.isNotBlank()) "$validFrom - $validTo" else ""
+        validFromTo.bindText(binding.validFromTitle, binding.validFromValue)
         binding.dateOfPositiveValue.text = data.dateOfFirstPositiveTest.parseFromTo(YEAR_MONTH_DAY, FORMATTED_YEAR_MONTH_DAY)
-        binding.countryValue.text = data.countryOfVaccination
+        data.countryOfVaccination.bindCountryWith(binding.countryTitle, binding.countryValue)
+        data.certificateIssuer.bindText(binding.certificateIssuerTitle, binding.certificateIssuerValue)
     }
 
     companion object {

diff --git a/app/src/main/java/dgca/wallet/app/android/certificate/claim/TestViewHolder.kt b/app/src/main/java/dgca/wallet/app/android/certificate/claim/TestViewHolder.kt
@@ -35,20 +35,13 @@ class TestViewHolder(private val binding: ItemTestBinding) : RecyclerView.ViewHo
     fun bind(data: TestModel) {
         binding.testResultValue.text = data.resultType.value
         binding.dateOfCollectionValue.text = data.dateTimeOfCollection.toFormattedDateTime()
-        val dateTimeOfTestResult = data.dateTimeOfTestResult?.toFormattedDateTime()
-        if (dateTimeOfTestResult?.isNotBlank() == true) {
-            binding.dateOfTestResultValue.text = dateTimeOfTestResult
-            View.VISIBLE
-        } else {
-            View.GONE
-        }.apply {
-            binding.dateOfTestResultTitle.visibility = this
-            binding.dateOfTestResultValue.visibility = this
-        }
+        (data.dateTimeOfTestResult?.toFormattedDateTime() ?: "").bindText(binding.dateOfTestResultTitle, binding.dateOfTestResultValue)
 
         binding.diseaseValue.text = data.disease.value
         binding.typeOfTestValue.text = data.typeOfTest.value
-        binding.countryValue.text = data.countryOfVaccination
+        data.testingCentre.bindText(binding.testingCenterTitle, binding.testingCenterValue)
+        data.countryOfVaccination.bindCountryWith(binding.countryTitle, binding.countryValue)
+        data.certificateIssuer.bindText(binding.certificateIssuerTitle, binding.certificateIssuerValue)
     }
 
     companion object {

diff --git a/app/src/main/java/dgca/wallet/app/android/certificate/claim/VaccinationViewHolder.kt b/app/src/main/java/dgca/wallet/app/android/certificate/claim/VaccinationViewHolder.kt
@@ -36,9 +36,10 @@ class VaccinationViewHolder(private val binding: ItemVaccinationBinding) : Recyc
     fun bind(data: VaccinationModel) {
         binding.dateValue.text = data.dateOfVaccination.parseFromTo(YEAR_MONTH_DAY, FORMATTED_YEAR_MONTH_DAY)
         binding.diseaseValue.text = data.disease.value
-        binding.doseTotalNumberValue.text = data.totalSeriesOfDoses.toString()
-        binding.doseSequenceValue.text = data.doseNumber.toString()
-        binding.countryValue.text = data.countryOfVaccination
+        data.manufacturer.value.bindText(binding.manufacturerTitle, binding.manufacturerValue)
+        data.vaccine.value.bindText(binding.vaccineOrProphylaxisTitle, binding.vaccineOrProphylaxisValue)
+        data.countryOfVaccination.bindCountryWith(binding.countryTitle, binding.countryValue)
+        data.certificateIssuer.bindText(binding.certificateIssuerTitle, binding.certificateIssuerValue)
     }
 
     companion object {

diff --git a/app/src/main/java/dgca/wallet/app/android/certificate/claim/ViewHolderUtils.kt b/app/src/main/java/dgca/wallet/app/android/certificate/claim/ViewHolderUtils.kt
@@ -0,0 +1,56 @@
+/*
+ *  ---license-start
+ *  eu-digital-green-certificates / dgca-wallet-app-android
+ *  ---
+ *  Copyright (C) 2021 T-Systems International GmbH and all other contributors
+ *  ---
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *  ---license-end
+ *
+ *  Created by osarapulov on 7/22/21 8:42 PM
+ */
+
+package dgca.wallet.app.android.certificate.claim
+
+import android.view.View
+import android.widget.TextView
+import java.util.*
+
+
+fun String.bindCountryWith(countryTitleView: View, countryValueView: TextView) {
+    val issuerCountry =
+        if (this.isNotBlank()) Locale("", this).displayCountry else ""
+    issuerCountry.apply {
+        if (this.isNotBlank()) {
+            countryValueView.text = this
+            View.VISIBLE
+        } else {
+            View.GONE
+        }.apply {
+            countryTitleView.visibility = this
+            countryValueView.visibility = this
+        }
+    }
+}
+
+fun String.bindText(titleView: View, valueView: TextView) = apply {
+    if (this.isNotBlank()) {
+        valueView.text = this
+        View.VISIBLE
+    } else {
+        View.GONE
+    }.apply {
+        titleView.visibility = this
+        valueView.visibility = this
+    }
+}