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

Unverified Commit 7efff330 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

Change the reminder layout

parent 7bd77c41

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

+1 −0
Original line number Diff line number Diff line
@@ -7,4 +7,5 @@ 
    <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/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>

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

+6 −1
Original line number Diff line number Diff line
@@ -94,7 +94,12 @@ 
    </array>



    <string name="funding_googleplay_contribution_reminder_title">Support Thunderbird</string>

    <string name="funding_googleplay_contribution_reminder_message">Our mission is to provide an open source email app that is secure, private and free for users around the world. Your financial contribution supports this work. Will you give today?</string>



    <string name="funding_googleplay_contribution_reminder_statement">Thunderbird is free and open source.</string>

    <string name="funding_googleplay_contribution_reminder_statement_point_1">We don’t show ads.</string>

    <string name="funding_googleplay_contribution_reminder_statement_point_2">We don’t sell your data.</string>

    <string name="funding_googleplay_contribution_reminder_claim">We are funded solely by users like you. </string>

    <string name="funding_googleplay_contribution_reminder_message">Join our mission to create the best privacy-respecting, customizable email experience possible.</string>

    <string name="funding_googleplay_contribution_reminder_positive_button">Yes</string>

    <string name="funding_googleplay_contribution_reminder_negative_button">Not now</string>

</resources>