Updated date time calculation logic (eu-digital-green-certificates#53)

SchulzeStTSI · May 27, 2021 · c4d03bd · c4d03bd
1 parent f85fe17
commit c4d03bd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/app/src/main/java/dgca/verifier/app/android/TimeExt.kt b/app/src/main/java/dgca/verifier/app/android/TimeExt.kt
@@ -23,12 +23,23 @@
 package dgca.verifier.app.android
 
 import java.text.SimpleDateFormat
-import java.util.Locale
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import java.util.*
 
 const val YEAR_MONTH_DAY = "yyyy-MM-dd"
-const val DATE_TIME = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
 const val FORMATTED_YEAR_MONTH_DAY = "MMM d, yyyy"
-const val FORMATTED_DATE_TIME = "MMM d, yyyy, HH:mm"
+private const val FORMATTED_DATE_TIME = "MMM d, yyyy, HH:mm"
+
+private fun String.toZonedDateTime(): ZonedDateTime? = try {
+    ZonedDateTime.parse(this)
+} catch (error: Throwable) {
+    null
+}
+
+private val DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern(FORMATTED_DATE_TIME)
+fun String.toFormattedDateTime(): String? =
+    this.toZonedDateTime()?.let { DATE_TIME_FORMATTER.format(it) }
 
 fun String.parseFromTo(from: String, to: String): String {
     return try {

diff --git a/app/src/main/java/dgca/verifier/app/android/verification/TestViewHolder.kt b/app/src/main/java/dgca/verifier/app/android/verification/TestViewHolder.kt
@@ -23,20 +23,28 @@
 package dgca.verifier.app.android.verification
 
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import dgca.verifier.app.android.DATE_TIME
-import dgca.verifier.app.android.FORMATTED_DATE_TIME
 import dgca.verifier.app.android.databinding.ItemTestBinding
 import dgca.verifier.app.android.model.TestModel
-import dgca.verifier.app.android.parseFromTo
+import dgca.verifier.app.android.toFormattedDateTime
 
 class TestViewHolder(private val binding: ItemTestBinding) : RecyclerView.ViewHolder(binding.root) {
 
     fun bind(data: TestModel) {
         binding.testResultValue.text = data.resultType.value
-        binding.dateOfCollectionValue.text = data.dateTimeOfCollection.parseFromTo(DATE_TIME, FORMATTED_DATE_TIME)
-        binding.dateOfTestResultValue.text = data.dateTimeOfTestResult?.parseFromTo(DATE_TIME, FORMATTED_DATE_TIME)
+        val dateOfCollectionString: String? =
+            data.dateTimeOfCollection.toFormattedDateTime()?.apply {
+                binding.dateOfCollectionValue.text = this
+            }
+        binding.dateOfCollectionValue.visibility =
+            if (dateOfCollectionString?.isNotEmpty() == true) View.VISIBLE else View.GONE
+        val dateOfTestResultString: String? =
+            data.dateTimeOfTestResult?.toFormattedDateTime()?.apply {
+                binding.dateOfTestResultValue.text = this
+            }
+        binding.dateOfTestResultValue.visibility = if(dateOfTestResultString?.isNotEmpty() == true) View.VISIBLE else View.GONE
         binding.diseaseValue.text = data.disease
         binding.typeOfTestValue.text = data.typeOfTest
         binding.countryValue.text = data.countryOfVaccination