Basic Layout for Test Certificate Detail Screen (DEV)

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragment.kt

@@ -34,6 +34,13 @@ class GreenCertificateTestFragment : Fragment(R.layout.fragment_test_green_certi
             ratScreen.setOnClickListener {
                 doNavigate(NavGraphDirections.actionSubmissionTestResultGreenCertificateFragment(RAPID_ANTIGEN))
             }
+
+            detailsScreen.setOnClickListener {
+                doNavigate(
+                    GreenCertificateTestFragmentDirections
+                        .actionGreenCertificateTestFragmentToGreenCertificateDetailsFragment()
+                )
+            }
         }
     }
 

Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_green_certificate.xml

@@ -29,5 +29,11 @@
             android:layout_height="wrap_content"
             android:text="RAT screen" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/details_screen"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Details screen" />
+
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>

Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_vaccination.xml

@@ -53,6 +53,5 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>

Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml

@@ -177,6 +177,7 @@
         <action
             android:id="@+id/action_vaccinationTestFragment_to_vaccinationDetailsFragment"
             app:destination="@id/vaccinationDetailsFragment" />
+
     </fragment>
 
     <fragment
@@ -192,5 +193,15 @@
         android:id="@+id/greenCertificateTestFragment"
         android:name="de.rki.coronawarnapp.test.greencertificate.GreenCertificateTestFragment"
         android:label="GreenCertificateTestFragment"
-        tools:layout="@layout/fragment_test_green_certificate" />
+        tools:layout="@layout/fragment_test_green_certificate" >
+        <action
+            android:id="@+id/action_greenCertificateTestFragment_to_greenCertificateDetailsFragment"
+            app:destination="@id/greenCertificateDetailsFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/greenCertificateDetailsFragment"
+        android:name="de.rki.coronawarnapp.greencertificate.ui.certificates.details.GreenCertificateDetailsFragment"
+        android:label="GreenCertificateDetailsFragment"
+        tools:layout="@layout/fragment_greencertificate_details" />
+
 </navigation>

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

@@ -4,10 +4,15 @@ 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.GreenCertificateDetailsFragment
+import de.rki.coronawarnapp.greencertificate.ui.certificates.details.GreenCertificateDetailsModule
 
 @Module
 abstract class GreenCertificateUIModule {
 
     @ContributesAndroidInjector(modules = [CertificatesFragmentModule::class])
     abstract fun certificatesFragment(): CertificatesFragment
+
+    @ContributesAndroidInjector(modules = [GreenCertificateDetailsModule::class])
+    abstract fun certificateDetailsFragment(): GreenCertificateDetailsFragment
 }

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

@@ -0,0 +1,84 @@
+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.FragmentGreencertificateDetailsBinding
+import de.rki.coronawarnapp.ui.view.onOffsetChange
+import de.rki.coronawarnapp.util.di.AutoInject
+import de.rki.coronawarnapp.util.setUrl
+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 javax.inject.Inject
+
+class GreenCertificateDetailsFragment : Fragment(R.layout.fragment_greencertificate_details), AutoInject {
+
+    @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
+    private val binding: FragmentGreencertificateDetailsBinding by viewBinding()
+    private val viewModel: GreenCertificateDetailsViewModel by cwaViewModels { viewModelFactory }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) =
+        with(binding) {
+            toolbar.setNavigationOnClickListener { popBackStack() }
+
+            qrCodeCard.title.text = getString(R.string.detail_green_certificate_card_title)
+            qrCodeCard.subtitle.text = "Test durchgeführt am 12.05.21 18:01" // will be changed
+
+            appBarLayout.onOffsetChange { titleAlpha, subtitleAlpha ->
+                title.alpha = titleAlpha
+                subtitle.alpha = subtitleAlpha
+            }
+
+            if (travelNoticeGerman.text ==
+                requireContext().getString(R.string.green_certificate_attribute_certificate_travel_notice_german)
+            ) {
+                travelNoticeGerman.setUrl(
+                    R.string.green_certificate_attribute_certificate_travel_notice_german,
+                    R.string.green_certificate_travel_notice_link_de,
+                    R.string.green_certificate_travel_notice_link_de
+                )
+            }
+
+            if (travelNoticeEnglish.text ==
+                requireContext().getString(R.string.green_certificate_attribute_certificate_travel_notice_english)
+            ) {
+                travelNoticeEnglish.setUrl(
+                    R.string.green_certificate_attribute_certificate_travel_notice_english,
+                    R.string.green_certificate_travel_notice_link_en,
+                    R.string.green_certificate_travel_notice_link_en
+                )
+            }
+
+            setToolbarOverlay()
+
+            viewModel.qrCode.observe(viewLifecycleOwner) {
+                qrCodeCard.image.setImageBitmap(it)
+                it?.let {
+                    qrCodeCard.image.setOnClickListener { viewModel.openFullScreen() }
+                    qrCodeCard.progressBar.hide()
+                }
+            }
+
+            // TODO: Will in the future be called when the data is loaded from the database
+            viewModel.generateQrCode()
+        }
+
+    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) + 170
+        binding.subtitle.requestLayout()
+
+        val behavior: AppBarLayout.ScrollingViewBehavior = params.behavior as (AppBarLayout.ScrollingViewBehavior)
+        behavior.overlayTop = (width / 3) + 170
+    }
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/GreenCertificateDetailsModule.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 GreenCertificateDetailsModule {
+
+    @Binds
+    @IntoMap
+    @CWAViewModelKey(GreenCertificateDetailsViewModel::class)
+    abstract fun greenCertificateDetailsFragment(
+        factory: GreenCertificateDetailsViewModel.Factory
+    ): CWAViewModelFactory<out CWAViewModel>
+}

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

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

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

