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

Commit a2473fec authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

mail: Rename thunderbird to Mail

parent 3772caf8

app-thunderbird/src/main/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
    <application

        android:name=".ThunderbirdApp"

        android:icon="@drawable/ic_app_logo_e"

        android:label="@string/app_name"

        android:label="@string/app_name_e"

        android:theme="@style/Theme.Thunderbird.Startup"

        >

app-thunderbird/src/main/kotlin/net/thunderbird/android/provider/TbAppNameProvider.kt

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ class TbAppNameProvider( 
    context: Context,

) : AppNameProvider, BrandNameProvider, FilePrefixProvider {

    override val appName: String by lazy {

        context.getString(R.string.app_name)

        context.getString(R.string.app_name_e)

    }



    override val brandName: String by lazy {

        context.getString(R.string.brand_name)

        context.getString(R.string.brand_name_e)

    }



    override val filePrefix: String = "thunderbird"

app-thunderbird/src/main/res/values/e_strings.xml

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

<resources>

    <string name="app_name_e" translatable="false">Mail</string>

    <string name="brand_name_e" translatable="false">Mail</string>

</resources>

feature/onboarding/migration/thunderbird/src/main/kotlin/app/k9mail/feature/onboarding/migration/thunderbird/TbOnboardingMigrationScreen.kt

+3 −9
Original line number Diff line number Diff line
@@ -82,9 +82,9 @@ internal fun TbOnboardingMigrationScreen( 


            Spacer(modifier = Modifier.height(MainTheme.spacings.triple))



            TextGroup(title = stringResource(R.string.onboarding_migration_thunderbird_new_account_title)) {

            TextGroup(title = stringResource(R.string.onboarding_migration_thunderbird_new_account_title_e)) {

                ButtonOutlined(

                    text = stringResource(R.string.onboarding_migration_thunderbird_new_account_button_text),

                    text = stringResource(R.string.onboarding_migration_thunderbird_new_account_title_e),

                    onClick = onAddAccount,

                    modifier = Modifier.testTag("AddAccountButton"),

                )
@@ -109,13 +109,7 @@ internal fun TbOnboardingMigrationScreen( 


@Composable

private fun AlreadyUsingThunderbirdCard(onQrCodeScan: () -> Unit) {

    TextCard(title = stringResource(R.string.onboarding_migration_thunderbird_qr_code_import_title)) {

        TextBodyMedium(

            text = stringResource(R.string.onboarding_migration_thunderbird_qr_code_import_text),

            modifier = Modifier

                .padding(bottom = MainTheme.spacings.double),

        )



    TextCard(title = stringResource(R.string.onboarding_migration_thunderbird_qr_code_import_title_e)) {

        TextBodyMediumFullLineHeight(

            text = stringResource(R.string.onboarding_migration_thunderbird_qr_code_import_instructions_intro),

        )

feature/onboarding/migration/thunderbird/src/main/res/values/e_strings.xml

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

<resources>

    <string name="onboarding_migration_thunderbird_qr_code_import_title_e">Are you using Thunderbird on desktop?</string>

    <string name="onboarding_migration_thunderbird_new_account_title_e">New to Mail?</string>

</resources>