From deddc5dd29be36e7312f6e4cdda439daf7497410 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Mon, 19 May 2025 13:11:31 +0200 Subject: [PATCH 01/14] fix version header --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eeaba80e3..811e3bd49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Delta Chat Android Changelog -## 1.58.4 +## v1.58.4 2025-05 * make in-chat apps properly work when they are not sent yet, in draft mode From 5587eda6573e3cc9154d9f115c306c820994b7bb Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 19 May 2025 21:37:10 +0200 Subject: [PATCH 02/14] clearer instructions how to add apps&co to a chat the instructions are shown when there are no Apps, Images etc. in a chat. while the "shared in this chat" wording is maybe more correct on an abstract way (there are other ways than "attach" to have an app), the "attached in this chat" points implicitly better to the new app selector - esp. as the same wording is used for "images", where the avg user usually knows about how to get that attached. this little rewording comes from a discussion with @hpk42, surely, there can be more improvements :) --- src/main/res/values/strings.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a95acc7aa..dd59003dd 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -466,7 +466,7 @@ Send Message to… Real-Time Apps - Enable real-time connections for apps shared in chats. If enabled, chat partners may be able to discover your IP address when you start an app. + Enable real-time connections for apps attached to chats. If enabled, chat partners may be able to discover your IP address when you start an app. Show locations in time frame @@ -518,15 +518,15 @@ Docs Links Map - Images and videos shared in this chat will appear here. - Documents and other files shared in this chat will appear here. - Images shared in this chat will appear here. - Videos shared in this chat will appear here. - Audio files and voice messages shared in this chat will appear here. - Apps shared in this chat will appear here. - Media shared in any chat will appear here. - Documents and other files shared in any chat will appear here. - Apps shared in any chat will appear here. + Images and videos attached to this chat will appear here. + Documents and other files attached to this chat will appear here. + Images attached to this chat will appear here. + Videos attached to this chat will appear here. + Audio files and voice messages attached to this chat will appear here. + Apps attached to this chat will appear here. + Media attached to any chat will appear here. + Documents and other files attached to any chat will appear here. + Apps attached to any chat will appear here. Media Preview Aspect Ratio Grid From a7b86dd59a8f5acfdf5d3da82aaca26651928fd9 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 21 May 2025 19:15:35 +0200 Subject: [PATCH 03/14] update translations --- src/main/res/values-cs/strings.xml | 4 ++++ src/main/res/values-de/strings.xml | 18 ++++++++++-------- src/main/res/values-ru/strings.xml | 18 +++++++++--------- src/main/res/values-uk/strings.xml | 4 ++++ src/main/res/values-zh-rCN/strings.xml | 20 ++++++++++---------- src/main/res/values/strings.xml | 2 ++ 6 files changed, 39 insertions(+), 27 deletions(-) diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 95858f5af..adfe95370 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -202,6 +202,10 @@ Obrázky a videa Soubor Soubory + Odeslat původní soubory a nekomprimované obrázky + + Vybrat ze Souborů + Vybrat z Galerie Aplikace diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 8da2b2399..83b1cc0db 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -56,6 +56,7 @@ Speichern Chat Medien + Apps & Medien Profil Hauptmenü Chat starten @@ -275,6 +276,7 @@ Datei exportieren Dateien exportieren Alle Medien + Alle Apps & Medien Im Chat zeigen App im Chat zeigen @@ -466,7 +468,7 @@ Nachricht senden an… Echtzeit-Apps - Aktiviert Echtzeitverbindungen für in Chats verwendeten Apps. Wenn aktiviert, können Chat-Partner möglicherweise Ihre IP-Adresse ermitteln, wenn Sie eine App starten. + Aktiviert Echtzeitverbindungen für an Chats angehängte Apps. Wenn aktiviert, können Chat-Partner möglicherweise Ihre IP-Adresse ermitteln, wenn Sie eine App starten. Standorte im Zeitrahmen anzeigen @@ -518,12 +520,12 @@ Dokumente Links Karte - In diesem Chat geteilte Bilder und Videos werden hier angezeigt. - In diesem Chat geteilte Dokumente und Dateien werden hier angezeigt. - In diesem Chat geteilte Bilder werden hier angezeigt. - In diesem Chat geteilte Videos werden hier angezeigt. - In diesem Chat geteilte Audiodateien und Sprachnachrichten werden hier angezeigt. - In diesem Chat geteilte Apps werden hier angezeigt. + Diesem Chat angehängte Bilder und Videos werden hier angezeigt. + Diesem Chat angehängte Dokumente und Dateien werden hier angezeigt. + Diesem Chat angehängte Bilder werden hier angezeigt. + Diesem Chat angehängte Videos werden hier angezeigt. + Diesem Chat angehängte Audiodateien und Sprachnachrichten werden hier angezeigt. + Diesem Chat angehängte Apps werden hier angezeigt. Medien aus allen Chats werden hier angezeigt. Dokumente und Dateien aus allen Chats werden hier angezeigt. Apps aus allen Chats werden hier angezeigt. @@ -1036,7 +1038,7 @@ Weiter Um Fotos oder Videos aufzunehmen, bitte in den System-Einstellungen DeltaChat den Zugriff auf die Kamera erlauben. - Um Audio-Nachrichten zu senden, bitte in den System-Einstellungen DeltaChat den Zugriff auf das Mikrophon erlauben. + Um Audio-Nachrichten zu senden, bitte in den System- oder App-Einstellungen den Zugriff auf das Mikrophon erlauben. Um Dateien zu empfangen oder zu versenden, bitte in den System-Einstellungen Delta Chat den Zugriff auf den Speicher erlauben. Um einen Standort anzuhängen, bitte in den Systemeinstellungen DeltaChat den Zugriff auf \"Standort\" erlauben. Um Benachrichtigungen zu erhalten, öffnen Sie \"Systemeinstellungen / Apps / Delta Chat\" und aktivieren Sie \"Benachrichtigungen\". diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index f192c209e..c616ccaa5 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -550,15 +550,15 @@ Документы Ссылки Карта - Здесь можно просмотреть изображения и видео, отправленные в этом чате. - Здесь можно просмотреть документы и другие файлы, отправленные в этом чате. - Здесь можно просмотреть изображения, отправленные в этом чате. - Здесь можно просмотреть видео, отправленные в этом чате. - Здесь можно просмотреть аудиофайлы и голосовые сообщения, отправленные в этом чате. - Здесь можно просмотреть приложения, отправленные в этом чате. - Здесь можно просмотреть медиафайлы, отправленные в любом чате. - Здесь можно просмотреть документы и другие файлы, отправленные в любом чате. - Здесь можно просмотреть приложения, полученные или отправленные в любом чате. + Изображения и видео, прикреплённые к этому чату, будут показаны здесь. + Документы и прочие файлы, прикреплённые к этому чату, будут показаны здесь. + Изображения, прикреплённые к этому чату, будут показаны здесь. + Видео, прикреплённые к этому чату, будут показаны здесь. + Аудиофайлы и голосовые сообщения, прикреплённые к этому чату, будут показаны здесь. + Приложения, прикреплённые к этому чату, будут показаны здесь. + Медиафайлы, из всех ваших чатов, будут показаны здесь. + Документы и прочие вложения, из всех ваших чатов, будут показаны здесь. + Приложения, из всех ваших чатов, будут показаны здесь. Предпросмотр медиафайлов Сетка с соотношением сторон diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index faec9af67..62aaedb46 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -202,6 +202,10 @@ Зображення та відео Файл Файли + Надсилати оригінальні файли та нестиснуті зображення + + Вибрати з Файлів + Вибрати з Галереї Застосунок diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index ac1b711cd..9f49fa5e4 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -450,7 +450,7 @@ 发送消息到... 实时应用 - 为聊天中共享的应用启用实时连接。如果启用，聊天伙伴可能能够在您启动应用时发现您的 IP 地址。 + 为聊天中附加的应用启用实时连接。如果启用，聊天伙伴可能会在您启动应用时发现您的 IP 地址。 显示时间范围内的位置 @@ -502,15 +502,15 @@ 文档 链接 地图 - 在此聊天中分享的图像和视频将显示于此。 - 在此聊天中分享的文档、音乐和其他文件将显示于此。 - 此聊天中分享的图片将显示在这里 - 此聊天中分享的视频将显示在这里 - 此聊天中分享的音频文件和语音消息将显示在这里。 - 在此聊天中分享的私人应用会出现在这里 - 任何聊天中分享的媒体文件都将出现在这里 - 在任何聊天中分享的文档和其他文件会出现在这里。 - 任何聊天中共享的应用都会出现在此处。 + 此聊天附加的图片和视频将显示在此处。 + 此聊天附加的文档和其他文件将显示在此处。 + 此聊天附加的图片将显示在此处。 + 此聊天附加的视频将显示在此处。 + 此聊天附加的音频文件和语音消息将显示在此处。 + 此聊天附加的应用将显示在此处。 + 任何聊天附加的媒体都将显示在此处。 + 任何聊天附加的文档和其他文件都将显示在此处。 + 任何聊天附加的应用都将显示在此处。 媒体预览 宽高比网格 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index dd59003dd..6f3294e49 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -56,6 +56,7 @@ Save Chat Media + Apps & Media Profile Main Menu Start Chat @@ -275,6 +276,7 @@ Export Attachment Export Attachments All Media + All Apps & Media Show in Chat Show App in Chat From 93c52ec5278f303c57f9efca31e4d61b1ccfd0c0 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 23 May 2025 12:56:15 +0200 Subject: [PATCH 04/14] remove redundant 'App' subtitle in 'Apps' list --- .../thoughtcrime/securesms/ProfileDocumentsAdapter.java | 2 +- .../org/thoughtcrime/securesms/components/WebxdcView.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java b/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java index c1fb1e320..426393328 100644 --- a/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java +++ b/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java @@ -108,7 +108,7 @@ class ProfileDocumentsAdapter extends StickyHeaderGridAdapter { viewHolder.documentView.setVisibility(View.GONE); viewHolder.webxdcView.setVisibility(View.VISIBLE); - viewHolder.webxdcView.setWebxdc(dcMsg, context.getString(R.string.webxdc_app)); + viewHolder.webxdcView.setWebxdc(dcMsg, ""); viewHolder.webxdcView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg)); viewHolder.webxdcView.setOnLongClickListener(view -> { itemClickListener.onMediaLongClicked(dcMsg); return true; }); viewHolder.itemView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg)); diff --git a/src/main/java/org/thoughtcrime/securesms/components/WebxdcView.java b/src/main/java/org/thoughtcrime/securesms/components/WebxdcView.java index 0dc7ec984..65d6667d3 100644 --- a/src/main/java/org/thoughtcrime/securesms/components/WebxdcView.java +++ b/src/main/java/org/thoughtcrime/securesms/components/WebxdcView.java @@ -86,7 +86,12 @@ public class WebxdcView extends FrameLayout { if (summary.isEmpty()) { summary = defaultSummary; } - appSubtitle.setText(summary); + if (summary.isEmpty()) { + appSubtitle.setVisibility(View.GONE); + } else { + appSubtitle.setVisibility(View.VISIBLE); + appSubtitle.setText(summary); + } } public String getDescription() { From 04ed9e27c130ee787dd4d332a189eff4405089d1 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 23 May 2025 13:03:31 +0200 Subject: [PATCH 05/14] remove ambigious time from app list it is unclear, which time this is - time of adding or time of last update? it is the prior, however, both are not important enough to clutter the list, also desktop/ios do not show them. i assume, the time display was just kept when adapting from files view. by making the apps easier accessible, (cmp https://github.com/deltachat/deltachat-ios/pull/2721 ) we really only want an uncluttered list. --- .../org/thoughtcrime/securesms/ProfileDocumentsAdapter.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java b/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java index 426393328..424547412 100644 --- a/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java +++ b/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java @@ -102,6 +102,7 @@ class ProfileDocumentsAdapter extends StickyHeaderGridAdapter { viewHolder.audioView.setOnLongClickListener(view -> { itemClickListener.onMediaLongClicked(dcMsg); return true; }); viewHolder.audioView.disablePlayer(!selected.isEmpty()); viewHolder.itemView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg)); + viewHolder.date.setVisibility(View.VISIBLE); } else if (slide != null && slide.isWebxdcDocument()) { viewHolder.audioView.setVisibility(View.GONE); @@ -112,6 +113,7 @@ class ProfileDocumentsAdapter extends StickyHeaderGridAdapter { viewHolder.webxdcView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg)); viewHolder.webxdcView.setOnLongClickListener(view -> { itemClickListener.onMediaLongClicked(dcMsg); return true; }); viewHolder.itemView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg)); + viewHolder.date.setVisibility(View.GONE); } else if (slide != null && slide.hasDocument()) { viewHolder.audioView.setVisibility(View.GONE); @@ -122,11 +124,13 @@ class ProfileDocumentsAdapter extends StickyHeaderGridAdapter { viewHolder.documentView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg)); viewHolder.documentView.setOnLongClickListener(view -> { itemClickListener.onMediaLongClicked(dcMsg); return true; }); viewHolder.itemView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg)); + viewHolder.date.setVisibility(View.VISIBLE); } else { viewHolder.documentView.setVisibility(View.GONE); viewHolder.audioView.setVisibility(View.GONE); viewHolder.webxdcView.setVisibility(View.GONE); + viewHolder.date.setVisibility(View.GONE); } viewHolder.itemView.setOnLongClickListener(view -> { itemClickListener.onMediaLongClicked(dcMsg); return true; }); From bb410a1bb109417e3db68ebbbb1bc175e42305f4 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 23 May 2025 13:43:19 +0200 Subject: [PATCH 06/14] update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 811e3bd49..13fb13633 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Delta Chat Android Changelog +## Unreleased + +* Clearer app lists by removing redundant "App" subtitle + ## v1.58.4 2025-05 From 47350b180961e0212588fcb0cc45438d90ba3e8a Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 23 May 2025 14:26:34 +0200 Subject: [PATCH 07/14] 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 08/14] 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 09/14] 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 10/14] 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 11/14] 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 12/14] 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 13/14] 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 14/14] 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