@@ -0,0 +1,42 @@
+package de.rki.coronawarnapp.greencertificate.ui.certificates.details
+
+import android.graphics.Bitmap
+import androidx.lifecycle.asLiveData
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+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 kotlinx.coroutines.flow.MutableStateFlow
+import timber.log.Timber
+
+class GreenCertificateDetailsViewModel @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<GreenCertificateDetailsNavigation>()
+
+    fun onClose() = events.postValue(GreenCertificateDetailsNavigation.Back)
+
+    fun openFullScreen() = qrCodeText?.let { events.postValue(GreenCertificateDetailsNavigation.FullQrCode(it)) }
+
+    /* TODO: Adapt to Green Certificate */
+    fun generateQrCode() = launch {
+        try {
+            mutableStateFlow.value = qrCodeGenerator.createQrCode("Sample String")
+        } catch (e: Exception) {
+            Timber.d(e, "generateQrCode failed for greenCertificate=%s", "Sample Certificate")
+            mutableStateFlow.value = null
+        }
+    }
+
+    @AssistedFactory
+    interface Factory : SimpleCWAViewModelFactory<GreenCertificateDetailsViewModel>
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListQrCodeCardItemVH.kt

@@ -3,7 +3,7 @@ package de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder
 import android.graphics.Bitmap
 import android.view.ViewGroup
 import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.databinding.VaccinationListQrcodeCardBinding
+import de.rki.coronawarnapp.databinding.IncludeCertificateQrcodeCardBinding
 import de.rki.coronawarnapp.util.TimeAndDateExtensions.toShortDayFormat
 import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListAdapter
 import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListItem
@@ -12,16 +12,16 @@ import org.joda.time.Instant
 import org.joda.time.LocalDate
 
 class VaccinationListQrCodeCardItemVH(parent: ViewGroup) :
-    VaccinationListAdapter.ItemVH<VaccinationListQrCodeCardItem, VaccinationListQrcodeCardBinding>(
-        layoutRes = R.layout.vaccination_list_qrcode_card,
+    VaccinationListAdapter.ItemVH<VaccinationListQrCodeCardItem, IncludeCertificateQrcodeCardBinding>(
+        layoutRes = R.layout.include_certificate_qrcode_card,
         parent = parent
     ) {
 
-    override val viewBinding: Lazy<VaccinationListQrcodeCardBinding> = lazy {
-        VaccinationListQrcodeCardBinding.bind(itemView)
+    override val viewBinding: Lazy<IncludeCertificateQrcodeCardBinding> = lazy {
+        IncludeCertificateQrcodeCardBinding.bind(itemView)
     }
 
-    override val onBindData: VaccinationListQrcodeCardBinding
+    override val onBindData: IncludeCertificateQrcodeCardBinding
     .(item: VaccinationListQrCodeCardItem, payloads: List<Any>) -> Unit =
         { item, _ ->
             image.setImageBitmap(item.qrCode)

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>