From 10a209487e585dd7d0233528787a1fa8b7c0c1ce Mon Sep 17 00:00:00 2001 From: Lefucjusz Date: Wed, 18 May 2022 11:47:08 +0200 Subject: [PATCH] [MOS-363] Call app texts not fully shown fix Fixes for the cut texts in call app problem. Problematic texts have been shortened and additionally icons have been slightly widened. --- image/assets/lang/Deutsch.json | 8 ++++---- image/assets/lang/Espanol.json | 4 ++-- image/assets/lang/Francais.json | 6 +++--- image/assets/lang/Polski.json | 4 ++-- image/assets/lang/Svenska.json | 4 ++-- module-apps/application-call/widgets/StateIcon.hpp | 8 ++++---- module-apps/application-call/widgets/StateIcons.cpp | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/image/assets/lang/Deutsch.json b/image/assets/lang/Deutsch.json index 7c3adf69fe5deebf09bf3ff1aafc10cf51b6024d..f3fe13cb358a50a35181f8567e92f9aa0fe0b96f 100644 --- a/image/assets/lang/Deutsch.json +++ b/image/assets/lang/Deutsch.json @@ -298,7 +298,7 @@ "app_desktop_show": "ZEIGEN", "app_desktop_calls": "ANRUFE", "app_desktop_clear": "LEEREN", - "app_desktop_clear_all": "ALLES LEEREN", + "app_desktop_clear_all": "KPL.-LEER.", "app_desktop_replay": "ANTWORTEN", "app_popup_volume_text": "LAUTSTÄRKE", "app_popup_music_volume_text": "MUSIKLAUTSTÄRKE", @@ -309,7 +309,7 @@ "app_call_reject": "ABLEHNEN", "app_call_answer": "ANTWORTEN", "app_call_message": "NACHRICHT", - "app_call_end_call": "ANRUF BEENDEN", + "app_call_end_call": "ANRUF ENDE", "app_call_emergency": "Notruf", "app_call_is_calling": "ruft an", "app_call_calling": "wird angerufen", @@ -318,8 +318,8 @@ "app_call_contact": "KONTAKT", "app_call_mute": "STUMMSCHALTEN", "app_call_muted": "STUMM", - "app_call_speaker": "LAUTSPRECHER", - "app_call_speaker_on": "LAUTSPRECHER AN", + "app_call_speaker": "LTSPR.", + "app_call_speaker_on": "LTSPR. AN", "app_call_bluetooth": "BLUETOOTH", "app_call_no_sim": "Keine SIM-Karte.\n\nZum Anrufen\nSIM-Karte einsetzen.", "app_call_no_network_connection": "Keine Netzwerkverbindung.", diff --git a/image/assets/lang/Espanol.json b/image/assets/lang/Espanol.json index 546242fb13f66b22bb81acf2c2bb910120a3c2c0..c9bae6b8569de43ebc0ff66c487cb5b3e7e435d8 100644 --- a/image/assets/lang/Espanol.json +++ b/image/assets/lang/Espanol.json @@ -309,7 +309,7 @@ "app_call_reject": "RECHAZAR", "app_call_answer": "RESPONDER", "app_call_message": "MENSAJE", - "app_call_end_call": "FINALIZAR LLAMADA", + "app_call_end_call": "COLGAR", "app_call_emergency": "Llamada de emergencia", "app_call_is_calling": "está llamando", "app_call_calling": "llamando...", @@ -319,7 +319,7 @@ "app_call_mute": "SILENCIAR", "app_call_muted": "SILENCIADO", "app_call_speaker": "ALTAVOZ", - "app_call_speaker_on": "ALTAVOZ ACTIVADO", + "app_call_speaker_on": "ALTAVOZ ON", "app_call_bluetooth": "BLUETOOTH", "app_call_no_sim": "No hay SIM.\n\nPara hacer una llamada,\ndebes insertar una tarjeta SIM.", "app_call_no_network_connection": "No hay conexión de red.", diff --git a/image/assets/lang/Francais.json b/image/assets/lang/Francais.json index 465760fbbef5fe5e07db16d1332a5caaf4a387dd..d461f4359e855e046acfcb6effe41f1c169287d3 100644 --- a/image/assets/lang/Francais.json +++ b/image/assets/lang/Francais.json @@ -278,7 +278,7 @@ "app_call_reject": "REJETER", "app_call_answer": "RÉPONDRE", "app_call_message": "MESSAGE", - "app_call_end_call": "RACCROCHER", + "app_call_end_call": "RACCR.", "app_call_emergency": "Appel d'urgence", "app_call_is_calling": "appelle", "app_call_calling": "Appel en cours...", @@ -287,8 +287,8 @@ "app_call_contact": "CONTACT", "app_call_mute": "MUET", "app_call_muted": "SILENCIEUX", - "app_call_speaker": "HAUT-PARLEUR", - "app_call_speaker_on": "HAUT-PARLEUR ACTIVÉ", + "app_call_speaker": "HP", + "app_call_speaker_on": "HP ACTIVÉ", "app_call_bluetooth": "BLUETOOTH", "app_call_no_sim": "Pas de carte SIM.\n\nPour faire un appel,\nveuillez insérer une carte SIM.", "app_call_no_network_connection": "Pas de connexion réseau.", diff --git a/image/assets/lang/Polski.json b/image/assets/lang/Polski.json index 24751eedd77a742f09064227567989921a1b3a46..a95577996b22725d86c7b087c1605aadc9501874 100644 --- a/image/assets/lang/Polski.json +++ b/image/assets/lang/Polski.json @@ -317,8 +317,8 @@ "app_call_emergency": "Połączenie alarmowe", "app_call_is_calling": "dzwoni", "app_call_calling": "dzwoni…", - "app_call_call_ended": "połączenie zakończone", - "app_call_call_rejected": "połączenie odrzucone", + "app_call_call_ended": "poł. zakończone", + "app_call_call_rejected": "poł. odrzucone", "app_call_contact": "KONTAKT", "app_call_mute": "WYCISZ", "app_call_muted": "WYCISZONE", diff --git a/image/assets/lang/Svenska.json b/image/assets/lang/Svenska.json index 3dd5ef54c524d8421dae961a8b462e3d2c2f4aab..753e32406e6835762c0aa04f550cb3a72d2e0a62 100644 --- a/image/assets/lang/Svenska.json +++ b/image/assets/lang/Svenska.json @@ -260,9 +260,9 @@ "app_call_mute": "STUM", "app_call_muted": "MIC. AV", "app_call_speaker": "HÖGT.", - "app_call_speaker_on": "HÖGT.PÅ", + "app_call_speaker_on": "HÖGT. PÅ", "app_call_bluetooth": "BLUETOOTH", - "app_call_no_sim": "För att ringa,,\nsätt i ett SIM-kort.", + "app_call_no_sim": "För att ringa,\nsätt i ett SIM-kort.", "app_call_no_network_connection": "Ingen nätverksanslutning.", "app_call_call_request_failed": "Något gick fel.", "app_call_offline": "Du är frånkopplad.\n\nByt till \"ansluten\"\nför att ringa.", diff --git a/module-apps/application-call/widgets/StateIcon.hpp b/module-apps/application-call/widgets/StateIcon.hpp index 53dbaf66957eeead6886dc0a3421e5125c0e4e00..9c141cfe3eba13863c101a55a01e5a744e1d5c90 100644 --- a/module-apps/application-call/widgets/StateIcon.hpp +++ b/module-apps/application-call/widgets/StateIcon.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #pragma once @@ -16,9 +16,9 @@ namespace gui { namespace icon { - constexpr uint32_t w = 100; - constexpr uint32_t h = 100; - constexpr uint32_t defaultSideMargin = 20; + constexpr uint32_t w = 150; + constexpr uint32_t h = 100; + constexpr uint32_t defaultSideMargin = 5; } // namespace icon /// @brief Icon widget with custom predefined images and strings diff --git a/module-apps/application-call/widgets/StateIcons.cpp b/module-apps/application-call/widgets/StateIcons.cpp index a728f5a76e7468657219a4f92dd55d35c87b046f..31865796a8524ddeb759eb5505d8f5122c2dd2dd 100644 --- a/module-apps/application-call/widgets/StateIcons.cpp +++ b/module-apps/application-call/widgets/StateIcons.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "CallAppStyle.hpp" @@ -19,7 +19,7 @@ namespace gui constexpr auto speakerImg = "call_speaker"; constexpr auto speakerOnImg = "call_speaker_on"; constexpr auto speakerStr = "app_call_speaker"; - constexpr auto speakerOnStr = "app_call_speaker"; + constexpr auto speakerOnStr = "app_call_speaker_on"; const StateIcon::IconMap contactIconMap = { {AddContactIconState::ADD_CONTACT, {crossImg, addContactStr}}};