yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-06 11:59:58 +02:00
Code Issues Releases Wiki Activity

show action button to see the list of apps sent in chat

Browse source
This commit is contained in:
adbenitez 2025-05-23 14:26:34 +02:00
parent bb410a1bb1
commit 47350b1809
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -526,6 +526,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} else if (itemId == R.id.menu_show_map) { } else if (itemId == R.id.menu_show_map) {
WebxdcActivity.openMaps(this, chatId); WebxdcActivity.openMaps(this, chatId);
return true; return true;
} else if (itemId == R.id.menu_show_apps) {
handleProfile(true);
return true;
} else if (itemId == R.id.menu_search_up) { } else if (itemId == R.id.menu_search_up) {
handleMenuSearchNext(false); handleMenuSearchNext(false);
return true; 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 intent = new Intent(this, ProfileActivity.class);
intent.putExtra(ProfileActivity.CHAT_ID_EXTRA, chatId); intent.putExtra(ProfileActivity.CHAT_ID_EXTRA, chatId);
intent.putExtra(ProfileActivity.FROM_CHAT, true); intent.putExtra(ProfileActivity.FROM_CHAT, true);
if (showApps) {
intent.putExtra(ProfileActivity.FORCE_TAB_EXTRA, ProfileActivity.TAB_WEBXDC);
}
startActivity(intent); startActivity(intent);
overridePendingTransition(0, 0); overridePendingTransition(0, 0);
} }
@ -863,7 +869,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
buttonToggle.getBackground().invalidateSelf(); buttonToggle.getBackground().invalidateSelf();
}); });
titleView.setOnClickListener(v -> handleProfile()); titleView.setOnClickListener(v -> handleProfile(false));
titleView.setOnBackClickedListener(view -> handleReturnToConversationList()); titleView.setOnBackClickedListener(view -> handleReturnToConversationList());
composeText.setOnKeyListener(composeKeyPressedListener); composeText.setOnKeyListener(composeKeyPressedListener);

7
src/main/res/menu/conversation.xml
View file

@ -25,6 +25,11 @@
android:visible="false" android:visible="false"
app:showAsAction="always"/> app:showAsAction="always"/>
<item android:id="@+id/menu_show_apps"
android:title="@string/webxdc_apps"
android:icon="@drawable/baseline_apps_24"
app:showAsAction="ifRoom" />
<item android:id="@+id/menu_ephemeral_messages" <item android:id="@+id/menu_ephemeral_messages"
android:title="@string/ephemeral_messages" /> android:title="@string/ephemeral_messages" />
@ -34,7 +39,7 @@
<item android:id="@+id/menu_show_map" <item android:id="@+id/menu_show_map"
android:title="@string/tab_map" android:title="@string/tab_map"
android:icon="@drawable/ic_map_white_24dp" android:icon="@drawable/ic_map_white_24dp"
app:showAsAction="ifRoom" /> app:showAsAction="never" />
<item android:title="@string/menu_archive_chat" <item android:title="@string/menu_archive_chat"
android:id="@+id/menu_archive_chat"/> android:id="@+id/menu_archive_chat"/>