diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/ActionItem.kt b/vector/src/main/java/im/vector/app/features/userdirectory/ActionItem.kt index 2307640634..afbc523db2 100644 --- a/vector/src/main/java/im/vector/app/features/userdirectory/ActionItem.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/ActionItem.kt @@ -26,6 +26,7 @@ import im.vector.app.R import im.vector.app.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyModel import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.utils.DebouncedClickListener @EpoxyModelClass(layout = R.layout.item_contact_action) abstract class ActionItem : VectorEpoxyModel() { @@ -36,7 +37,7 @@ abstract class ActionItem : VectorEpoxyModel() { override fun bind(holder: Holder) { super.bind(holder) - holder.view.setOnClickListener(clickAction) + holder.view.setOnClickListener(clickAction?.let { DebouncedClickListener(it) }) // If name is empty, use userId as name and force it being centered holder.actionTitleText.setTextOrHide(title) if (actionIconRes != null) { diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt index 353505a35e..3e1523d0cc 100644 --- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt @@ -59,18 +59,18 @@ class UserListController @Inject constructor(private val session: Session, // For now we remove this option if in invite to existing room flow (and not create DM) && currentState.existingRoomId == null) { actionItem { - id(R.drawable.ic_invite_people) + id(R.drawable.ic_share) title(stringProvider.getString(R.string.invite_friends)) - actionIconRes(R.drawable.ic_invite_people) + actionIconRes(R.drawable.ic_share) clickAction(View.OnClickListener { callback?.onInviteFriendClick() }) } } actionItem { - id(R.drawable.ic_book) + id(R.drawable.ic_baseline_perm_contact_calendar_24) title(stringProvider.getString(R.string.contacts_book_title)) - actionIconRes(R.drawable.ic_book) + actionIconRes(R.drawable.ic_baseline_perm_contact_calendar_24) clickAction(View.OnClickListener { callback?.onContactBookClick() }) diff --git a/vector/src/main/res/drawable/ic_baseline_perm_contact_calendar_24.xml b/vector/src/main/res/drawable/ic_baseline_perm_contact_calendar_24.xml new file mode 100644 index 0000000000..ba2ca10744 --- /dev/null +++ b/vector/src/main/res/drawable/ic_baseline_perm_contact_calendar_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/vector/src/main/res/drawable/ic_qr_code_add.xml b/vector/src/main/res/drawable/ic_qr_code_add.xml index 32e41f6e57..133af41083 100644 --- a/vector/src/main/res/drawable/ic_qr_code_add.xml +++ b/vector/src/main/res/drawable/ic_qr_code_add.xml @@ -1,72 +1,36 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M15,3L20,3A1,1 0,0 1,21 4L21,9A1,1 0,0 1,20 10L15,10A1,1 0,0 1,14 9L14,4A1,1 0,0 1,15 3z" + android:strokeWidth="2" + android:fillColor="#00000000" + android:strokeColor="#000000"/> + android:pathData="M14.25,16.5L20.75,16.5A0.25,0.25 0,0 1,21 16.75L21,18.25A0.25,0.25 0,0 1,20.75 18.5L14.25,18.5A0.25,0.25 0,0 1,14 18.25L14,16.75A0.25,0.25 0,0 1,14.25 16.5z" + android:fillColor="#000000"/> + android:pathData="M18.5,14.25L18.5,20.75A0.25,0.25 0,0 1,18.25 21L16.75,21A0.25,0.25 0,0 1,16.5 20.75L16.5,14.25A0.25,0.25 0,0 1,16.75 14L18.25,14A0.25,0.25 0,0 1,18.5 14.25z" + android:fillColor="#000000"/> + android:pathData="M4,14L9,14A1,1 0,0 1,10 15L10,20A1,1 0,0 1,9 21L4,21A1,1 0,0 1,3 20L3,15A1,1 0,0 1,4 14z" + android:strokeWidth="2" + android:fillColor="#00000000" + android:strokeColor="#000000"/> + android:pathData="M4,3L9,3A1,1 0,0 1,10 4L10,9A1,1 0,0 1,9 10L4,10A1,1 0,0 1,3 9L3,4A1,1 0,0 1,4 3z" + android:strokeWidth="2" + android:fillColor="#00000000" + android:strokeColor="#000000"/> + android:pathData="M5.75,5.5L7.25,5.5A0.25,0.25 0,0 1,7.5 5.75L7.5,7.25A0.25,0.25 0,0 1,7.25 7.5L5.75,7.5A0.25,0.25 0,0 1,5.5 7.25L5.5,5.75A0.25,0.25 0,0 1,5.75 5.5z" + android:fillColor="#000000"/> + android:pathData="M5.75,16.5L7.25,16.5A0.25,0.25 0,0 1,7.5 16.75L7.5,18.25A0.25,0.25 0,0 1,7.25 18.5L5.75,18.5A0.25,0.25 0,0 1,5.5 18.25L5.5,16.75A0.25,0.25 0,0 1,5.75 16.5z" + android:fillColor="#000000"/> - - - + android:pathData="M16.75,5.5L18.25,5.5A0.25,0.25 0,0 1,18.5 5.75L18.5,7.25A0.25,0.25 0,0 1,18.25 7.5L16.75,7.5A0.25,0.25 0,0 1,16.5 7.25L16.5,5.75A0.25,0.25 0,0 1,16.75 5.5z" + android:fillColor="#000000"/> diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml index 459f118ccd..d56bae4678 100644 --- a/vector/src/main/res/layout/fragment_home_drawer.xml +++ b/vector/src/main/res/layout/fragment_home_drawer.xml @@ -110,7 +110,7 @@ android:textAllCaps="false" android:textColor="?colorAccent" android:textSize="13sp" - app:icon="@drawable/ic_invite_people" + app:icon="@drawable/ic_share" app:iconGravity="textStart" app:iconSize="20dp" app:iconTint="?colorAccent" diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml index 15884502ad..a5210ed99a 100644 --- a/vector/src/main/res/layout/fragment_user_list.xml +++ b/vector/src/main/res/layout/fragment_user_list.xml @@ -93,6 +93,7 @@ android:maxHeight="80dp" android:paddingTop="16dp" android:paddingBottom="16dp" + android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/chipGroupScrollView" /> diff --git a/vector/src/main/res/layout/item_contact_action.xml b/vector/src/main/res/layout/item_contact_action.xml index daea0d5154..6c5fa38f4c 100644 --- a/vector/src/main/res/layout/item_contact_action.xml +++ b/vector/src/main/res/layout/item_contact_action.xml @@ -10,9 +10,11 @@ diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index aeb7a60fec..53ab08bffd 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -426,7 +426,7 @@ Sorry. Action not performed, due to missing permissions To scan a QR code, you need to allow camera access. - To check your address book, you need to allow Contact permission. + Allow permission to access your contacts. Saved @@ -1757,7 +1757,7 @@ View the room directory Name or ID (#example:matrix.org) - Name or ID (like %s) + Search by name or ID Enable swipe to reply in timeline Add a dedicated tab for unread notifications on main screen. diff --git a/vector/src/main/res/values/style_snackbar.xml b/vector/src/main/res/values/style_snackbar.xml index 5f1412e0b4..3a826a6dda 100644 --- a/vector/src/main/res/values/style_snackbar.xml +++ b/vector/src/main/res/values/style_snackbar.xml @@ -2,15 +2,15 @@ -