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

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

Merge pull request #8613 from wmontwe/change-funding-strings 

Change funding strings
parents 129889a2 7efff330

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

0 → 100644
+11 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- These are the funding feature overwrites that are K-9 specific -->

    <string name="funding_googleplay_contribution_title">Support K-9 Mail</string>

    <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_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/ContributionHeader.kt

+7 −4
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ internal fun ContributionHeader( 
                    logo = GoldenHearthSunburst,

                    title = ContributionIdStringMapper.mapToContributionTitle(contribution.id),

                    description = ContributionIdStringMapper.mapToContributionDescription(contribution.id),

                    thankYou = stringResource(R.string.funding_googleplay_contribution_header_thank_you_message),

                    showThankYou = true,

                    benefits = ContributionIdStringMapper.mapToContributionBenefits(contribution.id),

                    modifier = modifier,

                )
@@ -68,7 +68,7 @@ private fun ContributionHeaderView( 
    title: String,

    description: String,

    modifier: Modifier = Modifier,

    thankYou: String? = null,

    showThankYou: Boolean = false,

    benefits: ImmutableList<String> = persistentListOf(),

) {

    Column(
@@ -96,9 +96,12 @@ private fun ContributionHeaderView( 
            textAlign = TextAlign.Center,

        )



        if (thankYou != null) {

        if (showThankYou) {

            TextBodyMedium(

                text = thankYou,

                text = stringResource(R.string.funding_googleplay_contribution_header_thank_you),

            )

            TextBodyMedium(

                text = stringResource(R.string.funding_googleplay_contribution_header_thank_you_message),

            )

        }

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

+9 −1
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 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.SpanStyle

import androidx.compose.ui.text.buildAnnotatedString

import androidx.compose.ui.text.font.FontStyle

import androidx.compose.ui.text.withStyle

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
@@ -83,7 +87,11 @@ internal fun ContributionList( 
            )



            TextBodyMedium(

                text = stringResource(R.string.funding_googleplay_contribution_list_disclaimer),

                text = buildAnnotatedString {

                    withStyle(SpanStyle(fontStyle = FontStyle.Italic)) {

                        append(stringResource(R.string.funding_googleplay_contribution_list_disclaimer))

                    }

                },

                modifier = Modifier.padding(top = MainTheme.spacings.default),

            )

        }

feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/reminder/FundingReminderDialogFragment.kt

+3 −1
Original line number Diff line number Diff line
@@ -10,10 +10,12 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder 


internal class FundingReminderDialogFragment : DialogFragment() {

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {

        val contentView = layoutInflater.inflate(R.layout.funding_googleplay_contribution_reminder, null)



        return MaterialAlertDialogBuilder(requireContext())

            .setIcon(R.drawable.funding_googleplay_contribution_reminder_icon)

            .setTitle(R.string.funding_googleplay_contribution_reminder_title)

            .setMessage(R.string.funding_googleplay_contribution_reminder_message)

            .setView(contentView)

            .setPositiveButton(R.string.funding_googleplay_contribution_reminder_positive_button) { _, _ ->

                handlePositiveButton()

            }

feature/funding/googleplay/src/main/res/layout/funding_googleplay_contribution_reminder.xml

0 → 100644
+104 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>





<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    >



    <TextView

        android:id="@+id/funding_googleplay_contribution_reminder_statement"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="16dp"

        android:layout_marginTop="16dp"

        android:layout_marginEnd="16dp"

        android:text="@string/funding_googleplay_contribution_reminder_statement"

        android:textAppearance="?textAppearanceBodyMedium"

        />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:layout_marginStart="16dp"

        android:layout_marginTop="16dp"

        android:layout_marginEnd="16dp"

        >



        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="16dp"

            android:text="•"

            android:textAppearance="?textAppearanceBodyMedium"

            tools:ignore="HardcodedText"

            />



        <TextView

            android:id="@+id/funding_googleplay_contribution_reminder_statement_point_1"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginStart="8dp"

            android:text="@string/funding_googleplay_contribution_reminder_statement_point_1"

            android:textAppearance="?textAppearanceBodyMedium"

            />

    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:layout_marginStart="16dp"

        android:layout_marginTop="8dp"

        android:layout_marginEnd="16dp"

        >



        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="16dp"

            android:text="•"

            android:textAppearance="?textAppearanceBodyMedium"

            tools:ignore="HardcodedText"

            />



        <TextView

            android:id="@+id/funding_googleplay_contribution_reminder_statement_point_2"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginStart="8dp"

            android:text="@string/funding_googleplay_contribution_reminder_statement_point_2"

            android:textAppearance="?textAppearanceBodyMedium"

            />

    </LinearLayout>



    <TextView

        android:id="@+id/funding_googleplay_contribution_reminder_claim"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="16dp"

        android:layout_marginTop="16dp"

        android:layout_marginEnd="16dp"

        android:text="@string/funding_googleplay_contribution_reminder_claim"

        android:textAppearance="?textAppearanceBodyMedium"

        android:textStyle="bold"

        />



    <TextView

        android:id="@+id/funding_googleplay_contribution_reminder_message"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="16dp"

        android:layout_marginTop="16dp"

        android:layout_marginEnd="16dp"

        android:text="@string/funding_googleplay_contribution_reminder_message"

        android:textAppearance="?textAppearanceBodyMedium"

        />



</LinearLayout>