Merge pull request #8599 from marcRDZ/fix-8430_support-thunderbird-link

Add Thunderbird website hyperlink on contribution screen

app-k9mail/src/main/res/values/constants.xml

@@ -4,4 +4,6 @@
     <string name="user_forum_url" translatable="false">https://forum.k9mail.app/</string>
     <string name="funding_url" translatable="false">https://www.thunderbird.net/donate/mobile/?form=k9mail&amp;utm_source=%s&amp;utm_medium=android_app&amp;utm_campaign=inapp_appeal_v2</string>
     <string name="message_header_mua" translatable="false">K-9 Mail for Android</string>
+    <string name="thunderbird_website_domain" translatable="false">www.thunderbird.net</string>
+    <string name="thunderbird_website_url" translatable="false">https://www.thunderbird.net</string>
 </resources>

app-k9mail/src/main/res/values/funding_strings.xml

@@ -5,7 +5,7 @@
     <string name="funding_googleplay_contribution_header_title">Support K-9 Mail</string>
     <string name="funding_googleplay_contribution_header_description">We never show ads or sell your data. We are entirely funded by individual contributions from users like you. If you’re enjoying K-9 Mail, please help support it. We can’t do this without you!</string>
     <string name="funding_googleplay_contribution_header_thank_you_message">Your contribution furthers the development of secure, private and open-source email. We are truly grateful to have you with us!</string>
-    <string name="funding_googleplay_contribution_list_empty_message">K-9 Mail is developed by Thunderbird.\nVisit www.thunderbird.net for more ways to support our work.</string>
+    <string name="funding_googleplay_contribution_list_empty_message">K-9 Mail is developed by Thunderbird.\nVisit <xliff:g id="link_text">%s</xliff:g> for more ways to support our work.</string>
     <string name="funding_googleplay_contribution_reminder_title">Support K-9 Mail</string>
     <string name="funding_googleplay_contribution_reminder_statement">K-9 Mail is free and open source.</string>
 </resources>

feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionList.kt

@@ -15,10 +15,14 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.withLink
 import androidx.compose.ui.text.withStyle
+import app.k9mail.core.ui.compose.common.resources.annotatedStringResource
 import app.k9mail.core.ui.compose.designsystem.atom.Surface
 import app.k9mail.core.ui.compose.designsystem.atom.button.ButtonText
 import app.k9mail.core.ui.compose.designsystem.atom.icon.Icon
@@ -205,13 +209,32 @@ private fun ListEmptyView(
         verticalArrangement = Arrangement.spacedBy(MainTheme.spacings.double),
         modifier = modifier.padding(vertical = MainTheme.spacings.double),
     ) {
+        val annotatedString = annotatedStringResource(
+            id = R.string.funding_googleplay_contribution_list_empty_message,
+            argument = buildAnnotatedString {
+                withStyle(
+                    style = SpanStyle(
+                        color = MainTheme.colors.primary,
+                        textDecoration = TextDecoration.Underline,
+                    ),
+                ) {
+                    withLink(
+                        LinkAnnotation.Url(
+                            url = stringResource(R.string.funding_googleplay_thunderbird_website_url),
+                        ),
+                    ) {
+                        append(stringResource(R.string.funding_googleplay_thunderbird_website_domain))
+                    }
+                }
+            },
+        )
+
         TextBodyMedium(
             text = stringResource(R.string.funding_googleplay_contribution_list_empty_title),
         )
 
-        // TODO The link needs to be clickable
         TextBodyMedium(
-            text = stringResource(R.string.funding_googleplay_contribution_list_empty_message),
+            text = annotatedString,
         )
     }
 }

feature/funding/googleplay/src/main/res/values-ca/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="funding_googleplay_contribution_list_title">Contribució segura</string>
     <string name="funding_googleplay_contribution_title">Dóna suport a Thunderbird</string>
     <string name="funding_googleplay_contribution_list_type_one_time">Donació única</string>
@@ -11,7 +11,7 @@
     <string name="funding_googleplay_contribution_list_type_none_available">Cap disponible</string>
     <string name="funding_googleplay_contribution_list_disclaimer">Les contribucions no són deduïbles fiscalment com a donacions benèfiques.</string>
     <string name="funding_googleplay_contribution_footer_manage_button">Modifica el pagament mensual</string>
-    <string name="funding_googleplay_contribution_list_empty_message">Visiteu www.thunderbird.net per obtenir més maneres de donar suport al Thunderbird</string>
+    <string name="funding_googleplay_contribution_list_empty_message">Visiteu <xliff:g id="link_text">%s</xliff:g> per obtenir més maneres de donar suport al Thunderbird.</string>
     <string name="funding_googleplay_contribution_list_empty_title">Actualment, les contribucions des de l\'aplicació no estan disponibles.</string>
     <string name="funding_googleplay_contribution_error_show_more">Mostra més detalls</string>
     <string name="funding_googleplay_contribution_error_unknown">Error desconegut</string>
