- add timer to dismiss screen after 15sec; (eu-digital-green-certificates#52)

Author: MykhailoNester

app/src/main/java/dgca/verifier/app/android/verification/VerificationDialogFragment.kt

@@ -40,10 +40,14 @@ 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.FORMATTED_YEAR_MONTH_DAY
+import dgca.verifier.app.android.R
+import dgca.verifier.app.android.YEAR_MONTH_DAY
 import dgca.verifier.app.android.databinding.DialogFragmentVerificationBinding
+import dgca.verifier.app.android.dpToPx
 import dgca.verifier.app.android.model.CertificateData
 import dgca.verifier.app.android.model.CertificateModel
+import dgca.verifier.app.android.parseFromTo
 
 @ExperimentalUnsignedTypes
 @AndroidEntryPoint
@@ -72,7 +76,13 @@ class VerificationDialogFragment : BottomSheetDialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setViewHeight()
+        val displayMetrics = DisplayMetrics()
+        requireActivity().windowManager.defaultDisplay.getMetrics(displayMetrics)
+        val height = displayMetrics.heightPixels
+        val params = binding.content.layoutParams as FrameLayout.LayoutParams
+        params.height = height - TOP_MARGIN.dpToPx()
+
+        binding.timerView.translationX = -displayMetrics.widthPixels.toFloat()
 
         dialog.expand()
 
@@ -83,7 +93,6 @@ class VerificationDialogFragment : BottomSheetDialogFragment() {
 
         viewModel.verificationResult.observe(viewLifecycleOwner, {
             setCertStatusUI(it.isValid())
-
             setCertDataVisibility(it.isValid())
         })
         viewModel.verificationError.observe(viewLifecycleOwner, {
@@ -96,10 +105,12 @@ class VerificationDialogFragment : BottomSheetDialogFragment() {
 
                 val list = getCertificateListData(certificate)
                 adapter.update(list)
+
+                startTimer()
             }
         })
         viewModel.inProgress.observe(viewLifecycleOwner, {
-            binding.progressContainer.isVisible = it
+            binding.progressBar.isVisible = it
         })
 
         viewModel.init(args.qrCodeText)
@@ -110,14 +121,6 @@ class VerificationDialogFragment : BottomSheetDialogFragment() {
         _binding = null
     }
 
-    private fun setViewHeight() {
-        val displayMetrics = DisplayMetrics()
-        requireActivity().windowManager.defaultDisplay.getMetrics(displayMetrics)
-        val height = displayMetrics.heightPixels
-        val params = binding.content.layoutParams as FrameLayout.LayoutParams
-        params.height = height - TOP_MARGIN.dpToPx()
-    }
-
     private fun setCertStatusUI(isValid: Boolean) {
         val text: String
         val imageId: Int
@@ -200,8 +203,21 @@ class VerificationDialogFragment : BottomSheetDialogFragment() {
         button.setTextColor(ContextCompat.getColor(requireContext(), R.color.black))
     }
 
+    private fun startTimer() {
+        binding.timerView.animate()
+            .setDuration(COLLAPSE_TIME)
+            .translationX(0F)
+            .withEndAction {
+                if (isVisible) {
+                    dismiss()
+                }
+            }
+            .start()
+    }
+
     companion object {
         private const val TOP_MARGIN = 50
+        private const val COLLAPSE_TIME = 15000L // 15 sec
     }
 }
 

app/src/main/res/layout/dialog_fragment_verification.xml

@@ -112,7 +112,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:background="@color/white"
-        app:layout_constraintBottom_toTopOf="@id/bottom_container"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/verification_status_bg" />
@@ -126,7 +126,6 @@
         android:paddingStart="@dimen/default_margin"
         android:paddingEnd="@dimen/default_margin"
         android:text="@string/reason_for_invalidity"
-        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/verification_status_bg" />
@@ -138,23 +137,24 @@
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/default_margin"
         android:paddingEnd="@dimen/default_margin"
-        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/reason_for_certificate_invalidity_title"
-        tools:text="@string/cryptographic_signature_not_valid" />
+        tools:text="Test error" />
 
     <androidx.constraintlayout.widget.Group
         android:id="@+id/errorDetails"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:visibility="gone"
         app:constraint_referenced_ids="reason_for_certificate_invalidity_title, reason_for_certificate_invalidity_name" />
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/nestedScrollView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:paddingHorizontal="@dimen/default_padding"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/bottom_container"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -230,11 +230,20 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <View
+        android:id="@+id/timer_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/grey_transparent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <LinearLayout
         android:id="@+id/bottom_container"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="@color/white"
         android:gravity="center_horizontal"
         android:orientation="vertical"
         android:paddingBottom="@dimen/default_margin"
@@ -263,21 +272,14 @@
             android:src="@drawable/eu_logo_big" />
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/progress_container"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginTop="20dp"
-        android:background="@color/white"
-        android:gravity="center"
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:indeterminateTint="@color/blue"
         app:layout_constraintBottom_toTopOf="@+id/bottom_container"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ProgressBar
-            android:id="@+id/progress_bar"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:indeterminateTint="@color/blue" />
-    </LinearLayout>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>