Profile screen (EXPOSUREAPP-6029)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/antigen/profile/RATProfileSettings.kt

@@ -1,10 +1,10 @@
 package de.rki.coronawarnapp.coronatest.antigen.profile
 
 import android.content.Context
+import androidx.core.content.edit
 import com.google.gson.Gson
 import dagger.Reusable
 import de.rki.coronawarnapp.util.di.AppContext
-import de.rki.coronawarnapp.util.preferences.clearAndNotify
 import de.rki.coronawarnapp.util.preferences.createFlowPreference
 import de.rki.coronawarnapp.util.serialization.BaseGson
 import de.rki.coronawarnapp.util.serialization.fromJson
@@ -35,9 +35,17 @@ class RATProfileSettings @Inject constructor(
         }
     )
 
-    fun clear() = prefs.clearAndNotify()
+    val onboarded = prefs.createFlowPreference(
+        key = PREFS_KEY_ONBOARDED,
+        defaultValue = false
+    )
+
+    fun deleteProfile() = prefs.edit(commit = true) {
+        remove(PREFS_KEY_PROFILE)
+    }
 
     companion object {
         private const val PREFS_KEY_PROFILE = "ratprofile.settings.profile"
+        private const val PREFS_KEY_ONBOARDED = "ratprofile.settings.onboarded"
     }
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/antigen/profile/VCard.kt

