From f08c4abc0e42bec551e9e5bbe46bb27f13141b5f Mon Sep 17 00:00:00 2001 From: Angelo Fuchs Date: Wed, 3 Jun 2020 21:33:27 +0200 Subject: [PATCH] #1228 group image now behaves like single contact image. --- res/layout/profile_activity.xml | 1 + res/menu/profile_chat.xml | 4 -- res/values/strings.xml | 1 + .../securesms/ProfileActivity.java | 37 ++++++++----------- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/res/layout/profile_activity.xml b/res/layout/profile_activity.xml index eb06fd4a1..8ba38ddea 100644 --- a/res/layout/profile_activity.xml +++ b/res/layout/profile_activity.xml @@ -51,6 +51,7 @@ android:layout_height="wrap_content" android:layout_above="@id/pager" android:layout_gravity="center" + android:padding="8dp" android:adjustViewBounds="true"/> diff --git a/res/menu/profile_chat.xml b/res/menu/profile_chat.xml index e6b590cd3..4d5529f3a 100644 --- a/res/menu/profile_chat.xml +++ b/res/menu/profile_chat.xml @@ -2,10 +2,6 @@ - - diff --git a/res/values/strings.xml b/res/values/strings.xml index e2c2f8630..b712a0251 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -168,6 +168,7 @@ Select all Expand Edit name + Edit group name and image Edit group name Edit group image Settings diff --git a/src/org/thoughtcrime/securesms/ProfileActivity.java b/src/org/thoughtcrime/securesms/ProfileActivity.java index 4334644af..049737aac 100644 --- a/src/org/thoughtcrime/securesms/ProfileActivity.java +++ b/src/org/thoughtcrime/securesms/ProfileActivity.java @@ -98,7 +98,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity titleView = (ConversationTitleView) supportActionBar.getCustomView(); titleView.setOnBackClickedListener(view -> onBackPressed()); - titleView.setOnAvatarClickListener(view -> onShowAndEditImage()); + titleView.setOnAvatarClickListener(view -> onEnlargeAvatar()); updateToolbar(); @@ -118,10 +118,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity if (chatId != 0) { inflater.inflate(R.menu.profile_chat, menu); if (chatIsGroup) { - menu.findItem(R.id.edit_name).setTitle(R.string.menu_edit_group_name); - } - else { - menu.findItem(R.id.edit_group_image).setVisible(false); + menu.findItem(R.id.edit_name).setTitle(R.string.menu_edit_group_name_and_image); } } @@ -339,9 +336,6 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity case R.id.edit_name: onEditName(); break; - case R.id.edit_group_image: - onShowAndEditImage(); - break; case R.id.show_encr_info: onEncrInfo(); break; @@ -398,7 +392,19 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity .show(); } - public void onShowAndEditImage() { + public void onEnlargeAvatar() { + AvatarImageView profileLarge = findViewById(R.id.profile_large); + Recipient recipient; + if(chatIsGroup) + recipient = dcContext.getRecipient(dcContext.getChat(chatId)); + else + recipient = dcContext.getRecipient(dcContext.getContact(contactId)); + profileLarge.setAvatar(GlideApp.with(this), recipient, false); + profileLarge.setVisibility(ImageView.VISIBLE); + profileLarge.setOnClickListener(v -> profileLarge.setVisibility(ImageView.INVISIBLE)); + } + + public void onEditName() { if (chatIsGroup) { Intent intent = new Intent(this, GroupCreateActivity.class); intent.putExtra(GroupCreateActivity.EDIT_GROUP_CHAT_ID, chatId); @@ -406,19 +412,6 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity intent.putExtra(GroupCreateActivity.GROUP_CREATE_VERIFIED_EXTRA, true); } startActivity(intent); - } else { - AvatarImageView profileLarge = findViewById(R.id.profile_large); - DcContact contact = dcContext.getContact(contactId); - Recipient recipient = dcContext.getRecipient(contact); - profileLarge.setAvatar(GlideApp.with(this), recipient, false); - profileLarge.setVisibility(ImageView.VISIBLE); - profileLarge.setOnClickListener(v -> profileLarge.setVisibility(ImageView.INVISIBLE)); - } - } - - public void onEditName() { - if (chatIsGroup) { - onShowAndEditImage(); } else { DcContact dcContact = dcContext.getContact(contactId);