Skip to content

Commit

Permalink
Replace account_common_title by AppNameProvider
Browse files Browse the repository at this point in the history
  • Loading branch information
wmontwe committed Jun 13, 2024
1 parent 3aec5e0 commit c5d0ea4
Show file tree
Hide file tree
Showing 80 changed files with 124 additions and 55 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,17 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import app.k9mail.core.ui.compose.designsystem.atom.text.TextDisplayMedium
import app.k9mail.core.ui.compose.designsystem.template.ResponsiveWidthContainer
import app.k9mail.core.ui.compose.theme2.MainTheme
import app.k9mail.feature.account.common.R

private const val TITLE_ICON_SIZE_DP = 56

@Composable
fun AppTitleTopHeader(
title: String,
modifier: Modifier = Modifier,
title: String = stringResource(id = R.string.account_common_title),
) {
ResponsiveWidthContainer(
modifier = Modifier
Expand Down
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-az/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
<resources>
<string name="account_common_button_next">Növbəti</string>
<string name="account_common_button_back">Geri</string>
<string name="account_common_title">K-9 Mail</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
<resources>
<string name="account_common_button_next">Напред</string>
<string name="account_common_button_back">Назад</string>
<string name="account_common_title">К-9 Поща</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-bs/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_button_next">Sljedeći</string>
<string name="account_common_button_back">Nazad</string>
<string name="account_common_error_server_message">Server je odgovorio ovom porukom:
Expand Down
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Endavant</string>
<string name="account_common_button_back">Enrere</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">El servidor ha retornat en següent missatge:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-co/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
<string name="account_common_button_back">Ritornu</string>
<string name="account_common_error_server_message">U servitore hà mandatu quessu messaghju :
\n%s</string>
<string name="account_common_title">K-9 Mail</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Další</string>
<string name="account_common_button_back">Zpět</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">Server vrátil následující zprávu:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
<resources>
<string name="account_common_button_next">Næste</string>
<string name="account_common_button_back">Tilbage</string>
<string name="account_common_title">K-9 Mail</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_button_next">Weiter</string>
<string name="account_common_button_back">Zurück</string>
<string name="account_common_error_server_message">Der Server hat die folgende Nachricht zurückgegeben:
Expand Down
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
<resources>
<string name="account_common_button_next">Επόμενο</string>
<string name="account_common_button_back">Πίσω</string>
<string name="account_common_title">K-9 Mail</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
<resources>
<string name="account_common_button_next">Next</string>
<string name="account_common_button_back">Back</string>
<string name="account_common_title">K-9 Mail</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-eo/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
\n%s</string>
<string name="account_common_button_next">Sekven</string>
<string name="account_common_button_back">Reen</string>
<string name="account_common_title">K-9 Retpoŝtilo</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Siguiente</string>
<string name="account_common_button_back">Atrás</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">El servidor devolvió el siguiente mensaje:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-et/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Edasi</string>
<string name="account_common_button_back">Tagasi</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">Serveri vastuses sisaldus selline sõnum:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-eu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Hurrengoa</string>
<string name="account_common_button_back">Aurrekoa</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">Zerbitzariak mezu hau itzuli du:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">بعدی</string>
<string name="account_common_button_back">بازگشت</string>
<string name="account_common_title">نامهٔ کِی۹</string>
<string name="account_common_error_server_message">کارساز، پیام زیر را برگردانده است:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Seuraava</string>
<string name="account_common_button_back">Takaisin</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">Palvelin palautti seuraavan viestin:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Suivant</string>
<string name="account_common_button_back">Précédent</string>
<string name="account_common_title">Courriel K-9 Mail</string>
<string name="account_common_error_server_message">Le message suivant a été retourné par le serveur :
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-fy/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Folgjende</string>
<string name="account_common_button_back">Tebek</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">De server joech it folgjende berjocht werom:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
<resources>
<string name="account_common_button_next">अगला</string>
<string name="account_common_button_back">पिछला</string>
<string name="account_common_title">K-9 मेल</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
<resources>
<string name="account_common_button_next">Következő</string>
<string name="account_common_button_back">Vissza</string>
<string name="account_common_title">K-9 Mail</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
\n%s</string>
<string name="account_common_button_next">Berikutnya</string>
<string name="account_common_button_back">Kembali</string>
<string name="account_common_title">K-9 Mail</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-is/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Næsta</string>
<string name="account_common_button_back">Til baka</string>
<string name="account_common_title">K-9 - Póstur</string>
<string name="account_common_error_server_message">Póstþjónninn svaraði með eftirfarandi skilaboðum:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Successivo</string>
<string name="account_common_button_back">Precedente</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">Il server ha restituito il seguente messaggio:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-iw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_error_server_message">השרת החזיר את השגיאה הבאה:
\n%s</string>
<string name="account_common_title">דוא\"ל K-9</string>
<string name="account_common_button_next">הבא</string>
<string name="account_common_button_back">הקודם</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">次へ</string>
<string name="account_common_button_back">戻る</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">サーバーから以下のメッセージが返答されました:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">다음</string>
<string name="account_common_button_back">이전</string>
<string name="account_common_title">K-9 메일</string>
<string name="account_common_error_server_message">서버가 다음의 메시지를 보냈습니다:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-lt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_error_server_message">Serverio grąžintas pranešimas:
\n%s</string>
<string name="account_common_title">K-9 paštas</string>
<string name="account_common_button_next">Toliau</string>
<string name="account_common_button_back">Atgal</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Neste</string>
<string name="account_common_button_back">Tilbake</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">Tjeneren svarte følgende:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Volgende</string>
<string name="account_common_button_back">Terug</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">De server gaf het volgende bericht terug:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Dalej</string>
<string name="account_common_button_back">Cofnij</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">Serwer zwrócił następujący komunikat:
\n%s</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Próximo</string>
<string name="account_common_button_back">Voltar</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">O servidor retornou a seguinte mensagem:
\n%s</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Próximo</string>
<string name="account_common_button_back">Anterior</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">O servidor retornou a seguinte mensagem:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-ro/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Înainte</string>
<string name="account_common_button_back">Înapoi</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">Serverul a returnat următorul mesaj:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
<string name="account_common_button_back">Назад</string>
<string name="account_common_error_server_message">Сервер вернул следующее сообщение:
\n%s</string>
<string name="account_common_title">K-9 Mail</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-sk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Ďalej</string>
<string name="account_common_button_back">Späť</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">Server vrátil nasledujúcu správu:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-sl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Naslednji</string>
<string name="account_common_button_back">Prejšnji</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">Strežnik je vrnil naslednje sporočilo:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-sq/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Pasuesi</string>
<string name="account_common_button_back">Mbrapsht</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">Shërbyesi ktheu mesazhin vijues:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-sv/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_button_next">Nästa</string>
<string name="account_common_button_back">Tillbaka</string>
<string name="account_common_error_server_message">Servern returnerade följande meddelande:
Expand Down
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">İleri</string>
<string name="account_common_button_back">Geri</string>
<string name="account_common_title">K-9 Posta</string>
<string name="account_common_error_server_message">Sunucu aşağıdaki hatayı döndürdü:
\n%s</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values-vi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">Kế tiếp</string>
<string name="account_common_button_back">Quay lại</string>
<string name="account_common_title">Thư K-9</string>
<string name="account_common_error_server_message">Máy chủ trả lại tin nhắn sau:
\n%s</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<resources>
<string name="account_common_button_next">下一步</string>
<string name="account_common_button_back">返回</string>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_error_server_message">服务器返回了以下消息:
\n%s</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
<resources>
<string name="account_common_button_next">下一步</string>
<string name="account_common_button_back">返回</string>
<string name="account_common_title">K-9 Mail</string>
</resources>
1 change: 0 additions & 1 deletion feature/account/common/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="account_common_title">K-9 Mail</string>
<string name="account_common_button_next">Next</string>
<string name="account_common_button_back">Back</string>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import app.k9mail.feature.account.server.settings.ui.incoming.IncomingServerSett
import app.k9mail.feature.account.server.validation.ui.IncomingServerValidationViewModel
import app.k9mail.feature.account.server.validation.ui.ServerValidationScreen
import org.koin.androidx.compose.koinViewModel
import org.koin.compose.koinInject
import org.koin.core.parameter.parametersOf

private const val NESTED_NAVIGATION_ROUTE_MODIFY = "modify"
Expand Down Expand Up @@ -57,6 +58,7 @@ fun EditIncomingServerSettingsNavHost(
viewModel = koinViewModel<IncomingServerValidationViewModel> {
parametersOf(accountUuid)
},
appNameProvider = koinInject(),
)
}
composable(route = NESTED_NAVIGATION_ROUTE_SAVE) {
Expand Down
Loading

0 comments on commit c5d0ea4

Please sign in to comment.