Merge pull request #37 from 1IxI1/folder-avatar-removal

Add folder avatar removal

Author: macosswift

Telegram-Mac/packages-integration/bridges/SidebarUIIntegration.swift

@@ -170,8 +170,10 @@ final class AppSidebarUIEnvironment: SidebarUIEnvironment {
         return InputTextDataRowItem(size, stableId: stableId, context: accountContext, state: state, viewType: .singleItem, placeholder: nil, inputPlaceholder: strings().chatListFilterNamePlaceholder, rightItem: rightItem, filter: { $0 }, updateState: updateState, limit: 12, hasEmoji: true, playAnimation: playAnimation)
     }
 
-    func makePeerRow(_ size: NSSize, peer: Peer, stableId: AnyHashable, viewType: GeneralViewType, action: @escaping () -> Void, contextMenuItems: @escaping () -> Signal<[ContextMenuItem], NoError>) -> TableRowItem {
-        return ShortPeerRowItem(size, peer: peer, account: accountContext.account, context: accountContext, stableId: stableId, height: 44, photoSize: NSMakeSize(30, 30), inset: NSEdgeInsets(left: 20, right: 20), viewType: viewType, action: action, contextMenuItems: contextMenuItems)
+    func makePeerRow(_ size: NSSize, peer: Peer, stableId: AnyHashable, viewType: GeneralViewType, action: @escaping () -> Void, remove: @escaping () -> Void, contextMenuItems: @escaping () -> Signal<[ContextMenuItem], NoError>) -> TableRowItem {
+        let item = ShortPeerRowItem(size, peer: peer, account: accountContext.account, context: accountContext, stableId: stableId, height: 44, photoSize: NSMakeSize(30, 30), inset: NSEdgeInsets(left: 20, right: 20), viewType: viewType, action: action, contextMenuItems: contextMenuItems)
+        item.avatarRemoveAction = remove
+        return item
     }
 
     func makeAnimatedHeader() -> SidebarAnimatedHeaderView {

packages/ShortPeerRow/Sources/ShortPeerRow/ShortPeerRowItem.swift

@@ -336,6 +336,7 @@ open class ShortPeerRowItem: GeneralRowItem {
 
     private let _menuPresentation: AppMenu.Presentation?
     public let badgeAction: ((NSView)->Void)?
+    public var avatarRemoveAction: (() -> Void)?
 
     public init(_ initialSize:NSSize, peer: Peer, account: Account, context: (any AccountContextProtocol)?, peerId: PeerId? = nil, stableId:AnyHashable? = nil, enabled: Bool = true, height:CGFloat = 50, photoSize:NSSize = NSMakeSize(36, 36), titleStyle:ControlStyle = ControlStyle(font: .medium(.title), foregroundColor: theme.colors.text, highlightColor: .white), titleAddition:String? = nil, leftImage:CGImage? = nil, statusStyle:ControlStyle = ControlStyle(font:.normal(.text), foregroundColor: theme.colors.grayText, highlightColor:.white), status:String? = nil, borderType:BorderType = [], drawCustomSeparator:Bool = true, isLookSavedMessage: Bool = false, deleteInset:CGFloat? = nil, drawLastSeparator:Bool = false, inset:NSEdgeInsets = NSEdgeInsets(left:10.0), drawSeparatorIgnoringInset: Bool = false, interactionType:ShortPeerItemInteractionType = .plain, generalType:GeneralInteractedType = .none, viewType: GeneralViewType = .legacy, action:@escaping ()->Void = {}, contextMenuItems:@escaping()->Signal<[ContextMenuItem], NoError> = { .single([]) }, inputActivity: PeerInputActivity? = nil, highlightOnHover: Bool = false, alwaysHighlight: Bool = false, badgeNode: ShortPeerBadgeNode? = nil, compactText: Bool = false, highlightVerified: Bool = false, customTheme: GeneralRowItem.Theme? = nil, drawPhotoOuter: Bool = false, disabledAction:(()->Void)? = nil, story: EngineStorySubscriptions.Item? = nil, openStory: @escaping(StoryInitialIndex?)->Void = { _ in }, menuOnAction: Bool = false, photoBadge: CGImage? = nil, customAction: CustomAction? = nil, makeAvatarRound: Bool = false, drawStarsPaid: StarsAmount? = nil, statusImage: CGImage? = nil, passLeftAction: Bool = false, rightActions: RightActions = .init(), monoforumPeer: Peer? = nil, fullSize: Bool = false, _menuPresentation: AppMenu.Presentation? = nil, badgeAction: ((NSView)->Void)? = nil) {
         self.peer = peer

packages/ShortPeerRow/Sources/ShortPeerRow/ShortPeerRowView.swift

@@ -33,6 +33,7 @@ open class ShortPeerRowView: TableRowView, Notifable, ViewDisplayDelegate {
     private var paidMessageBadgeCache: SendPaidMessageBadgeCache?
 
     private var deleteControl:ImageButton?
+    private var avatarRemoveControl: ImageButton?
     private var selectControl:SelectingControl?
     let container:Control = Control()
     private var switchView:SwitchView?
@@ -485,6 +486,12 @@ open class ShortPeerRowView: TableRowView, Notifable, ViewDisplayDelegate {
                 container.needsDisplay = true
 
             }
+
+            if let avatarRemoveControl {
+                avatarRemoveControl.frame = image.frame
+                avatarRemoveControl.layer?.mask?.frame = avatarRemoveControl.bounds
+                avatarRemoveControl.updateState()
+            }
 
             var additional: CGFloat = 0
 
@@ -843,6 +850,42 @@ open class ShortPeerRowView: TableRowView, Notifable, ViewDisplayDelegate {
         }
 
         image.userInteractionEnabled = item.story != nil
+
+        if item.avatarRemoveAction != nil, item.enabled {
+            let control: ImageButton
+            if let avatarRemoveControl {
+                control = avatarRemoveControl
+            } else {
+                control = ImageButton()
+                control.autohighlight = false
+                control.set(background: .clear, for: .Normal)
+                control.set(background: NSColor.black.withAlphaComponent(0.6), for: .Hover)
+                control.set(background: NSColor.black.withAlphaComponent(0.7), for: .Highlight)
+                let mask = SimpleLayer()
+                mask.contentsGravity = .resizeAspectFill
+                control.layer?.mask = mask
+                image.contentUpdated = { [weak mask] contents in
+                    mask?.contents = contents
+                }
+                control.set(handler: { [weak self] _ in
+                    guard let item = self?.item as? ShortPeerRowItem, item.enabled else {
+                        return
+                    }
+                    item.avatarRemoveAction?()
+                }, for: .Click)
+                container.addSubview(control)
+                avatarRemoveControl = control
+            }
+            control.layer?.mask?.contents = image.avatar.imageContents
+            let icon = TelegramThemeHooks.shared.image(.iconPipClose).precomposed(.white)
+            control.set(image: icon, for: .Hover)
+            control.set(image: icon, for: .Highlight)
+            control.setAccessibilityLabel(strings().voiceOverCommonRemove)
+        } else if let avatarRemoveControl {
+            avatarRemoveControl.removeFromSuperview()
+            self.avatarRemoveControl = nil
+            image.contentUpdated = nil
+        }
 
         let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.2, curve: .easeOut) : .immediate
         if let indicator = item.avatarStoryIndicator {

packages/SidebarUI/Sources/SidebarUI/ChatListFilterController.swift

@@ -641,6 +641,8 @@ private func chatListFilterEntries(state: State, includePeers: [Peer], excludePe
                 entries.append(.custom(sectionId: sectionId, index: index, value: .none, identifier: _id_include(peer.id), equatable: InputDataEquatable(E(viewType: viewType, peer: SidebarPeerEquatable(peer))), comparable: nil, item: { initialSize, stableId in
                     return arguments.environment.makePeerRow(initialSize, peer: peer, stableId: stableId, viewType: viewType, action: {
                         arguments.openInfo(peer.id)
+                    }, remove: {
+                        arguments.removeIncluded(peer.id)
                     }, contextMenuItems: {
                         return .single([ContextMenuItem(strings().chatListFilterIncludeRemoveChat, handler: {
                             arguments.removeIncluded(peer.id)
@@ -715,6 +717,8 @@ private func chatListFilterEntries(state: State, includePeers: [Peer], excludePe
                     entries.append(.custom(sectionId: sectionId, index: index, value: .none, identifier: _id_exclude(peer.id), equatable: InputDataEquatable(E(viewType: viewType, peer: SidebarPeerEquatable(peer))), comparable: nil, item: { initialSize, stableId in
                         return arguments.environment.makePeerRow(initialSize, peer: peer, stableId: stableId, viewType: viewType, action: {
                             arguments.openInfo(peer.id)
+                        }, remove: {
+                            arguments.removeExcluded(peer.id)
                         }, contextMenuItems: {
                             return .single([ContextMenuItem.init(strings().chatListFilterExcludeRemoveChat, handler: {
                                 arguments.removeExcluded(peer.id)

packages/SidebarUI/Sources/SidebarUI/SidebarUIEnvironment.swift

@@ -63,7 +63,7 @@ public protocol SidebarUIEnvironment: AnyObject {
     func titleEntities(_ state: Updated_ChatTextInputState) -> [MessageTextEntity]
     func inputStatesEqual(_ lhs: Updated_ChatTextInputState, _ rhs: Updated_ChatTextInputState) -> Bool
     func makeNameRow(_ size: NSSize, stableId: AnyHashable, state: Updated_ChatTextInputState, rightItem: InputDataRightItem, updateState: @escaping (Updated_ChatTextInputState) -> Void, playAnimation: Bool) -> TableRowItem
-    func makePeerRow(_ size: NSSize, peer: Peer, stableId: AnyHashable, viewType: GeneralViewType, action: @escaping () -> Void, contextMenuItems: @escaping () -> Signal<[ContextMenuItem], NoError>) -> TableRowItem
+    func makePeerRow(_ size: NSSize, peer: Peer, stableId: AnyHashable, viewType: GeneralViewType, action: @escaping () -> Void, remove: @escaping () -> Void, contextMenuItems: @escaping () -> Signal<[ContextMenuItem], NoError>) -> TableRowItem
     func makeAnimatedHeader() -> SidebarAnimatedHeaderView
     func applyInlineStickers(to text: NSMutableAttributedString, entities: [MessageTextEntity], isPremium: Bool, animated: Bool)
     func image(_ image: SidebarImage) -> NSImage