@@ -28,4 +28,4 @@
     <string name="funding_googleplay_contribution_footer_payment_unavailable_button">El pagament no està disponible en aquests moments</string>
     <string name="funding_googleplay_contribution_error_dismiss_button">Ignora l\'error</string>
     <string name="funding_googleplay_contribution_tfa_onetime_xs_description">El vostre suport ens fa avançar! Fins i tot les contribucions més petites generen un canvi, i estem molt agraïts de tenir-vos a bord.</string>
-</resources>
+</resources>

feature/funding/googleplay/src/main/res/values-co/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="funding_googleplay_contribution_header_title">Sustene Thunderbird</string>
     <string name="funding_googleplay_contribution_list_title">Cuntribuzione assicurata</string>
     <string name="funding_googleplay_contribution_list_type_one_time">Dà una volta</string>
@@ -8,7 +8,7 @@
     <string name="funding_googleplay_contribution_footer_payment_button">Cuntinuà u pagamentu</string>
     <string name="funding_googleplay_contribution_title">Sustene Thunderbird</string>
     <string name="funding_googleplay_contribution_list_empty_title">Ora, e cuntribuzioni ùn sò micca dispunibule via l’appiecazione.</string>
-    <string name="funding_googleplay_contribution_list_empty_message">Visitate u situ www.thunderbird.net per cunnosce parechje manere di sustene Thunderbird</string>
+    <string name="funding_googleplay_contribution_list_empty_message">Visitate u situ <xliff:g id="link_text">%s</xliff:g> per cunnosce parechje manere di sustene Thunderbird.</string>
     <string name="funding_googleplay_contribution_list_error_retry_button">Pruvà torna</string>
     <string name="funding_googleplay_contribution_footer_payment_unavailable_button">Pagamentu indispunibule attualmente</string>
     <string name="funding_googleplay_contribution_footer_manage_button">Mudificà u pagamentu misincu</string>
@@ -20,4 +20,4 @@
     <string name="funding_googleplay_contribution_error_service_disconnected">Ora, e cuntribuzioni ùn sò micca dispunibule.</string>
     <string name="funding_googleplay_contribution_header_description">Ùn affissemu alcuna publicità è un vindemu mai i vostri dati. Simu finanziati sanu sanu grazia à e cuntribuzioni da i nostri utilizatori. S’è Thunderbird vi piace, aiutateci à sustenelu. Ùn pudemu fà què senza voi !</string>
     <string name="funding_googleplay_contribution_list_disclaimer">E cuntribuzioni ùn ponu micca esse scuntate da l’impositi cum’è e dunazioni.</string>
-</resources>
+</resources>

feature/funding/googleplay/src/main/res/values-cs/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="funding_googleplay_contribution_list_title">Bezpečné přispění</string>
     <string name="funding_googleplay_contribution_list_type_one_time">Jednou</string>
     <string name="funding_googleplay_contribution_footer_payment_button">Pokračovat k platbě</string>
@@ -17,7 +17,7 @@
     <string name="funding_googleplay_contribution_error_show_more">Zobrazit další podrobnosti</string>
     <string name="funding_googleplay_contribution_error_dismiss_button">Zavřít chybu</string>
     <string name="funding_googleplay_contribution_tfa_recurring_xxl_title">Výjimečný měsíční dar</string>
-    <string name="funding_googleplay_contribution_list_empty_message">Navštivte www.thunderbird.net pro další způsoby, jak podpořit Thunderbird</string>
+    <string name="funding_googleplay_contribution_list_empty_message">Navštivte <xliff:g id="link_text">%s</xliff:g> pro další způsoby, jak podpořit Thunderbird.</string>
     <string name="funding_googleplay_contribution_error_purchase_failed">Nákup se nezdařil.</string>
     <string name="funding_googleplay_contribution_tfa_onetime_xs_title">Podstatný dar</string>
     <string name="funding_googleplay_contribution_error_service_disconnected">Dary nejsou v tuto chvíli dostupné.</string>
@@ -54,4 +54,4 @@
     <string name="funding_googleplay_contribution_reminder_statement">Thunderbird je zdarma a open-source.</string>
     <string name="funding_googleplay_contribution_reminder_statement_point_1">Nezobrazujeme reklamy.</string>
     <string name="funding_googleplay_contribution_reminder_statement_point_2">Neprodáváme vaše data.</string>
-</resources>
+</resources>

