Interoperability Onboarding and Information (EXPOSUREAPP-2730, EXPOSUREAPP-2733)

Corona-Warn-App/src/device/java/de/rki/coronawarnapp/ui/main/MainFragment.kt

@@ -35,6 +35,7 @@ import kotlinx.coroutines.withContext
  * @see PopupMenu
  */
 class MainFragment : Fragment(R.layout.fragment_main) {
+
     private val tracingViewModel: TracingViewModel by activityViewModels()
     private val settingsViewModel: SettingsViewModel by activityViewModels()
     private val submissionViewModel: SubmissionViewModel by activityViewModels()
@@ -45,11 +46,10 @@ class MainFragment : Fragment(R.layout.fragment_main) {
         binding.tracingViewModel = tracingViewModel
         binding.settingsViewModel = settingsViewModel
         binding.submissionViewModel = submissionViewModel
-        binding.lifecycleOwner = this
 
         setButtonOnClickListener()
         setContentDescription()
-
+        checkShouldInteroperabilityBeOpened()
         showOneTimeTracingExplanationDialog()
     }
 
@@ -159,6 +159,18 @@ class MainFragment : Fragment(R.layout.fragment_main) {
         popup.show()
     }
 
+    private fun checkShouldInteroperabilityBeOpened() {
+        if (!LocalData.isInteroperabilityShownAtLeastOnce) {
+            navigateToInteroperabilityFeature()
+        }
+    }
+
+    private fun navigateToInteroperabilityFeature() {
+        findNavController().doNavigate(
+            MainFragmentDirections.actionMainFragmentToOnboardingDeltaInteroperabilityFragment()
+        )
+    }
+
     private fun showOneTimeTracingExplanationDialog() {
 
         // check if the dialog explaining the tracing time was already shown

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainFragment.kt

@@ -48,7 +48,8 @@ class MainFragment : Fragment(R.layout.fragment_main) {
         binding.submissionViewModel = submissionViewModel
 
         setButtonOnClickListener()
-
+        setContentDescription()
+        checkShouldInteroperabilityBeOpened()
         showOneTimeTracingExplanationDialog()
     }
 
@@ -66,9 +67,10 @@ class MainFragment : Fragment(R.layout.fragment_main) {
         binding.mainScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT)
     }
 
-    override fun onStart() {
-        super.onStart()
-        binding.mainScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT)
+    private fun setContentDescription() {
+        binding.mainHeaderShare.buttonIcon.contentDescription = getString(R.string.button_share)
+        binding.mainHeaderOptionsMenu.buttonIcon.contentDescription = getString(R.string.button_menu)
+        binding.mainAbout.mainCard.contentDescription = getString(R.string.hint_external_webpage)
     }
 
     private fun setButtonOnClickListener() {
@@ -168,6 +170,18 @@ class MainFragment : Fragment(R.layout.fragment_main) {
         popup.show()
     }
 
+    private fun checkShouldInteroperabilityBeOpened() {
+        if (!LocalData.isInteroperabilityShownAtLeastOnce) {
+            navigateToInteroperabilityFeature()
+        }
+    }
+
+    private fun navigateToInteroperabilityFeature() {
+        findNavController().doNavigate(
+            MainFragmentDirections.actionMainFragmentToOnboardingDeltaInteroperabilityFragment()
+        )
+    }
+
     private fun showOneTimeTracingExplanationDialog() {
 
         // check if the dialog explaining the tracing time was already shown

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

@@ -44,6 +44,9 @@
         <action
             android:id="@+id/action_mainFragment_to_testRiskLevelCalculation"
             app:destination="@id/testRiskLevelCalculation" />
+        <action
+            android:id="@+id/action_mainFragment_to_onboardingDeltaInteroperabilityFragment"
+            app:destination="@id/onboardingDeltaInteroperabilityFragment" />
     </fragment>
 
     <fragment
@@ -85,7 +88,26 @@
         android:id="@+id/settingsTracingFragment"
         android:name="de.rki.coronawarnapp.ui.settings.SettingsTracingFragment"
         android:label="@layout/fragment_settings_tracing"
-        tools:layout="@layout/fragment_settings_tracing" />
+        tools:layout="@layout/fragment_settings_tracing">
+        <action
+            android:id="@+id/action_settingsTracingFragment_to_interopCountryConfigurationFragment"
+            app:destination="@id/interopCountryConfigurationFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/onboardingDeltaInteroperabilityFragment"
+        android:name="de.rki.coronawarnapp.ui.onboarding.OnboardingDeltaInteroperabilityFragment"
+        android:label="OnboardingDeltaInteroperabilityFragment" />
+
+    <fragment
+        android:id="@+id/interopCountryConfigurationFragment"
+        android:name="de.rki.coronawarnapp.ui.interoperability.InteroperabilityConfigurationFragment"
+        android:label="InteropCountryConfigurationFragment"
+        tools:layout="@layout/fragment_interoperability_configuration">
+        <action
+            android:id="@+id/action_interopCountryConfigurationFragment_to_settingTracingFragment"
+            app:destination="@id/settingsTracingFragment" />
+    </fragment>
 
     <fragment
         android:id="@+id/settingsNotificationFragment"

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt

@@ -14,8 +14,8 @@ object ApplicationConfigurationService {
                     .clearSupportedCountries()
                     .addAllSupportedCountries(
                         listOf(
-                            "DE", "UK", "FR", "IT", "SP", "PL", "RO", "NL",
-                            "BE", "CZ", "EL", "SE", "PT", "HU", "AT", "CH", "BG", "DK", "FI", "SK",
+                            "DE", "UK", "FR", "IT", "ES", "PL", "RO", "NL",
+                            "BE", "CZ", "SE", "PT", "HU", "AT", "CH", "BG", "DK", "FI", "SK",
                             "NO", "IE", "HR", "SI", "LT", "LV", "EE", "CY", "LU", "MT", "IS"
                         )
                     )

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt

@@ -24,6 +24,9 @@ object LocalData {
     private const val PREFERENCE_GOOGLE_API_PROVIDE_DIAGNOSIS_KEYS_CALL_COUNT =
         "preference_google_api_provide_diagnosis_keys_call_count"
 
+    private const val PREFERENCE_INTEROPERABILITY_IS_USED_AT_LEAST_ONCE =
+        "preference_interoperability_is_used_at_least_once"
+
     /****************************************************
      * ONBOARDING DATA
      ****************************************************/
@@ -750,4 +753,21 @@ object LocalData {
      ****************************************************/
 
     fun getSharedPreferenceInstance(): SharedPreferences = globalEncryptedSharedPreferencesInstance
+
+    /****************************************************
+     * INTEROPERABILITY
+     ****************************************************/
+
+    var isInteroperabilityShownAtLeastOnce: Boolean
+        get() {
+            return getSharedPreferenceInstance().getBoolean(
+                PREFERENCE_INTEROPERABILITY_IS_USED_AT_LEAST_ONCE,
+                false
+            )
+        }
+        set(value) {
+            getSharedPreferenceInstance().edit {
+                putBoolean(PREFERENCE_INTEROPERABILITY_IS_USED_AT_LEAST_ONCE, value)
+            }
+        }
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt

@@ -0,0 +1,28 @@
+package de.rki.coronawarnapp.storage.interoperability
+
+import de.rki.coronawarnapp.service.applicationconfiguration.ApplicationConfigurationService
+import de.rki.coronawarnapp.storage.LocalData
+import kotlinx.coroutines.runBlocking
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class InteroperabilityRepository @Inject constructor() {
+
+    fun saveInteroperabilityUsed() {
+        LocalData.isInteroperabilityShownAtLeastOnce = true
+    }
+
+    /**
+     * Gets all countries from @see ApplicationConfigurationService.asyncRetrieveApplicationConfiguration
+     * Also changes every country code to lower case
+     */
+    fun getAllCountries(): List<String> {
+        return runBlocking {
+            ApplicationConfigurationService.asyncRetrieveApplicationConfiguration()
+                .supportedCountriesList
+                ?.map { it.toLowerCase(Locale.ROOT) } ?: listOf()
+        }
+    }
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragment.kt

@@ -0,0 +1,43 @@
+package de.rki.coronawarnapp.ui.interoperability
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.databinding.FragmentInteroperabilityConfigurationBinding
+import de.rki.coronawarnapp.ui.main.MainActivity
+import de.rki.coronawarnapp.util.di.AutoInject
+import de.rki.coronawarnapp.util.ui.observe2
+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 InteroperabilityConfigurationFragment :
+    Fragment(R.layout.fragment_interoperability_configuration), AutoInject {
+
+    @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
+    private val vm: InteroperabilityConfigurationFragmentViewModel by cwaViewModels { viewModelFactory }
+
+    private val binding: FragmentInteroperabilityConfigurationBinding by viewBindingLazy()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        vm.countryList.observe2(this) {
+            binding.countryData = it
+        }
+
+        vm.saveInteroperabilityUsed()
+
+        binding.interoperabilityConfigurationHeader.headerButtonBack.buttonIcon.setOnClickListener {
+            vm.onBackPressed()
+        }
+
+        vm.navigateBack.observe2(this) {
+            if (it) {
+                (requireActivity() as MainActivity).goBack()
+            }
+        }
+    }
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentModule.kt

@@ -0,0 +1,18 @@
+package de.rki.coronawarnapp.ui.interoperability
+
+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 InteroperabilityConfigurationFragmentModule {
+    @Binds
+    @IntoMap
+    @CWAViewModelKey(InteroperabilityConfigurationFragmentViewModel::class)
+    abstract fun testRiskLevelFragment(
+        factory: InteroperabilityConfigurationFragmentViewModel.Factory
+    ): CWAViewModelFactory<out CWAViewModel>
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModel.kt

@@ -0,0 +1,27 @@
+package de.rki.coronawarnapp.ui.interoperability
+
+import androidx.lifecycle.MutableLiveData
+import com.squareup.inject.assisted.AssistedInject
+import de.rki.coronawarnapp.storage.interoperability.InteroperabilityRepository
+import de.rki.coronawarnapp.util.ui.SingleLiveEvent
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
+import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
+
+class InteroperabilityConfigurationFragmentViewModel @AssistedInject constructor(
+    private val interoperabilityRepository: InteroperabilityRepository
+) : CWAViewModel() {
+
+    val countryList = MutableLiveData(interoperabilityRepository.getAllCountries())
+    val navigateBack = SingleLiveEvent<Boolean>()
+
+    fun onBackPressed() {
+        navigateBack.postValue(true)
+    }
+
+    fun saveInteroperabilityUsed() {
+        interoperabilityRepository.saveInteroperabilityUsed()
+    }
+
+    @AssistedInject.Factory
+    interface Factory : SimpleCWAViewModelFactory<InteroperabilityConfigurationFragmentViewModel>
+}

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

@@ -1,13 +1,20 @@
 package de.rki.coronawarnapp.ui.main
 
 import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import de.rki.coronawarnapp.ui.interoperability.InteroperabilityConfigurationFragment
+import de.rki.coronawarnapp.ui.interoperability.InteroperabilityConfigurationFragmentModule
+import de.rki.coronawarnapp.ui.onboarding.OnboardingDeltaInteroperabilityModule
 
-@Module
+@Module(includes = [OnboardingDeltaInteroperabilityModule::class])
 abstract class MainActivityModule {
 
     // activity specific injection module for future dependencies
 
     // example:
     // @ContributesAndroidInjector
     // abstract fun mainFragment(): MainFragment
+
+    @ContributesAndroidInjector(modules = [InteroperabilityConfigurationFragmentModule::class])
+    abstract fun intertopConfigScreen(): InteroperabilityConfigurationFragment
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingActivity.kt

@@ -7,17 +7,21 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.LifecycleObserver
+import dagger.android.AndroidInjector
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.HasAndroidInjector
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.storage.LocalData
 import de.rki.coronawarnapp.ui.main.MainActivity
 import de.rki.coronawarnapp.util.di.AppInjector
+import javax.inject.Inject
 
 /**
  * This activity holds all the onboarding fragments and isn't used after a successful onboarding flow.
  *
  * @see LocalData
  */
-class OnboardingActivity : AppCompatActivity(), LifecycleObserver {
+class OnboardingActivity : AppCompatActivity(), LifecycleObserver, HasAndroidInjector {
     companion object {
         private val TAG: String? = OnboardingActivity::class.simpleName
 
@@ -27,6 +31,9 @@ class OnboardingActivity : AppCompatActivity(), LifecycleObserver {
         }
     }
 
+    @Inject lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Any>
+    override fun androidInjector(): AndroidInjector<Any> = dispatchingAndroidInjector
+
     private val FragmentManager.currentNavigationFragment: Fragment?
         get() = primaryNavigationFragment?.childFragmentManager?.fragments?.first()
 

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingActivityModule.kt

@@ -1,6 +1,7 @@
 package de.rki.coronawarnapp.ui.onboarding
 
 import dagger.Module
+import dagger.android.ContributesAndroidInjector
 
 @Module
 internal abstract class OnboardingActivityModule {
@@ -10,4 +11,7 @@ internal abstract class OnboardingActivityModule {
     // example:
     // @ContributesAndroidInjector
     // abstract fun onboardingFragment(): OnboardingFragment
+
+    @ContributesAndroidInjector(modules = [OnboardingTracingModule::class])
+    abstract fun onboardingScreen(): OnboardingTracingFragment
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragment.kt

@@ -0,0 +1,44 @@
+package de.rki.coronawarnapp.ui.onboarding
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.databinding.FragmentOnboardingDeltaInteroperabilityBinding
+import de.rki.coronawarnapp.ui.main.MainActivity
+import de.rki.coronawarnapp.util.di.AutoInject
+import de.rki.coronawarnapp.util.ui.observe2
+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 OnboardingDeltaInteroperabilityFragment :
+    Fragment(R.layout.fragment_onboarding_delta_interoperability), AutoInject {
+
+    @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
+    private val vm: OnboardingDeltaInteroperabilityFragmentViewModel by cwaViewModels { viewModelFactory }
+
+    private val binding: FragmentOnboardingDeltaInteroperabilityBinding by viewBindingLazy()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        vm.countryList.observe2(this) {
+            binding.countryData = it
+        }
+        vm.saveInteroperabilityUsed()
+
+        binding.onboardingButtonBack.buttonIcon.setOnClickListener {
+            vm.onBackPressed()
+        }
+        binding.onboardingButtonNext.setOnClickListener {
+            vm.onBackPressed()
+        }
+
+        vm.navigateBack.observe2(this) {
+            if (it) {
+                (requireActivity() as MainActivity).goBack()
+            }
+        }
+    }
+}