Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ccdaa237 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

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

Add Thunderbird website hyperlink on contribution screen
parents cc5cb253 eb135ad7

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

+2 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+25 −2
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line 
<?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>

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

+3 −3
Original line number Diff line number Diff line 
<?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>