feature/funding/googleplay/src/main/res/values-de/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="funding_googleplay_contribution_list_title">Sicher spenden</string>
     <string name="funding_googleplay_contribution_header_title">Thunderbird unterstützen</string>
     <string name="funding_googleplay_contribution_list_type_recurring">Monatlich</string>
@@ -31,7 +31,7 @@
     <string name="funding_googleplay_contribution_tfa_recurring_xxl_description">Du hilfst uns, große Träume zu verwirklichen! Deine Unterstützung befähigt uns, außergewöhnliche Dinge zu erreichen.</string>
     <string name="funding_googleplay_contribution_header_description">Wir zeigen keine Werbung und verkaufen deine Daten nicht. Wir finanzieren uns vollständig durch finanzielle Beiträge unserer Nutzer. Wenn dir Thunderbird gefällt, hilf uns bitte, es zu unterhalten. Wir können das nicht ohne dich tun!</string>
     <string name="funding_googleplay_contribution_list_empty_title">In-App-Spenden sind derzeit nicht verfügbar.</string>
-    <string name="funding_googleplay_contribution_list_empty_message">Besuche www.thunderbird.net für weitere Möglichkeiten zur Unterstützung von Thunderbird</string>
+    <string name="funding_googleplay_contribution_list_empty_message">Besuche <xliff:g id="link_text">%s</xliff:g> für weitere Möglichkeiten zur Unterstützung von Thunderbird.</string>
     <string name="funding_googleplay_contribution_error_service_disconnected">Spenden sind derzeit nicht verfügbar.</string>
     <string name="funding_googleplay_contribution_tfa_onetime_xs_title">Grundlegende Spende</string>
     <string name="funding_googleplay_contribution_tfa_onetime_s_title">Wertvolle Spende</string>
@@ -49,4 +49,4 @@
     <string name="funding_googleplay_contribution_reminder_message">Unser Ziel ist es, eine sichere, private und kostenlose Open-Source-E-Mail-App für Nutzer auf der ganzen Welt bereitzustellen. Deine Spende unterstützt diese Arbeit. Möchtest du heute spenden?</string>
     <string name="funding_googleplay_contribution_reminder_negative_button">Jetzt nicht</string>
     <string name="funding_googleplay_contribution_header_thank_you_message">Vielen Dank für deine großzügige Spende! Deine Unterstützung stärkt Thunderbird direkt, und wir sind dankbar, dich auf diesem Weg an unserer Seite zu haben.</string>
-</resources>
+</resources>

feature/funding/googleplay/src/main/res/values-es/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="funding_googleplay_contribution_header_description">Nunca mostramos anuncios ni vendemos tus datos. Nos financiamos completamente con contribuciones financieras de nuestros usuarios. Si disfrutas de Thunderbird, por favor, ayúdanos a mantenerlo. ¡No podemos hacer esto sin ti!</string>
     <string name="funding_googleplay_contribution_footer_payment_button">Continuar con el pago</string>
     <string name="funding_googleplay_contribution_list_type_recurring">Mensual</string>
@@ -19,7 +19,7 @@
     <string name="funding_googleplay_contribution_error_purchase_failed">Compra fallida.</string>
     <string name="funding_googleplay_contribution_error_service_disconnected">Actualmente, las colaboraciones no están disponibles.</string>
     <string name="funding_googleplay_contribution_list_empty_title">Las colaboraciones dentro de la aplicación no están disponibles actualmente.</string>
-    <string name="funding_googleplay_contribution_list_empty_message">Visite www.thunderbird.net para conocer más formas de apoyar a Thunderbird</string>
+    <string name="funding_googleplay_contribution_list_empty_message">Visite <xliff:g id="link_text">%s</xliff:g> para conocer más formas de apoyar a Thunderbird.</string>
     <string name="funding_googleplay_contribution_tfa_onetime_l_title">Gran contribución</string>
     <string name="funding_googleplay_contribution_tfa_onetime_xxl_title">Aporte excepcional</string>
     <string name="funding_googleplay_contribution_tfa_onetime_m_description">¡Tu colaboración realmente brilla! Está desempeñando un papel importante en el avance de nuestra misión, ayudándonos a alcanzar hitos importantes y lograr un mayor impacto.</string>
@@ -53,4 +53,4 @@
     <string name="funding_googleplay_contribution_reminder_statement_point_2">No vendemos tus datos.</string>
     <string name="funding_googleplay_contribution_reminder_statement">Thunderbird es gratuito y de código abierto.</string>
     <string name="funding_googleplay_contribution_reminder_statement_point_1">No mostramos anuncios.</string>
-</resources>
+</resources>

