From e561d869fabad799ed5af5b89532b4500710c958 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 14 Sep 2018 22:51:15 +0200 Subject: show contact/group details as icons in tablet view --- .../de/pixart/messenger/ui/ConversationFragment.java | 18 ++++++++++++++++++ src/main/res/drawable-hdpi/ic_contact_white_24dp.png | Bin 0 -> 324 bytes src/main/res/drawable-mdpi/ic_contact_white_24dp.png | Bin 0 -> 201 bytes src/main/res/drawable-xhdpi/ic_contact_white_24dp.png | Bin 0 -> 370 bytes .../res/drawable-xxhdpi/ic_contact_white_24dp.png | Bin 0 -> 647 bytes .../res/drawable-xxxhdpi/ic_contact_white_24dp.png | Bin 0 -> 756 bytes src/main/res/menu/fragment_conversation.xml | 12 ++++++++++++ src/main/res/values/strings.xml | 1 + 8 files changed, 31 insertions(+) create mode 100644 src/main/res/drawable-hdpi/ic_contact_white_24dp.png create mode 100644 src/main/res/drawable-mdpi/ic_contact_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_contact_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_contact_white_24dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_contact_white_24dp.png diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 0d4610c8e..def4b8a69 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -1207,14 +1207,20 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke final MenuItem menuNeedHelp = menu.findItem(R.id.action_create_issue); final MenuItem menuSearchUpdates = menu.findItem(R.id.action_check_updates); final MenuItem menuArchiveChat = menu.findItem(R.id.action_archive_chat); + final MenuItem menuGroupDetails = menu.findItem(R.id.action_group_details); + final MenuItem menuContactDetails = menu.findItem(R.id.action_contact_details); if (conversation != null) { if (conversation.getMode() == Conversation.MODE_MULTI) { menuInviteContact.setVisible(true); menuArchiveChat.setTitle(R.string.action_end_conversation_muc); + menuGroupDetails.setVisible(true); + menuContactDetails.setVisible(false); } else { menuInviteContact.setVisible(false); menuArchiveChat.setTitle(R.string.action_end_conversation); + menuGroupDetails.setVisible(false); + menuContactDetails.setVisible(true); } menuNeedHelp.setVisible(true); menuSearchUpdates.setVisible(false); @@ -1223,6 +1229,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke } else { menuNeedHelp.setVisible(false); menuSearchUpdates.setVisible(true); + menuInviteContact.setVisible(false); + menuGroupDetails.setVisible(false); + menuContactDetails.setVisible(false); } super.onCreateOptionsMenu(menu, menuInflater); } @@ -1541,6 +1550,15 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke case R.id.action_clear_history: clearHistoryDialog(conversation); break; + case R.id.action_group_details: + Intent intent = new Intent(activity, ConferenceDetailsActivity.class); + intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC); + intent.putExtra("uuid", conversation.getUuid()); + startActivity(intent); + break; + case R.id.action_contact_details: + activity.switchToContactDetails(conversation.getContact()); + break; case R.id.action_block: case R.id.action_unblock: final Activity activity = getActivity(); diff --git a/src/main/res/drawable-hdpi/ic_contact_white_24dp.png b/src/main/res/drawable-hdpi/ic_contact_white_24dp.png new file mode 100644 index 000000000..7c046b21c Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_contact_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_contact_white_24dp.png b/src/main/res/drawable-mdpi/ic_contact_white_24dp.png new file mode 100644 index 000000000..c61747dc2 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_contact_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_contact_white_24dp.png b/src/main/res/drawable-xhdpi/ic_contact_white_24dp.png new file mode 100644 index 000000000..eedda1b40 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_contact_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_contact_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_contact_white_24dp.png new file mode 100644 index 000000000..91e0d9a6b Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_contact_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_contact_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_contact_white_24dp.png new file mode 100644 index 000000000..f36920906 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_contact_white_24dp.png differ diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml index d67bf5253..197dc8137 100644 --- a/src/main/res/menu/fragment_conversation.xml +++ b/src/main/res/menu/fragment_conversation.xml @@ -77,4 +77,16 @@ android:orderInCategory="100" app:showAsAction="never" android:title="@string/create_issue" /> + + \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 6beb4ab3d..523893d91 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -825,4 +825,5 @@ Video compression Database backup App update + Group details -- cgit v1.2.3