From 47350b180961e0212588fcb0cc45438d90ba3e8a Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 23 May 2025 14:26:34 +0200 Subject: [PATCH 1/8] show action button to see the list of apps sent in chat --- .../thoughtcrime/securesms/ConversationActivity.java | 10 ++++++++-- src/main/res/menu/conversation.xml | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index 8883b61f6..cdd31e0a8 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -526,6 +526,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } else if (itemId == R.id.menu_show_map) { WebxdcActivity.openMaps(this, chatId); return true; + } else if (itemId == R.id.menu_show_apps) { + handleProfile(true); + return true; } else if (itemId == R.id.menu_search_up) { handleMenuSearchNext(false); return true; @@ -606,10 +609,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } } - private void handleProfile() { + private void handleProfile(boolean showApps) { Intent intent = new Intent(this, ProfileActivity.class); intent.putExtra(ProfileActivity.CHAT_ID_EXTRA, chatId); intent.putExtra(ProfileActivity.FROM_CHAT, true); + if (showApps) { + intent.putExtra(ProfileActivity.FORCE_TAB_EXTRA, ProfileActivity.TAB_WEBXDC); + } startActivity(intent); overridePendingTransition(0, 0); } @@ -863,7 +869,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity buttonToggle.getBackground().invalidateSelf(); }); - titleView.setOnClickListener(v -> handleProfile()); + titleView.setOnClickListener(v -> handleProfile(false)); titleView.setOnBackClickedListener(view -> handleReturnToConversationList()); composeText.setOnKeyListener(composeKeyPressedListener); diff --git a/src/main/res/menu/conversation.xml b/src/main/res/menu/conversation.xml index 46be4a3a6..4e0088568 100644 --- a/src/main/res/menu/conversation.xml +++ b/src/main/res/menu/conversation.xml @@ -25,6 +25,11 @@ android:visible="false" app:showAsAction="always"/> + + @@ -34,7 +39,7 @@ + app:showAsAction="never" /> From 56f55be938850dc8b0e678b00e13ad7272ce7e1f Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 23 May 2025 15:07:19 +0200 Subject: [PATCH 2/8] update apps icon --- src/main/res/drawable/baseline_apps_24.xml | 3 --- src/main/res/drawable/ic_apps_24.xml | 3 +++ src/main/res/layout/attachment_type_selector.xml | 2 +- src/main/res/menu/conversation.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 src/main/res/drawable/baseline_apps_24.xml create mode 100644 src/main/res/drawable/ic_apps_24.xml diff --git a/src/main/res/drawable/baseline_apps_24.xml b/src/main/res/drawable/baseline_apps_24.xml deleted file mode 100644 index 18dae5c30..000000000 --- a/src/main/res/drawable/baseline_apps_24.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/main/res/drawable/ic_apps_24.xml b/src/main/res/drawable/ic_apps_24.xml new file mode 100644 index 000000000..f578daeb2 --- /dev/null +++ b/src/main/res/drawable/ic_apps_24.xml @@ -0,0 +1,3 @@ + + + diff --git a/src/main/res/layout/attachment_type_selector.xml b/src/main/res/layout/attachment_type_selector.xml index 6a6fc0a00..e75a4ae88 100644 --- a/src/main/res/layout/attachment_type_selector.xml +++ b/src/main/res/layout/attachment_type_selector.xml @@ -195,7 +195,7 @@ android:id="@+id/webxdc_button" android:layout_width="53dp" android:layout_height="53dp" - android:src="@drawable/baseline_apps_24" + android:src="@drawable/ic_apps_24" android:scaleType="center" android:contentDescription="@string/webxdc_apps" app:circleColor="@color/apps_icon" diff --git a/src/main/res/menu/conversation.xml b/src/main/res/menu/conversation.xml index 4e0088568..d21b28434 100644 --- a/src/main/res/menu/conversation.xml +++ b/src/main/res/menu/conversation.xml @@ -27,7 +27,7 @@ Date: Fri, 23 May 2025 15:13:24 +0200 Subject: [PATCH 3/8] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13fb13633..75e480de4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## Unreleased * Clearer app lists by removing redundant "App" subtitle +* New button for quick access to the apps sent in current chat +* New icon for the in-chat apps button ## v1.58.4 2025-05 From e6655fa21d58dce4638c51167e2bb63b42302249 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 23 May 2025 12:31:25 +0200 Subject: [PATCH 4/8] point out that app drafts need to be sent we got some feedback, that ppl were wondering if others can use an app once drafted and opend. the old title "Tap to open" might even underline that impression. this PR changes the title to "Tap 'Send' to share" (we need to be super-short here, "Tap 'Send' to let others use the app" is already too much :) the sending out of apps is the much more important step than to open, play a game and then wondering ... ppl will figure out the latter themselves, wondering if one can configure eg. a poll before sending - and if not, then it's that. --- .../org/thoughtcrime/securesms/mms/AttachmentManager.java | 4 ++-- src/main/res/values/strings.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java index d00fe7e9a..8e7a592c8 100644 --- a/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -312,7 +312,7 @@ public class AttachmentManager { } else if (slide.hasDocument()) { if (slide.isWebxdcDocument()) { DcMsg instance = msg != null ? msg : DcHelper.getContext(context).getMsg(slide.dcMsgId); - webxdcView.setWebxdc(instance, context.getString(R.string.videochat_tap_to_open)); + webxdcView.setWebxdc(instance, context.getString(R.string.webxdc_draft_hint)); webxdcView.setWebxdcClickListener((v, s) -> { WebxdcActivity.openWebxdcActivity(context, instance); }); @@ -409,7 +409,7 @@ public class AttachmentManager { if (slide.isPresent()) { if (slide.get().isWebxdcDocument()) { if (webxdcView != null) { - webxdcView.setWebxdc(DcHelper.getContext(context).getMsg(slide.get().dcMsgId), context.getString(R.string.videochat_tap_to_open)); + webxdcView.setWebxdc(DcHelper.getContext(context).getMsg(slide.get().dcMsgId), context.getString(R.string.webxdc_draft_hint)); } } } diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 6f3294e49..c4de54441 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -195,6 +195,7 @@ Apps App Picker URL If set, the URL will be used as the App Picker instead of the default one + Tap \"Send\" to share Home Games Tools From 29d04afc516f2a03b903e7c7938b87879af90616 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 23 May 2025 13:45:46 +0200 Subject: [PATCH 5/8] update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75e480de4..3f270e185 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Clearer app lists by removing redundant "App" subtitle * New button for quick access to the apps sent in current chat * New icon for the in-chat apps button +* Improve hint for app drafts ## v1.58.4 2025-05 From 27875b83bc32a978b5c1a36a2733286f4dab3d80 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sat, 24 May 2025 16:02:57 +0200 Subject: [PATCH 6/8] unify singular/plural in attach menu also otherwise, we say "[attach] Contact", "[attach] File", "[attach] Video" etc. - so it should be "[attach] App" as well. this is also what desktop/iOS are doing. the title in the app picker itself, however, is fine with reading "Apps" - it shows multiple ones --- src/main/res/layout/attachment_type_selector.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/res/layout/attachment_type_selector.xml b/src/main/res/layout/attachment_type_selector.xml index e75a4ae88..114932d4d 100644 --- a/src/main/res/layout/attachment_type_selector.xml +++ b/src/main/res/layout/attachment_type_selector.xml @@ -197,7 +197,7 @@ android:layout_height="53dp" android:src="@drawable/ic_apps_24" android:scaleType="center" - android:contentDescription="@string/webxdc_apps" + android:contentDescription="@string/webxdc_app" app:circleColor="@color/apps_icon" /> @@ -205,7 +205,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/AttachmentTypeLabel" - android:text="@string/webxdc_apps"/> + android:text="@string/webxdc_app"/> From 813d4324f72981e6b7e6116056113929e8e7314c Mon Sep 17 00:00:00 2001 From: Yurt Page Date: Sun, 25 May 2025 11:36:40 +0300 Subject: [PATCH 7/8] README.md: add link Transifex translations --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f881688b7..945f2a11f 100644 --- a/README.md +++ b/README.md @@ -245,6 +245,8 @@ Android metadata and changelogs are translated using [Weblate](https://hosted.we Translation status +App strings and website are translated using [Transifex](https://app.transifex.com/delta-chat/). + # Credits Many of the user interface classes were based on the Android Signal messenger when we ported it from the former Telegram-UI base in 2019. From 201f6e46b005bfa2fc98ad0c80465d74d4914d11 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sun, 25 May 2025 11:48:51 +0200 Subject: [PATCH 8/8] remove 'metadata' folder again the 'metadata' folder was already removed at https://github.com/deltachat/deltachat-android/pull/3211/files , however then re-created with unimportant files by weblate, cmp. https://github.com/deltachat/deltachat-android/issues/3414 as the latter seems to be no longer the case, remove the folder again and see if it stays away now :) --- metadata/de/short_description.txt | 1 - metadata/it/changelogs/6864.txt | 7 ------- metadata/it/changelogs/6904.txt | 4 ---- metadata/pt-BR/full_description.txt | 12 ------------ 4 files changed, 24 deletions(-) delete mode 100644 metadata/de/short_description.txt delete mode 100644 metadata/it/changelogs/6864.txt delete mode 100644 metadata/it/changelogs/6904.txt delete mode 100644 metadata/pt-BR/full_description.txt diff --git a/metadata/de/short_description.txt b/metadata/de/short_description.txt deleted file mode 100644 index 36a005180..000000000 --- a/metadata/de/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Schreibe Nachrichten mit E-Mails. Retro, Offen. Privatsphäre im Design. diff --git a/metadata/it/changelogs/6864.txt b/metadata/it/changelogs/6864.txt deleted file mode 100644 index ab3bcb224..000000000 --- a/metadata/it/changelogs/6864.txt +++ /dev/null @@ -1,7 +0,0 @@ -- nuovo inserimento: puoi creare un nuovo profilo con un tocco su "Crea Nuovo Profilo" - oppure utilizzare un accesso esistente o la configurazione del secondo dispositivo come al solito -i contatti possono essere allegati come "Schede" in "Allega/Contatto"; quando il destinatario tocca le carte, è possibile stabilire la crittografia end-to-end garantita -- aggiungi contatti manualmente in "Nuova Chat / Nuovo Contatto / Aggiungi Contatto Manualmente" - - invia qualsiasi emoji come reazione - - mostrare le reazioni nei riepiloghi - - blocca/archivia/ecc. le chat direttamente dai risultati di ricerca - - Risolti bug e altro ancora diff --git a/metadata/it/changelogs/6904.txt b/metadata/it/changelogs/6904.txt deleted file mode 100644 index a6cffadc4..000000000 --- a/metadata/it/changelogs/6904.txt +++ /dev/null @@ -1,4 +0,0 @@ -- aggiungi un'opzione per contrassegnare tutte le chat selezionate come "Lette" (tocca a lungo una chat per avviare la modalità di selezione) - - i nuovi profili chatmail per dispositivo singolo hanno come impostazione predefinita "Elimina Messaggi Dopo il Download" - - quando si utilizza un profilo chatmail su più dispositivi, la cancellazione viene modificata in "Automatica" (la strategia di cancellazione dipende quindi dal server) - - Risolti bug e altro ancora diff --git a/metadata/pt-BR/full_description.txt b/metadata/pt-BR/full_description.txt deleted file mode 100644 index cd7a7dc0d..000000000 --- a/metadata/pt-BR/full_description.txt +++ /dev/null @@ -1,12 +0,0 @@ -Delta Chat é um aplicativo de mensagens que é completamente compatível com a infraestrutura de email já existente. -Assim, com o Delta Chat você tem a facilidade de muitos aplicativos de mensagens com o alcance de email. Além disso, você é independente de outras companhias e sercviços -- já que suas informações e dados não estão relacionadas com o Delta Chat, você não vai nem adicionar novas permissões aqui. -Resumo de alguns recursos: -* Seguro com criptografia de ponta a ponta, com suporte ao novo padrão Autocrypt -* Rápido usando Push-IMAP -* Maior base de usuários -- destinatários que não estiverem usando Delta Chat podem ser alcançados também -* Compatívle -- não apenas consigo mesmo -* Interface de usuário elegante e simples -* Sistema distribuído -* Sem spam -- apenas mensages de usuários conhecidos são mostradas por padrão -* Confiável -- pode até ser usado para mensagens comerciais -* Completamente OpenSource e baseado em padrões