feature/funding/googleplay/src/main/res/values-et/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="funding_googleplay_contribution_header_title">Toeta Thunderbirdi</string>
     <string name="funding_googleplay_contribution_list_title">Turvaline rahaline toetus</string>
     <string name="funding_googleplay_contribution_list_type_recurring">Iga kuu</string>
@@ -12,7 +12,7 @@
     <string name="funding_googleplay_contribution_footer_show_contribution_list_button">Anna veel üks mõjus panus</string>
     <string name="funding_googleplay_contribution_footer_manage_button">Muuda igakuist makset</string>
     <string name="funding_googleplay_contribution_list_empty_title">Rakenduse-sisene annetamise võimalus hetkel puudub.</string>
-    <string name="funding_googleplay_contribution_list_empty_message">Meie saidist www.thunderbird.net leiad veel võimalusi Thunderbirdi toetamiseks</string>
+    <string name="funding_googleplay_contribution_list_empty_message">Meie saidist <xliff:g id="link_text">%s</xliff:g> leiad veel võimalusi Thunderbirdi toetamiseks.</string>
     <string name="funding_googleplay_contribution_list_error_retry_button">Proovi uuesti</string>
     <string name="funding_googleplay_contribution_footer_payment_unavailable_button">Maksmisvõimalus pole hetkel saadaval</string>
     <string name="funding_googleplay_contribution_error_show_more">Näita lisateavet</string>
@@ -49,4 +49,4 @@
     <string name="funding_googleplay_contribution_reminder_title">Toeta Thunderbirdi</string>
     <string name="funding_googleplay_contribution_reminder_message">Meie eesmärgiks on pakkuda avatud lähtekoodil põhinevat e-postiklienti, mis on turvaline, privaatne ja vaba kõikidele kasutajatele üle maailma. Sinu rahaline toetus aitab seda tööd korraldada. Mis summaga sina täna lööd kaasa?</string>
     <string name="funding_googleplay_contribution_header_thank_you_message">Täname sind suuremeelse annetuse eest! Sinu toetus tugevdab otseselt Thunderbirdi ja me oleme tänulikud, et oled meie kõrval sellel teekonnal.</string>
-</resources>
+</resources>

feature/funding/googleplay/src/main/res/values-eu/strings.xml

@@ -9,4 +9,4 @@
     <string name="funding_googleplay_contribution_error_dismiss_button">Baztertu errorea</string>
     <string name="funding_googleplay_contribution_reminder_positive_button">Bai</string>
     <string name="funding_googleplay_contribution_reminder_negative_button">Orain ez</string>
-</resources>
+</resources>

feature/funding/googleplay/src/main/res/values-fa/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="funding_googleplay_contribution_list_type_one_time">پرداخت یک باره</string>
     <string name="funding_googleplay_contribution_header_title">حمایت از تاندربرد</string>
     <string name="funding_googleplay_contribution_list_title">مشارکت امن</string>
@@ -26,7 +26,7 @@
     <string name="funding_googleplay_contribution_reminder_positive_button">آری</string>
     <string name="funding_googleplay_contribution_reminder_negative_button">اکنون خیر</string>
     <string name="funding_googleplay_contribution_list_empty_title">مشارکت درون‌برنامه‌ای در حال حاضر در دسترس نیست.</string>
-    <string name="funding_googleplay_contribution_list_empty_message">جهت راه‌های دیگر حمایت از تاندربرد، از www.thunderbird.net بازدید نمایید</string>
+    <string name="funding_googleplay_contribution_list_empty_message">جهت راه‌های دیگر حمایت از تاندربرد، از <xliff:g id="link_text">%s</xliff:g> بازدید نمایید</string>
     <string name="funding_googleplay_contribution_footer_payment_unavailable_button">پرداخت در حال حاضر در دسترس نیست</string>
     <string name="funding_googleplay_contribution_error_show_more">نمایش جزییات بیشتر</string>
     <string name="funding_googleplay_contribution_error_dismiss_button">نادیده گرفتن خطا</string>
@@ -49,4 +49,4 @@
     <string name="funding_googleplay_contribution_reminder_title">حمایت از تاندربرد</string>
     <string name="funding_googleplay_contribution_reminder_message">ماموریت ما ارائه یک برنامه رایانامه متن‌باز است که امن، خصوصی و آزاد برای کاربران در سراسر جهان است. کمک مالی شما از این کار حمایت می‌کند. امروز کمک می‌کنی؟</string>
     <string name="funding_googleplay_contribution_header_thank_you_message">از کمک سخاوتمندانه شما متشکریم! حمایت شما به طور مستقیم، تاندربرد را تقویت می‌کند و ما از اینکه در این ماجراجویی در کنارمان هستید سپاسگزاریم.</string>
-</resources>
+</resources>