Merge pull request #963 from minvws/2982-dashboard-card-fix

2982 dashboard card fix
minvws · Dec 23, 2021 · 1390497 · 1390497
2 parents 411862d + 4cba74f
commit 1390497
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/...r/src/main/java/nl/rijksoverheid/ctr/holder/ui/myoverview/items/MyOverviewInfoCardItem.kt b/...r/src/main/java/nl/rijksoverheid/ctr/holder/ui/myoverview/items/MyOverviewInfoCardItem.kt
@@ -37,7 +37,7 @@ class MyOverviewInfoCardItem(
 
         viewBinding.button.run {
             visibility = if (infoItem.hasButton) View.VISIBLE else View.GONE
-            infoItem.buttonText?.let { setText(it) }
+            setText(infoItem.buttonText ?: R.string.my_overview_info_card_button_read_more)
         }
 
         when (infoItem) {
@@ -73,7 +73,8 @@ class MyOverviewInfoCardItem(
                     getOriginInfoText(infoItem, viewBinding.dashboardItemInfoRoot.context)
             }
             is DashboardItem.InfoItem.MissingDutchVaccinationItem -> {
-                viewBinding.text.text = viewBinding.text.context.getString(R.string.missing_dutch_certificate_info_card_text)
+                viewBinding.text.text =
+                    viewBinding.text.context.getString(R.string.missing_dutch_certificate_info_card_text)
             }
             is DashboardItem.InfoItem.TestCertificate3GValidity -> {
                 viewBinding.text.text =

diff --git a/holder/src/main/res/layout/item_my_overview_info_card.xml b/holder/src/main/res/layout/item_my_overview_info_card.xml
@@ -23,8 +23,10 @@
             android:layout_marginStart="24dp"
             android:layout_marginTop="24dp"
             app:layout_goneMarginEnd="24dp"
+            app:layout_goneMarginBottom="24dp"
             android:textAppearance="?attr/textAppearanceBody1"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/button"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/close"
             tools:text="@string/dashboard_item_refreshed_eu_vaccinations_text" />
@@ -39,7 +41,6 @@
             android:minWidth="0dp"
             android:layout_marginHorizontal="16dp"
             android:layout_marginBottom="8dp"
-            app:layout_goneMarginBottom="24dp"
             android:textColor="@color/link"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"

diff --git a/holder/src/main/res/values-en/strings.xml b/holder/src/main/res/values-en/strings.xml
@@ -432,7 +432,7 @@
   <string name="your_events_block_back_dialog_title">Are you sure you want to go back?</string>
   <string name="your_events_block_back_dialog_description">Doing so will stop the process of adding a certificate.</string>
   <string name="your_events_block_back_dialog_positive_button">Yes, go back</string>
-  <string name="your_events_block_back_dialog_negative_button">No, continue</string>
+  <string name="your_events_block_back_dialog_negative_button">No</string>
   <string name="your_events_replace_dialog_title">Want to replace your certificate?</string>
   <string name="your_events_replace_dialog_message">You created a certificate earlier. The details on it differ from those that have just been retrieved. Therefore you can only replace it.</string>
   <string name="your_events_replace_dialog_negative_button">No, stop</string>
@@ -589,5 +589,5 @@
   <string name="visitorpass_start_action">Gegevens ophalen</string>
   <string name="holder_dashboard_newvaliditybanner_title">The validity of coronavirus passes will be adjusted</string>
   <string name="holder_dashboard_newvaliditybanner_action">Read more on Government.nl</string>
-  <string name="holder_dashboard_newvaliditybanner_url">https://www.government.nl/corona-certificate</string>
+  <string name="holder_dashboard_newvaliditybanner_url">https://www.government.nl/covid-certificate</string>
 </resources>
diff --git a/holder/src/main/res/values/strings.xml b/holder/src/main/res/values/strings.xml
@@ -432,7 +432,7 @@
   <string name="your_events_block_back_dialog_title">Weet je zeker dat je terug wilt?</string>
   <string name="your_events_block_back_dialog_description">Hierdoor stop je het toevoegen van een bewijs.</string>
   <string name="your_events_block_back_dialog_positive_button">Ja, terug</string>
-  <string name="your_events_block_back_dialog_negative_button">Nee, ga verder</string>
+  <string name="your_events_block_back_dialog_negative_button">Nee</string>
   <string name="your_events_replace_dialog_title">Wil je je bewijs vervangen?</string>
   <string name="your_events_replace_dialog_message">Je hebt al eerder een bewijs gemaakt. De gegevens daarvan zijn anders dan de gegevens die net zijn opgehaald. Daarom kun je het bewijs alleen vervangen.</string>
   <string name="your_events_replace_dialog_negative_button">Nee, stop</string>