Refactoring issues (EXPOSUREAPP-14867) (#5879)

* Fix: 7. Onboarding > Falls Sie Corona-positiv getestet wurden * Fix : 9. Kontakt-Tagebuch > Informationen > Legal Text Box (languages unequal DE) * Fix: 10. Kontakt-Tagebuch > Informationen > Link to Data Privacy * Fix: 11. Homescreen > Menu Einstellungen - Test Menu * Fix: 14,15: Zertifikate > Persönliche Zertifikatskarte * Fix: Click listener * Fix: 16. Zertifikate > Persönliche Zertifikatskarte - grey certificates * Adjust margin * Fix: 22. Onboarding > Warnungen erhalten > "Weiter" button is overlapping the text in the background + Scrolling along the screen not possible * Fix: 23. Onboarding > Risiko-Ermittlung * Fix: 24. Onboarding > Datenspende * Fix: 25. Zertifikate > Informationen * Fix: 26. Tests erfassen (...) > QR-Code scannen > (RAT) > "Für mich" > Ihr Einverständnis - Legal Text box * Fix: 27. Tests erfassen (...) > QR-Code scannen > (RAT + PCR Pending) > "Für mich" > Ihr Einverständnis > COVID-TC YES > Pending test result > Ihr Einverständnis - consent toggler * Fix: 28. Test erfassen (...) > QR-Code scannen > (RAT positiv) > "Für mich" > (remove consent) > see the positive Test > "Andere warnen" * Fix: 13. Zertifikate > Zertifikat > Reisegültigkeit prüfen - Result screen Button "Für weiteres Land prüfen" * Fix: 12. Zertifikate > Zertifikat > Reisegültigkeit prüfen - Result screen PASS + OPEN - padding issues * UI bugs due to refactoring (EXPOSUREAPP-14867) (#5880) * Fix legal text card background in debuglog more info. * Fix contact form links. * Fix title color in settings fragment. * Fix ppa text. * [INTERNAL] Translation delivery: commit by LX Lab (#5878) * Fix X button in Legal Text fragment. * Make Exposure Logging title visible in switch. * Minimize spacing between buttons SRS. * Remove margin start from icons in submission done. * Remove extra padding on vielen dank page. * Fix: EOL - Background Activity Popup after App Reset/EOL/new onboarding (https://jira-ibs.wbs.net.sap/browse/EXPOSUREAPP-14884) (#5876) ## Ticket https://jira-ibs.wbs.net.sap/browse/EXPOSUREAPP-14884 Co-authored-by: Alex Paulescu <[email protected]> * Fix : EOL - information screen (EXPOSUREAPP-14883) (#5877) https://jira-ibs.wbs.net.sap/browse/EXPOSUREAPP-14883 Co-authored-by: Alex Paulescu <[email protected]> * Fix statistics cards height. * Fix bulletpoint spacing. * Revert conflicting changes. --------- Co-authored-by: SAP LX Lab Service Account <[email protected]> Co-authored-by: Mohamed <[email protected]> --------- Co-authored-by: Alex Paulescu <[email protected]> Co-authored-by: SAP LX Lab Service Account <[email protected]>
corona-warn-app · Mar 2, 2023 · ce10fc3 · ce10fc3
1 parent 963dc02
commit ce10fc3
Show file tree

Hide file tree

Showing 44 changed files with 196 additions and 189 deletions.
diff --git a/...a/de/rki/coronawarnapp/covidcertificate/person/ui/overview/items/PersonCertificateCard.kt b/...a/de/rki/coronawarnapp/covidcertificate/person/ui/overview/items/PersonCertificateCard.kt
@@ -30,6 +30,8 @@ class PersonCertificateCard(parent: ViewGroup) :
         val firstCertificate = curItem.overviewCertificates[0]
         setUIState(curItem)
 
+        qrCodeCard.setCovPassInfoClickListener { curItem.onCovPassInfoAction() }
+        qrCodeCard.setOnClickListener { curItem.onClickAction(curItem, bindingAdapterPosition) }
         itemView.apply {
             setOnClickListener { curItem.onClickAction(curItem, bindingAdapterPosition) }
             transitionName = firstCertificate.cwaCertificate.personIdentifier.groupingKey

diff --git a/...app/covidcertificate/validation/ui/validationresult/passed/DccValidationPassedFragment.kt b/...app/covidcertificate/validation/ui/validationresult/passed/DccValidationPassedFragment.kt
@@ -39,7 +39,7 @@ class DccValidationPassedFragment : Fragment(R.layout.covid_certificate_validati
                     dccValidationState = args.validation.state,
                     ruleCount = args.validation.acceptanceRules.size
                 )
-                populateList(validationResultAdapter)
+                populateList(validationResultAdapter, addPadding = true)
                 setNavigationOnClickListener { popBackStackTwice() }
                 offsetChange()
             }

diff --git a/...na-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt b/...na-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt
@@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentInformationLegalBinding
 import de.rki.coronawarnapp.util.convertToHyperlink
+import de.rki.coronawarnapp.util.formatter.formatVisibilityLanguageBased
 import de.rki.coronawarnapp.util.ui.popBackStack
 import de.rki.coronawarnapp.util.ui.viewBinding
 
@@ -22,6 +23,10 @@ class InformationLegalFragment : Fragment(R.layout.fragment_information_legal) {
         super.onViewCreated(view, savedInstanceState)
         setButtonOnClickListener()
         setUpContactFormLinks()
+        with(binding) {
+            informationLegalContactForm.visibility = formatVisibilityLanguageBased(true)
+            informationLegalContactFormNonEnDe.visibility = formatVisibilityLanguageBased(false)
+        }
     }
 
     /**

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
@@ -60,16 +60,18 @@ class HomeFragment : Fragment(R.layout.home_fragment_layout), AutoInject {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         binding.mainHeaderLogo.setCWAContentDescription(getString(R.string.accessibility_logo))
+        with(binding.toolbar) {
+            addMenuId(R.id.home_fragment_menu_id)
+            setupMenuIcons(menu)
+            setupDebugMenu(menu)
+            setupMenuItemClickListener()
+            menu.setItemContentDescription(requireContext())
+        }
         viewModel.isEol.observe(viewLifecycleOwner) {
-            with(binding.toolbar) {
-                addMenuId(R.id.home_fragment_menu_id)
-                menu.findItem(R.id.mainSharingFragment).isVisible = !it
-                menu.findItem(R.id.settingsFragment).isVisible = !it
-                menu.findItem(R.id.mainOverviewFragment).isVisible = !it
-                setupMenuIcons(menu)
-                setupDebugMenu(menu)
-                setupMenuItemClickListener()
-                menu.setItemContentDescription(requireContext())
+            binding.toolbar.menu.apply {
+                findItem(R.id.mainSharingFragment).isVisible = !it
+                findItem(R.id.settingsFragment).isVisible = !it
+                findItem(R.id.mainOverviewFragment).isVisible = !it
             }
         }
 

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/CertificateOverviewQrCardView.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/CertificateOverviewQrCardView.kt
@@ -137,7 +137,7 @@ class CertificateOverviewQrCardView @JvmOverloads constructor(
         }
     }
 
-    override fun setOnClickListener(l: OnClickListener?) {
+    fun setCovPassInfoClickListener(l: OnClickListener?) {
         binding.covpassInfoButton.setOnClickListener(l)
     }
 

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/SettingsRowView.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/SettingsRowView.kt
@@ -28,7 +28,7 @@ class SettingsRowView @JvmOverloads constructor(
 
             val titleColor = getColor(
                 R.styleable.SettingsRowView_android_textColor,
-                resources.getColor(R.color.colorTextPrimary2, resources.newTheme())
+                resources.getColor(R.color.colorOnPrimary, resources.newTheme())
             )
             binding.settingsRowHeaderTitle.setTextColor(titleColor)
 

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/SwitchRowView.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/SwitchRowView.kt
@@ -24,7 +24,7 @@ class SwitchRowView @JvmOverloads constructor(
         LayoutInflater.from(context).inflate(R.layout.switch_row, this, true)
 
         context.withStyledAttributes(attrs, R.styleable.SwitchRowView) {
-            val titleText = getText(R.styleable.SwitchRowView_android_title) ?: ""
+            val titleText = getText(R.styleable.SwitchRowView_title) ?: ""
             title.isVisible = titleText.isNotEmpty()
             title.text = titleText
         }

diff --git a/Corona-Warn-App/src/main/res/layout/admission_federal_state_item.xml b/Corona-Warn-App/src/main/res/layout/admission_federal_state_item.xml
@@ -42,7 +42,7 @@
         android:layout_width="0dp"
         android:layout_height="@dimen/height_1"
         android:layout_marginStart="@dimen/margin_32"
-        android:background="?android:attr/listDivider"
+        android:background="@color/dividerColor"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

diff --git a/Corona-Warn-App/src/main/res/layout/age_warning_layout.xml b/Corona-Warn-App/src/main/res/layout/age_warning_layout.xml
@@ -7,7 +7,8 @@
         style="@style/Card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/margin_24"
+        android:layout_marginHorizontal="@dimen/margin_16"
+        android:layout_marginVertical="@dimen/margin_24"
         android:backgroundTint="@color/colorCardBackgroundHighlightGray"
         android:focusable="true"
         android:textColor="@color/colorStableLight">

diff --git a/Corona-Warn-App/src/main/res/layout/bugreporting_legal_fragment.xml b/Corona-Warn-App/src/main/res/layout/bugreporting_legal_fragment.xml
@@ -46,47 +46,59 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="@string/debugging_debuglog_legal_dialog_title" />
 
-            <TextView
-                android:id="@+id/debug_log_legal_privacy_card_title"
-                style="@style/headline5"
-                android:layout_width="0dp"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/debug_log_privacy_container"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/margin_36"
-                android:layout_marginTop="@dimen/margin_24"
-                android:accessibilityHeading="true"
-                android:focusable="true"
-                android:text="@string/debugging_debuglog_legal_privacy_card_title"
+                android:layout_margin="@dimen/margin_16"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/debuglog_legal_headline" />
+                app:layout_constraintTop_toBottomOf="@id/debuglog_legal_headline"
+                style="@style/GreyCard">
 
-            <TextView
-                android:id="@+id/debug_log_legal_privacy_card_first_section"
-                style="@style/subtitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/margin_36"
-                android:layout_marginTop="@dimen/margin_24"
-                android:accessibilityHeading="true"
-                android:focusable="true"
-                android:text="@string/debugging_debuglog_legal_privacy_card_first_section"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/debug_log_legal_privacy_card_title" />
+                <TextView
+                    android:id="@+id/debug_log_legal_privacy_card_title"
+                    style="@style/headline5"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/margin_24"
+                    android:layout_marginTop="@dimen/margin_24"
+                    android:accessibilityHeading="true"
+                    android:focusable="true"
+                    android:text="@string/debugging_debuglog_legal_privacy_card_title"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/debug_log_legal_privacy_card_second_section"
-                style="@style/subtitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/margin_36"
-                android:layout_marginTop="@dimen/margin_24"
-                android:accessibilityHeading="true"
-                android:focusable="true"
-                android:text="@string/debugging_debuglog_legal_privacy_card_second_section"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/debug_log_legal_privacy_card_first_section" />
+                <TextView
+                    android:id="@+id/debug_log_legal_privacy_card_first_section"
+                    style="@style/subtitle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/margin_24"
+                    android:layout_marginTop="@dimen/margin_24"
+                    android:accessibilityHeading="true"
+                    android:focusable="true"
+                    android:text="@string/debugging_debuglog_legal_privacy_card_first_section"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/debug_log_legal_privacy_card_title" />
+
+                <TextView
+                    android:id="@+id/debug_log_legal_privacy_card_second_section"
+                    style="@style/subtitle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/margin_24"
+                    android:layout_marginTop="@dimen/margin_24"
+                    android:accessibilityHeading="true"
+                    android:focusable="true"
+                    android:text="@string/debugging_debuglog_legal_privacy_card_second_section"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/debug_log_legal_privacy_card_first_section" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView
                 android:id="@+id/debuglog_legal_body_headline"
@@ -99,7 +111,7 @@
                 android:text="@string/debugging_debuglog_legal_section_title"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/debug_log_legal_privacy_card_second_section"
+                app:layout_constraintTop_toBottomOf="@id/debug_log_privacy_container"
                 tools:text="@string/debugging_debuglog_legal_section_title" />
 
             <TextView

diff --git a/Corona-Warn-App/src/main/res/layout/bulletpoint_data_privacy_layout.xml b/Corona-Warn-App/src/main/res/layout/bulletpoint_data_privacy_layout.xml
@@ -119,7 +119,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_24"
-                android:paddingBottom="@dimen/padding_16"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/bulletpoint_text_four"
@@ -130,7 +129,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_24"
-                android:paddingBottom="@dimen/padding_16"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/bulletpoint_text_five"
@@ -141,7 +139,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_24"
-                android:paddingBottom="@dimen/padding_16"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/bulletpoint_text_six"
@@ -152,7 +149,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_24"
-                android:paddingBottom="@dimen/padding_16"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/bulletpoint_text_seven"

diff --git a/Corona-Warn-App/src/main/res/layout/certificate_overview_qr_card_layout.xml b/Corona-Warn-App/src/main/res/layout/certificate_overview_qr_card_layout.xml
@@ -5,7 +5,7 @@
     style="@style/Card.Vaccination"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="24dp"
+    android:layout_marginHorizontal="@dimen/margin_16"
     android:padding="12dp">
 
     <TextView
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
-        override fun setOnClickListener(l: OnClickListener?) {
+        fun setCovPassInfoClickListener(l: OnClickListener?) {
             binding.covpassInfoButton.setOnClickListener(l)
         }
@@ Expand Down @@