mirror of
https://github.com/deltachat/deltachat-android.git
synced 2025-10-06 03:49:58 +02:00
show action button to see the list of apps sent in chat
This commit is contained in:
parent
bb410a1bb1
commit
47350b1809
2 changed files with 14 additions and 3 deletions
|
@ -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);
|
||||
|
|
|
@ -25,6 +25,11 @@
|
|||
android:visible="false"
|
||||
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"
|
||||
android:title="@string/ephemeral_messages" />
|
||||
|
||||
|
@ -34,7 +39,7 @@
|
|||
<item android:id="@+id/menu_show_map"
|
||||
android:title="@string/tab_map"
|
||||
android:icon="@drawable/ic_map_white_24dp"
|
||||
app:showAsAction="ifRoom" />
|
||||
app:showAsAction="never" />
|
||||
|
||||
<item android:title="@string/menu_archive_chat"
|
||||
android:id="@+id/menu_archive_chat"/>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue