TIQR-381: Fix HTML text references

app/build.gradle.kts

@@ -194,6 +194,7 @@ dependencies {
     implementation(libs.google.firebase.messaging)
     implementation(libs.appauth)
     implementation(libs.jwtdecode)
+    implementation(libs.material3.html.text)
 
     implementation(libs.dagger.hilt.android)
     implementation(libs.dagger.hilt.fragment)

app/src/main/kotlin/nl/eduid/screens/scan/RegistrationExplanation.kt

@@ -4,19 +4,16 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.tooling.preview.Preview
+import de.charlex.compose.material3.HtmlText
 import nl.eduid.R
-import nl.eduid.ui.annotatedStringWithBoldParts
 import nl.eduid.ui.theme.EduidAppAndroidTheme
 
 @Composable
@@ -25,14 +22,10 @@ fun RegistrationExplanation(modifier: Modifier = Modifier) = Column(
     verticalArrangement = Arrangement.Bottom,
     modifier = modifier
 ) {
-    Text(
-        text = annotatedStringWithBoldParts(
-            stringResource(R.string.ScanView_MainText_COPY),
-            stringResource(R.string.ScanView_MainTextBoldPart_COPY),
-            boldWeight = FontWeight.Bold
-            ),
+    HtmlText(
+        text = stringResource(R.string.ScanView_MainText_COPY),
         style = MaterialTheme.typography.titleLarge.copy(
-            textAlign = TextAlign.Center, color = Color.White, fontWeight = FontWeight.SemiBold
+            textAlign = TextAlign.Center, color = Color.White, fontWeight = FontWeight.Normal
         ),
         modifier = Modifier.fillMaxWidth()
     )

app/src/main/kotlin/nl/eduid/ui/TermsAndConditions.kt

@@ -1,20 +1,14 @@
 package nl.eduid.ui
 
-import android.text.Html
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import de.charlex.compose.material3.HtmlText
 import nl.eduid.R
 import nl.eduid.ui.theme.EduidAppAndroidTheme
 
@@ -37,7 +31,7 @@ fun CheckToSAndPrivacyPolicy(
                 .width(16.dp)
         )
         HtmlText(
-            html = stringResource(id = R.string.LinkFromInstitution_AgreeWithTerms_COPY),
+            text = stringResource(id = R.string.LinkFromInstitution_AgreeWithTerms_COPY),
             modifier = Modifier
                 .wrapContentWidth()
                 .padding(start = 12.dp)

app/src/main/kotlin/nl/eduid/ui/theme/Color.kt

@@ -10,7 +10,7 @@ val md_theme_light_secondary = Color(0xFF0060AC)
 val md_theme_light_onSecondary = Color(0xFFFFFFFF)
 val md_theme_light_secondaryContainer = Color(0xFFD4E3FF)
 val md_theme_light_onSecondaryContainer = Color(0xFF001C39)
-val md_theme_light_tertiary = Color(0xFF006874)
+val md_theme_light_tertiary = Color(0xFF0060AC)
 val md_theme_light_onTertiary = Color(0xFFFFFFFF)
 val md_theme_light_tertiaryContainer = Color(0xFF97F0FF)
 val md_theme_light_onTertiaryContainer = Color(0xFF001F24)

app/src/main/res/values-nl/strings.xml

@@ -20,7 +20,7 @@
   <string name="HomeView_ActivityButton_COPY">"Activiteit"</string>
   <string name="HomeView_ScanQRButton_COPY">"Scan QR"</string>
   <string name="ScanView_Title_COPY">"Scan de QR-code"</string>
-  <string name="ScanView_MainText_COPY">"Zie je geen QR-code?\nGa naar eduid.nl/security\nMaak je persoonlijke QR-code aan\nScan het hier\n"</string>
+  <string name="ScanView_MainText_COPY">"&lt;b&gt;Zie je geen QR-code?&lt;/b&gt;&lt;br/&gt;\nGa naar &lt;a href=&quot;https://eduid.nl/security&quot; target=&quot;_blank&quot;&gt;eduid.nl/security&lt;/a&gt;&lt;br/&gt;\nMaak je persoonlijke QR-code aan&lt;br/&gt;\nScan het hier\n"</string>
   <string name="ScanView_MainTextBoldPart_COPY">"Zie je geen QR-code?"</string>
   <string name="ScanView_Flashlight_NotAvailable_COPY">"Zaklamp is niet beschikbaar"</string>
   <string name="ScanView_Flashlight_TurnOn_COPY">"Zet zaklamp aan"</string>
@@ -456,7 +456,7 @@
   <string name="LinkFromInstitution_InstitutionDomainNameWarning2_COPY">"We raden je aan om je persoonlijke e-mailadres te gebruiken voor eduID."</string>
   <string name="LinkFromInstitution_AllowedDomainNamesError_COPY">"Domeinnaam %1$s niet toegestaan."</string>
   <string name="LinkFromInstitution_AllowedDomainNamesError2_COPY">"eduID is beperkt om alleen te worden gebruikt door toegestane domeinen."</string>
-  <string name="LinkFromInstitution_AgreeWithTerms_COPY">"&lt;span&gt;Ik ga akkoord met &lt;a tabindex='-1' href='https://eduid.nl/gebruiksvoorwaarden/' target='_blank'&gt;de voorwaarden.&lt;/a&gt; En ik begrijp &lt;a tabindex='-1' href='https://eduid.nl/privacyverklaring/' target='_blank'&gt;de privacyverklaring&lt;/a&gt;.&lt;/span&gt;"</string>
+  <string name="LinkFromInstitution_AgreeWithTerms_COPY">"&lt;span&gt;Ik ga akkoord met &lt;a tabindex='-1' href='https://eduid.nl/gebruiksvoorwaarden/' target='_blank'&gt;de voorwaarden.&lt;/a&gt; En ik begrijp &lt;a tabindex='-1' href='https://eduid.nl/privacy/' target='_blank'&gt;de privacyverklaring&lt;/a&gt;.&lt;/span&gt;"</string>
   <string name="LinkFromInstitution_RequestEduIdButton_COPY">"Vraag je eduID aan"</string>
   <string name="PollFromInstitution_Header_COPY">"Open je mailbox!"</string>
   <string name="PollFromInstitution_Awaiting_COPY">"Wachten tot je op de link klikt..."</string>

app/src/main/res/values/strings.xml

@@ -20,7 +20,7 @@
   <string name="HomeView_ActivityButton_COPY">"Activity"</string>
   <string name="HomeView_ScanQRButton_COPY">"Scan QR"</string>
   <string name="ScanView_Title_COPY">"Scan the QR-code"</string>
-  <string name="ScanView_MainText_COPY">"Don't see a QR code?\nGo to eduid.nl/security\nCreate your personal QR code\nScan it here\n"</string>
+  <string name="ScanView_MainText_COPY">"&lt;b&gt;Don't see a QR code?&lt;/b&gt;&lt;br/&gt;\nGo to &lt;a href=&quot;https://eduid.nl/security&quot; target=&quot;_blank&quot;&gt;eduid.nl/security&lt;/a&gt;&lt;br/&gt;\nCreate your personal QR code&lt;br/&gt;\nScan it here\n"</string>
   <string name="ScanView_MainTextBoldPart_COPY">"Don't see a QR code?"</string>
   <string name="ScanView_Flashlight_NotAvailable_COPY">"Torch isn't available"</string>
   <string name="ScanView_Flashlight_TurnOn_COPY">"Turn on flashlight"</string>

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-android-sdk-compile = "33"
+android-sdk-compile = "34"
 android-sdk-target = "33"
 android-sdk-min = "24"
 android-buildTools = "33.0.0"
@@ -88,6 +88,7 @@ jwtdecode = "com.auth0.android:jwtdecode:2.0.2"
 google-android-material = "com.google.android.material:material:1.9.0"
 google-mlkit-barcode = "com.google.mlkit:barcode-scanning:17.1.0"
 google-firebase-messaging = "com.google.firebase:firebase-messaging-ktx:23.1.0"
+material3-html-text = "de.charlex.compose.material3:material3-html-text:2.0.0-beta01"
 
 okhttp-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }

localizations.yaml

@@ -133,14 +133,14 @@ SHARED:
     MainText:
       COPY:
         en: |
-          Don't see a QR code?
-          Go to eduid.nl/security
-          Create your personal QR code
+          <b>Don't see a QR code?</b><br/>
+          Go to <a href="https://eduid.nl/security" target="_blank">eduid.nl/security</a><br/>
+          Create your personal QR code<br/>
           Scan it here
         nl: |
-          Zie je geen QR-code?
-          Ga naar eduid.nl/security
-          Maak je persoonlijke QR-code aan
+          <b>Zie je geen QR-code?</b><br/>
+          Ga naar <a href="https://eduid.nl/security" target="_blank">eduid.nl/security</a><br/>
+          Maak je persoonlijke QR-code aan<br/>
           Scan het hier
     MainTextBoldPart:
       COPY:
@@ -2279,7 +2279,7 @@ SHARED:
           <span>Ik ga akkoord met <a tabindex='-1'
           href='https://eduid.nl/gebruiksvoorwaarden/' target='_blank'>de
           voorwaarden.</a> En ik begrijp <a tabindex='-1'
-          href='https://eduid.nl/privacyverklaring/' target='_blank'>de
+          href='https://eduid.nl/privacy/' target='_blank'>de
           privacyverklaring</a>.</span>
     RequestEduIdButton:
       COPY: