Buttons update

Author: Isaac

submodules/TelegramUI/Components/Chat/ChatChannelSubscriberInputPanelNode/Sources/ChatChannelSubscriberInputPanelNode.swift

@@ -418,33 +418,14 @@ public final class ChatChannelSubscriberInputPanelNode: ChatInputPanelNode {
 
                     let _ = previousAction
 
-                    /*var offset: CGFloat = 30.0
-                    
-                    if let previousAction = previousAction, [.join, .muteNotifications].contains(previousAction) && action == .unmuteNotifications || [.join, .unmuteNotifications].contains(previousAction) && action == .muteNotifications {
-                        if [.join, .muteNotifications].contains(previousAction) {
-                            offset *= -1.0
-                        }
-                        if let snapshotView = self.button.view.snapshotContentTree() {
-                            snapshotView.frame = self.button.frame
-                            self.button.supernode?.view.addSubview(snapshotView)
-                            
-                            snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak snapshotView] _ in
-                                snapshotView?.removeFromSuperview()
-                            })
-                            snapshotView.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: offset), duration: 0.2,  removeOnCompletion: false, additive: true)
-                            self.button.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
-                            self.button.layer.animatePosition(from: CGPoint(x: 0.0, y: -offset), to: CGPoint(), duration: 0.2, additive: true)
-                        }
-                    }*/
-                    
                     let titleColor: UIColor
                     if case .join = self.action {
                         titleColor = interfaceState.theme.chat.inputPanel.actionControlForegroundColor
                     } else {
                         titleColor = interfaceState.theme.chat.inputPanel.panelControlColor
                     }
-                    self.buttonTitle.attributedText = NSAttributedString(string: title, font: Font.regular(17.0), textColor: titleColor)
-                    self.buttonTintTitle.attributedText = NSAttributedString(string: title, font: Font.regular(17.0), textColor: .black)
+                    self.buttonTitle.attributedText = NSAttributedString(string: title, font: Font.semibold(16.0), textColor: titleColor)
+                    self.buttonTintTitle.attributedText = NSAttributedString(string: title, font: Font.semibold(16.0), textColor: .black)
                     self.button.accessibilityLabel = title
                 } else {
                     self.action = nil
@@ -493,7 +474,7 @@ public final class ChatChannelSubscriberInputPanelNode: ChatInputPanelNode {
         transition.updateFrame(view: self.buttonBackgroundView, frame: CGRect(origin: CGPoint(), size: buttonFrame.size))
         let buttonTintColor: GlassBackgroundView.TintColor
         if case .join = self.action {
-            buttonTintColor = .init(kind: .custom, color: interfaceState.theme.chat.inputPanel.actionControlFillColor)
+            buttonTintColor = .init(kind: .custom, color: interfaceState.theme.chat.inputPanel.inputBackgroundColor.withMultipliedAlpha(0.7), innerColor: interfaceState.theme.chat.inputPanel.actionControlFillColor)
         } else {
             buttonTintColor = .init(kind: .panel, color: interfaceState.theme.chat.inputPanel.inputBackgroundColor.withMultipliedAlpha(0.7))
         }

submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelNode.swift

@@ -1566,14 +1566,14 @@ public class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDeleg
 
             let buttonTitle: String
             if case let .webView(title, _) = interfaceState.botMenuButton {
-                buttonTitle = title.uppercased()
+                buttonTitle = title
             } else {
-                buttonTitle = interfaceState.strings.Conversation_InputMenu.uppercased()
+                buttonTitle = interfaceState.strings.Conversation_InputMenu
             }
 
             buttonTitleUpdated = self.menuButtonTextNode.attributedText != nil && self.menuButtonTextNode.attributedText?.string != buttonTitle
 
-            self.menuButtonTextNode.attributedText = NSAttributedString(string: buttonTitle, font: Font.with(size: 16.0, design: .round, weight: .medium, traits: []), textColor: interfaceState.theme.chat.inputPanel.actionControlForegroundColor)
+            self.menuButtonTextNode.attributedText = NSAttributedString(string: buttonTitle, font: Font.with(size: 16.0, design: .round, weight: .semibold, traits: []), textColor: interfaceState.theme.chat.inputPanel.actionControlForegroundColor)
             self.menuButton.accessibilityLabel = self.menuButtonTextNode.attributedText?.string
 
             if buttonTitleUpdated, let buttonTextSnapshotView = self.menuButtonTextNode.view.snapshotView(afterScreenUpdates: false) {
@@ -1949,7 +1949,7 @@ public class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDeleg
         let menuButtonFrame = CGRect(x: leftInset + 8.0, y: menuButtonOriginY, width: menuButtonExpanded ? menuButtonWidth : menuCollapsedButtonWidth, height: menuButtonHeight)
         transition.updateFrameAsPositionAndBounds(node: self.menuButton, frame: menuButtonFrame)
         transition.updateFrame(view: self.menuButtonBackgroundView, frame: CGRect(origin: CGPoint(), size: menuButtonFrame.size))
-        self.menuButtonBackgroundView.update(size: menuButtonFrame.size, cornerRadius: menuButtonFrame.height * 0.5, isDark: interfaceState.theme.overallDarkAppearance, tintColor: .init(kind: .custom, color: interfaceState.theme.chat.inputPanel.actionControlFillColor), transition: ComponentTransition(transition))
+        self.menuButtonBackgroundView.update(size: menuButtonFrame.size, cornerRadius: menuButtonFrame.height * 0.5, isDark: interfaceState.theme.overallDarkAppearance, tintColor: .init(kind: .panel, color: interfaceState.theme.chat.inputPanel.inputBackgroundColor.withMultipliedAlpha(0.7), innerColor: interfaceState.theme.chat.inputPanel.actionControlFillColor), transition: ComponentTransition(transition))
         transition.updateFrame(node: self.menuButtonClippingNode, frame: CGRect(origin: CGPoint(x: 19.0, y: 0.0), size: CGSize(width: menuButtonWidth - 19.0, height: menuButtonFrame.height)))
         var menuButtonTitleTransition = transition
         if buttonTitleUpdated {

submodules/TelegramUI/Components/GlassBackgroundComponent/Sources/GlassBackgroundComponent.swift

@@ -252,10 +252,12 @@ public class GlassBackgroundView: UIView {
 
         public let kind: Kind
         public let color: UIColor
+        public let innerColor: UIColor?
 
-        public init(kind: Kind, color: UIColor) {
+        public init(kind: Kind, color: UIColor, innerColor: UIColor? = nil) {
             self.kind = kind
             self.color = color
+            self.innerColor = innerColor
         }
     }
 
@@ -285,6 +287,8 @@ public class GlassBackgroundView: UIView {
     public let maskContentView: UIView
     private let contentContainer: ContentContainer
 
+    private var innerBackgroundView: UIView?
+    
     public var contentView: UIView {
         if let nativeView = self.nativeView {
             return nativeView.contentView
@@ -404,6 +408,30 @@ public class GlassBackgroundView: UIView {
         if self.params != params {
             self.params = params
 
+            if let innerColor = params.tintColor.innerColor {
+                let innerBackgroundFrame = CGRect(origin: CGPoint(), size: size).insetBy(dx: 3.0, dy: 3.0)
+                let innerBackgroundRadius = min(innerBackgroundFrame.width, innerBackgroundFrame.height) * 0.5
+                
+                let innerBackgroundView: UIView
+                if let current = self.innerBackgroundView {
+                    innerBackgroundView = current
+                } else {
+                    innerBackgroundView = UIView()
+                    self.innerBackgroundView = innerBackgroundView
+                    self.contentView.insertSubview(innerBackgroundView, at: 0)
+                    
+                    innerBackgroundView.frame = innerBackgroundFrame
+                    innerBackgroundView.layer.cornerRadius = innerBackgroundRadius
+                }
+                
+                innerBackgroundView.backgroundColor = innerColor
+                transition.setFrame(view: innerBackgroundView, frame: innerBackgroundFrame)
+                transition.setCornerRadius(layer: innerBackgroundView.layer, cornerRadius: innerBackgroundRadius)
+            } else if let innerBackgroundView = self.innerBackgroundView {
+                self.innerBackgroundView = nil
+                innerBackgroundView.removeFromSuperview()
+            }
+            
             if let shadowView = self.shadowView {
                 let shadowInnerInset: CGFloat = 0.5
                 shadowView.image = generateImage(CGSize(width: shadowInset * 2.0 + cornerRadius * 2.0, height: shadowInset * 2.0 + cornerRadius * 2.0), rotatedContext: { size, context in