From c27e2559ddbc3273a67d72b12fefa7add7d5ee0f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 13 Dec 2018 14:18:19 +0100 Subject: [PATCH 01/17] Remove (useless?) colors_materials.xml file --- .../src/main/res/values/colors_materials.xml | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 vector/src/main/res/values/colors_materials.xml diff --git a/vector/src/main/res/values/colors_materials.xml b/vector/src/main/res/values/colors_materials.xml deleted file mode 100644 index 5579d2dc0c..0000000000 --- a/vector/src/main/res/values/colors_materials.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - #ff212121 - #fffafafa - - #20444444 - #20ffffff - - #ff5a595b - #ffd6d7d7 - - #ffffffff - #00000000 - - #80ffffff - #80000000 - - @color/bright_foreground_material_light - @color/bright_foreground_material_dark - - #ffbebebe - #ff323232 - #80bebebe - #80323232 - - #6640c4ff - #6640c4ff - - - - #de000000 - - - - #deffffff - - - - - - - - - - - #fffafafa - #fff5f5f5 - #ffeeeeee - #ff757575 - #ff212121 - - #ff37474f - #ff263238 - #ff21272b - - \ No newline at end of file From 0bb142fdf4929a6d2a420b46a01f639b3b7ddbd0 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 13 Dec 2018 14:21:40 +0100 Subject: [PATCH 02/17] Move string from donottranslate.xml to new file config.xml --- vector/src/main/res/values/config.xml | 24 +++++++++++++++++++ vector/src/main/res/values/donottranslate.xml | 19 --------------- 2 files changed, 24 insertions(+), 19 deletions(-) create mode 100755 vector/src/main/res/values/config.xml diff --git a/vector/src/main/res/values/config.xml b/vector/src/main/res/values/config.xml new file mode 100755 index 0000000000..9413f38655 --- /dev/null +++ b/vector/src/main/res/values/config.xml @@ -0,0 +1,24 @@ + + + + Riot.im + + + https://vector.im + https://matrix.org + https://matrix.org + https://vector.im + + + "https://scalar-staging.riot.im/scalar" + "https://scalar-staging.riot.im/scalar-web/" + + + + + + + matrix.org + + + diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml index 1411c74cab..db8cce57bd 100755 --- a/vector/src/main/res/values/donottranslate.xml +++ b/vector/src/main/res/values/donottranslate.xml @@ -1,24 +1,5 @@ - Riot.im - - - https://vector.im - https://matrix.org - https://matrix.org - https://vector.im - - - "https://scalar-staging.riot.im/scalar" - "https://scalar-staging.riot.im/scalar-web/" - - - - - - - matrix.org - + : From 5498a07f5f814d20f235909941c3cfea08f3d2f8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 13 Dec 2018 15:12:30 +0100 Subject: [PATCH 03/17] Done TODO --- .../src/main/java/im/vector/activity/VectorAppCompatActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/vector/src/main/java/im/vector/activity/VectorAppCompatActivity.kt b/vector/src/main/java/im/vector/activity/VectorAppCompatActivity.kt index 5f2b24d2c4..d089328cf8 100755 --- a/vector/src/main/java/im/vector/activity/VectorAppCompatActivity.kt +++ b/vector/src/main/java/im/vector/activity/VectorAppCompatActivity.kt @@ -60,7 +60,6 @@ abstract class VectorAppCompatActivity : AppCompatActivity() { * UI * ========================================================================================== */ - // TODO Maintenance: Toolbar is bound here now. Use this member in children Activities @Nullable @BindView(R.id.toolbar) protected lateinit var toolbar: Toolbar From d04d6d96c7ddaf0cf397aeea6501ef7c91723b3d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 13 Dec 2018 15:25:34 +0100 Subject: [PATCH 04/17] Create a specific Activity to view a user Avatar -> allow zoom on it and do not manage by hand state --- vector/src/main/AndroidManifest.xml | 1 + .../activity/VectorAvatarViewerActivity.kt | 55 +++++++++++++++++ .../activity/VectorMemberDetailsActivity.java | 60 +------------------ .../res/layout/activity_avatar_viewer.xml | 19 ++++++ .../res/layout/activity_member_details.xml | 24 -------- .../res/layout/vector_large_round_avatar.xml | 14 ++--- 6 files changed, 81 insertions(+), 92 deletions(-) create mode 100644 vector/src/main/java/im/vector/activity/VectorAvatarViewerActivity.kt create mode 100644 vector/src/main/res/layout/activity_avatar_viewer.xml diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index cf2bc10ab3..3c65fd1d2d 100755 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -207,6 +207,7 @@ android:name="android.support.PARENT_ACTIVITY" android:value="im.vector.activity.VectorRoomActivity" /> + + + + + + + + \ No newline at end of file diff --git a/vector/src/main/res/layout/activity_member_details.xml b/vector/src/main/res/layout/activity_member_details.xml index e93658fc6d..aebb579084 100644 --- a/vector/src/main/res/layout/activity_member_details.xml +++ b/vector/src/main/res/layout/activity_member_details.xml @@ -1,6 +1,4 @@ - - - - - - - - - - diff --git a/vector/src/main/res/layout/vector_large_round_avatar.xml b/vector/src/main/res/layout/vector_large_round_avatar.xml index 4467ac74ad..88c3b9fda4 100644 --- a/vector/src/main/res/layout/vector_large_round_avatar.xml +++ b/vector/src/main/res/layout/vector_large_round_avatar.xml @@ -1,6 +1,6 @@ - @@ -9,18 +9,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:adjustViewBounds="true" - android:scaleType="centerCrop" /> + android:scaleType="centerCrop" + tools:src="@tools:sample/avatars" /> - + \ No newline at end of file From e98d199d8d1fbfa494584b135a57315804eff56e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 13 Dec 2018 16:50:31 +0100 Subject: [PATCH 05/17] Improve layout --- .../main/res/layout/adapter_item_member_details_devices.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vector/src/main/res/layout/adapter_item_member_details_devices.xml b/vector/src/main/res/layout/adapter_item_member_details_devices.xml index 49617d82e3..c843be1c67 100644 --- a/vector/src/main/res/layout/adapter_item_member_details_devices.xml +++ b/vector/src/main/res/layout/adapter_item_member_details_devices.xml @@ -81,8 +81,7 @@ + From f850df091ae1c0dd6db0df7f80b5aa1b6706e5be Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 13 Dec 2018 17:04:49 +0100 Subject: [PATCH 06/17] Add some tools attributes --- .../res/layout/activity_member_details.xml | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/vector/src/main/res/layout/activity_member_details.xml b/vector/src/main/res/layout/activity_member_details.xml index aebb579084..5d1ff03f22 100644 --- a/vector/src/main/res/layout/activity_member_details.xml +++ b/vector/src/main/res/layout/activity_member_details.xml @@ -1,6 +1,7 @@ + android:visibility="gone" + tools:visibility="visible" /> @@ -59,7 +61,8 @@ android:gravity="center_horizontal" android:singleLine="true" android:textColor="@android:color/white" - android:textSize="20sp" /> + android:textSize="20sp" + tools:text="Display Name" /> + android:textSize="14sp" + tools:text="User presence" /> + + android:listSelector="@android:color/transparent" + tools:listitem="@layout/vector_adapter_member_details_items" /> + android:visibility="gone" + tools:visibility="visible" /> + android:visibility="gone" + tools:alpha="0.3" + tools:layout_marginTop="200dp" + tools:listitem="@layout/adapter_item_member_details_devices" + tools:visibility="visible" /> Date: Thu, 13 Dec 2018 17:24:48 +0100 Subject: [PATCH 07/17] Show userId below display name in member detail screen (Fix #2756) --- CHANGES.rst | 2 +- .../activity/VectorMemberDetailsActivity.java | 64 ++++++++----------- .../res/layout/activity_member_details.xml | 38 +++++++++-- 3 files changed, 58 insertions(+), 46 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 647dfeb284..5fb65891d3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,7 @@ Features: - Improvements: - - + - Show userId below display name in member detail screen (#2756) Other changes: - diff --git a/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java b/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java index 35af9bf1d7..db2525fa57 100644 --- a/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java +++ b/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java @@ -59,6 +59,7 @@ import java.util.Map; import butterknife.BindView; +import butterknife.OnClick; import im.vector.Matrix; import im.vector.R; import im.vector.adapters.VectorMemberDetailsAdapter; @@ -125,8 +126,10 @@ public class VectorMemberDetailsActivity extends MXCActionBarActivity implements ImageView mMemberAvatarImageView; @BindView(R.id.member_avatar_badge) ImageView mMemberAvatarBadgeImageView; - @BindView(R.id.member_details_name) - TextView mMemberNameTextView; + @BindView(R.id.member_details_display_name) + TextView mMemberDisplayNameTextView; + @BindView(R.id.member_details_user_id) + TextView mMemberUserIdTextView; @BindView(R.id.member_details_presence) TextView mPresenceTextView; @@ -1212,33 +1215,6 @@ public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition } }); - - // when clicking on the username - // switch member name <-> member id - mMemberNameTextView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - User user = mSession.getDataHandler().getUser(mMemberId); - - if (TextUtils.equals(mMemberNameTextView.getText(), mMemberId)) { - if ((null != user) && !TextUtils.isEmpty(user.displayname)) { - mMemberNameTextView.setText(user.displayname); - } - } else { - mMemberNameTextView.setText(mMemberId); - } - } - }); - - // long tap : copy to the clipboard - mMemberNameTextView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - SystemUtilsKt.copyToClipboard(VectorMemberDetailsActivity.this, mMemberNameTextView.getText()); - return true; - } - }); - mMemberAvatarImageView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -1419,18 +1395,18 @@ private void updateUi() { return; } - if (null != mMemberNameTextView) { - if ((null != mRoomMember) && !TextUtils.isEmpty(mRoomMember.displayname)) { - mMemberNameTextView.setText(mRoomMember.displayname); - } else { - refreshUser(); - mMemberNameTextView.setText(mUser.displayname); - } - - // do not display the activity name in the action bar - setTitle(""); + if ((null != mRoomMember) && !TextUtils.isEmpty(mRoomMember.displayname)) { + mMemberDisplayNameTextView.setText(mRoomMember.displayname); + } else { + refreshUser(); + mMemberDisplayNameTextView.setText(mUser.displayname); } + mMemberUserIdTextView.setText(mMemberId); + + // do not display the activity name in the action bar + setTitle(""); + // disable the progress bar enableProgressBarView(CommonActivityUtils.UTILS_HIDE_PROGRESS_BAR); @@ -1550,6 +1526,16 @@ public void onDestroy() { } } + /* ========================================================================================== + * UI Event + * ========================================================================================== */ + + @OnClick({R.id.member_details_user_id, R.id.member_details_display_name}) + void onUserInfoClicked(TextView v) { + // Copy to the clipboard + SystemUtilsKt.copyToClipboard(this, v.getText()); + } + // ********* IDevicesAdapterListener implementation ********* private final ApiCallback mDevicesVerificationCallback = new ApiCallback() { diff --git a/vector/src/main/res/layout/activity_member_details.xml b/vector/src/main/res/layout/activity_member_details.xml index 5d1ff03f22..aa727c76f7 100644 --- a/vector/src/main/res/layout/activity_member_details.xml +++ b/vector/src/main/res/layout/activity_member_details.xml @@ -53,27 +53,53 @@ + + + + From 30cb724c6fdf27056361e2ec78eec66e48286be2 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 13 Dec 2018 17:30:21 +0100 Subject: [PATCH 08/17] Fix kotlin issue --- .../java/im/vector/activity/VectorAvatarViewerActivity.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/vector/src/main/java/im/vector/activity/VectorAvatarViewerActivity.kt b/vector/src/main/java/im/vector/activity/VectorAvatarViewerActivity.kt index 25b5f8a494..6e9f3092d5 100644 --- a/vector/src/main/java/im/vector/activity/VectorAvatarViewerActivity.kt +++ b/vector/src/main/java/im/vector/activity/VectorAvatarViewerActivity.kt @@ -34,10 +34,12 @@ class VectorAvatarViewerActivity : MXCActionBarActivity() { override fun initUiAndData() { super.initUiAndData() - getSession(intent)?.let { - it.mediaCache.loadBitmap(it.homeServerConfig, + val session = getSession(intent) + + if (session != null) { + session.mediaCache.loadBitmap(session.homeServerConfig, photoView, intent.getStringExtra(EXTRA_AVATAR_URL), 0, ExifInterface.ORIENTATION_UNDEFINED, null, null) - } ?: run { + } else { finish() } } From 04b9a454242a3835188d460d3694d32d109e8a16 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 13 Dec 2018 17:37:42 +0100 Subject: [PATCH 09/17] improve tools --- vector/src/main/res/layout/activity_member_details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vector/src/main/res/layout/activity_member_details.xml b/vector/src/main/res/layout/activity_member_details.xml index aa727c76f7..2d92946ca8 100644 --- a/vector/src/main/res/layout/activity_member_details.xml +++ b/vector/src/main/res/layout/activity_member_details.xml @@ -114,9 +114,8 @@ android:layout_alignParentTop="true" android:background="@android:color/transparent" app:contentInsetEnd="0dp" - app:contentInsetStart="0dp"> + app:contentInsetStart="0dp" /> - @@ -138,6 +137,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/member_details_action_bar" android:visibility="gone" + tools:layout_marginStart="200dp" tools:visibility="visible" /> @@ -152,7 +152,7 @@ android:listSelector="@android:color/transparent" android:visibility="gone" tools:alpha="0.3" - tools:layout_marginTop="200dp" + tools:layout_marginStart="200dp" tools:listitem="@layout/adapter_item_member_details_devices" tools:visibility="visible" /> From cf43455087c94d3c9c522a59eec77bf0df19890b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 13 Dec 2018 17:49:14 +0100 Subject: [PATCH 10/17] Let's animate Riot! --- .../im/vector/activity/VectorAvatarViewerActivity.kt | 6 +++++- .../vector/activity/VectorMemberDetailsActivity.java | 11 ++++++++++- vector/src/main/res/layout/activity_avatar_viewer.xml | 1 + .../src/main/res/layout/vector_large_round_avatar.xml | 1 + vector/src/main/res/values-v21/theme_black.xml | 3 +++ vector/src/main/res/values-v21/theme_dark.xml | 3 +++ vector/src/main/res/values-v21/theme_light.xml | 5 ++++- vector/src/main/res/values-v21/theme_status.xml | 5 ++++- 8 files changed, 31 insertions(+), 4 deletions(-) diff --git a/vector/src/main/java/im/vector/activity/VectorAvatarViewerActivity.kt b/vector/src/main/java/im/vector/activity/VectorAvatarViewerActivity.kt index 6e9f3092d5..e17c8cb0fc 100644 --- a/vector/src/main/java/im/vector/activity/VectorAvatarViewerActivity.kt +++ b/vector/src/main/java/im/vector/activity/VectorAvatarViewerActivity.kt @@ -23,7 +23,6 @@ import butterknife.BindView import com.github.chrisbanes.photoview.PhotoView import im.vector.R -// TODO Transition class VectorAvatarViewerActivity : MXCActionBarActivity() { @BindView(R.id.avatar_viewer_image) @@ -54,4 +53,9 @@ class VectorAvatarViewerActivity : MXCActionBarActivity() { } } } + + // For transition + override fun onBackPressed() { + supportFinishAfterTransition() + } } \ No newline at end of file diff --git a/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java b/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java index db2525fa57..af33467127 100644 --- a/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java +++ b/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java @@ -17,8 +17,10 @@ */ package im.vector.activity; +import android.app.ActivityOptions; import android.content.DialogInterface; import android.content.Intent; +import android.os.Build; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.app.AlertDialog; @@ -1281,7 +1283,14 @@ private void displayFullScreenAvatar() { } if (!TextUtils.isEmpty(avatarUrl)) { - startActivity(VectorAvatarViewerActivity.Companion.getIntent(this, mSession.getMyUserId(), avatarUrl)); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + ActivityOptions options = + ActivityOptions.makeSceneTransitionAnimation(this, mMemberAvatarImageView, "vector_transition_avatar"); + startActivity(VectorAvatarViewerActivity.Companion.getIntent(this, mSession.getMyUserId(), avatarUrl), options.toBundle()); + } else { + // No transition + startActivity(VectorAvatarViewerActivity.Companion.getIntent(this, mSession.getMyUserId(), avatarUrl)); + } } } diff --git a/vector/src/main/res/layout/activity_avatar_viewer.xml b/vector/src/main/res/layout/activity_avatar_viewer.xml index 7e805450e1..15ec61839d 100644 --- a/vector/src/main/res/layout/activity_avatar_viewer.xml +++ b/vector/src/main/res/layout/activity_avatar_viewer.xml @@ -14,6 +14,7 @@ android:id="@+id/avatar_viewer_image" android:layout_width="match_parent" android:layout_height="match_parent" + android:transitionName="vector_transition_avatar" tools:src="@tools:sample/avatars" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/vector_large_round_avatar.xml b/vector/src/main/res/layout/vector_large_round_avatar.xml index 88c3b9fda4..73ba5f36f3 100644 --- a/vector/src/main/res/layout/vector_large_round_avatar.xml +++ b/vector/src/main/res/layout/vector_large_round_avatar.xml @@ -10,6 +10,7 @@ android:layout_height="match_parent" android:adjustViewBounds="true" android:scaleType="centerCrop" + android:transitionName="vector_transition_avatar" tools:src="@tools:sample/avatars" /> ?attr/vctr_primary_dark_color + + + true diff --git a/vector/src/main/res/values-v21/theme_dark.xml b/vector/src/main/res/values-v21/theme_dark.xml index c9f0878c6f..122fcd74a4 100644 --- a/vector/src/main/res/values-v21/theme_dark.xml +++ b/vector/src/main/res/values-v21/theme_dark.xml @@ -2,6 +2,9 @@ diff --git a/vector/src/main/res/values-v21/theme_light.xml b/vector/src/main/res/values-v21/theme_light.xml index 2d6c90561c..d8da52f065 100644 --- a/vector/src/main/res/values-v21/theme_light.xml +++ b/vector/src/main/res/values-v21/theme_light.xml @@ -1,5 +1,8 @@ - diff --git a/vector/src/main/res/values-v21/theme_status.xml b/vector/src/main/res/values-v21/theme_status.xml index cec9194d6d..ad866ff777 100644 --- a/vector/src/main/res/values-v21/theme_status.xml +++ b/vector/src/main/res/values-v21/theme_status.xml @@ -1,5 +1,8 @@ - From 7e19f9f54ea3920f9505e2cb326a100881aab3e0 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 13 Dec 2018 19:36:01 +0100 Subject: [PATCH 11/17] Rework avatar in layout. One id per layout --- .../activity/VectorMemberDetailsActivity.java | 2 +- .../vector/activity/VectorRoomActivity.java | 10 ++--- .../vector/adapters/GroupRoomViewHolder.java | 2 +- .../vector/adapters/GroupUserViewHolder.java | 2 +- .../im/vector/adapters/GroupViewHolder.java | 2 +- .../im/vector/adapters/PeopleAdapter.java | 2 +- .../adapters/VectorGroupsListAdapter.java | 2 +- .../adapters/VectorMessagesAdapter.java | 6 +-- .../adapters/VectorMessagesAdapterHelper.java | 39 +++++++++---------- .../adapters/VectorPublicRoomsAdapter.java | 8 ++-- .../adapters/VectorReadReceiptsAdapter.kt | 2 +- .../adapters/VectorRoomSummaryAdapter.java | 2 +- .../adapters/VectorRoomsSelectionAdapter.java | 3 +- .../VectorSearchMessagesListAdapter.java | 2 +- .../vector/preference/UserAvatarPreference.kt | 2 +- .../preference/VectorGroupPreference.kt | 2 +- .../main/res/drawable/avatar_mask_black.xml | 17 -------- .../main/res/drawable/avatar_mask_dark.xml | 17 -------- .../main/res/drawable/avatar_mask_light.xml | 17 -------- .../drawable/avatar_mask_room_header_dark.xml | 19 --------- .../avatar_mask_room_header_light.xml | 19 --------- .../avatar_mask_room_header_status.xml | 19 --------- .../main/res/drawable/avatar_mask_status.xml | 17 -------- .../avatar_mask_white_stroke_black.xml | 19 --------- .../avatar_mask_white_stroke_dark.xml | 19 --------- .../avatar_mask_white_stroke_light.xml | 19 --------- .../avatar_mask_white_stroke_status.xml | 19 --------- .../res/layout/activity_member_details.xml | 29 +++++++------- .../main/res/layout/activity_vector_room.xml | 8 ++-- ...pter_item_circular_avatar_contact_view.xml | 21 ---------- ...adapter_item_circular_avatar_room_view.xml | 21 ---------- .../adapter_item_circular_room_view.xml | 28 ++++++------- .../res/layout/adapter_item_contact_view.xml | 21 +++++----- .../res/layout/adapter_item_group_invite.xml | 6 +-- .../adapter_item_group_user_room_view.xml | 21 +++++----- .../res/layout/adapter_item_group_view.xml | 15 ++++--- .../res/layout/adapter_item_read_receipt.xml | 17 ++++---- .../res/layout/adapter_item_room_view.xml | 33 +++++++++------- .../adapter_item_vector_message_code.xml | 11 ++++-- .../adapter_item_vector_message_emoji.xml | 11 ++++-- .../adapter_item_vector_message_file.xml | 11 ++++-- ...dapter_item_vector_message_image_video.xml | 11 ++++-- ...dapter_item_vector_message_room_member.xml | 11 ++++-- ..._item_vector_message_text_emote_notice.xml | 11 ++++-- .../adapter_item_vector_recent_room.xml | 27 +++++++------ .../main/res/layout/notice_round_avatar.xml | 23 ----------- .../main/res/layout/round_avatar_vector.xml | 23 ----------- .../res/layout/vector_large_round_avatar.xml | 21 ---------- .../layout/vector_receipt_round_avatar.xml | 24 +++--------- .../main/res/layout/vector_room_header.xml | 10 +++-- .../vector_room_header_round_avatar.xml | 22 ----------- .../res/layout/vector_room_round_avatar.xml | 23 ----------- .../layout/vector_settings_round_avatar.xml | 10 +++-- .../vector_settings_round_group_avatar.xml | 2 +- vector/src/main/res/values/attrs.xml | 4 -- vector/src/main/res/values/theme_black.xml | 2 - vector/src/main/res/values/theme_dark.xml | 3 -- vector/src/main/res/values/theme_light.xml | 3 -- vector/src/main/res/values/theme_status.xml | 3 -- 59 files changed, 218 insertions(+), 557 deletions(-) delete mode 100644 vector/src/main/res/drawable/avatar_mask_black.xml delete mode 100644 vector/src/main/res/drawable/avatar_mask_dark.xml delete mode 100644 vector/src/main/res/drawable/avatar_mask_light.xml delete mode 100644 vector/src/main/res/drawable/avatar_mask_room_header_dark.xml delete mode 100644 vector/src/main/res/drawable/avatar_mask_room_header_light.xml delete mode 100644 vector/src/main/res/drawable/avatar_mask_room_header_status.xml delete mode 100644 vector/src/main/res/drawable/avatar_mask_status.xml delete mode 100644 vector/src/main/res/drawable/avatar_mask_white_stroke_black.xml delete mode 100644 vector/src/main/res/drawable/avatar_mask_white_stroke_dark.xml delete mode 100644 vector/src/main/res/drawable/avatar_mask_white_stroke_light.xml delete mode 100644 vector/src/main/res/drawable/avatar_mask_white_stroke_status.xml delete mode 100644 vector/src/main/res/layout/adapter_item_circular_avatar_contact_view.xml delete mode 100644 vector/src/main/res/layout/adapter_item_circular_avatar_room_view.xml delete mode 100644 vector/src/main/res/layout/notice_round_avatar.xml delete mode 100644 vector/src/main/res/layout/round_avatar_vector.xml delete mode 100644 vector/src/main/res/layout/vector_large_round_avatar.xml delete mode 100644 vector/src/main/res/layout/vector_room_header_round_avatar.xml delete mode 100644 vector/src/main/res/layout/vector_room_round_avatar.xml diff --git a/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java b/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java index af33467127..14d702425a 100644 --- a/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java +++ b/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java @@ -124,7 +124,7 @@ public class VectorMemberDetailsActivity extends MXCActionBarActivity implements private VectorMemberDetailsDevicesAdapter mDevicesListViewAdapter; // UI widgets - @BindView(R.id.avatar_img) + @BindView(R.id.member_detail_avatar) ImageView mMemberAvatarImageView; @BindView(R.id.member_avatar_badge) ImageView mMemberAvatarBadgeImageView; diff --git a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java index 12721d69f3..6e40abc980 100755 --- a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java +++ b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java @@ -658,7 +658,7 @@ public void onResourceLimitStateChanged() { } //setDragEdge(SwipeBackLayout.DragEdge.LEFT); - mActionBarHeaderRoomAvatar = mRoomHeaderView.findViewById(R.id.avatar_img); + mActionBarHeaderRoomAvatar = mRoomHeaderView.findViewById(R.id.room_header_avatar); // hide the header room as soon as the bottom layout (text edit zone) is touched mBottomLayout.setOnTouchListener(new View.OnTouchListener() { @@ -963,11 +963,7 @@ public void onActiveWidgetUpdate() { } }); - View avatarLayout = findViewById(R.id.room_self_avatar); - - if (null != avatarLayout) { - mAvatarImageView = avatarLayout.findViewById(R.id.avatar_img); - } + mAvatarImageView = findViewById(R.id.room_self_avatar); refreshSelfAvatar(); @@ -3803,7 +3799,7 @@ public void onUnexpectedError(Exception e) { .show(); } - @OnClick(R.id.room_avatar) + @OnClick(R.id.room_header_avatar) void onRoomAvatarClick() { // tap on the expanded room avatar // sanity checks : reported by GA diff --git a/vector/src/main/java/im/vector/adapters/GroupRoomViewHolder.java b/vector/src/main/java/im/vector/adapters/GroupRoomViewHolder.java index a3455e9308..ea7fcfdbc1 100644 --- a/vector/src/main/java/im/vector/adapters/GroupRoomViewHolder.java +++ b/vector/src/main/java/im/vector/adapters/GroupRoomViewHolder.java @@ -35,7 +35,7 @@ public class GroupRoomViewHolder extends RecyclerView.ViewHolder { private static final String LOG_TAG = GroupRoomViewHolder.class.getSimpleName(); - @BindView(R.id.contact_avatar) + @BindView(R.id.adapter_item_group_contact_avatar) ImageView vContactAvatar; @BindView(R.id.contact_name) diff --git a/vector/src/main/java/im/vector/adapters/GroupUserViewHolder.java b/vector/src/main/java/im/vector/adapters/GroupUserViewHolder.java index 7c737c2f72..4fb915d6d2 100644 --- a/vector/src/main/java/im/vector/adapters/GroupUserViewHolder.java +++ b/vector/src/main/java/im/vector/adapters/GroupUserViewHolder.java @@ -34,7 +34,7 @@ public class GroupUserViewHolder extends RecyclerView.ViewHolder { private static final String LOG_TAG = GroupUserViewHolder.class.getSimpleName(); - @BindView(R.id.contact_avatar) + @BindView(R.id.adapter_item_group_contact_avatar) ImageView vContactAvatar; @BindView(R.id.contact_name) diff --git a/vector/src/main/java/im/vector/adapters/GroupViewHolder.java b/vector/src/main/java/im/vector/adapters/GroupViewHolder.java index 7733b2af3f..8cc23840c4 100644 --- a/vector/src/main/java/im/vector/adapters/GroupViewHolder.java +++ b/vector/src/main/java/im/vector/adapters/GroupViewHolder.java @@ -39,7 +39,7 @@ public class GroupViewHolder extends RecyclerView.ViewHolder { private static final String LOG_TAG = GroupViewHolder.class.getSimpleName(); - @BindView(R.id.room_avatar) + @BindView(R.id.group_avatar) ImageView vGroupAvatar; @BindView(R.id.group_name) diff --git a/vector/src/main/java/im/vector/adapters/PeopleAdapter.java b/vector/src/main/java/im/vector/adapters/PeopleAdapter.java index 7345eafd73..d43d488784 100644 --- a/vector/src/main/java/im/vector/adapters/PeopleAdapter.java +++ b/vector/src/main/java/im/vector/adapters/PeopleAdapter.java @@ -341,7 +341,7 @@ public void removeDirectChat(final String roomId) { class ContactViewHolder extends RecyclerView.ViewHolder { - @BindView(R.id.contact_avatar) + @BindView(R.id.adapter_item_contact_avatar) ImageView vContactAvatar; @BindView(R.id.contact_badge) diff --git a/vector/src/main/java/im/vector/adapters/VectorGroupsListAdapter.java b/vector/src/main/java/im/vector/adapters/VectorGroupsListAdapter.java index 87fe00bb01..0cd11fa4c7 100644 --- a/vector/src/main/java/im/vector/adapters/VectorGroupsListAdapter.java +++ b/vector/src/main/java/im/vector/adapters/VectorGroupsListAdapter.java @@ -91,7 +91,7 @@ public View getView(int position, View convertView, ViewGroup parent) { groupName.setText(group.getDisplayName()); groupName.setTypeface(null, Typeface.NORMAL); - final ImageView groupAvatar = convertView.findViewById(R.id.room_avatar); + final ImageView groupAvatar = convertView.findViewById(R.id.group_avatar); VectorUtils.loadGroupAvatar(mContext, mSession, groupAvatar, group); final TextView groupTopic = convertView.findViewById(R.id.group_topic); diff --git a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java index e788fa9c98..3ebc9cfa58 100755 --- a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java +++ b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java @@ -1154,13 +1154,13 @@ public boolean onLongClick(View v) { } // Sender avatar - View avatarLayoutView = mHelper.setSenderAvatar(convertView, row, isMergedView); + View avatarView = mHelper.setSenderAvatar(convertView, row, isMergedView); // if the messages are merged // the thumbnail is hidden // and the subview must be moved to be aligned with the previous body View bodyLayoutView = convertView.findViewById(R.id.messagesAdapter_body_layout); - VectorMessagesAdapterHelper.alignSubviewToAvatarView(subView, bodyLayoutView, avatarLayoutView, isMergedView); + VectorMessagesAdapterHelper.alignSubviewToAvatarView(subView, bodyLayoutView, avatarView, isMergedView); // messages separator View messageSeparatorView = convertView.findViewById(R.id.messagesAdapter_message_separator); @@ -1183,7 +1183,7 @@ public boolean onLongClick(View v) { manageSelectionMode(convertView, event, msgType); // read marker - setReadMarker(convertView, row, isMergedView, avatarLayoutView, bodyLayoutView); + setReadMarker(convertView, row, isMergedView, avatarView, bodyLayoutView); // download / upload progress layout if ((ROW_TYPE_IMAGE == msgType) || (ROW_TYPE_FILE == msgType) || (ROW_TYPE_VIDEO == msgType) || (ROW_TYPE_STICKER == msgType)) { diff --git a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java index bc38ecc909..94796876e4 100755 --- a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java +++ b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java @@ -231,9 +231,9 @@ private void refreshGroupFlairView(final View groupFlairView, final Event event, List imageViews = new ArrayList<>(); - imageViews.add((ImageView) (groupFlairView.findViewById(R.id.message_avatar_group_1).findViewById(R.id.avatar_img))); - imageViews.add((ImageView) (groupFlairView.findViewById(R.id.message_avatar_group_2).findViewById(R.id.avatar_img))); - imageViews.add((ImageView) (groupFlairView.findViewById(R.id.message_avatar_group_3).findViewById(R.id.avatar_img))); + imageViews.add(groupFlairView.findViewById(R.id.message_avatar_group_1)); + imageViews.add(groupFlairView.findViewById(R.id.message_avatar_group_2)); + imageViews.add(groupFlairView.findViewById(R.id.message_avatar_group_3)); TextView moreText = groupFlairView.findViewById(R.id.message_more_than_expected); @@ -489,13 +489,12 @@ void loadMemberAvatar(ImageView avatarView, MessageRow row) { */ View setSenderAvatar(View convertView, MessageRow row, boolean isMergedView) { Event event = row.getEvent(); - View avatarLayoutView = convertView.findViewById(R.id.messagesAdapter_roundAvatar); + ImageView avatarView = convertView.findViewById(R.id.messagesAdapter_avatar); - if (null != avatarLayoutView) { + if (null != avatarView) { final String userId = event.getSender(); - avatarLayoutView.setClickable(true); - avatarLayoutView.setOnLongClickListener(new View.OnLongClickListener() { + avatarView.setOnLongClickListener(new View.OnLongClickListener() { @Override public boolean onLongClick(View v) { return (null != mEventsListener) && mEventsListener.onAvatarLongClick(userId); @@ -503,7 +502,7 @@ public boolean onLongClick(View v) { }); // click on the avatar opens the details page - avatarLayoutView.setOnClickListener(new View.OnClickListener() { + avatarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (null != mEventsListener) { @@ -513,21 +512,19 @@ public void onClick(View v) { }); } - if (null != avatarLayoutView) { + if (null != avatarView) { if (isMergedView) { - avatarLayoutView.setVisibility(View.INVISIBLE); + avatarView.setVisibility(View.INVISIBLE); } else { - avatarLayoutView.setVisibility(View.VISIBLE); + avatarView.setVisibility(View.VISIBLE); - ImageView avatarImageView = avatarLayoutView.findViewById(R.id.avatar_img); + avatarView.setTag(null); - avatarImageView.setTag(null); - - loadMemberAvatar(avatarImageView, row); + loadMemberAvatar(avatarView, row); } } - return avatarLayoutView; + return avatarView; } /** @@ -685,11 +682,11 @@ void displayReadReceipts(View convertView, List imageViews = new ArrayList<>(); - imageViews.add(avatarsListView.findViewById(R.id.message_avatar_receipt_1).findViewById(R.id.avatar_img)); - imageViews.add(avatarsListView.findViewById(R.id.message_avatar_receipt_2).findViewById(R.id.avatar_img)); - imageViews.add(avatarsListView.findViewById(R.id.message_avatar_receipt_3).findViewById(R.id.avatar_img)); - imageViews.add(avatarsListView.findViewById(R.id.message_avatar_receipt_4).findViewById(R.id.avatar_img)); - imageViews.add(avatarsListView.findViewById(R.id.message_avatar_receipt_5).findViewById(R.id.avatar_img)); + imageViews.add(avatarsListView.findViewById(R.id.message_avatar_receipt_1)); + imageViews.add(avatarsListView.findViewById(R.id.message_avatar_receipt_2)); + imageViews.add(avatarsListView.findViewById(R.id.message_avatar_receipt_3)); + imageViews.add(avatarsListView.findViewById(R.id.message_avatar_receipt_4)); + imageViews.add(avatarsListView.findViewById(R.id.message_avatar_receipt_5)); TextView moreText = avatarsListView.findViewById(R.id.message_more_than_expected); diff --git a/vector/src/main/java/im/vector/adapters/VectorPublicRoomsAdapter.java b/vector/src/main/java/im/vector/adapters/VectorPublicRoomsAdapter.java index cf9a6295ab..a61a476410 100644 --- a/vector/src/main/java/im/vector/adapters/VectorPublicRoomsAdapter.java +++ b/vector/src/main/java/im/vector/adapters/VectorPublicRoomsAdapter.java @@ -25,12 +25,12 @@ import android.widget.ImageView; import android.widget.TextView; -import im.vector.R; -import im.vector.util.VectorUtils; - import org.matrix.androidsdk.MXSession; import org.matrix.androidsdk.rest.model.publicroom.PublicRoom; +import im.vector.R; +import im.vector.util.VectorUtils; + /** * An adapter which can display m.room.member content. */ @@ -65,7 +65,7 @@ public View getView(int position, View convertView, ViewGroup parent) { String roomName = !TextUtils.isEmpty(publicRoom.name) ? publicRoom.name : VectorUtils.getPublicRoomDisplayName(publicRoom); // retrieve the UI items - ImageView avatarImageView = convertView.findViewById(R.id.room_avatar); + ImageView avatarImageView = convertView.findViewById(R.id.adapter_item_recent_room_avatar); TextView roomNameTxtView = convertView.findViewById(R.id.roomSummaryAdapter_roomName); TextView roomMessageTxtView = convertView.findViewById(R.id.roomSummaryAdapter_roomMessage); diff --git a/vector/src/main/java/im/vector/adapters/VectorReadReceiptsAdapter.kt b/vector/src/main/java/im/vector/adapters/VectorReadReceiptsAdapter.kt index bef18c5861..a7cd3c9abd 100644 --- a/vector/src/main/java/im/vector/adapters/VectorReadReceiptsAdapter.kt +++ b/vector/src/main/java/im/vector/adapters/VectorReadReceiptsAdapter.kt @@ -124,7 +124,7 @@ class VectorReadReceiptsAdapter(private val mContext: Context, } class ReadReceiptViewHolder(val view: View) : RecyclerView.ViewHolder(view) { - @BindView(R.id.avatar_img_vector) + @BindView(R.id.read_receipt_user_avatar) lateinit var imageView: ImageView @BindView(R.id.read_receipt_user_name) diff --git a/vector/src/main/java/im/vector/adapters/VectorRoomSummaryAdapter.java b/vector/src/main/java/im/vector/adapters/VectorRoomSummaryAdapter.java index 8928c9056c..3af69ce4f1 100644 --- a/vector/src/main/java/im/vector/adapters/VectorRoomSummaryAdapter.java +++ b/vector/src/main/java/im/vector/adapters/VectorRoomSummaryAdapter.java @@ -675,7 +675,7 @@ public View getChildView(int groupPosition, int childPosition, boolean isLastChi int vectorSilverColor = ContextCompat.getColor(mContext, R.color.vector_silver_color); // retrieve the UI items - ImageView avatarImageView = convertView.findViewById(R.id.room_avatar); + ImageView avatarImageView = convertView.findViewById(R.id.adapter_item_recent_room_avatar); TextView roomNameTxtView = convertView.findViewById(R.id.roomSummaryAdapter_roomName); TextView roomMsgTxtView = convertView.findViewById(R.id.roomSummaryAdapter_roomMessage); View bingUnreadMsgView = convertView.findViewById(R.id.bing_indicator_unread_message); diff --git a/vector/src/main/java/im/vector/adapters/VectorRoomsSelectionAdapter.java b/vector/src/main/java/im/vector/adapters/VectorRoomsSelectionAdapter.java index 70fcea3a98..201cb390c4 100644 --- a/vector/src/main/java/im/vector/adapters/VectorRoomsSelectionAdapter.java +++ b/vector/src/main/java/im/vector/adapters/VectorRoomsSelectionAdapter.java @@ -82,6 +82,7 @@ private String getFormattedTimestamp(Event event) { return text; } + // TODO Recycling is not managed well here @Override public View getView(int position, View convertView, ViewGroup parent) { if (convertView == null) { @@ -96,7 +97,7 @@ public View getView(int position, View convertView, ViewGroup parent) { RoomSummary roomSummary = getItem(position); // retrieve the UI items - ImageView avatarImageView = convertView.findViewById(R.id.room_avatar); + ImageView avatarImageView = convertView.findViewById(R.id.adapter_item_recent_room_avatar); TextView roomNameTxtView = convertView.findViewById(R.id.roomSummaryAdapter_roomName); TextView roomMessageTxtView = convertView.findViewById(R.id.roomSummaryAdapter_roomMessage); diff --git a/vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java b/vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java index 022aaedaa1..916f5709ba 100755 --- a/vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java +++ b/vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java @@ -108,7 +108,7 @@ public View getView(int position, View convertView2, ViewGroup parent) { Room room = mSession.getDataHandler().getStore().getRoom(event.roomId); // refresh the avatar - ImageView avatarView = convertView.findViewById(R.id.messagesAdapter_roundAvatar).findViewById(R.id.avatar_img); + ImageView avatarView = convertView.findViewById(R.id.messagesAdapter_avatar); mHelper.loadMemberAvatar(avatarView, row); // display the sender diff --git a/vector/src/main/java/im/vector/preference/UserAvatarPreference.kt b/vector/src/main/java/im/vector/preference/UserAvatarPreference.kt index 69b931d8bd..3597be5cc7 100755 --- a/vector/src/main/java/im/vector/preference/UserAvatarPreference.kt +++ b/vector/src/main/java/im/vector/preference/UserAvatarPreference.kt @@ -45,7 +45,7 @@ open class UserAvatarPreference : Preference { override fun onBindViewHolder(holder: PreferenceViewHolder) { super.onBindViewHolder(holder) - mAvatarView = holder.itemView.findViewById(R.id.avatar_img) + mAvatarView = holder.itemView.findViewById(R.id.settings_avatar) mLoadingProgressBar = holder.itemView.findViewById(R.id.avatar_update_progress_bar) refreshAvatar() } diff --git a/vector/src/main/java/im/vector/preference/VectorGroupPreference.kt b/vector/src/main/java/im/vector/preference/VectorGroupPreference.kt index 683ab4e4e9..5d66773f3a 100644 --- a/vector/src/main/java/im/vector/preference/VectorGroupPreference.kt +++ b/vector/src/main/java/im/vector/preference/VectorGroupPreference.kt @@ -64,7 +64,7 @@ class VectorGroupPreference : SwitchPreference { val inflater = LayoutInflater.from(context) val layout = inflater.inflate(R.layout.vector_settings_round_group_avatar, null, false) as FrameLayout - mAvatarView = layout.findViewById(R.id.avatar_img) + mAvatarView = layout.findViewById(R.id.settings_round_group_avatar) val params = LinearLayout.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) diff --git a/vector/src/main/res/drawable/avatar_mask_black.xml b/vector/src/main/res/drawable/avatar_mask_black.xml deleted file mode 100644 index 05cf3ae6c4..0000000000 --- a/vector/src/main/res/drawable/avatar_mask_black.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - diff --git a/vector/src/main/res/drawable/avatar_mask_dark.xml b/vector/src/main/res/drawable/avatar_mask_dark.xml deleted file mode 100644 index 54f2147593..0000000000 --- a/vector/src/main/res/drawable/avatar_mask_dark.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - diff --git a/vector/src/main/res/drawable/avatar_mask_light.xml b/vector/src/main/res/drawable/avatar_mask_light.xml deleted file mode 100644 index 68bd5cf4b2..0000000000 --- a/vector/src/main/res/drawable/avatar_mask_light.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - diff --git a/vector/src/main/res/drawable/avatar_mask_room_header_dark.xml b/vector/src/main/res/drawable/avatar_mask_room_header_dark.xml deleted file mode 100644 index acba5bc723..0000000000 --- a/vector/src/main/res/drawable/avatar_mask_room_header_dark.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/vector/src/main/res/drawable/avatar_mask_room_header_light.xml b/vector/src/main/res/drawable/avatar_mask_room_header_light.xml deleted file mode 100644 index 8c885326b0..0000000000 --- a/vector/src/main/res/drawable/avatar_mask_room_header_light.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/vector/src/main/res/drawable/avatar_mask_room_header_status.xml b/vector/src/main/res/drawable/avatar_mask_room_header_status.xml deleted file mode 100644 index 3b8b22667f..0000000000 --- a/vector/src/main/res/drawable/avatar_mask_room_header_status.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/vector/src/main/res/drawable/avatar_mask_status.xml b/vector/src/main/res/drawable/avatar_mask_status.xml deleted file mode 100644 index ff75ac86ef..0000000000 --- a/vector/src/main/res/drawable/avatar_mask_status.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - diff --git a/vector/src/main/res/drawable/avatar_mask_white_stroke_black.xml b/vector/src/main/res/drawable/avatar_mask_white_stroke_black.xml deleted file mode 100644 index a50cf1a40a..0000000000 --- a/vector/src/main/res/drawable/avatar_mask_white_stroke_black.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/vector/src/main/res/drawable/avatar_mask_white_stroke_dark.xml b/vector/src/main/res/drawable/avatar_mask_white_stroke_dark.xml deleted file mode 100644 index 6642ca0926..0000000000 --- a/vector/src/main/res/drawable/avatar_mask_white_stroke_dark.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/vector/src/main/res/drawable/avatar_mask_white_stroke_light.xml b/vector/src/main/res/drawable/avatar_mask_white_stroke_light.xml deleted file mode 100644 index 7f44b8bbb0..0000000000 --- a/vector/src/main/res/drawable/avatar_mask_white_stroke_light.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/vector/src/main/res/drawable/avatar_mask_white_stroke_status.xml b/vector/src/main/res/drawable/avatar_mask_white_stroke_status.xml deleted file mode 100644 index f718a21885..0000000000 --- a/vector/src/main/res/drawable/avatar_mask_white_stroke_status.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/vector/src/main/res/layout/activity_member_details.xml b/vector/src/main/res/layout/activity_member_details.xml index 2d92946ca8..c7b536092d 100644 --- a/vector/src/main/res/layout/activity_member_details.xml +++ b/vector/src/main/res/layout/activity_member_details.xml @@ -23,26 +23,23 @@ android:visibility="visible"> - - - - + - + android:layout_marginBottom="8dp" + android:adjustViewBounds="true" + android:scaleType="centerCrop" + tools:src="@tools:sample/avatars" /> - - - - - - - diff --git a/vector/src/main/res/layout/adapter_item_circular_avatar_room_view.xml b/vector/src/main/res/layout/adapter_item_circular_avatar_room_view.xml deleted file mode 100644 index 6696bcd3a5..0000000000 --- a/vector/src/main/res/layout/adapter_item_circular_avatar_room_view.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - diff --git a/vector/src/main/res/layout/adapter_item_circular_room_view.xml b/vector/src/main/res/layout/adapter_item_circular_room_view.xml index bf60fc041c..d521646cdf 100755 --- a/vector/src/main/res/layout/adapter_item_circular_room_view.xml +++ b/vector/src/main/res/layout/adapter_item_circular_room_view.xml @@ -8,23 +8,25 @@ android:paddingBottom="10dp" tools:background="#22ff0000"> - + android:layout_centerHorizontal="true" + android:adjustViewBounds="true" + android:scaleType="centerCrop" + tools:src="@tools:sample/avatars" /> @@ -34,7 +36,7 @@ android:id="@+id/room_unread_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignTop="@+id/room_avatar_layout" + android:layout_alignTop="@+id/room_avatar" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_marginEnd="10dp" @@ -54,7 +56,7 @@ android:id="@+id/room_avatar_encrypted_icon" android:layout_width="15dp" android:layout_height="15dp" - android:layout_alignBottom="@+id/room_avatar_layout" + android:layout_alignBottom="@+id/room_avatar" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_marginEnd="15dp" @@ -68,7 +70,7 @@ android:id="@+id/room_name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@+id/room_avatar_layout" + android:layout_below="@+id/room_avatar" android:layout_marginTop="6dp" android:ellipsize="end" android:fontFamily="sans-serif-regular" diff --git a/vector/src/main/res/layout/adapter_item_contact_view.xml b/vector/src/main/res/layout/adapter_item_contact_view.xml index 5671c0dede..f7dea32ab9 100644 --- a/vector/src/main/res/layout/adapter_item_contact_view.xml +++ b/vector/src/main/res/layout/adapter_item_contact_view.xml @@ -9,20 +9,23 @@ android:paddingEnd="16dp" android:paddingRight="16dp"> - + android:layout_centerVertical="true" + android:adjustViewBounds="true" + android:background="@color/riot_primary_background_color_light" + android:scaleType="centerCrop" + tools:src="@tools:sample/avatars" /> + android:layout_toEndOf="@+id/group_avatar" + android:layout_toRightOf="@+id/group_avatar"> - + android:layout_centerVertical="true" + android:adjustViewBounds="true" + android:background="@color/riot_primary_background_color_light" + android:scaleType="centerCrop" + tools:src="@tools:sample/avatars" /> - + android:layout_toRightOf="@+id/left_margin" + android:adjustViewBounds="true" + android:scaleType="centerCrop" + tools:src="@tools:sample/avatars" /> + android:layout_toEndOf="@+id/group_avatar" + android:layout_toRightOf="@+id/group_avatar"> - - + - - - - + app:layout_constraintTop_toTopOf="parent" + tools:src="@tools:sample/avatars" /> - + android:layout_toRightOf="@+id/indicator_unread_message" + android:adjustViewBounds="true" + android:contentDescription="@string/avatar" + android:scaleType="centerCrop" + tools:src="@tools:sample/avatars" /> @@ -41,9 +44,9 @@ android:id="@+id/room_avatar_encrypted_icon" android:layout_width="15dp" android:layout_height="15dp" - android:layout_alignEnd="@+id/room_avatar_layout" - android:layout_alignRight="@+id/room_avatar_layout" - android:layout_alignBottom="@+id/room_avatar_layout" + android:layout_alignEnd="@+id/room_avatar" + android:layout_alignRight="@+id/room_avatar" + android:layout_alignBottom="@+id/room_avatar" android:layout_marginEnd="-4dp" android:layout_marginRight="-4dp" android:src="@drawable/e2e_verified" @@ -59,8 +62,8 @@ android:layout_marginLeft="16dp" android:layout_marginEnd="16dp" android:layout_marginRight="16dp" - android:layout_toEndOf="@+id/room_avatar_layout" - android:layout_toRightOf="@+id/room_avatar_layout"> + android:layout_toEndOf="@+id/room_avatar" + android:layout_toRightOf="@+id/room_avatar"> - + - + - + - + - + - + - + android:layout_toRightOf="@id/bing_indicator_unread_message" + android:adjustViewBounds="true" + android:scaleType="centerCrop" + tools:src="@tools:sample/avatars" /> - - - - - - - - diff --git a/vector/src/main/res/layout/round_avatar_vector.xml b/vector/src/main/res/layout/round_avatar_vector.xml deleted file mode 100644 index bc48b4d80a..0000000000 --- a/vector/src/main/res/layout/round_avatar_vector.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - diff --git a/vector/src/main/res/layout/vector_large_round_avatar.xml b/vector/src/main/res/layout/vector_large_round_avatar.xml deleted file mode 100644 index 73ba5f36f3..0000000000 --- a/vector/src/main/res/layout/vector_large_round_avatar.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/layout/vector_receipt_round_avatar.xml b/vector/src/main/res/layout/vector_receipt_round_avatar.xml index 5567641fad..196772a54d 100644 --- a/vector/src/main/res/layout/vector_receipt_round_avatar.xml +++ b/vector/src/main/res/layout/vector_receipt_round_avatar.xml @@ -1,25 +1,11 @@ - - - - - - - - + android:adjustViewBounds="true" + android:contentDescription="@string/receipt_avatar" + android:scaleType="centerCrop" + tools:src="@tools:sample/avatars" /> diff --git a/vector/src/main/res/layout/vector_room_header.xml b/vector/src/main/res/layout/vector_room_header.xml index aa95a88e2a..fc6a8f2f0b 100644 --- a/vector/src/main/res/layout/vector_room_header.xml +++ b/vector/src/main/res/layout/vector_room_header.xml @@ -6,13 +6,15 @@ android:background="?attr/vctr_primary_color" android:orientation="vertical"> - + android:layout_marginTop="16dp" + android:adjustViewBounds="true" + android:scaleType="centerCrop" + tools:src="@tools:sample/avatars" /> - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/layout/vector_room_round_avatar.xml b/vector/src/main/res/layout/vector_room_round_avatar.xml deleted file mode 100644 index 309a2db955..0000000000 --- a/vector/src/main/res/layout/vector_room_round_avatar.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/vector/src/main/res/layout/vector_settings_round_avatar.xml b/vector/src/main/res/layout/vector_settings_round_avatar.xml index 11e556eb6c..d18b8fe3f8 100644 --- a/vector/src/main/res/layout/vector_settings_round_avatar.xml +++ b/vector/src/main/res/layout/vector_settings_round_avatar.xml @@ -1,20 +1,24 @@ + android:scaleType="centerCrop" + tools:src="@tools:sample/avatars" /> + android:visibility="gone" + tools:visibility="visible" /> + \ No newline at end of file diff --git a/vector/src/main/res/layout/vector_settings_round_group_avatar.xml b/vector/src/main/res/layout/vector_settings_round_group_avatar.xml index 371cdb8531..1456956f58 100644 --- a/vector/src/main/res/layout/vector_settings_round_group_avatar.xml +++ b/vector/src/main/res/layout/vector_settings_round_group_avatar.xml @@ -6,7 +6,7 @@ android:layout_height="wrap_content"> - - - - diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml index 0bf9c5aca9..134d7ea544 100644 --- a/vector/src/main/res/values/theme_black.xml +++ b/vector/src/main/res/values/theme_black.xml @@ -6,8 +6,6 @@