@@ -0,0 +1,51 @@
+package de.rki.coronawarnapp.coronatest.antigen.profile
+
+import dagger.Reusable
+import de.rki.coronawarnapp.util.TimeStamper
+import org.joda.time.format.ISODateTimeFormat
+import javax.inject.Inject
+
+@Reusable
+class VCard @Inject constructor(
+    private val timeStamper: TimeStamper
+) {
+
+    /**
+     * Return V-Card format for [RATProfile]
+     * @return [String]
+     */
+    fun create(ratProfile: RATProfile): String = ratProfile.run {
+        val lastName = lastName.escapeAll()
+        val firstName = firstName.escapeAll()
+        val fullName = buildString {
+            append(firstName)
+            if (lastName.isNotBlank()) {
+                append(" $lastName")
+            }
+        }
+        val city = city.escapeAll()
+        val street = street.escapeAll()
+        val zipCode = zipCode.escapeAll()
+        val phone = phone.escapeAll()
+        val email = email.escapeAll()
+        val birthDate = birthDate?.toString(ISODateTimeFormat.basicDate()).orEmpty()
+        val rev = timeStamper.nowUTC.toString(ISODateTimeFormat.basicDateTimeNoMillis()) // Time the vCard was updated
+        """
+            BEGIN:VCARD
+            VERSION:4.0
+            N:$lastName;$firstName;;;
+            FN:$fullName
+            BDAY:$birthDate
+            EMAIL;TYPE=home:$email
+            TEL;TYPE="cell,home":$phone
+            ADR;TYPE=home:;;$street;$city;;$zipCode
+            REV:$rev
+            END:VCARD
+        """.trimIndent()
+    }
+
+    private fun String.escapeAll(): String = replace("\n", "")
+        .replace("\\", "\\\\")
+        .replace(",", "\\,")
+        .replace(";", "\\;")
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/RATProfileUIModule.kt

@@ -4,10 +4,20 @@ import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import de.rki.coronawarnapp.ui.coronatest.rat.profile.create.RATProfileCreateFragment
 import de.rki.coronawarnapp.ui.coronatest.rat.profile.create.RATProfileCreateFragmentModule
+import de.rki.coronawarnapp.ui.coronatest.rat.profile.onboarding.RATProfileOnboardingFragment
+import de.rki.coronawarnapp.ui.coronatest.rat.profile.onboarding.RATProfileOnboardingFragmentModule
+import de.rki.coronawarnapp.ui.coronatest.rat.profile.qrcode.RATProfileQrCodeFragment
+import de.rki.coronawarnapp.ui.coronatest.rat.profile.qrcode.RATProfileQrCodeFragmentModule
 
 @Module
 internal abstract class RATProfileUIModule {
 
     @ContributesAndroidInjector(modules = [RATProfileCreateFragmentModule::class])
     abstract fun ratProfileCreateFragment(): RATProfileCreateFragment
+
+    @ContributesAndroidInjector(modules = [RATProfileQrCodeFragmentModule::class])
+    abstract fun ratProfileQrCodeFragment(): RATProfileQrCodeFragment
+
+    @ContributesAndroidInjector(modules = [RATProfileOnboardingFragmentModule::class])
+    abstract fun ratProfileOnboardingFragment(): RATProfileOnboardingFragment
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/create/RATProfileCreateFragment.kt

@@ -40,6 +40,11 @@ class RATProfileCreateFragment : Fragment(R.layout.rat_profile_create_fragment),
 
             // Birth date
             birthDateInputEdit.setOnClickListener { openDatePicker() }
+            birthDateInputEdit.doAfterTextChanged {
+                if (it.toString().isBlank()) {
+                    viewModel.birthDateChanged(null)
+                }
+            }
 
             // Address
             streetInputEdit.doAfterTextChanged { viewModel.streetChanged(it.toString()) }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/create/RATProfileCreateFragmentViewModel.kt

@@ -41,7 +41,7 @@ class RATProfileCreateFragmentViewModel @AssistedInject constructor(
         }
     }
 
-    fun birthDateChanged(birthDate: LocalDate) {
+    fun birthDateChanged(birthDate: LocalDate?) {
         profileData.apply {
             value = value?.copy(birthDate = birthDate)
         }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/onboarding/RATProfileOnboardingFragment.kt

@@ -5,19 +5,28 @@ import android.view.View
 import androidx.fragment.app.Fragment
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.RatProfileOnboardingFragmentBinding
+import de.rki.coronawarnapp.util.di.AutoInject
 import de.rki.coronawarnapp.util.ui.doNavigate
 import de.rki.coronawarnapp.util.ui.popBackStack
 import de.rki.coronawarnapp.util.ui.viewBindingLazy
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
+import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
+import javax.inject.Inject
 
-class RATProfileOnboardingFragment : Fragment(R.layout.rat_profile_onboarding_fragment) {
+class RATProfileOnboardingFragment : Fragment(R.layout.rat_profile_onboarding_fragment), AutoInject {
 
     private val binding: RatProfileOnboardingFragmentBinding by viewBindingLazy()
 
+    @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
+
+    private val viewModel: RATProfileOnboardingFragmentViewModel by cwaViewModels { viewModelFactory }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) =
         with(binding) {
             toolbar.setNavigationOnClickListener { popBackStack() }
 
             nextButton.setOnClickListener {
+                viewModel.onNext()
                 doNavigate(
                     RATProfileOnboardingFragmentDirections
                         .actionRatProfileOnboardingFragmentToRatProfileCreateFragment()

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/onboarding/RATProfileOnboardingFragmentModule.kt

@@ -0,0 +1,18 @@
+package de.rki.coronawarnapp.ui.coronatest.rat.profile.onboarding
+
+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 RATProfileOnboardingFragmentModule {
+    @Binds
+    @IntoMap
+    @CWAViewModelKey(RATProfileOnboardingFragmentViewModel::class)
+    abstract fun ratProfileOnboardingFragment(
+        factory: RATProfileOnboardingFragmentViewModel.Factory
+    ): CWAViewModelFactory<out CWAViewModel>
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/onboarding/RATProfileOnboardingFragmentViewModel.kt

@@ -0,0 +1,19 @@
+package de.rki.coronawarnapp.ui.coronatest.rat.profile.onboarding
+
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import de.rki.coronawarnapp.coronatest.antigen.profile.RATProfileSettings
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
+import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
+
+class RATProfileOnboardingFragmentViewModel @AssistedInject constructor(
+    private val ratProfileSettings: RATProfileSettings,
+) : CWAViewModel() {
+
+    fun onNext() {
+        ratProfileSettings.onboarded.update { true }
+    }
+
+    @AssistedFactory
+    interface Factory : SimpleCWAViewModelFactory<RATProfileOnboardingFragmentViewModel>
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/qrcode/ProfileQrCodeNavigation.kt

@@ -0,0 +1,6 @@
+package de.rki.coronawarnapp.ui.coronatest.rat.profile.qrcode
+
+sealed class ProfileQrCodeNavigation {
+    object Back : ProfileQrCodeNavigation()
+    object SubmissionConsent : ProfileQrCodeNavigation()
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/qrcode/RATProfileQrCodeFragment.kt

@@ -2,18 +2,106 @@ package de.rki.coronawarnapp.ui.coronatest.rat.profile.qrcode
 
 import android.os.Bundle
 import android.view.View
+import android.widget.LinearLayout
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.text.bold
+import androidx.core.text.buildSpannedString
 import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.coronatest.antigen.profile.RATProfile
 import de.rki.coronawarnapp.databinding.RatProfileQrCodeFragmentBinding
+import de.rki.coronawarnapp.util.di.AutoInject
+import de.rki.coronawarnapp.util.joinToSpannable
 import de.rki.coronawarnapp.util.ui.popBackStack
 import de.rki.coronawarnapp.util.ui.viewBindingLazy
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
+import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
+import javax.inject.Inject
+import kotlin.math.abs
 
-class RATProfileQrCodeFragment : Fragment(R.layout.rat_profile_qr_code_fragment) {
+class RATProfileQrCodeFragment : Fragment(R.layout.rat_profile_qr_code_fragment), AutoInject {
 
+    @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
+
+    private val viewModel: RATProfileQrCodeFragmentViewModel by cwaViewModels { viewModelFactory }
     private val binding: RatProfileQrCodeFragmentBinding by viewBindingLazy()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        setToolbarOverlay()
+        binding.apply {
+            appBarLayout.addOnOffsetChangedListener(
+                AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
+                    val alpha = 1.0f - abs(verticalOffset / (appBarLayout.totalScrollRange.toFloat() * 0.5f))
+                    title.alpha = alpha
+                }
+            )
+
+            nextButton.setOnClickListener { viewModel.onNext() }
+            toolbar.setNavigationOnClickListener { viewModel.onClose() }
+            toolbar.setOnMenuItemClickListener {
+                confirmDeletionDialog()
+                true
+            }
+        }
+        viewModel.profile.observe(viewLifecycleOwner) { personProfile ->
+            with(binding) {
+                progressBar.hide()
+                personProfile.profile?.let { bindPersonInfo(it) }
+                qrCodeImage.setImageBitmap(personProfile.bitmap)
+            }
+        }
+
+        viewModel.events.observe(viewLifecycleOwner) {
+            when (it) {
+                ProfileQrCodeNavigation.Back -> popBackStack()
+                ProfileQrCodeNavigation.SubmissionConsent ->
+                    findNavController().navigate(R.id.submissionConsentFragment)
+            }
+        }
+    }
+
+    private fun confirmDeletionDialog() {
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(getString(R.string.rat_qr_code_profile_dialog_title))
+            .setMessage(getString(R.string.rat_qr_code_profile_dialog_message))
+            .setPositiveButton(getString(R.string.rat_qr_code_profile_dialog_positive_button)) { _, _ ->
+                viewModel.deleteProfile()
+            }
+            .setNegativeButton(getString(R.string.rat_qr_code_profile_dialog_negative_button)) { _, _ ->
+                // No-Op
+            }
+            .show()
+    }
+
+    private fun bindPersonInfo(ratProfile: RATProfile) = with(ratProfile) {
+        val name = buildSpannedString { bold { append("$firstName $lastName") } }
+        val birthDate = birthDate?.let {
+            getString(
+                R.string.rat_qr_code_profile_birth_date,
+                birthDate.toString("dd.MM.yyyy").orEmpty()
+            )
+        }.orEmpty()
+
+        val address = "$zipCode $city"
+        binding.profileInfo.text = arrayOf(name, birthDate, street, address, phone, email)
+            .filter { it.isNotBlank() }
+            .joinToSpannable("\n")
+    }
+
+    private fun setToolbarOverlay() {
+        val width = requireContext().resources.displayMetrics.widthPixels
+
+        val params: CoordinatorLayout.LayoutParams = binding.nestedScrollView.layoutParams
+            as (CoordinatorLayout.LayoutParams)
+
+        val textParams = binding.title.layoutParams as (LinearLayout.LayoutParams)
+        textParams.bottomMargin = (width / 2) - 24 /* 24 is space between screen border and QrCode */
+        binding.title.requestLayout() /* 24 is space between screen border and QrCode */
 
-        binding.closeButton.setOnClickListener { popBackStack() }
+        val behavior: AppBarLayout.ScrollingViewBehavior = params.behavior as (AppBarLayout.ScrollingViewBehavior)
+        behavior.overlayTop = (width / 2) - 24
     }
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/qrcode/RATProfileQrCodeFragmentModule.kt

@@ -0,0 +1,18 @@
+package de.rki.coronawarnapp.ui.coronatest.rat.profile.qrcode
+
+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 RATProfileQrCodeFragmentModule {
+    @Binds
+    @IntoMap
+    @CWAViewModelKey(RATProfileQrCodeFragmentViewModel::class)
+    abstract fun ratProfileQrCodeFragmentViewModel(
+        factory: RATProfileQrCodeFragmentViewModel.Factory
+    ): CWAViewModelFactory<out CWAViewModel>
+}