Basic Layout for Test Certificate Detail Screen (DEV)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/GreenCertificateUIModule.kt

@@ -4,10 +4,17 @@ import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import de.rki.coronawarnapp.greencertificate.ui.certificates.CertificatesFragment
 import de.rki.coronawarnapp.greencertificate.ui.certificates.CertificatesFragmentModule
+import de.rki.coronawarnapp.greencertificate.ui.certificates.details.CertificateDetailsFragment
+import de.rki.coronawarnapp.greencertificate.ui.certificates.details.CertificateDetailsModule
+import de.rki.coronawarnapp.vaccination.ui.consent.VaccinationConsentFragment
+import de.rki.coronawarnapp.vaccination.ui.consent.VaccinationConsentFragmentModule
 
 @Module
 abstract class GreenCertificateUIModule {
 
     @ContributesAndroidInjector(modules = [CertificatesFragmentModule::class])
     abstract fun certificatesFragment(): CertificatesFragment
+
+    @ContributesAndroidInjector(modules = [CertificateDetailsModule::class])
+    abstract fun certificateDetailsFragment(): CertificateDetailsFragment
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CertificateDetailsFragment.kt

@@ -0,0 +1,66 @@
+package de.rki.coronawarnapp.greencertificate.ui.certificates.details
+
+import android.os.Bundle
+import android.view.View
+import android.widget.LinearLayout
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.fragment.app.Fragment
+import com.google.android.material.appbar.AppBarLayout
+import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.databinding.FragmentVaccinationDetailsBinding
+import de.rki.coronawarnapp.ui.view.onOffsetChange
+import de.rki.coronawarnapp.util.di.AutoInject
+import de.rki.coronawarnapp.util.ui.popBackStack
+import de.rki.coronawarnapp.util.ui.viewBinding
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
+import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
+import org.joda.time.format.DateTimeFormat
+import javax.inject.Inject
+
+class CertificateDetailsFragment : Fragment(R.layout.fragment_greencertificate_details), AutoInject {
+
+    @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
+
+    //private val args by navArgs<DetailsFra>()
+    private val binding: FragmentVaccinationDetailsBinding by viewBinding()
+
+    private val viewModel: CertificateDetailsViewModel by cwaViewModels { viewModelFactory }
+
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) =
+        with(binding) {
+            toolbar.setNavigationOnClickListener { popBackStack() }
+
+            appBarLayout.onOffsetChange { titleAlpha, subtitleAlpha ->
+                title.alpha = titleAlpha
+                subtitle.alpha = subtitleAlpha
+            }
+            setToolbarOverlay()
+
+            viewModel.qrCode.observe(viewLifecycleOwner) {
+                qrCodeCard.image.setImageBitmap(it)
+                it?.let {
+                    qrCodeCard.image.setOnClickListener { viewModel.openFullScreen() }
+                    qrCodeCard.progressBar.hide()
+                }
+            }
+        }
+
+    private fun setToolbarOverlay() {
+        val width = requireContext().resources.displayMetrics.widthPixels
+
+        val params: CoordinatorLayout.LayoutParams = binding.scrollView.layoutParams
+            as (CoordinatorLayout.LayoutParams)
+
+        val textParams = binding.subtitle.layoutParams as (LinearLayout.LayoutParams)
+        textParams.bottomMargin = (width / 3) - 24 /* 24 is space between screen border and QrCode */
+        binding.subtitle.requestLayout() /* 24 is space between screen border and QrCode */
+
+        val behavior: AppBarLayout.ScrollingViewBehavior = params.behavior as (AppBarLayout.ScrollingViewBehavior)
+        behavior.overlayTop = (width / 3) - 24
+    }
+
+    companion object {
+        private val format = DateTimeFormat.forPattern("dd.MM.yy")
+    }
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CertificateDetailsModule.kt

@@ -0,0 +1,19 @@
+package de.rki.coronawarnapp.greencertificate.ui.certificates.details
+
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.IntoMap
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModelKey
+
+@Module
+abstract class CertificateDetailsModule {
+
+    @Binds
+    @IntoMap
+    @CWAViewModelKey(CertificateDetailsViewModel::class)
+    abstract fun vaccinationDetailsFragment(
+        factory: CertificateDetailsViewModel.Factory
+    ): CWAViewModelFactory<out CWAViewModel>
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CertificateDetailsNavigation.kt

@@ -0,0 +1,6 @@
+package de.rki.coronawarnapp.greencertificate.ui.certificates.details
+
+sealed class CertificateDetailsNavigation {
+    object Back : CertificateDetailsNavigation()
+    data class FullQrCode(val qrCodeText: String) : CertificateDetailsNavigation()
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CertificateDetailsViewModel.kt

@@ -0,0 +1,49 @@
+package de.rki.coronawarnapp.greencertificate.ui.certificates.details
+
+import android.graphics.Bitmap
+import androidx.lifecycle.asLiveData
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import de.rki.coronawarnapp.greencertificate.ui.certificates.details.CertificateDetailsNavigation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.QrCodeGenerator
+import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
+import de.rki.coronawarnapp.util.ui.SingleLiveEvent
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
+import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
+import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
+import de.rki.coronawarnapp.vaccination.core.VaccinationCertificate
+import kotlinx.coroutines.flow.MutableStateFlow
+import timber.log.Timber
+
+class CertificateDetailsViewModel @AssistedInject constructor(
+    private val qrCodeGenerator: QrCodeGenerator,
+    dispatcherProvider: DispatcherProvider,
+) : CWAViewModel(dispatcherProvider) {
+
+    private var qrCodeText: String? = null
+    private val mutableStateFlow = MutableStateFlow<Bitmap?>(null)
+    val qrCode = mutableStateFlow.asLiveData(dispatcherProvider.Default)
+
+    val events = SingleLiveEvent<CertificateDetailsNavigation>()
+
+    fun onClose() = events.postValue(CertificateDetailsNavigation.Back)
+
+    fun openFullScreen() = qrCodeText?.let { events.postValue(CertificateDetailsNavigation.FullQrCode(it)) }
+
+    private fun generateQrCode(certificate: VaccinationCertificate?) = launch {
+        try {
+            mutableStateFlow.value = certificate?.let {
+                qrCodeText = it.vaccinationQrCodeString
+                qrCodeGenerator.createQrCode(it.vaccinationQrCodeString)
+            }
+        } catch (e: Exception) {
+            Timber.d(e, "generateQrCode failed for vaccinationCertificate=%s", certificate)
+            mutableStateFlow.value = null
+        }
+    }
+
+    @AssistedFactory
+    interface Factory : SimpleCWAViewModelFactory<CertificateDetailsViewModel>
+
+}

Corona-Warn-App/src/main/res/drawable/greencertificate_gradient.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:endColor="#35B55F"
+        android:startColor="#2E854B" />
+</shape>