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

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

mail: Rename unified inbox to all inboxes

parent bbbef4a4

feature/account/accountmanager/src/main/res/values/e_strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -42,4 +42,11 @@ 


    <string name="global_settings_sent_sound_title">Email sent sound</string>

    <string name="global_settings_sent_sound_summary">Play a sound when an email is successfully sent</string>



    <string name="integrated_inbox_title_e">All Inboxes</string>

    <string name="message_list_widget_inbox_title_e">All Inboxes</string>

    <string name="navigation_drawer_unified_inbox_title_e">All Inboxes</string>

    <string name="unread_widget_unified_inbox_account_summary_e">All Inboxes</string>

    <string name="show_unified_inbox_title_e">Show All Inboxes</string>

    <string name="folder_settings_include_in_integrated_inbox_summary_e">All messages are shown in All Inboxes</string>

</resources>

feature/navigation/drawer/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ dependencies { 


    implementation(projects.core.ui.theme.api)

    implementation(projects.core.ui.compose.designsystem)

    implementation(projects.feature.account.accountmanager)



    implementation(projects.feature.account.avatar)

feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListItem.kt

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import app.k9mail.core.mail.folder.api.FolderType 
import app.k9mail.core.ui.compose.designsystem.atom.icon.Icon

import app.k9mail.core.ui.compose.designsystem.atom.icon.Icons

import app.k9mail.core.ui.compose.designsystem.organism.drawer.NavigationDrawerItem

import app.k9mail.feature.navigation.drawer.R

import app.k9mail.feature.account.accountmanager.R as AmR

import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccountFolder

import app.k9mail.feature.navigation.drawer.domain.entity.DisplayFolder

import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolder
@@ -59,7 +59,7 @@ private fun mapFolderName( 
@Composable

private fun mapUnifiedFolderName(folder: DisplayUnifiedFolder): String {

    return when (folder.unifiedType) {

        DisplayUnifiedFolderType.INBOX -> stringResource(R.string.navigation_drawer_unified_inbox_title)

        DisplayUnifiedFolderType.INBOX -> stringResource(AmR.string.navigation_drawer_unified_inbox_title_e)

    }

}

feature/widget/message-list/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ plugins { 
dependencies {

    implementation(projects.legacy.ui.legacy)

    implementation(projects.legacy.core)

    implementation(projects.feature.account.accountmanager)



    implementation(libs.timber)

}

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/BaseMessageListWidgetProvider.kt

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import android.content.Context 
import android.content.Intent

import android.widget.RemoteViews

import androidx.core.app.PendingIntentCompat

import app.k9mail.feature.account.accountmanager.R as AmR

import app.k9mail.legacy.search.SearchAccount.Companion.createUnifiedInboxAccount

import com.fsck.k9.CoreResourceProvider

import com.fsck.k9.activity.MessageCompose
@@ -36,7 +37,7 @@ abstract class BaseMessageListWidgetProvider : AppWidgetProvider(), KoinComponen 
    private fun updateAppWidget(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int) {

        val views = RemoteViews(context.packageName, R.layout.message_list_widget_layout)



        views.setTextViewText(R.id.folder, context.getString(R.string.message_list_widget_inbox_title))

        views.setTextViewText(R.id.folder, context.getString(AmR.string.message_list_widget_inbox_title_e))



        val intent = Intent(context, MessageListWidgetService::class.java)

        views.setRemoteAdapter(R.id.listView, intent)