diff --git a/CHANGELOG-upstream.md b/CHANGELOG-upstream.md
index eeaba80e3..3f270e185 100644
--- a/CHANGELOG-upstream.md
+++ b/CHANGELOG-upstream.md
@@ -1,6 +1,13 @@
# Delta Chat Android Changelog
-## 1.58.4
+## 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
+* Improve hint for app drafts
+
+## v1.58.4
2025-05
* make in-chat apps properly work when they are not sent yet, in draft mode
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/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
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
index 3ab2b0fa4..e40b9bd45 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
@@ -532,6 +532,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;
@@ -612,10 +615,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);
}
@@ -873,7 +879,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/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java b/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
index c1fb1e320..424547412 100644
--- a/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
+++ b/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
@@ -102,16 +102,18 @@ 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);
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));
+ 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; });
diff --git a/src/main/java/org/thoughtcrime/securesms/components/WebxdcView.java b/src/main/java/org/thoughtcrime/securesms/components/WebxdcView.java
index 997ea4cc9..84ced7bbe 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() {
diff --git a/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
index 7476cf926..c3dbd0e65 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/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 3a790bd33..69668c4ab 100644
--- a/src/main/res/layout/attachment_type_selector.xml
+++ b/src/main/res/layout/attachment_type_selector.xml
@@ -111,9 +111,9 @@
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"
+ android:contentDescription="@string/webxdc_app"
app:circleColor="@color/apps_icon"
/>
@@ -121,7 +121,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/AttachmentTypeLabel"
- android:text="@string/webxdc_apps"/>
+ android:text="@string/webxdc_app"/>
diff --git a/src/main/res/menu/conversation.xml b/src/main/res/menu/conversation.xml
index 46be4a3a6..d21b28434 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"/>
+