Merge pull request element-hq#7428 from vector-im/alfogrillo/avatar_t…

…appability Improve avatar tappability
NicolasBuquet · Mar 16, 2023 · 571deb8 · 571deb8
2 parents c560237 + 31de127
commit 571deb8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift b/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
@@ -366,7 +366,8 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
         view.backgroundColor = .clear
 
         let avatarInsets: UIEdgeInsets = .init(top: 7, left: 7, bottom: 7, right: 7)
-        let button: UIButton = .init(frame: view.bounds.inset(by: avatarInsets))
+        let button: UIButton = .init(frame: view.bounds)
+        button.imageEdgeInsets = avatarInsets
         button.setImage(Asset.Images.tabPeople.image, for: .normal)
         button.menu = avatarMenu
         button.showsMenuAsPrimaryAction = true
@@ -386,12 +387,12 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
     }
 
     private func updateAvatarButtonItem() {
-        guard let avatarView = avatarMenuView, let button = avatarMenuButton, let avatar = userAvatarViewData(from: currentMatrixSession) else {
-            return
+        if let avatar = userAvatarViewData(from: currentMatrixSession) {
+            avatarMenuView?.fill(with: avatar)
+            avatarMenuButton?.setImage(nil, for: .normal)
+        } else {
+            avatarMenuButton?.setImage(Asset.Images.tabPeople.image, for: .normal)
         }
-
-        button.setImage(nil, for: .normal)
-        avatarView.fill(with: avatar)
     }
 
     private func showRoom(withId roomId: String, eventId: String? = nil) {

diff --git a/changelog.d/pr-7427.bugfix b/changelog.d/pr-7427.bugfix
@@ -0,0 +1 @@
+Room list: increase tappability area of the avatar button.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Room list: increase tappability area of the avatar button.