From 2340c575d034b46f9f5fc176d0a6fd9a2b8a1ff0 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Mon, 22 Mar 2021 19:55:41 +0100
Subject: [PATCH 01/38] Explore typing notifications inspired by web

- First iteration
---
 Riot/Modules/DotsView/DotsView.swift          | 152 ++++++++++++++++++
 .../Modules/Room/DataSources/RoomDataSource.h |   5 +
 .../Modules/Room/DataSources/RoomDataSource.m |  41 ++++-
 Riot/Modules/Room/RoomViewController.m        |  63 +++-----
 Riot/Modules/Room/RoomViewController.xib      |   4 +-
 .../BubbleCells/RoomTypingBubbleCell.swift    | 105 ++++++++++++
 .../BubbleCells/RoomTypingBubbleCell.xib      |  54 +++++++
 7 files changed, 375 insertions(+), 49 deletions(-)
 create mode 100644 Riot/Modules/DotsView/DotsView.swift
 create mode 100644 Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
 create mode 100644 Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.xib

diff --git a/Riot/Modules/DotsView/DotsView.swift b/Riot/Modules/DotsView/DotsView.swift
new file mode 100644
index 000000000..ca69fb6de
--- /dev/null
+++ b/Riot/Modules/DotsView/DotsView.swift
@@ -0,0 +1,152 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import UIKit
+
+@IBDesignable
+@objcMembers
+class DotsView: UIView {
+    // MARK: - Public properties
+    
+    @IBInspectable var highlightedDotColor: UIColor = .darkGray {
+        didSet {
+        }
+    }
+    
+    @IBInspectable var dotColor: UIColor = .lightGray {
+        didSet {
+        }
+    }
+    
+    @IBInspectable var dotMaxWidth: CGFloat = 10 {
+        didSet {
+            self.sizeToFit()
+        }
+    }
+    
+    @IBInspectable var dotMinWidth: CGFloat = 8 {
+        didSet {
+            self.sizeToFit()
+        }
+    }
+    
+    @IBInspectable var numberOfDots: UInt = 3 {
+        didSet {
+            createDotViews()
+        }
+    }
+    
+    @IBInspectable var interSpaceMargin: CGFloat = 7 {
+        didSet {
+            self.sizeToFit()
+        }
+    }
+    
+    // MARK: - Private members
+    
+    private var dotLayers: Array<CALayer> = Array()
+    private var highlightedDotIndex: UInt = 0 {
+        didSet {
+            updateDotViews()
+        }
+    }
+    private let updateInterval: TimeInterval = 0.4
+    private var lastUpdateDate: Date = Date()
+    private var animating: Bool = false {
+        didSet {
+            let displayLink = CADisplayLink(target: self, selector: #selector(fireTimer))
+            displayLink.add(to: .current, forMode: .default)
+        }
+    }
+
+    // MARK: - Lifecycle
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        createDotViews()
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        createDotViews()
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        updateDotViews()
+    }
+    
+    override var intrinsicContentSize: CGSize {
+        return CGSize(width: dotMaxWidth + (CGFloat(numberOfDots) - 1) * (dotMinWidth + interSpaceMargin), height: dotMaxWidth)
+    }
+    
+    override func didMoveToSuperview() {
+        animating = superview != nil
+    }
+    
+    // MARK: - Interface Builder
+    
+    override func prepareForInterfaceBuilder() {
+        super.prepareForInterfaceBuilder()
+        createDotViews()
+    }
+    
+    // MARK: - Private methods
+    
+    private func createDotViews() {
+        while dotLayers.count > numberOfDots {
+            dotLayers.popLast()?.removeFromSuperlayer()
+        }
+        
+        while dotLayers.count < numberOfDots {
+            let dotLayer = CALayer()
+            dotLayer.masksToBounds = true
+            layer.addSublayer(dotLayer)
+            dotLayers.append(dotLayer)
+        }
+        
+        if highlightedDotIndex >= dotLayers.count {
+            highlightedDotIndex = 0
+            updateDotViews()
+        }
+    }
+    
+    private func updateDotViews() {
+        CATransaction.begin()
+        CATransaction.setAnimationDuration(1)
+        var x: CGFloat = 0
+        for (index, dotLayer) in dotLayers.enumerated() {
+            if index == highlightedDotIndex {
+                dotLayer.frame = CGRect(x: x, y: (bounds.height - dotMaxWidth) / 2, width: dotMaxWidth, height: dotMaxWidth)
+                dotLayer.backgroundColor = dotColor.cgColor
+            } else {
+                dotLayer.frame = CGRect(x: x, y: (bounds.height - dotMinWidth) / 2, width: dotMinWidth, height: dotMinWidth)
+                dotLayer.backgroundColor = index == ((highlightedDotIndex + 1) % numberOfDots) ? highlightedDotColor.cgColor : dotColor.cgColor
+            }
+            dotLayer.cornerRadius = dotLayer.bounds.height / 2
+            x = dotLayer.frame.maxX + interSpaceMargin
+        }
+        lastUpdateDate = Date()
+        CATransaction.commit()
+    }
+    
+    func fireTimer() {
+        if Date().timeIntervalSince(lastUpdateDate) >= updateInterval {
+            self.highlightedDotIndex = (self.highlightedDotIndex + 1) % self.numberOfDots
+        }
+    }
+}
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.h b/Riot/Modules/Room/DataSources/RoomDataSource.h
index f28f91fac..ced9e687a 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.h
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.h
@@ -48,6 +48,11 @@
  */
 @property(nonatomic, readonly) RoomEncryptionTrustLevel encryptionTrustLevel;
 
+/**
+ List of members who are typing in the room.
+ */
+@property(nonatomic, nullable) NSArray *currentTypingUsers;
+
 /**
  Check if there is an active jitsi widget in the room and return it.
 
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 8975281c8..880f6dc65 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -53,6 +53,8 @@
 
 @property (nonatomic) BOOL showRoomCreationCell;
 
+@property (nonatomic) NSInteger typingCellIndex;
+
 @end
 
 @implementation RoomDataSource
@@ -185,6 +187,16 @@
     [self setNeedsUpdateAdditionalContentHeightForCellData:cellData];
 }
 
+- (CGFloat)cellHeightAtIndex:(NSInteger)index withMaximumWidth:(CGFloat)maxWidth
+{
+    if (index == self.typingCellIndex)
+    {
+        return 24;
+    }
+    
+    return [super cellHeightAtIndex:index withMaximumWidth:maxWidth];
+}
+
 - (void)setNeedsUpdateAdditionalContentHeightForCellData:(id<MXKRoomBubbleCellDataStoring>)cellData
 {
     RoomBubbleCellData *roomBubbleCellData;
@@ -261,16 +273,37 @@
             [self updateStatusInfo];
         }
         
-        //  we may have changed the number of bubbles in this block, consider that change
-        return bubbles.count;
+        if (self.currentTypingUsers.count == 0)
+        {
+            //  we may have changed the number of bubbles in this block, consider that change
+            return bubbles.count;
+        }
+        
+        self.typingCellIndex = bubbles.count;
+        return bubbles.count + 1;
     }
     
-    //  leave it as is, if coming as 0 from super
-    return count;
+    if (self.currentTypingUsers.count == 0)
+    {
+        self.typingCellIndex = -1;
+
+        //  leave it as is, if coming as 0 from super
+        return count;
+    }
+    
+    self.typingCellIndex = count;
+    return count + 1;
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
+    if (indexPath.row == self.typingCellIndex)
+    {
+        RoomTypingBubbleCell *cell = [tableView dequeueReusableCellWithIdentifier:RoomTypingBubbleCell.cellIdentifier forIndexPath:indexPath];
+        [cell updateTypingUsers:_currentTypingUsers mediaManager:self.mxSession.mediaManager];
+        return cell;
+    }
+    
     // Do cell data customization that needs to be done before [MXKRoomBubbleTableViewCell render]
     RoomBubbleCellData *roomBubbleCellData = [self cellDataAtIndex:indexPath.row];
 
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 963fc991f..442a6fd79 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -370,6 +370,8 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
     
     [self.bubblesTableView registerClass:RoomCreationIntroCell.class forCellReuseIdentifier:RoomCreationIntroCell.defaultReuseIdentifier];
     
+    [self.bubblesTableView registerNib:[UINib nibWithNibName:@"RoomTypingBubbleCell" bundle:nil] forCellReuseIdentifier:RoomTypingBubbleCell.cellIdentifier];
+    
     [self vc_removeBackTitle];
     
     // Replace the default input toolbar view.
@@ -4025,54 +4027,29 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
 
 - (void)refreshTypingNotification
 {
-    if ([self.titleView isKindOfClass:RoomTitleView.class])
+    RoomDataSource *roomDataSource = (RoomDataSource *) self.roomDataSource;
+    BOOL needsUpdate = currentTypingUsers.count != roomDataSource.currentTypingUsers.count;
+
+    NSMutableArray *typingUsers = [NSMutableArray new];
+    for (NSUInteger i = 0 ; i < currentTypingUsers.count ; i++) {
+        NSString *userId = currentTypingUsers[i];
+        MXRoomMember* member = [self.roomDataSource.roomState.members memberWithUserId:userId];
+        [typingUsers addObject:member];
+        needsUpdate = needsUpdate || member.userId != ((MXRoomMember *) roomDataSource.currentTypingUsers[i]).userId;
+    }
+
+    if (needsUpdate)
     {
-        RoomTitleView *titleView = (RoomTitleView *)self.titleView;
-        
-        // Prepare here typing notification
-        NSString* text = nil;
-        NSUInteger count = currentTypingUsers.count;
-        
-        // get the room member names
-        NSMutableArray *names = [[NSMutableArray alloc] init];
-        
-        // keeps the only the first two users
-        for(int i = 0; i < MIN(count, 2); i++)
+        roomDataSource.currentTypingUsers = typingUsers;
+        [self.bubblesTableView reloadData];
+        if (self.isScrollToBottomHidden)
         {
-            NSString* name = currentTypingUsers[i];
-            
-            MXRoomMember* member = [self.roomDataSource.roomState.members memberWithUserId:name];
-            
-            if (member && member.displayname.length)
+            NSInteger count = [self.roomDataSource tableView:self.bubblesTableView numberOfRowsInSection:0];
+            if (count)
             {
-                name = member.displayname;
-            }
-            
-            // sanity check
-            if (name)
-            {
-                [names addObject:name];
+                [self scrollBubblesTableViewToBottomAnimated:YES];
             }
         }
-        
-        if (0 == names.count)
-        {
-            // something to do ?
-        }
-        else if (1 == names.count)
-        {
-            text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_one_user_is_typing", @"Vector", nil), names[0]];
-        }
-        else if (2 == names.count)
-        {
-            text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_two_users_are_typing", @"Vector", nil), names[0], names[1]];
-        }
-        else
-        {
-            text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_many_users_are_typing", @"Vector", nil), names[0], names[1]];
-        }
-        
-        titleView.typingNotificationString = text;
     }
 }
 
diff --git a/Riot/Modules/Room/RoomViewController.xib b/Riot/Modules/Room/RoomViewController.xib
index a43b40a18..afcb068b5 100644
--- a/Riot/Modules/Room/RoomViewController.xib
+++ b/Riot/Modules/Room/RoomViewController.xib
@@ -140,7 +140,7 @@
                     </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" alpha="0.0" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QHs-rM-UU8" userLabel="scroll badge" customClass="BadgeLabel" customModule="Riot" customModuleProvider="target">
-                    <rect key="frame" x="334" y="562.5" width="18" height="15.5"/>
+                    <rect key="frame" x="334.5" y="562" width="17.5" height="16.5"/>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="11"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
@@ -205,7 +205,7 @@
     </objects>
     <designables>
         <designable name="QHs-rM-UU8">
-            <size key="intrinsicContentSize" width="17.5" height="15.5"/>
+            <size key="intrinsicContentSize" width="17.5" height="16.5"/>
         </designable>
     </designables>
     <resources>
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
new file mode 100644
index 000000000..60f9cb98e
--- /dev/null
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
@@ -0,0 +1,105 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import UIKit
+
+@objcMembers
+class RoomTypingBubbleCell: UITableViewCell {
+    // MARK: - Constants
+    
+    static let cellIdentifier = "RoomTypingBubbleCell"
+    
+    // MARK: - Outlets
+    
+    @IBOutlet weak var additionalUsersLabel: UILabel?
+    @IBOutlet weak var additionalUsersLabelLeadingConstraint: NSLayoutConstraint?
+    @IBOutlet weak var dotsView: DotsView?
+    @IBOutlet weak var dotsViewLeadingConstraint: NSLayoutConstraint?
+
+    // MARK: - members
+    
+    private var userPictureViews: Array<MXKImageView> = Array()
+    private var typingUsers: Array<MXRoomMember> = Array()
+    
+    // MARK: - Lifecycle
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        
+        additionalUsersLabel?.textColor = ThemeService.shared().theme.textSecondaryColor
+        dotsView?.highlightedDotColor = ThemeService.shared().theme.textTertiaryColor
+        dotsView?.dotColor = ThemeService.shared().theme.tabBarUnselectedItemTintColor
+    }
+    
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        
+        for pictureView in userPictureViews {
+            pictureView.removeFromSuperview()
+        }
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+
+        guard userPictureViews.count > 0 else {
+            return
+        }
+
+        additionalUsersLabel?.sizeToFit()
+        
+        var pictureViewsMaxX: CGFloat = 0
+        var xOffset: CGFloat = 0
+        for pictureView in userPictureViews {
+            pictureView.center = CGPoint(x: 16 + xOffset + pictureView.bounds.midX, y: self.bounds.midY)
+            xOffset += round(pictureView.bounds.maxX * 2 / 3)
+            pictureViewsMaxX = pictureView.frame.maxX
+        }
+        
+        let leftMagin: CGFloat = pictureViewsMaxX + (userPictureViews.count == 1 ? 16 : 8)
+        additionalUsersLabelLeadingConstraint?.constant = leftMagin
+        
+        dotsViewLeadingConstraint?.constant = additionalUsersLabel?.text.isEmptyOrNil == true ? leftMagin : leftMagin + 8 + (additionalUsersLabel?.frame.width ?? 0)
+    }
+    
+    // MARK: - Business methods
+    
+    func updateTypingUsers(_ typingUsers: Array<MXRoomMember>, mediaManager: MXMediaManager) {
+        for pictureView in userPictureViews {
+            pictureView.removeFromSuperview()
+        }
+        userPictureViews = Array()
+        
+        for user in typingUsers {
+            if userPictureViews.count >= 4 {
+                break
+            }
+
+            let pictureView = MXKImageView(frame: CGRect(x: 0, y: 0, width: 24, height: 24))
+            pictureView.layer.masksToBounds = true
+            pictureView.layer.cornerRadius = pictureView.bounds.midX
+            
+            let defaultavatarImage = AvatarGenerator.generateAvatar(forMatrixItem: user.userId, withDisplayName: user.displayname)
+            pictureView.setImageURI(user.avatarUrl, withType: nil, andImageOrientation: .up, toFitViewSize: pictureView.bounds.size, with: MXThumbnailingMethodCrop, previewImage: defaultavatarImage, mediaManager: mediaManager)
+            
+            userPictureViews.append(pictureView)
+            self.contentView.addSubview(pictureView)
+        }
+        
+        additionalUsersLabel?.text = typingUsers.count <= 4 ? nil : "+\(typingUsers.count - 4)"
+        self.setNeedsLayout()
+    }
+}
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.xib b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.xib
new file mode 100644
index 000000000..ec01f9b08
--- /dev/null
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.xib
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="nQB-23-kip" customClass="RoomTypingBubbleCell" customModule="Riot" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="nQB-23-kip" id="vRo-3W-dC9">
+                <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+3" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4KE-u0-T4p">
+                        <rect key="frame" x="20" y="13" width="18.5" height="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bn5-WN-DQs" customClass="DotsView" customModule="Riot" customModuleProvider="target">
+                        <rect key="frame" x="38" y="13" width="91" height="18"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    </view>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="4KE-u0-T4p" firstAttribute="leading" secondItem="vRo-3W-dC9" secondAttribute="leading" constant="20" symbolic="YES" id="PFN-Ig-2NK"/>
+                    <constraint firstItem="Bn5-WN-DQs" firstAttribute="leading" secondItem="vRo-3W-dC9" secondAttribute="leading" constant="38" id="hmq-dH-neQ"/>
+                    <constraint firstItem="Bn5-WN-DQs" firstAttribute="centerY" secondItem="vRo-3W-dC9" secondAttribute="centerY" id="jup-hc-eNQ"/>
+                </constraints>
+            </tableViewCellContentView>
+            <constraints>
+                <constraint firstItem="4KE-u0-T4p" firstAttribute="centerY" secondItem="nQB-23-kip" secondAttribute="centerY" id="hBP-OB-KGd"/>
+            </constraints>
+            <connections>
+                <outlet property="additionalUsersLabel" destination="4KE-u0-T4p" id="SVG-Oa-aHI"/>
+                <outlet property="additionalUsersLabelLeadingConstraint" destination="PFN-Ig-2NK" id="4Wr-XS-XXp"/>
+                <outlet property="dotsView" destination="Bn5-WN-DQs" id="QqF-bu-Pbm"/>
+                <outlet property="dotsViewLeadingConstraint" destination="hmq-dH-neQ" id="6hM-Sc-pCc"/>
+            </connections>
+            <point key="canvasLocation" x="166.66666666666669" y="20.758928571428569"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

From 8bedb05384f145170579ccb34cd1c878a4b78d79 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Wed, 24 Mar 2021 23:16:27 +0100
Subject: [PATCH 02/38] Explore typing notifications inspired by web

- Update for dark mode
---
 .../Views/BubbleCells/RoomTypingBubbleCell.swift     | 12 ++++--------
 .../Room/Views/BubbleCells/RoomTypingBubbleCell.xib  |  8 +-------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
index 60f9cb98e..b69541f88 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
@@ -36,20 +36,16 @@ class RoomTypingBubbleCell: UITableViewCell {
     
     // MARK: - Lifecycle
     
-    override func awakeFromNib() {
-        super.awakeFromNib()
-        
-        additionalUsersLabel?.textColor = ThemeService.shared().theme.textSecondaryColor
-        dotsView?.highlightedDotColor = ThemeService.shared().theme.textTertiaryColor
-        dotsView?.dotColor = ThemeService.shared().theme.tabBarUnselectedItemTintColor
-    }
-    
     override func prepareForReuse() {
         super.prepareForReuse()
         
         for pictureView in userPictureViews {
             pictureView.removeFromSuperview()
         }
+        
+        additionalUsersLabel?.textColor = ThemeService.shared().theme.textSecondaryColor
+        dotsView?.highlightedDotColor = ThemeService.shared().theme.textTertiaryColor
+        dotsView?.dotColor = ThemeService.shared().theme.textSecondaryColor
     }
     
     override func layoutSubviews() {
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.xib b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.xib
index ec01f9b08..5cd15a92d 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.xib
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.xib
@@ -4,7 +4,6 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -25,7 +24,7 @@
                     </label>
                     <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bn5-WN-DQs" customClass="DotsView" customModule="Riot" customModuleProvider="target">
                         <rect key="frame" x="38" y="13" width="91" height="18"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </view>
                 </subviews>
                 <constraints>
@@ -46,9 +45,4 @@
             <point key="canvasLocation" x="166.66666666666669" y="20.758928571428569"/>
         </tableViewCell>
     </objects>
-    <resources>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-    </resources>
 </document>

From 435da06a0c5613cceebcb9bf1897068a27464208 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 25 Mar 2021 10:26:15 +0100
Subject: [PATCH 03/38] Explore typing notifications inspired by web

- generated strings updated
---
 Riot/Generated/Strings.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index dd05e41f8..0d5515a5a 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -1514,7 +1514,7 @@ internal enum VectorL10n {
   internal static var identityServerSettingsDisconnect: String { 
     return VectorL10n.tr("Vector", "identity_server_settings_disconnect") 
   }
-  /// Disconnecting from your identity server will mean you won’t be discoverable by other users and  be able to invite others by email or phone.
+  /// Disconnecting from your identity server will mean you won’t be discoverable by other users and be able to invite others by email or phone.
   internal static var identityServerSettingsDisconnectInfo: String { 
     return VectorL10n.tr("Vector", "identity_server_settings_disconnect_info") 
   }

From 630bdde126f2303096c9f6c547c38c68184cf299 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 25 Mar 2021 11:53:45 +0100
Subject: [PATCH 04/38] Explore typing notifications inspired by web

- bug fixing
---
 Riot/Modules/Room/DataSources/RoomDataSource.m | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 880f6dc65..210f27c93 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -275,6 +275,8 @@
         
         if (self.currentTypingUsers.count == 0)
         {
+            self.typingCellIndex = -1;
+            
             //  we may have changed the number of bubbles in this block, consider that change
             return bubbles.count;
         }

From 8c21eb0ff627cdcdf2cb6f161a46e42feed862d2 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 25 Mar 2021 22:15:18 +0100
Subject: [PATCH 05/38] Switching composer between text mode & action mode

---
 .../Room/Actions/Contents.json                |   6 +
 .../action_camera.imageset/Contents.json      |  26 +++
 .../action_camera.imageset/action_camera.png  | Bin 0 -> 469 bytes
 .../action_camera@2x.png                      | Bin 0 -> 780 bytes
 .../action_camera@3x.png                      | Bin 0 -> 1118 bytes
 .../action_file.imageset/Contents.json        |  26 +++
 .../action_file.imageset/action_file.png      | Bin 0 -> 653 bytes
 .../action_file.imageset/action_file@2x.png   | Bin 0 -> 1269 bytes
 .../action_file.imageset/action_file@3x.png   | Bin 0 -> 1845 bytes
 .../Contents.json                             |  26 +++
 .../action_media_library.png                  | Bin 0 -> 519 bytes
 .../action_media_library@2x.png               | Bin 0 -> 851 bytes
 .../action_media_library@3x.png               | Bin 0 -> 1238 bytes
 .../action_sticker.imageset/Contents.json     |  26 +++
 .../action_sticker.png                        | Bin 0 -> 582 bytes
 .../action_sticker@2x.png                     | Bin 0 -> 1050 bytes
 .../action_sticker@3x.png                     | Bin 0 -> 1457 bytes
 Riot/Generated/Images.swift                   |   4 +
 Riot/Generated/Strings.swift                  |   2 +-
 Riot/Modules/Room/RoomViewController.m        | 219 ++++++++++--------
 .../Views/InputToolbar/RoomActionItem.swift   |  30 +++
 .../Views/InputToolbar/RoomActionsBar.swift   | 129 +++++++++++
 .../Views/InputToolbar/RoomInputToolbarView.h |  36 +--
 .../Views/InputToolbar/RoomInputToolbarView.m | 135 ++++-------
 .../InputToolbar/RoomInputToolbarView.xib     |  12 +
 25 files changed, 467 insertions(+), 210 deletions(-)
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/Contents.json
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/Contents.json
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/action_camera.png
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/action_camera@2x.png
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/action_camera@3x.png
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/Contents.json
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/action_file.png
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/action_file@2x.png
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/action_file@3x.png
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/Contents.json
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/action_media_library.png
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/action_media_library@2x.png
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/action_media_library@3x.png
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/Contents.json
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/action_sticker.png
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/action_sticker@2x.png
 create mode 100644 Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/action_sticker@3x.png
 create mode 100644 Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
 create mode 100644 Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift

diff --git a/Riot/Assets/Images.xcassets/Room/Actions/Contents.json b/Riot/Assets/Images.xcassets/Room/Actions/Contents.json
new file mode 100644
index 000000000..73c00596a
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Actions/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/Contents.json
new file mode 100644
index 000000000..aec39f6e4
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/Contents.json
@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "action_camera.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "action_camera@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "action_camera@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/action_camera.png b/Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/action_camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..799e2c02a34e0e95981ca836b05eb11146523f1d
GIT binary patch
literal 469
zcmV;`0V@89P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0cuG^K~#7F?Nm`t
z!axw6okHS=kRGAjKu@5J{2NXHH$W1F_$B^|v2p^#4f=1Oy@4K~M`)-fM%x{yr6H(k
zcZGiPlI?b9cHZ0B-C2M=6cDNjhtHE!fz$;dtRD`d5D?wSzMO3>(3s!#c*;}R93a_=
z+9S8fUHeN2@P&2%!yW{@>MjtJ1F_HFLV<M#rstS({CSZ_`B)PtBxwv9;4K_4?cr^q
zK-0VLlY}wnYeGd3AP38{(IcjV)k>=)&o}{Z(jN1%4tYofuiSjlgSjc7TF%VC_tsnc
z>X@5tVBBJ(s}ow&U=O19u(xRm?dyQMPIEDN;f#*TqLmp)Nz)=<l0a#ZX$b&|u+W7R
z!ma{Bl2znWZI7M+SL%W1SikLDn3fRYTotc#i_E%=y~g5UO_n}@3ETMBQUz<=q6`*L
z;x^_J_%HP8U<c#^6hP%zab{a&U}DFK;qZ}G@*W8$mj+B>4;_31SN?hDwiUnZ00000
LNkvXXu0mjfO-#xO

literal 0
HcmV?d00001

diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/action_camera@2x.png b/Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/action_camera@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..191b388f9587a3ecb24cbb846a02a88fff45975e
GIT binary patch
literal 780
zcmV+n1M~ceP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0-;GnK~#7F?U_+-
z(?Af0|6Lmt30ma_xF>)kBx-q1IYGk-+DNpBr{oPatpuE)<pgb?cz`Os0w=&nFiIa#
zVtbfPup8Qx#=DcWLH?vDPO^^XpUv+6GXY9UN=oh%1tFe(J*X*7!7O7bRpI5!-3tid
zEMOcsj`%V_F+x_->TkR~g#%6kR=(|TLg^E@pjES9fAblZSPQ83J_Jb`_fS0Z*NHss
zuSNA%1Pe4QNz!2r?!g<X!+6kyCH~ZJ<m{#tpAcVW@9|VcTKV-XQ~X&&Y6sAsZt&Ab
zSTJ=4;y4b7@PeZZvIi06Vpe;HZ3VRnDG0UI^ZgxIFg1ylFYklfZg^aI)S#5CvUPVb
zX=^Y@r|wFXN+p`MPW}?Wncb!o9ZpFV50j90t<L1Gl?zxo?>7165tac;UuEY<z6OZY
zHkJeh-OjFa0ZQ?rT@q*_R_k-%q2OaaguLyZk*9x{7b;2Dc!qheR{?|(7C<38&DXa$
z&7JW^fwrU&!JiO?L!H$BWt02sd&eG+F=HWwkbrUUzv}P8yGBMlW-J0$=IuH%0<`YT
z5`2ac!3X9i2p}TBgLj64_`YxKi1REs3t-cCVdLe^J$!EnN1O#H&`(&x=IuKix!;3K
z>t}GpU4T;0VGFrebP_WVn9c+W@}$=_ekOn;B0nMJp<VPIohYjc?8f&%0#g$9x-*L~
zB`L4qEeIgCh}i>mW)We6=aRGoAtoxa1A+{rvd<iD+4;a-jw-idxCy4V%xpn`{`&4H
z_IcRp04W_Oh&d^TBLUn1tB!Idm7)peRS*1O{>_1<ugLx@0V4i<F<ccyS8Wv`f4&IV
z#pd=s7clbY1nWNi;!vlT8+-XFexo;9<gcPdBl*`<Nl8hG48H-^gzWqXdo2<G0000<
KMNUMnLSTY3vQ(`A

literal 0
HcmV?d00001

diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/action_camera@3x.png b/Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/action_camera@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7af3968c98f2ff9190e9509d66c31ec113a1db34
GIT binary patch
literal 1118
zcmV-k1flzhP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1M^8lK~#7F?V4Y1
z+eQ$^zgf~L0mlK4z@DJW2_hm$fj%WZLEICh0-6+kGToQJP5{RzsCxoCPX(F=QcsZd
z1XWKEqDcxB;_h_Uu>(<NOhqC`PP9LOkVr_B@Nstj><r-Xcsw4D$K&x-KoBPG@5iIj
zD8?L&zWH$oVMGLSq8N<tF;f?eE*5|YFPZ4c>-76yAVBK^t@rmk$`nWTZGvVQ8qJ$;
zzkcu%Ez+t$SD!uVl0qLX!UpM^TlWWOiPi+N%PP^PaN;Crmwc?k>!Y+cL<=aigw{od
z_Qi3;Yo^#nOSED^&M8~#c?CK0K!soCX)i~^gtL5T{kOdi5mkofs`an6?g}Rmv1Yzu
zU!S63YM0o?^Svz<&<p2mtB$MBcC+)};yaLrbt}JFE08gCVNz!;t223it^au2TF+g`
zvvuwH?ssUInHGYxA~u{%U*|A*r7?awO5bI;8^7<~0jVP_6GdB1CXp8k^f6_@l_<E&
zM%gFGbCnSdk`v61)-<rbu-0iuQIucg+$#k-N$>(}FIpCSG7tu);9gZ$eoi3gL+o<O
zu!302>-}@{hbQH06P#whe_@50E?r7d>@@pbX^6NK3Cm%ga2u-*(T&N|={#uJ5$G~d
z(xA0s^>e`sRKrZgYMU@)zyTd&Z2mY)?7}ciIHa#go31To<m<W#mL?E0AB4fbS)OK9
zS?tgr1A83A{fCLxVYa0DZYcugHrLpEbL+uirVqcX^R{eue@KddwqYiLAi_R~hhtS-
zpJxx*eJ4;lb@zZEq5>I(&9lmX9-K9?p>H9Gm_TgI&f9eH7LBtc+h03?5K;o=MQ9Gu
z5MdBx?w$}pN}%IKmew?G|Hei^k<O}&KolIKVF+pf0Yn5cMe#QpCJ4r@ww%up5vYy+
zd7jEldiYwb1`&axUmqrD7}rpM03rgp;u8&16h#LD2rV(wMbnT>_f|w8QtBQW#%_a%
zY!6F0>A1<Zu<P_fX0%4I7K7T3Y+DHn5}(|ITAK%&Ml#IDSGYJ@B>J4r9Z5{By+<?;
zvfHa2!$p4{OLCTDw5&J|@kG&yv}UbfqyKp3EmY@ow9zk^AQIXqq4FPj#E@kOMVT3!
zKc~wPms|$X+HJ))oC^<8yuNw=y)Mh{Y9ugxr~+~i$33p$$yGjGMn?L1ooDH7pAszV
zUuMA<t2KCmYVZQp;03B-S|E{5!6m1pK}jG658x>^7|Ir8<Qj69726u$nLIBE<hqsy
z=wUTs*ZrOD-&M{@ulM&lq-me%($7gZl4`pdC3~lzs)j0RChfC$H2UJRo?DEf|MCya
kD0w^{kH_Qjcsw8Ge`GL#XpsZJD*ylh07*qoM6N<$f*Th3pa1{>

literal 0
HcmV?d00001

diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/Contents.json
new file mode 100644
index 000000000..63ec74393
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/Contents.json
@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "action_file.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "action_file@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "action_file@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/action_file.png b/Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/action_file.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d944b128424028f710a5f0b169375c475bc561d
GIT binary patch
literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0wPI7K~#7F<&{xx
z(?Af0XU7(b1QzB5_y(jmh#}>f8zenJf`o&3bDvOKq|zItC!l%a0g8KrniDiPpdx8O
zjdzC~Z(JPPsonB~Ixn`@_V@4nJ39;TzlVT3gd6R<3Kjz*(FX!g4^1`b2+`g?_g|m?
zlYoYMQYDeT^@{I=fEb1C=S2{15vy>Tk^+DBA`nW_M*2+9PLiu({-4GIdAJ~oExg>A
zZw4p)?&9SrCMCAgED(FQ7AV5ey3{s=D_&<}P_V96;9<1i&fwaDlPb9RZntgjXxdnS
z;i#nXoZxWY4SaydrSCXHRN_;LS9I7&;4hq9hR?b|-((}toNs$k9-d!#+y3>jR=|lq
z^fEXR9c1w9F-702;0u%``$_`N*PU0OXly`gd)^%l^Mb~z(XhDi4FB!Fn-+PZ=%u#c
z^cueTHe|RFWPi<Ald7uBK*}UcX9+M~2VbtkDb!R|r2qju<E!482RzFv_^MTDRk_ab
z-r1usJ7KMW?j>n0^UjoN(J`tt$+D@gs-;zkPpbr0)<DnXhrYNL+E1jE9T3E|t$Pej
zgb;(9vSGp6476O#mql{bpLO3H3G?jT6<!t~vkMV%(9&!0^LfBsa*M&-IoDYQH$>??
zNOvhghphn=p#|22`+Mv2d+$NZ9%!LqJ{zcsl0bS|Q4(=)U-wf}c%?uV&hc(vABnwX
nW%1rf7n>{?U-+XK?oIpweW0!btEzG400000NkvXXu0mjf4U{R%

literal 0
HcmV?d00001

diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/action_file@2x.png b/Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/action_file@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f4522ab7be943bcede71985f74aa89bd17c54af
GIT binary patch
literal 1269
zcmV<R1Pc3!P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1d2&SK~#7F?U`L}
z>qHdC&x}(E>5?k!AUmL}fJEHh*OnDDT|pCx7V*^N3DHzayMo)hf?HmJ;@lOqtbi=R
zA_+oVdk*I~b?}Tm_BbEqf&8Va$z<aEj?bKr83XLJ)Bjrn{sVpb^RNX1kA)ORfY5wK
z2>{d>q`aTDzj^0+trs=ml|MR=7>)?KRWfz*QP$djwR@A2c`s)`-M>Bog?AOc5~v8<
z^EVeyMUy1FfcE|C%Zl)<hV+F0i9c!<P1?Ev437%?<~SmZQ9;|2^UtPVoeO?VOUqpQ
zjXezC7F~a<OUMQf5uQ%pT-@b-hXTAWBwVJ)*tpr@`8aR>);wT=4;aP<&mz!1-PUn>
zOh`Pj&EJXvHh3k`dMDGu2nPCyXxZl0V8g2W!?y(AF@|IKdAm5HETL+(r$~kAp{8x_
zMm@mrprE6VBIWe(3s-nn(C!7Ub2s9FhCgaVKm{rnKB9v3-2^HquGA?B1gr6D8^G`?
z3VjN^1O1cL;8{ZGHv+|$3`pQ{gYfl-s}B9svJPb~Yj3o23=n+N75>#vR|jPkl@+%e
zAV=o)iZa(q1~5Eji443zd`iQ!hw8r$eQF6F_f+`%{=*MlD1wjM4Q!;x`Fc>G$_6Cx
zV5ByNm)@Tmd>k98&Qqa0%DX1jjkCO7Nh#=+EyGF%l)(q>evq2?nDLN+31s29=-ogL
z{QU6z21?{?fDN7-upIbYBdKxgK^DHB`7!F1T;SvDx=bp9pT0itl+80eQ~)0ke6Ofi
zs%*fz@Z2`ny!qEU{BT66(G2KH?M9-~I*<#c)L?e_Z68YD*~nSSNY<iPGAs6K@T@`u
zo{LH|J!Zo5K9}I%L%D}G+HNE&@qoBA2JTFFsUp7fTJA=~+u7@jZW?~m?M5PN7OMYp
zeGJ-Njl0T07G5trv4?WtaSQOQ0uSJ^{$7kzMXLF{Y_jlqu_4TUJ`2C^UtJ=K4#eqp
z@6@%Wwi<u{p9>A{--aquA6sNl6I|deDRr94N_t?6W*Gkc8@=d*gRDzP7%t~sQtHE#
zb>IU7J`>nNXr3*Sb33iM6wO>O?vvLg6}y|N*o_Ej87lLX4kw`(IaOg+Q7fUXLH@zz
z8>6T3yoE=2CskDR((q=Zm%vvIY-a<)FkCJvIyLy9^Fg=%Fhn}f$*IJ6Yu1BJW+l4;
zs6OZes+GK=cwiToW{I4Xn%|`w`-m#C8z973dn@HxvWz$$_~4cA8Wh1-2<%nsfz<%Y
z#T=OFyWCJJTvld2HTHP76rX1<4GEGn&sDQhRTXxldFPaL%-8>;eK7z>S+f#|dr!_z
z*MX0(0>wYxprZ9?7A;pJc&kX>=$q|^+32mK()|FRDDXKw7;OV-LK)^qI<&dxBFAyT
z26MKOHT)8l>}J3>49{}fkuBP4!N(oW6*5m|m%0f#KOb0l0^Xa;$x#7q(g&{l+$yT{
zfa7_IbSbdUz|9-{Jm9ugo8PP(tTwImgr?ztPnpGQQOZ1GkE9yEApS!fD^EV{!R+0(
fz<1hdr-l9j#u{U2?FBcK00000NkvXXu0mjf6f$98

literal 0
HcmV?d00001

diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/action_file@3x.png b/Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/action_file@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..13ed744fc0e4e92f638233252e53fda390e53e23
GIT binary patch
literal 1845
zcmV-52g>+~P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH2Fgi9K~#7F?OR)J
z+eQ?<Go*?DsRCyORaX#Y1(D#SK)-6QAodDk1GSBQS^f$d2e7*W+bgj1RiJe$X9ZPP
zP<97G92tg5&U7v%`9aSN@9-hXh|Y%}<cLEa&V8Lb0+?ftIp&ySj)w{c4-5<4y@gnW
zOX|-Tz*q|;TL6#?$w>x*`WdL>haq^MF5Bw?6vTre2#FC8zLA2jT@#Xx!;t$sMTmM3
z1U>1#SHwWaftcIqGY~tU7q|8y2WFa}#GD}70|6^g5RA*t=l13fIAUfAN=zz_x{^T?
zN<tozW|AO9PD7D%TqZf!kYf4#<<<#xIENVnk`oKk$~jbisqOK>)APj*hQINDkZ@%E
z6ypcDI)R9pT0vuS)SnI07%AZ_@}kwt_Ai0?I&al=Jarw`&|X7`oiDGpIzYh85JVvd
zSI7CwjTInW&q`9?<No*k_If|-Ix}Hnw3Q=&qmqN@s}&{%TQyA?Mpr99z|;vMk%K1j
za&rwF@#WRVnX-{H-8qg~H~~{7=y7+i8H@OD$Rda6FSMVJK_Au`dj<qdjUXh4i@0mc
zj*F6m@O{5$IMo0Grb1Bt^w*_Hkb|H&VjFyzFzVg+uR+K|3`r&k0qcWT`D&*$hSh%r
zc`;FfZpg79maBswHtk~^5JgdwY3zha=m7x}Gcl~lDde1&NDhKAeW5Es{s#n1gdj!E
zwiME4GX11RDw!NiAyk-utv%`SV<4b%6C07!u?*=8F583l7HP@5AePaA>6{1N2Oyx*
z6+|azvvhKBZe>R;!|6k6bgOIyWs@TV!C_fP&ZFPoHfrB^N^h2Z7inUQdUy9g&Annc
z-4A(0)`Ti4R-bft_muQtDGg*0^0=+5$kW6sC)?x9Z&Tkml4DaKUGuBbSJ3e7*(6dr
zImu`V%_zP?vO8cwlJCgqSdr5*k76gT$!DnqWxYLDa>ihcS;e!lJPTHlO$JI-TLnjy
zLJ;lk<s&EgBtT%9J5!!zQueraq0F@7Ty_*Di1POE2Cuw$Sx*l7D{1vtkr(e9<{nBV
z%v^XDAqP<?%u_lK;~UhGGxArtoH<p2EJ6+<cNC-CpzZAy@mFQbvo_=+h<bybH&{!P
zbM3EWK7TdTk)mVBkZ1EKkUHe@LFg21c5ixnMg7%{$Oe_`NMktrpd{kh!f6IMdHvP5
zf9|#>C9>VQCzrt^)B4wR-gJY-{Z+P(R0TN*rxi4MNG*zxV~aKva!`S+f*b_d2h~5m
zTLI%k>Qnfl(T1P~l&(OgL0>_P>4m2x;)LtzqZ1&fUxfmh2FV9meGg|V=k1@5G~=_I
zfd;dfrjC>b$;4t2w)9-e;Jm$YbbtJG$Vt)w8SN!=E2kgw+IrD_iZm0GrZz1*OCPcO
zDmytNp{oPt8&T#QJvWkrX#ggm66a@2HT9xgwz}v*BZ$Ly+T+Z-ul5;zRW><!OAm~6
zh8(F84tK=n1}%z7eR3zF=uYco)TC=^FJVpt3P~lIX@HQ0RuDDJYbR0R_0Cc^HR<pH
zP2^C7uH57(#J+IWv~Ob~eK9FnkUlmNx-v@-k6%1DiENZcq-`e}1%>sX+y6^nYIPSS
zyf+_V6Yu78nfnlJr3WR_;eN$3awMvW1)zycVHo1EYcs1sEr=n)2TGgd0!9@7^j*@d
zi$(kzEEV~v^jOPFPLc*JmXjlq2vU9Q9s}06cY?_l+#(2DGxfiAdj_qip~Uw$<11Pw
zE0kTAoj?-vAka4YxyOG>9}|&Whn%qOL!>k!O*v8#P!mOcBv30Q?T0Y32>@r3Z2J&t
z38X&K6$Oc)WHTfdhZ+bGZKsb77B}{llO(ryt4bit06B`O<*(hruDr<_s(tC>iquZB
z^Ibgv7_SLuIA&JKL68;2;l^y=q$aAarT^U2KY#qkyC&553l_yslSw&K<1bE3?HJk@
zS*j-o;Uu}%Pj?SZ8<KF7!4>nDi&oE7cS>F1lqh<hk4{v3Q@F_hbDi4>p)1f-izJX$
zz_~A0KYhQX?lNopn$uSykr?K|w!K$2d2*6DAqUh0byQKhojp>X0Ouzn6#vv}wP5U{
zk_}Qd-eewoCQ)m$6En=rOX`%mB6sWA=8sCpl*mEkE>`h|U2>hgz#M5><RA)f!F&91
zcTKU3=2l3Ux(}IrooSS$P7Q_iAk3OQRRd*y6_O5=Dt1r@nl?FzQa5oX$z<$z)K#&F
zby`uFRV$J|`Tk&kl2IxPm3<`>(*X&hrKWhshC4wTw@wF&kUmo~itu<Zz6?KH{#b2B
jJjWb!%rVCtUmyMlRnah$-uygz00000NkvXXu0mjfff_+T

literal 0
HcmV?d00001

diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/Contents.json
new file mode 100644
index 000000000..7854a9423
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/Contents.json
@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "action_media_library.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "action_media_library@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "action_media_library@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/action_media_library.png b/Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/action_media_library.png
new file mode 100644
index 0000000000000000000000000000000000000000..0adba836c6cbcb3a209c2f0f44d5158594a2b405
GIT binary patch
literal 519
zcmV+i0{H!jP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0h~!hK~#7F-BnRe
z!axw6T_o{CO^;A-AUCj5{8df>o<K-!iC>goHG$p$Z@|AX<py$u9--2bm`Hb=H9%Hu
z5jW*S-`DKy%e>v$nOT6p4yG=Sf`@Aq-~pfkdI%ZE;nZ?_-vlUl7X^Ay02qk&wAvX+
zn=hRdya@#Xfp?cSSNtXv2O~@1*FZ#Hq*x*Aik49pXAkr-Ol-HcuqOvk_a@`eT_<VZ
zfKLCauBm#$ES|OiW9(u-=$q0ug1$kHMiy^lis+Oh#^8j)nHk$=S<Hj-^W7vB=_x1=
zt0MOXC`6BPT#u{nF(UJGXeNnYZfeXdfrz5llUm1HIuiS)B>>uxQz@IUCV=5PpI2hL
zGg>Fks?MN9dy)hC0x*8FZo@osM0+J(u28E!f~LTah^%%L+fI{)Vs9J1c9|wM$6Iu9
z2)huFn4P<m5>G7}pW~efNXU1I&m1c+WvW0ZYx=V*H6T;A7<!<lZPm$C=RT?RQ!#%z
zr0xWbny2&1rjvims>;56nKThS8d{B<(Xb6dA;6#2oB{kBd;n=4o!Mxh<JSNH002ov
JPDHLkV1iD;*FgXP

literal 0
HcmV?d00001

diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/action_media_library@2x.png b/Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/action_media_library@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa6ddc4f99a35453e4666a758b0875f05986e238
GIT binary patch
literal 851
zcmV-Z1FZasP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0_aIZK~#7F?U_+-
z+CUJ7XV;{v)TZJH<Oa<NiW`#mo*?7~MG91X!aPN4A~n5%xk2A5wW=T|C_O=a1R9`1
z!rtku!HH{QV>`y{Dtr=>y}MZZ+p{yXvj97GJZ@NA=ksrub;j`&7^?$94T{C0-*CYz
zy}919q6S3@crm!@qCf*m0KG)xR`2xI_N{9y)8sv(M1%xX2On#Wuzx`bK>_;oxIOf@
z@!%lGu?;9G?s^Qs!=vC8looO(0r;9xH7GB&U;~H$oC+ue5r&Lme|baZ!H~?C)lxh{
zp#TTZrY9ZK*J4%&7vur8K^hTCObCVOP5zy{%UFMJp<ri_0wn_MiZG-4q@O3#8bLyo
z2$<8Gjvc@-zTbxu0Z+eN)Z+RXV^v6q5&@M8Z$|aWRE9F&IwVAi0LFQDe{dB_3s!m9
z08*gNjS4jPzhBk`XCp4eZ(6u79pOk(iOolnT>wIVv9OK3Ct98Ex@iN@iY6BbG67?3
z`Ovgv5+MEf^!S}2ujk7EG)x<S@*?dT7`qX4HTk<na*LCr&H*C(1O<~q09t~hzAl1#
zOdIEK1wad=(1J)LfFX_++|g%xXJdq%9ks7DZXZg)Pym|+&|>A<AAMu=^dU`3<9mnl
zzp!Ou7cn`8>)S@V1sNFYEonwgD$Q7oOE0w@V!wa`_!AxoC1-|kaBC)2NF<(}bVeGj
zA^N04$eF@Y3D?!WZtGMU=|PSZo(oBnqV40Gyi7_-GB;_Qe|AkO2NBAu5_i%2fhMKA
ztm2v!pxg&%ir%HD3(=P_vqtaI6t=wRoi-sXRb@^_Z(l-~h;;%i?}E`T2^6qO2oJ(0
z6*jT302DXgB~=GbpMCwHM1(XcKpyxKY#1CDO6Cx`N!vSb!(HVX`$2nGlX`BTK;#}7
z?&smM;P&Pd8VO~P#x^s^Ecmyvej*R~$|NFc@{-tNR<~O0RE#WT?;M~tfK(@C{ouLS
djvYJh`3o?@GrUq}Bh>%^002ovPDHLkV1l}-Yz_bb

literal 0
HcmV?d00001

diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/action_media_library@3x.png b/Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/action_media_library@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dfd074ab0b731e1eb15eb1e57d0eac22426c876
GIT binary patch
literal 1238
zcmV;{1S$K8P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1Zzn|K~#7F?VMds
z+dvS<XV*dMLxXYz(+jlp1TloZw)6r`djgP1s=k!)RFxnBCjd@B-V04RLE!|18(1V%
zsBv~WYZ3|3tUuy)@CN@Lv+GFyYiD+5cGdtnIXO8wIi|wmOfI!|OMMu8;6jvvu~&d#
zg8?uG=ZM$=&Rbn)<0#g%Q70BpzP|%z9ROen%!Y(wji^HLD3j*f&0S#pcm~9g*dXw5
zzP-H}Wpd~Wns4uHqQC~sAoTKk*UPo_kU46Kr`uJUasaaoiq&rAb4xWGVqz@PGBg^-
z59H>f8deH)w|dOjr4mx=dw;8{L8U+l@D`p3oUyWUO!*Wt8=eY`y;Kcx^)v7ao({HZ
zAW|Ikl*t7Op#Wy%0%D8utSj;fv{kd0<QmGL5mN<ng@CP_mD=9Jfl~XMJ;1^NZNp{I
zfQcsN3XaY=ar{B&OQ*Y3b4Z|AS-T431oBsoQ$G)zXIX_cid8z05W@t*j%wvR#C6um
z4B0*;#4LdjF5*m|D|jtPh*1L3ZWU@;_mTbx5@Oa0^0)Hn1ZC+_F-joD)j88RJkLv<
zE}7<o%Fo)ncGT$<G*%%Y#%=R+=tZh<KL63AlNa~^2{A8Fq*YWrZ3b2Wr8s1c$DjdI
zQ;q6Cc;#Yyry=^{;^s~LTnZ+Aj&D}}%0bXUngY3qaLyRo<PB`lkAHl_Ek@<xCXis{
z#6dghm>A_j7Qb2ORccOmxxRpu9)O`}7YK#e>Q-u1*J-$;-+C*x29<DEb>v3VMyEh7
z4De%b<#S`)V7Ic-viQI;O(abMVMmrAx^L=-L9_f)gfux!o<vRy4FX}OPb(uz31URA
zvau!r<dLrn87HAYjLhcG;_U=U;mvYw&*I)<)=h3=fhe=y?=Ekw-gm}vktS#HxkX*o
zzciRgAgb!E_bT-@(10v#$z3n2p+H=LTzU~FYE>@|G87O4%$&)^5~xo;gI?qpq=ZZv
zhM_>>N}w)c33RKWLKns`6j;rQ$z?X1&r0;2>2k*?`j%a)@JM979wbffda1VfSSDvo
z!OS-~z>hHH=-a4@B02BFX-D72m0U;B_p}mTBm0A7^nEYkO%<aXsD=seLYgLLe23Yc
z$)y*4&qNDen$h=6^(dy1@XlNl=P2Q&==(QlU?#g<htc=zp~)pWL5wAkj&_o1GE8{i
zlSY>?AwdFl9{!-Con+b!6W*mDkr=9z;eg95|95jS3yi!THQeQ1sG@Ir*DKYtYJmhh
z8}m=)s8<=Y0=Wg*?E%G~O~x%nqHA$wCkPAp<I+HQa#@b^JBQ=|kJ2o^Mx}V#47@dI
z@xoo#hXr59H<#n3TwSW?gRf+s?7Slb)zW8^Svac(-GC0<#iWBX>6kb!expUm_3%jd
z=E;T|jGO786`(x$q_e%yYC!Z43*6md-At(&YFfyk(WRyHDd?v2ePVr@LL!Ail=oSg
z{Rp=bCyk0bvI!k6el`caqa?@WIXO8wIXUL=54DWl7jMf|&;S4c07*qoM6N<$g3o0>
A;Q#;t

literal 0
HcmV?d00001

diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/Contents.json
new file mode 100644
index 000000000..adf12f0d6
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/Contents.json
@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "action_sticker.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "action_sticker@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "action_sticker@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/action_sticker.png b/Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/action_sticker.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb7a04d3fedd7a64764e1531e27487662a2119e5
GIT binary patch
literal 582
zcmV-M0=fN(P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0ozGLK~#7F-IY;J
z@<0&BXSOx*;Zu8remCF<ANjyn@dWA(BteN!lqVyas3!nVAU^q`K~EswfFm?Qj7hsQ
z?yQPJ3smt%e+e`@+y4K%vokHgPY0(>dYxl00==P#{sCeR7<~H>LYJ9)pj5k`ubh3!
zVCm|h1n4vY*n{a9BMc@PskGp7=kOR%oo5gid?0QucN(>{Nlc0#)tESdFJQz@9{%r?
z$71g+T{kvOs0s7HwB9dN+i%0M6k!eK1yxguBVq8e`j;x16EC8ulrUg`HTWhJ!_dGT
zMj8F-U6Bqm+?fA+=?zk91vULOGAjuKb3+b3foZf;*Le)Wd=O5%&xOwug68sIb+;vh
z#mjx)SzK6?mD`0n>dpb@BFvY=af2RYIb^1-{%W-?m7+;Yr<Y8l*%a96Sl7d1Ww@&k
zhs<4=O-pLri2Iu2J1aioP4z*s8hnhs8xY>kQjb(zm#fxs0AssN6CW{HaNQP2ekUN+
z@|54}$?8qDZDbK2F|dcixCIj($nG$T<C$qmH4yrRN}Cx^Q}q@0>;p)-tl|j+VNj@S
zGeI3@kVQPzz?u|y0wZD4WxiUkAh9o3V%5zmo(Xvg{<&(Lo8O6yy-twjBlL@S21JM0
Uvtx15!T<mO07*qoM6N<$f?G`ZWB>pF

literal 0
HcmV?d00001

diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/action_sticker@2x.png b/Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/action_sticker@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..13a2b75119e96e2c5819dbaa3eea71b33b314557
GIT binary patch
literal 1050
zcmV+#1m*jQP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1FuO$K~#7F?U`Lp
z+dvS<XEs|2sRgAs2qz#tLE{1seS;GKCjcZ;)F;9dDj<=bpyUMYTcx%r;RbL5e1lqi
zR4K7{x)VZ3>~;JRlSFEMQUp$R<NwUgdS@m8Q>OgiAY{a=pGPH<xFD1&0b&sd^8l3Z
z+{Qs9n@GPDT>^;4?Q*#R88DOq`T9v-L2Hwg*m@Eh8(Y5`Eg|=t*0v2PNoBx;aCeUs
zY(X}hrZpt70dw_Z?Qy82@OTt92&~*#JGCT}5*aX8KRU_K>qfMo>h)rIJHhy9IAlC>
zzXCxCMgSsQ2$Ys%Z97q81;jvkZhchZ86qgQ9TtN~1KMGOP=ryV9X5A%bP_deU<l2g
z9j@ykUto+NsO{^;-D>#fA?Ua-cuI#3Kmo>!lM`}2Y(IpCkmtD-7{7QXuavtN_MveF
zI^Ms62|};JYtt$iSD@qliNba7jpvU!gb?1sgn>eAn%)l>z*!|sM(q2^ceM3kSOHan
z357rf&ZD3K0vBL>@FvxD12p&r4=HySfmrfSkb$otEM!;aMB?Zor^dNY>)vZL-+#1C
zgI@kPEQ%Zy34_iJNS!@9`mO(DohthvTM1Ep0k<{BszfGigOG;zo>ja~$M>cDQ@t5d
z_#+ZV274V=?-oB?3>r1_{h-kOe`dysN~uQ_LS(muXEm*0jCbp5(i@a?Gayjup#w-4
zEp#_b^Gz$j7H4RHS^Q&Nty7k*CqI&Dex5va-dr|s@PGjXbb){c$OsM_zj!{7Jmqo0
z66q*XYX5e5w-WZb2u{Fr$Oyjqoz)-nv-RUO6i|=T6o?Yf1PsuNIdGH3hiw1NXMcTK
z0Y#^=X2%fE1PthO%!Yr&2~p|2<P=?JWRWEz6IXouHs&vY&oC5Z`};d_3#26C8KVJG
z$|?*6HhQlfybo(pvyzHuj0W)Gp`Xj?R{?Y1dM{h9yAm}ejd&)sCYHHe1yb&X7XH2L
zy~YUdrxnkH8o;Zd0QMm{j{muj1NutCh-U^iw(b_o)uf?>)Stt@tRFs`cqXzlce}K+
zr8i&$VxoLuhb|fqtSrPcv3jF9l&f5HKt^OGo{41u?}zJm<u`G{N%-;`DP6nwI!p1L
z`^BdnPCy%cP=$@rjo?E6J2Tyo%33^=@+YQ)g6GLf*x}^wqUjprN{g>$EuKlV0*^TQ
zF?q98Ue5`4UgzI6|BAS-+xO&Af>xhHJd^3qtnHqX?i^4~H14dOA@ivzQ>Mh>A1bBE
UH10O~g#Z8m07*qoM6N<$f+`HqF#rGn

literal 0
HcmV?d00001

diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/action_sticker@3x.png b/Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/action_sticker@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d000e8f4c8ab95168d1c282536f38a7922870313
GIT binary patch
literal 1457
zcmV;i1y1^jP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1x86kK~#7F?VMdw
z+g22S&ymDa3gfN-X9d6tYR5@u`V_N*kQD%(I!vB`r%nqq&=rKNfaE!0?5?1&f~YH~
z%1?*Ey7%-PCC&sQ$yfgt(f1I7ENuMwo}+W`xdNb}p`oFnp{^j5Olx@1QtGCoZF|wu
zdKnRyi4Oxo8*cw*F8}KSkw==&0IZSYIHz8B(}NNzMUY6*FkUCZ4vXkO77#`n@r?re
z?R9t4g@P$m(0A|lI%vaoW+_pyEK;z0`D8GHf+$2#;bOkV1++IV9{v0lawb<n97=6P
z{;Lwj+~sI&IlFm=o&`CvFx+2PTK!d_9ARxv`@{L+{xisl%p>Sy0`|8_!v@R{{KgK?
zdxK5LNG3sn9OVxQVHsu+L^!=cXEjU6r4|(A8y?R5-!{xPF6X6gT1lw{)kw|+*S4IM
zG(~2rB+X%U4E2#Cv^51EXkrozS{Uvf%xcbwg9w%vPWBEUA&Ek4{^a*H{*hNuV-WP_
zd2j2`{Cq=dn0KP^IBBn#CT-&oQ_A0g`pXeob5iXaVl;y0-|zPU=@{-2T-bI^Cb?!K
z2q|%Ln{|T8v;k8E$;=$?M`+!K=Zv4;TP#xrnVPO6Chsja2YtG7eSmumSJ>ajRoJm3
zXzcraxaau(P3$T}tRTyVr*O|f+xj8)@u&xa?t}LKfp37gFpC^PzVFv=zLge56gi4w
zLQHqy8$qk_!>Grc$e*%s3F?JML?izCx2z-rS@Qj@u;C_UOWUxBO0y7L;`2Ik+=_Xx
zk%HvOxR{!CT%Iz#=C7l)y)h{k2{1C9L?-F^lRc?_+AxFg+RlhSyh0m>6P%dG+Aw33
zDQ1EL^}y2_cCVfcj2F7{q6UJ9yArB<-FxXm1<bS{2`R_^Z}p<PW7Lh9Y^{;?XS8sU
zuQcsj&!_2(Z0iI1bY>c+vzw#|USB*OtW7&jq>Mp5vxxeM+umsRr)_wM96|gkcv$-O
zs?V=Ix|||svgb%?wP69ZAn9vpEy;fBZjk6Y2(;|#s$jZ7u7p+G8T0Rd>$4bMSLRwR
zMX~l#&eo2}xsg*1P1Y%tk0%M)i^)0CmjkqTeLVT75t7IeB1e#g=t9Y*v|P%gu2w+;
zCjXc#=MJPKsT?741lhJdf>I$juFerTS@s^Kkt0M33f4!EE7y`BjnAVV3&N@bIYR7;
zA}RP2N+7suMbstI?#{9~D~lW<R*>U3<&^e3zY04nO#{ACrS7U^l_SIoDksdyjT${!
z+TD4`5vKOVWFImV2!~f_u@;OTgjAa`^O7S>6%>5B1&$)lFGpd=l^%B>)$`>iM=<Km
z7dVQ%s~=y47NkVD4hhLyj$kCHs8Ph>6)H!<3lr{QD?*N7yg$fBU+R>6@3bKuT1F%d
zucG7##)7==OIJg_p+=TWXF`sX`RFN9j*w^*=T&cT$hqMU$O+Wpg3z$#RJ0r+@h;cP
z$G>a@eWx6_+qe3BT*K6vdKq$rRQseYbh=XDK}M8Pp@R4Wh!s?p93hn;sjzKcx5-0N
zQp%Jgq`n<WlD0_7E8I*dTaJ+Feld}B{%Ek0HgWT0xE*$!fWDGmg&ZN58|ox+^ILeH
zG~~#lcGz(w`uEm(70D5DyW{Yp_u?qXOB8G-FamYBpfA_MtCS<;CP<Kw3wl|Et0to<
zXzqpK1lw3Dmm?H@TR6YM_GBMU2<}C15W0Ek!MnYUDthsEDd`Uj{MsJF+*4H4zbk8e
z<3GIqshYmK2^IWlik+74KUfa7_#rMK5Vx4O-atb`LqkJDL(cpUh_tJ=AaVlg00000
LNkvXXu0mjfZd|d+

literal 0
HcmV?d00001

diff --git a/Riot/Generated/Images.swift b/Riot/Generated/Images.swift
index 6f45d8668..7f973231f 100644
--- a/Riot/Generated/Images.swift
+++ b/Riot/Generated/Images.swift
@@ -98,6 +98,10 @@ internal enum Asset {
     internal static let peopleEmptyScreenArtwork = ImageAsset(name: "people_empty_screen_artwork")
     internal static let peopleEmptyScreenArtworkDark = ImageAsset(name: "people_empty_screen_artwork_dark")
     internal static let peopleFloatingAction = ImageAsset(name: "people_floating_action")
+    internal static let actionCamera = ImageAsset(name: "action_camera")
+    internal static let actionFile = ImageAsset(name: "action_file")
+    internal static let actionMediaLibrary = ImageAsset(name: "action_media_library")
+    internal static let actionSticker = ImageAsset(name: "action_sticker")
     internal static let error = ImageAsset(name: "error")
     internal static let errorMessageTick = ImageAsset(name: "error_message_tick")
     internal static let roomActivitiesRetry = ImageAsset(name: "room_activities_retry")
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index dd05e41f8..0d5515a5a 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -1514,7 +1514,7 @@ internal enum VectorL10n {
   internal static var identityServerSettingsDisconnect: String { 
     return VectorL10n.tr("Vector", "identity_server_settings_disconnect") 
   }
-  /// Disconnecting from your identity server will mean you won’t be discoverable by other users and  be able to invite others by email or phone.
+  /// Disconnecting from your identity server will mean you won’t be discoverable by other users and be able to invite others by email or phone.
   internal static var identityServerSettingsDisconnectInfo: String { 
     return VectorL10n.tr("Vector", "identity_server_settings_disconnect_info") 
   }
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 8c6be6078..87f9f09a8 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -410,6 +410,8 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
         
     }];
     [self userInterfaceThemeDidChange];
+    
+    [self setupActions];
 }
 
 - (void)userInterfaceThemeDidChange
@@ -1697,6 +1699,128 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
     [self.roomInfoCoordinatorBridgePresenter pushFrom:self.navigationController animated:YES];
 }
 
+- (void)setupActions {
+    RoomInputToolbarView *roomInputView = ((RoomInputToolbarView *) self.inputToolbarView);
+    __weak typeof(self) weakSelf = self;
+    roomInputView.actionsBar.actionItems = @[
+        [[RoomActionItem alloc] initWithImage:[UIImage imageNamed:@"action_camera"] andAction:^{
+            if (weakSelf)
+            {
+                typeof(self) self = weakSelf;
+                roomInputView.actionMenuOpened = NO;
+                [self showCameraControllerAnimated:YES];
+            }
+        }],
+        [[RoomActionItem alloc] initWithImage:[UIImage imageNamed:@"action_media_library"] andAction:^{
+            if (weakSelf)
+            {
+                typeof(self) self = weakSelf;
+                roomInputView.actionMenuOpened = NO;
+                [self showMediaPickerAnimated:YES];
+            }
+        }],
+        [[RoomActionItem alloc] initWithImage:[UIImage imageNamed:@"action_sticker"] andAction:^{
+            if (weakSelf)
+            {
+                typeof(self) self = weakSelf;
+                roomInputView.actionMenuOpened = NO;
+                [self roomInputToolbarViewPresentStickerPicker];
+            }
+        }],
+        [[RoomActionItem alloc] initWithImage:[UIImage imageNamed:@"action_file"] andAction:^{
+            if (weakSelf)
+            {
+                typeof(self) self = weakSelf;
+                roomInputView.actionMenuOpened = NO;
+                [self roomInputToolbarViewDidTapFileUpload];
+            }
+        }],
+    ];
+}
+
+- (void)roomInputToolbarViewPresentStickerPicker
+{
+    // Search for the sticker picker widget in the user account
+    Widget *widget = [[WidgetManager sharedManager] userWidgets:self.roomDataSource.mxSession ofTypes:@[kWidgetTypeStickerPicker]].firstObject;
+    
+    if (widget)
+    {
+        // Display the widget
+        [widget widgetUrl:^(NSString * _Nonnull widgetUrl) {
+            
+            StickerPickerViewController *stickerPickerVC = [[StickerPickerViewController alloc] initWithUrl:widgetUrl forWidget:widget];
+            
+            stickerPickerVC.roomDataSource = self.roomDataSource;
+            
+            [self.navigationController pushViewController:stickerPickerVC animated:YES];
+        } failure:^(NSError * _Nonnull error) {
+            
+            NSLog(@"[RoomVC] Cannot display widget %@", widget);
+            [[AppDelegate theDelegate] showErrorAsAlert:error];
+        }];
+    }
+    else
+    {
+        // The Sticker picker widget is not installed yet. Propose the user to install it
+        __weak typeof(self) weakSelf = self;
+        
+        [currentAlert dismissViewControllerAnimated:NO completion:nil];
+        
+        NSString *alertMessage = [NSString stringWithFormat:@"%@\n%@",
+                                  NSLocalizedStringFromTable(@"widget_sticker_picker_no_stickerpacks_alert", @"Vector", nil),
+                                  NSLocalizedStringFromTable(@"widget_sticker_picker_no_stickerpacks_alert_add_now", @"Vector", nil)
+                                  ];
+        
+        currentAlert = [UIAlertController alertControllerWithTitle:nil message:alertMessage preferredStyle:UIAlertControllerStyleAlert];
+        
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"no"]
+                                                         style:UIAlertActionStyleCancel
+                                                       handler:^(UIAlertAction * action)
+                                 {
+            if (weakSelf)
+            {
+                typeof(self) self = weakSelf;
+                self->currentAlert = nil;
+            }
+            
+        }]];
+        
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"yes"]
+                                                         style:UIAlertActionStyleDefault
+                                                       handler:^(UIAlertAction * action)
+                                 {
+            if (weakSelf)
+            {
+                typeof(self) self = weakSelf;
+                self->currentAlert = nil;
+                
+                // Show the sticker picker settings screen
+                IntegrationManagerViewController *modularVC = [[IntegrationManagerViewController alloc]
+                                                               initForMXSession:self.roomDataSource.mxSession
+                                                               inRoom:self.roomDataSource.roomId
+                                                               screen:[IntegrationManagerViewController screenForWidget:kWidgetTypeStickerPicker]
+                                                               widgetId:nil];
+                
+                [self presentViewController:modularVC animated:NO completion:nil];
+            }
+        }]];
+        
+        [currentAlert mxk_setAccessibilityIdentifier:@"RoomVCStickerPickerAlert"];
+        [self presentViewController:currentAlert animated:YES completion:nil];
+    }
+}
+
+- (void)roomInputToolbarViewDidTapFileUpload
+{
+    MXKDocumentPickerPresenter *documentPickerPresenter = [MXKDocumentPickerPresenter new];
+    documentPickerPresenter.delegate = self;
+    
+    NSArray<MXKUTI*> *allowedUTIs = @[MXKUTI.data];
+    [documentPickerPresenter presentDocumentPickerWith:allowedUTIs from:self animated:YES completion:nil];
+    
+    self.documentPickerPresenter = documentPickerPresenter;
+}
+
 #pragma mark - Dialpad
 
 - (void)openDialpad
@@ -3321,80 +3445,6 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
     self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
 }
 
-#pragma mark - RoomInputToolbarViewDelegate
-
-- (void)roomInputToolbarViewPresentStickerPicker:(MXKRoomInputToolbarView*)toolbarView
-{
-    // Search for the sticker picker widget in the user account
-    Widget *widget = [[WidgetManager sharedManager] userWidgets:self.roomDataSource.mxSession ofTypes:@[kWidgetTypeStickerPicker]].firstObject;
-    
-    if (widget)
-    {
-        // Display the widget
-        [widget widgetUrl:^(NSString * _Nonnull widgetUrl) {
-            
-            StickerPickerViewController *stickerPickerVC = [[StickerPickerViewController alloc] initWithUrl:widgetUrl forWidget:widget];
-            
-            stickerPickerVC.roomDataSource = self.roomDataSource;
-            
-            [self.navigationController pushViewController:stickerPickerVC animated:YES];
-        } failure:^(NSError * _Nonnull error) {
-            
-            NSLog(@"[RoomVC] Cannot display widget %@", widget);
-            [[AppDelegate theDelegate] showErrorAsAlert:error];
-        }];
-    }
-    else
-    {
-        // The Sticker picker widget is not installed yet. Propose the user to install it
-        __weak typeof(self) weakSelf = self;
-        
-        [currentAlert dismissViewControllerAnimated:NO completion:nil];
-        
-        NSString *alertMessage = [NSString stringWithFormat:@"%@\n%@",
-                                  NSLocalizedStringFromTable(@"widget_sticker_picker_no_stickerpacks_alert", @"Vector", nil),
-                                  NSLocalizedStringFromTable(@"widget_sticker_picker_no_stickerpacks_alert_add_now", @"Vector", nil)
-                                  ];
-        
-        currentAlert = [UIAlertController alertControllerWithTitle:nil message:alertMessage preferredStyle:UIAlertControllerStyleAlert];
-        
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"no"]
-                                                         style:UIAlertActionStyleCancel
-                                                       handler:^(UIAlertAction * action)
-                                 {
-            if (weakSelf)
-            {
-                typeof(self) self = weakSelf;
-                self->currentAlert = nil;
-            }
-            
-        }]];
-        
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"yes"]
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction * action)
-                                 {
-            if (weakSelf)
-            {
-                typeof(self) self = weakSelf;
-                self->currentAlert = nil;
-                
-                // Show the sticker picker settings screen
-                IntegrationManagerViewController *modularVC = [[IntegrationManagerViewController alloc]
-                                                               initForMXSession:self.roomDataSource.mxSession
-                                                               inRoom:self.roomDataSource.roomId
-                                                               screen:[IntegrationManagerViewController screenForWidget:kWidgetTypeStickerPicker]
-                                                               widgetId:nil];
-                
-                [self presentViewController:modularVC animated:NO completion:nil];
-            }
-        }]];
-        
-        [currentAlert mxk_setAccessibilityIdentifier:@"RoomVCStickerPickerAlert"];
-        [self presentViewController:currentAlert animated:YES completion:nil];
-    }
-}
-
 #pragma mark - VoIP
 
 - (void)placeCallWithVideo:(BOOL)video
@@ -3641,27 +3691,6 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
     }
 }
 
-- (void)roomInputToolbarViewDidTapFileUpload:(MXKRoomInputToolbarView *)toolbarView
-{
-    MXKDocumentPickerPresenter *documentPickerPresenter = [MXKDocumentPickerPresenter new];
-    documentPickerPresenter.delegate = self;
-    
-    NSArray<MXKUTI*> *allowedUTIs = @[MXKUTI.data];
-    [documentPickerPresenter presentDocumentPickerWith:allowedUTIs from:self animated:YES completion:nil];
-    
-    self.documentPickerPresenter = documentPickerPresenter;
-}
-
-- (void)roomInputToolbarViewDidTapCamera:(MXKRoomInputToolbarView*)toolbarView
-{
-    [self showCameraControllerAnimated:YES];
-}
-
-- (void)roomInputToolbarViewDidTapMediaLibrary:(MXKRoomInputToolbarView*)toolbarView
-{
-    [self showMediaPickerAnimated:YES];
-}
-
 - (void)roomInputToolbarViewDidTapCancel:(MXKRoomInputToolbarView*)toolbarView
 {
     [self cancelEventSelection];
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift b/Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
new file mode 100644
index 000000000..e22f9bda5
--- /dev/null
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
@@ -0,0 +1,30 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import UIKit
+
+@objcMembers
+@objc class RoomActionItem: NSObject {
+    var image: UIImage!
+    var action: (() -> Void)!
+
+    init(image: UIImage, andAction action: @escaping () -> Void) {
+        super.init()
+        
+        self.image = image
+        self.action = action
+    }
+}
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
new file mode 100644
index 000000000..7f4bdcb98
--- /dev/null
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
@@ -0,0 +1,129 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import UIKit
+
+@objcMembers
+@objc class RoomActionsBar: UIScrollView {
+    // MARK: - Properties
+    
+    var itemSpacing: CGFloat = 20 {
+        didSet {
+            self.setNeedsLayout()
+        }
+    }
+    
+    var actionItems: Array<RoomActionItem> = [] {
+        didSet {
+            var actionButtons: Array<UIButton> = []
+            for (index, item) in actionItems.enumerated() {
+                let button = UIButton(type: .custom)
+                button.setImage(item.image, for: .normal)
+                button.addTarget(self, action: #selector(buttonAction(_:)), for: .touchUpInside)
+                button.tintColor = ThemeService.shared().theme.tintColor
+                button.tag = index
+                actionButtons.append(button)
+                addSubview(button)
+            }
+            self.actionButtons = actionButtons
+            self.lastBounds = .zero
+            self.setNeedsLayout()
+        }
+    }
+    
+    private var actionButtons: Array<UIButton> = [] {
+        willSet {
+            for button in actionButtons {
+                button.removeFromSuperview()
+            }
+        }
+    }
+    
+    private var lastBounds = CGRect.zero
+    
+    // MARK: - Lifecycle
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.showsHorizontalScrollIndicator = false
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        self.showsHorizontalScrollIndicator = false
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+
+        guard lastBounds != self.bounds else {
+            return
+        }
+
+        lastBounds = self.bounds
+
+        var currentX: CGFloat = 0
+        for button in actionButtons {
+            button.frame = CGRect(x: currentX, y: 0, width: self.bounds.height, height: self.bounds.height)
+            currentX = button.frame.maxX + itemSpacing
+        }
+
+        self.contentSize = CGSize(width: currentX - itemSpacing, height: self.bounds.height)
+    }
+    
+    // MARK: - Business methods
+    
+    func customizeViewRendering() {
+        for button in actionButtons {
+            button.tintColor = ThemeService.shared().theme.tintColor
+        }
+    }
+    
+    func animate(showIn: Bool, completion: ((Bool) -> Void)? = nil) {
+        if showIn {
+            for button in actionButtons {
+                button.transform = CGAffineTransform(translationX: 0, y: self.bounds.height)
+            }
+            for (index, button) in actionButtons.enumerated() {
+                UIView.animate(withDuration: 0.32, delay: 0.05 * Double(index), usingSpringWithDamping: 0.5, initialSpringVelocity: 7, options: .curveEaseInOut) {
+                    button.transform = CGAffineTransform.identity
+                } completion: { (finished) in
+                    completion?(finished)
+                }
+            }
+        } else {
+            for (index, button) in actionButtons.enumerated() {
+                UIView.animate(withDuration: 0.2, delay: 0.05 * Double(index), options: .curveEaseInOut) {
+                    button.transform = CGAffineTransform(translationX: 0, y: self.bounds.height)
+                } completion: { (finished) in
+                    completion?(finished)
+                }
+            }
+        }
+    }
+    
+    // MARK: - Private methods
+    
+    @objc private func buttonAction(_ sender: UIButton) {
+        if let action = actionItems[sender.tag].action {
+            action()
+        }
+    }
+    
+    private func setupView() {
+        self.showsHorizontalScrollIndicator = false
+    }
+}
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h
index e5559e9fe..b2ad883b8 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h
@@ -18,6 +18,8 @@
 
 #import "MediaPickerViewController.h"
 
+@class RoomActionsBar;
+
 /**
  Destination of the message in the composer
  */
@@ -31,34 +33,6 @@ typedef enum : NSUInteger
 
 @protocol RoomInputToolbarViewDelegate <MXKRoomInputToolbarViewDelegate>
 
-/**
- Tells the delegate that the user wants to display the sticker picker.
-
- @param toolbarView the room input toolbar view.
- */
-- (void)roomInputToolbarViewPresentStickerPicker:(MXKRoomInputToolbarView*)toolbarView;
-
-/**
- Tells the delegate that the user wants to send external files.
- 
- @param toolbarView the room input toolbar view
- */
-- (void)roomInputToolbarViewDidTapFileUpload:(MXKRoomInputToolbarView*)toolbarView;
-
-/**
- Tells the delegate that the user wants to take photo or video with camera.
- 
- @param toolbarView the room input toolbar view
- */
-- (void)roomInputToolbarViewDidTapCamera:(MXKRoomInputToolbarView*)toolbarView;
-
-/**
- Tells the delegate that the user wants to show media library.
- 
- @param toolbarView the room input toolbar view
- */
-- (void)roomInputToolbarViewDidTapMediaLibrary:(MXKRoomInputToolbarView*)toolbarView;
-
 /**
  Tells the delegate that the user wants to cancel the current edition / reply.
  
@@ -95,6 +69,7 @@ typedef enum : NSUInteger
 @property (weak, nonatomic) IBOutlet UIImageView *inputContextImageView;
 @property (weak, nonatomic) IBOutlet UILabel *inputContextLabel;
 @property (weak, nonatomic) IBOutlet UIButton *inputContextButton;
+@property (weak, nonatomic) IBOutlet RoomActionsBar *actionsBar;
 
 /**
  Tell whether the filled data will be sent encrypted. NO by default.
@@ -111,4 +86,9 @@ typedef enum : NSUInteger
  */
 @property (nonatomic) RoomInputToolbarViewSendMode sendMode;
 
+/**
+ YES if action menu is opened. NO otherwise
+ */
+@property (nonatomic, getter=isActionMenuOpened) BOOL actionMenuOpened;
+
 @end
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index dfceba978..cb3a55146 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -120,6 +120,7 @@ const double RoomInputToolbarViewContextBarHeight = 30;
     self.inputContextImageView.tintColor = ThemeService.shared.theme.textSecondaryColor;
     self.inputContextLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
     self.inputContextButton.tintColor = ThemeService.shared.theme.textSecondaryColor;
+    [self.actionsBar customizeViewRendering];
 }
 
 #pragma mark -
@@ -142,6 +143,7 @@ const double RoomInputToolbarViewContextBarHeight = 30;
     RoomInputToolbarViewSendMode previousMode = _sendMode;
     _sendMode = sendMode;
 
+    self.actionMenuOpened = NO;
     [self updatePlaceholder];
     [self updateToolbarButtonLabelWithPreviousMode: previousMode];
 }
@@ -329,92 +331,7 @@ const double RoomInputToolbarViewContextBarHeight = 30;
 {
     if (button == self.attachMediaButton)
     {
-        // Check whether media attachment is supported
-        if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:presentViewController:)])
-        {
-            // Ask the user the kind of the call: voice or video?
-            actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
-
-            __weak typeof(self) weakSelf = self;
-            
-            [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_action_camera", @"Vector", nil)
-                                                            style:UIAlertActionStyleDefault
-                                                          handler:^(UIAlertAction * action) {
-                                                              
-                                                              if (weakSelf)
-                                                              {
-                                                                  typeof(self) self = weakSelf;
-                                                                  self->actionSheet = nil;
-                                                                  
-                                                                  [self.delegate roomInputToolbarViewDidTapCamera:self];
-                                                              }
-                                                          }]];
-            
-            
-            [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_action_send_photo_or_video", @"Vector", nil)
-                                                            style:UIAlertActionStyleDefault
-                                                          handler:^(UIAlertAction * action) {
-
-                                                              if (weakSelf)
-                                                              {
-                                                                  typeof(self) self = weakSelf;
-                                                                  self->actionSheet = nil;
-
-                                                                  [self.delegate roomInputToolbarViewDidTapMediaLibrary:self];
-                                                              }
-
-                                                          }]];
-
-            if (BuildSettings.allowSendingStickers)
-            {
-                [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_action_send_sticker", @"Vector", nil)
-                                                                style:UIAlertActionStyleDefault
-                                                              handler:^(UIAlertAction * action) {
-                    
-                    if (weakSelf)
-                    {
-                        typeof(self) self = weakSelf;
-                        self->actionSheet = nil;
-                        
-                        [self.delegate roomInputToolbarViewPresentStickerPicker:self];
-                    }
-                    
-                }]];
-            }
-            
-            [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_action_send_file", @"Vector", nil)
-                                                            style:UIAlertActionStyleDefault
-                                                          handler:^(UIAlertAction * action) {
-                                                              
-                                                              if (weakSelf)
-                                                              {
-                                                                  typeof(self) self = weakSelf;
-                                                                  self->actionSheet = nil;
-                                                                  
-                                                                  [self.delegate roomInputToolbarViewDidTapFileUpload:self];
-                                                              }
-                                                          }]];
-
-            [actionSheet addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                            style:UIAlertActionStyleCancel
-                                                          handler:^(UIAlertAction * action) {
-
-                                                              if (weakSelf)
-                                                              {
-                                                                  typeof(self) self = weakSelf;
-                                                                  self->actionSheet = nil;
-                                                              }
-
-                                                          }]];
-
-            [actionSheet popoverPresentationController].sourceView = self.attachMediaButton;
-            [actionSheet popoverPresentationController].sourceRect = self.attachMediaButton.bounds;
-            [self.window.rootViewController presentViewController:actionSheet animated:YES completion:nil];
-        }
-        else
-        {
-            NSLog(@"[RoomInputToolbarView] Attach media is not supported");
-        }
+        self.actionMenuOpened = !self.isActionMenuOpened;
     }
 
     [super onTouchUpInside:button];
@@ -443,9 +360,55 @@ const double RoomInputToolbarViewContextBarHeight = 30;
         self.rightInputToolbarButton.alpha = 0;
         self.messageComposerContainerTrailingConstraint.constant = 12;
     }
+    
     [self layoutIfNeeded];
 }
 
+#pragma mark - properties
+
+- (void)setActionMenuOpened:(BOOL)actionMenuOpened
+{
+    if (_actionMenuOpened != actionMenuOpened)
+    {
+        _actionMenuOpened = actionMenuOpened;
+        
+        if (_actionMenuOpened) {
+            self.actionsBar.hidden = NO;
+            [self.actionsBar animateWithShowIn:_actionMenuOpened completion:nil];
+        }
+        else
+        {
+            [self.actionsBar animateWithShowIn:_actionMenuOpened completion:^(BOOL finished) {
+                self.actionsBar.hidden = YES;
+            }];
+        }
+        
+        [UIView animateWithDuration:.4 delay:0 usingSpringWithDamping:0.45 initialSpringVelocity:5 options:UIViewAnimationOptionCurveEaseIn animations:^{
+            self.attachMediaButton.transform = actionMenuOpened ? CGAffineTransformMakeRotation(M_PI * 3 / 4) : CGAffineTransformIdentity;
+        } completion:^(BOOL finished) {
+        }];
+        
+        [UIView animateWithDuration:.2 delay:_actionMenuOpened ? 0 : .1 options:UIViewAnimationOptionCurveEaseIn animations:^{
+            self->messageComposerContainer.alpha = actionMenuOpened ? 0 : 1;
+            self.rightInputToolbarButton.alpha = self->growingTextView.text.length == 0 || actionMenuOpened ? 0 : 1;
+        } completion:^(BOOL finished) {
+        }];
+        
+        [UIView animateWithDuration:.3 animations:^{
+            if (actionMenuOpened)
+            {
+                self.mainToolbarHeightConstraint.constant = self.mainToolbarMinHeightConstraint.constant;
+            }
+            else
+            {
+                [self->growingTextView refreshHeight];
+            }
+            [self layoutIfNeeded];
+            [self.delegate roomInputToolbarView:self heightDidChanged:self.mainToolbarHeightConstraint.constant completion:nil];
+        }];
+    }
+}
+
 #pragma mark - Clipboard - Handle image/data paste from general pasteboard
 
 - (void)paste:(id)sender
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib
index fbc52e9f1..e99b0ef66 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib
@@ -27,6 +27,14 @@
                                 <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="WbU-WH-gwL"/>
                             </connections>
                         </button>
+                        <scrollView hidden="YES" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ESv-9w-KJF" customClass="RoomActionsBar" customModule="Riot" customModuleProvider="target">
+                            <rect key="frame" x="60" y="8" width="540" height="38"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="38" id="i6C-gL-ADZ"/>
+                            </constraints>
+                            <viewLayoutGuide key="contentLayoutGuide" id="F6O-76-cZl"/>
+                            <viewLayoutGuide key="frameLayoutGuide" id="rZR-Bv-AqG"/>
+                        </scrollView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QWp-NV-uh5" userLabel="Message Composer Container">
                             <rect key="frame" x="60" y="9" width="528" height="36"/>
                             <subviews>
@@ -105,11 +113,14 @@
                         <constraint firstItem="QWp-NV-uh5" firstAttribute="leading" secondItem="Hga-l8-Wua" secondAttribute="trailing" constant="12" id="M9f-je-3zO"/>
                         <constraint firstAttribute="bottom" secondItem="QWp-NV-uh5" secondAttribute="bottom" constant="13" id="NGr-2o-sOP"/>
                         <constraint firstAttribute="trailing" secondItem="G8Z-CM-tGs" secondAttribute="trailing" constant="12" id="Sua-LC-3yW"/>
+                        <constraint firstItem="ESv-9w-KJF" firstAttribute="leading" secondItem="Hga-l8-Wua" secondAttribute="trailing" constant="12" id="TIe-py-lFJ"/>
                         <constraint firstItem="QWp-NV-uh5" firstAttribute="top" secondItem="a84-Vc-6ud" secondAttribute="top" constant="9" id="WyZ-3i-OHi"/>
                         <constraint firstAttribute="bottom" secondItem="G8Z-CM-tGs" secondAttribute="bottom" constant="12" id="Yam-dS-zwr"/>
                         <constraint firstAttribute="height" constant="58" id="Yjj-ua-rbe"/>
                         <constraint firstAttribute="bottom" secondItem="Hga-l8-Wua" secondAttribute="bottom" constant="12" id="b0G-CY-AmP"/>
                         <constraint firstAttribute="trailing" secondItem="QWp-NV-uh5" secondAttribute="trailing" constant="12" id="hXO-cY-Jgz"/>
+                        <constraint firstAttribute="trailing" secondItem="ESv-9w-KJF" secondAttribute="trailing" id="jCS-Tf-vxr"/>
+                        <constraint firstAttribute="bottom" secondItem="ESv-9w-KJF" secondAttribute="bottom" constant="12" id="v8r-ac-MKn"/>
                     </constraints>
                 </view>
             </subviews>
@@ -125,6 +136,7 @@
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
+                <outlet property="actionsBar" destination="ESv-9w-KJF" id="h7H-vz-yzO"/>
                 <outlet property="attachMediaButton" destination="Hga-l8-Wua" id="Osr-ek-c91"/>
                 <outlet property="growingTextView" destination="wgb-ON-N29" id="nwF-uV-Ng9"/>
                 <outlet property="inputContextButton" destination="48y-kn-7b5" id="yRn-1S-96w"/>

From ddcce2e49135cbc11b9f5deae6d9f64017a15fd3 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Fri, 26 Mar 2021 11:18:05 +0100
Subject: [PATCH 06/38] Switching composer between text mode & action mode

- Deselect text if user taps action button to avoid overlaps
---
 Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index cb3a55146..a0b5aceb8 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -372,6 +372,8 @@ const double RoomInputToolbarViewContextBarHeight = 30;
     {
         _actionMenuOpened = actionMenuOpened;
         
+        self->growingTextView.internalTextView.selectedTextRange = nil;
+
         if (_actionMenuOpened) {
             self.actionsBar.hidden = NO;
             [self.actionsBar animateWithShowIn:_actionMenuOpened completion:nil];

From f08434b684e7165b821cfb664878d335d0884fda Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Sat, 27 Mar 2021 07:51:51 +0100
Subject: [PATCH 07/38] Switching composer between text mode & action mode

- Fixed: if you start typing while the new attachment sending mode is on, the send button appears
---
 .../Room/Views/InputToolbar/RoomInputToolbarView.m     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index a0b5aceb8..5997ce8bb 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -350,6 +350,8 @@ const double RoomInputToolbarViewContextBarHeight = 30;
 
 - (void)updateSendButtonWithMessage:(NSString *)textMessage
 {
+    self.actionMenuOpened = NO;
+    
     if (textMessage.length)
     {
         self.rightInputToolbarButton.alpha = 1;
@@ -372,7 +374,13 @@ const double RoomInputToolbarViewContextBarHeight = 30;
     {
         _actionMenuOpened = actionMenuOpened;
         
-        self->growingTextView.internalTextView.selectedTextRange = nil;
+        if (self->growingTextView.internalTextView.selectedRange.length > 0)
+        {
+            NSRange range = self->growingTextView.internalTextView.selectedRange;
+            range.location = range.location + range.length;
+            range.length = 0;
+            self->growingTextView.internalTextView.selectedRange = range;
+        }
 
         if (_actionMenuOpened) {
             self.actionsBar.hidden = NO;

From e6663a9148707ddd84aaab01080dda91cabc6bfb Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Mon, 29 Mar 2021 22:26:03 +0200
Subject: [PATCH 08/38] Explore typing notifications inspired by web

- prevent timeline from going up and down by keeping the space allocated for the typing notification
---
 Riot/Modules/Room/DataSources/RoomDataSource.m  |  4 ++--
 Riot/Modules/Room/RoomViewController.m          | 17 +++++++++++++++--
 .../BubbleCells/RoomTypingBubbleCell.swift      |  2 ++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 210f27c93..8cef6f9b2 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -273,7 +273,7 @@
             [self updateStatusInfo];
         }
         
-        if (self.currentTypingUsers.count == 0)
+        if (!self.currentTypingUsers)
         {
             self.typingCellIndex = -1;
             
@@ -285,7 +285,7 @@
         return bubbles.count + 1;
     }
     
-    if (self.currentTypingUsers.count == 0)
+    if (!self.currentTypingUsers)
     {
         self.typingCellIndex = -1;
 
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index abac470da..6e5173a6f 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -4109,9 +4109,22 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
 
     if (needsUpdate)
     {
+        BOOL needsReload = roomDataSource.currentTypingUsers == nil;
         roomDataSource.currentTypingUsers = typingUsers;
-        [self.bubblesTableView reloadData];
-        if (self.isScrollToBottomHidden)
+        if (needsReload)
+        {
+            [self.bubblesTableView reloadData];
+        }
+        else
+        {
+            NSInteger count = [self.roomDataSource tableView:self.bubblesTableView numberOfRowsInSection:0];
+            NSIndexPath *lastIndexPath = [NSIndexPath indexPathForRow:count - 1 inSection:0];
+            [self.bubblesTableView reloadRowsAtIndexPaths:@[lastIndexPath] withRowAnimation:UITableViewRowAnimationFade];
+        }
+        
+        if (self.isScrollToBottomHidden
+            && !self.bubblesTableView.isDragging
+            && !self.bubblesTableView.isDecelerating)
         {
             NSInteger count = [self.roomDataSource tableView:self.bubblesTableView numberOfRowsInSection:0];
             if (count)
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
index b69541f88..0fdbc7a8e 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
@@ -51,6 +51,8 @@ class RoomTypingBubbleCell: UITableViewCell {
     override func layoutSubviews() {
         super.layoutSubviews()
 
+        self.dotsView?.isHidden = userPictureViews.count == 0
+
         guard userPictureViews.count > 0 else {
             return
         }

From c1caaaa775773cc1e27f8826e641a26c9abb82f2 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Mon, 29 Mar 2021 23:45:47 +0200
Subject: [PATCH 09/38] Switching composer between text mode & action mode

- Fixed: The final frames of the appearance animation of the new composer buttons are missing
---
 Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
index 7f4bdcb98..0cf11e292 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
@@ -77,6 +77,7 @@ import UIKit
 
         var currentX: CGFloat = 0
         for button in actionButtons {
+            button.transform = CGAffineTransform.identity
             button.frame = CGRect(x: currentX, y: 0, width: self.bounds.height, height: self.bounds.height)
             currentX = button.frame.maxX + itemSpacing
         }
@@ -98,7 +99,7 @@ import UIKit
                 button.transform = CGAffineTransform(translationX: 0, y: self.bounds.height)
             }
             for (index, button) in actionButtons.enumerated() {
-                UIView.animate(withDuration: 0.32, delay: 0.05 * Double(index), usingSpringWithDamping: 0.5, initialSpringVelocity: 7, options: .curveEaseInOut) {
+                UIView.animate(withDuration: 0.38, delay: 0.05 * Double(index), usingSpringWithDamping: 0.5, initialSpringVelocity: 7, options: .curveEaseInOut) {
                     button.transform = CGAffineTransform.identity
                 } completion: { (finished) in
                     completion?(finished)
@@ -106,7 +107,7 @@ import UIKit
             }
         } else {
             for (index, button) in actionButtons.enumerated() {
-                UIView.animate(withDuration: 0.2, delay: 0.05 * Double(index), options: .curveEaseInOut) {
+                UIView.animate(withDuration: 0.3, delay: 0.05 * Double(index), options: .curveEaseInOut) {
                     button.transform = CGAffineTransform(translationX: 0, y: self.bounds.height)
                 } completion: { (finished) in
                     completion?(finished)

From 8a0674404e15b1a0d6135feedd72cd88c5f601f5 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Sat, 3 Apr 2021 00:03:57 +0200
Subject: [PATCH 10/38] Switching composer between text mode & action mode

- Tweaked animation speed
---
 Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift | 8 +++++---
 .../Room/Views/InputToolbar/RoomInputToolbarView.m        | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
index 0cf11e292..3f78b9cb3 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
@@ -99,7 +99,7 @@ import UIKit
                 button.transform = CGAffineTransform(translationX: 0, y: self.bounds.height)
             }
             for (index, button) in actionButtons.enumerated() {
-                UIView.animate(withDuration: 0.38, delay: 0.05 * Double(index), usingSpringWithDamping: 0.5, initialSpringVelocity: 7, options: .curveEaseInOut) {
+                UIView.animate(withDuration: 0.3, delay: 0.05 * Double(index), usingSpringWithDamping: 0.45, initialSpringVelocity: 11, options: .curveEaseInOut) {
                     button.transform = CGAffineTransform.identity
                 } completion: { (finished) in
                     completion?(finished)
@@ -107,10 +107,12 @@ import UIKit
             }
         } else {
             for (index, button) in actionButtons.enumerated() {
-                UIView.animate(withDuration: 0.3, delay: 0.05 * Double(index), options: .curveEaseInOut) {
+                UIView.animate(withDuration: 0.25, delay: 0.05 * Double(index), options: .curveEaseInOut) {
                     button.transform = CGAffineTransform(translationX: 0, y: self.bounds.height)
                 } completion: { (finished) in
-                    completion?(finished)
+                    if index == self.actionButtons.count - 1 {
+                        completion?(finished)
+                    }
                 }
             }
         }
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index 5997ce8bb..c76bbd038 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -201,7 +201,7 @@ const double RoomInputToolbarViewContextBarHeight = 30;
 
     if (self.mainToolbarHeightConstraint.constant != updatedHeight)
     {
-        [UIView animateWithDuration:.3 animations:^{
+        [UIView animateWithDuration:.15 animations:^{
             self.mainToolbarHeightConstraint.constant = updatedHeight;
             [self layoutIfNeeded];
             

From bfd605dff72f21c4f1489a65229ab58204e08cf6 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Tue, 6 Apr 2021 13:09:30 +0200
Subject: [PATCH 11/38] Limit typing notifications timeline jumps

---
 Riot/Modules/Room/DataSources/RoomDataSource.h |  2 ++
 Riot/Modules/Room/DataSources/RoomDataSource.m |  4 ++++
 Riot/Modules/Room/RoomViewController.m         | 17 +++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.h b/Riot/Modules/Room/DataSources/RoomDataSource.h
index ced9e687a..d4ec45c91 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.h
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.h
@@ -98,6 +98,8 @@
                                      success:(void(^)(void))success
                                      failure:(void(^)(NSError*))failure;
 
+- (void)resetTypingNotification;
+
 @end
 
 @protocol RoomDataSourceDelegate <MXKDataSourceDelegate>
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 8cef6f9b2..2122a398d 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -950,6 +950,10 @@
     }];
 }
 
+- (void)resetTypingNotification {
+    self.currentTypingUsers = nil;
+}
+
 #pragma - Accessibility
 
 - (void)setupAccessibilityForCell:(MXKRoomBubbleTableViewCell *)cell withCellData:(RoomBubbleCellData*)cellData
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 6e5173a6f..9ac281f7d 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -511,6 +511,12 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
         [self refreshRoomInputToolbar];
     }
     
+    // Reset typing notification in order to remove the allocated space
+    if ([self.roomDataSource isKindOfClass:RoomDataSource.class])
+    {
+        [((RoomDataSource*)self.roomDataSource) resetTypingNotification];
+    }
+
     [self listenTypingNotifications];
     [self listenCallNotifications];
     [self listenWidgetNotifications];
@@ -1338,6 +1344,17 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
         _scrollToBottomHidden = scrollToBottomHidden;
     }
     
+    if (!_scrollToBottomHidden && [self.roomDataSource isKindOfClass:RoomDataSource.class])
+    {
+        RoomDataSource *roomDataSource = (RoomDataSource *) self.roomDataSource;
+        if (roomDataSource.currentTypingUsers && !roomDataSource.currentTypingUsers.count)
+        {
+            [roomDataSource resetTypingNotification];
+            NSInteger count = [roomDataSource tableView:self.bubblesTableView numberOfRowsInSection:0];
+            [self.bubblesTableView deleteRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:count inSection:0]] withRowAnimation:UITableViewRowAnimationNone];
+        }
+    }
+
     [UIView animateWithDuration:.2 animations:^{
         self.scrollToBottomBadgeLabel.alpha = (scrollToBottomHidden || !self.scrollToBottomBadgeLabel.text) ? 0 : 1;
         self.scrollToBottomButton.alpha = scrollToBottomHidden ? 0 : 1;

From 18e2666b84942f3e5ddf5cda09f5b8e37b482f7a Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Tue, 6 Apr 2021 14:32:25 +0200
Subject: [PATCH 12/38] Consider displaying names in typing notifications

---
 Riot/Assets/en.lproj/Vector.strings           |  2 ++
 Riot/Generated/Strings.swift                  |  4 +++
 .../BubbleCells/RoomTypingBubbleCell.swift    | 26 +++++++++++++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index 40ab6cd46..6b58da5c1 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -406,6 +406,8 @@ Tap the + to start adding people.";
 "external_link_confirmation_title" = "Double-check this link";
 "external_link_confirmation_message" = "The link %@ is taking you to another site: %@\n\nAre you sure you want to continue?";
 
+"room_multiple_typing_notification" = "%@ and others";
+
 // Unknown devices
 "unknown_devices_alert_title" = "Room contains unknown sessions";
 "unknown_devices_alert" = "This room contains unknown sessions which have not been verified.\nThis means there is no guarantee that the sessions belong to the users they claim to.\nWe recommend you go through the verification process for each session before continuing, but you can resend the message without verifying if you prefer.";
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index 0d5515a5a..ab9947434 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -2938,6 +2938,10 @@ internal enum VectorL10n {
   internal static var roomMessageUnableOpenLinkErrorMessage: String { 
     return VectorL10n.tr("Vector", "room_message_unable_open_link_error_message") 
   }
+  /// %@ and others
+  internal static func roomMultipleTypingNotification(_ p1: String) -> String {
+    return VectorL10n.tr("Vector", "room_multiple_typing_notification", p1)
+  }
   /// %d new message
   internal static func roomNewMessageNotification(_ p1: Int) -> String {
     return VectorL10n.tr("Vector", "room_new_message_notification", p1)
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
index 0fdbc7a8e..ae06ed057 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
@@ -32,10 +32,17 @@ class RoomTypingBubbleCell: UITableViewCell {
     // MARK: - members
     
     private var userPictureViews: Array<MXKImageView> = Array()
-    private var typingUsers: Array<MXRoomMember> = Array()
     
     // MARK: - Lifecycle
     
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        
+        additionalUsersLabel?.textColor = ThemeService.shared().theme.textSecondaryColor
+        dotsView?.highlightedDotColor = ThemeService.shared().theme.textTertiaryColor
+        dotsView?.dotColor = ThemeService.shared().theme.textSecondaryColor
+    }
+    
     override func prepareForReuse() {
         super.prepareForReuse()
         
@@ -97,7 +104,22 @@ class RoomTypingBubbleCell: UITableViewCell {
             self.contentView.addSubview(pictureView)
         }
         
-        additionalUsersLabel?.text = typingUsers.count <= 4 ? nil : "+\(typingUsers.count - 4)"
+        switch typingUsers.count {
+        case 0:
+            additionalUsersLabel?.text = nil
+        case 1:
+            additionalUsersLabel?.text = firstUserNameFor(typingUsers)
+        default:
+            additionalUsersLabel?.text = VectorL10n.roomMultipleTypingNotification(firstUserNameFor(typingUsers) ?? "")
+        }
         self.setNeedsLayout()
     }
+    
+    private func firstUserNameFor(_ typingUsers: Array<MXRoomMember>) -> String? {
+        guard let firstUser = typingUsers.first else {
+            return nil
+        }
+        
+        return firstUser.displayname.isEmptyOrNil ? firstUser.userId : firstUser.displayname
+    }
 }

From 62cb90ffd76a400e349aae61dfef0105e6665147 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Wed, 7 Apr 2021 09:32:57 +0200
Subject: [PATCH 13/38] Switching composer between text mode & action mode

- Tweaked animation speed
---
 Riot/Modules/Room/RoomViewController.m | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 87f9f09a8..99d67c067 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -286,6 +286,8 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
 {
     [super finalizeInit];
     
+    self.resizeComposerAnimationDuration = 0.15;
+    
     // Setup `MXKViewControllerHandling` properties
     self.enableBarTintColorStatusChange = NO;
     self.rageShakeManager = [RageShakeManager sharedManager];

From f239790362594400277b9d29fa33b22fbb035b70 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Wed, 7 Apr 2021 10:28:35 +0200
Subject: [PATCH 14/38] Switching composer between text mode & action mode

- Tweaked animation speed
---
 Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index c76bbd038..aef222b14 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -393,7 +393,7 @@ const double RoomInputToolbarViewContextBarHeight = 30;
             }];
         }
         
-        [UIView animateWithDuration:.4 delay:0 usingSpringWithDamping:0.45 initialSpringVelocity:5 options:UIViewAnimationOptionCurveEaseIn animations:^{
+        [UIView animateWithDuration:.4 delay:0 usingSpringWithDamping:0.45 initialSpringVelocity:7 options:UIViewAnimationOptionCurveEaseIn animations:^{
             self.attachMediaButton.transform = actionMenuOpened ? CGAffineTransformMakeRotation(M_PI * 3 / 4) : CGAffineTransformIdentity;
         } completion:^(BOOL finished) {
         }];

From 890157dcc8103b80549dcdbae6a8d29635630b2f Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Wed, 7 Apr 2021 11:14:08 +0200
Subject: [PATCH 15/38] Crash in [RoomViewController setupActions]

---
 Riot/Modules/Room/RoomViewController.m | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 99d67c067..6a14a78c2 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -1702,6 +1702,10 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
 }
 
 - (void)setupActions {
+    if (![self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+        return;
+    }
+    
     RoomInputToolbarView *roomInputView = ((RoomInputToolbarView *) self.inputToolbarView);
     __weak typeof(self) weakSelf = self;
     roomInputView.actionsBar.actionItems = @[
@@ -1709,7 +1713,9 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
             if (weakSelf)
             {
                 typeof(self) self = weakSelf;
-                roomInputView.actionMenuOpened = NO;
+                if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                    ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
+                }
                 [self showCameraControllerAnimated:YES];
             }
         }],
@@ -1717,7 +1723,9 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
             if (weakSelf)
             {
                 typeof(self) self = weakSelf;
-                roomInputView.actionMenuOpened = NO;
+                if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                    ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
+                }
                 [self showMediaPickerAnimated:YES];
             }
         }],
@@ -1725,7 +1733,9 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
             if (weakSelf)
             {
                 typeof(self) self = weakSelf;
-                roomInputView.actionMenuOpened = NO;
+                if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                    ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
+                }
                 [self roomInputToolbarViewPresentStickerPicker];
             }
         }],
@@ -1733,7 +1743,9 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
             if (weakSelf)
             {
                 typeof(self) self = weakSelf;
-                roomInputView.actionMenuOpened = NO;
+                if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                    ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
+                }
                 [self roomInputToolbarViewDidTapFileUpload];
             }
         }],

From a09550a1ee9af09e32e39f0a9354a7175ecd28cd Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Wed, 7 Apr 2021 12:26:51 +0200
Subject: [PATCH 16/38] Crash in [RoomViewController refreshTypingNotification]

---
 .../Modules/Room/DataSources/TypingUserInfo.h | 34 ++++++++++++++
 .../Modules/Room/DataSources/TypingUserInfo.m | 46 +++++++++++++++++++
 Riot/Modules/Room/RoomViewController.m        | 15 +++++-
 .../BubbleCells/RoomTypingBubbleCell.swift    |  8 ++--
 Riot/SupportingFiles/Riot-Bridging-Header.h   |  1 +
 5 files changed, 98 insertions(+), 6 deletions(-)
 create mode 100644 Riot/Modules/Room/DataSources/TypingUserInfo.h
 create mode 100644 Riot/Modules/Room/DataSources/TypingUserInfo.m

diff --git a/Riot/Modules/Room/DataSources/TypingUserInfo.h b/Riot/Modules/Room/DataSources/TypingUserInfo.h
new file mode 100644
index 000000000..54914dc6e
--- /dev/null
+++ b/Riot/Modules/Room/DataSources/TypingUserInfo.h
@@ -0,0 +1,34 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface TypingUserInfo : NSObject
+
+@property (nonatomic, strong) NSString *userId;
+@property (nonatomic, strong, nullable) NSString *displayName;
+@property (nonatomic, strong, nullable) NSString *avatarUrl;
+
+- (instancetype) initWithMember:(MXRoomMember*)member;
+
+- (instancetype) initWithUserId:(NSString*)userId;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/Room/DataSources/TypingUserInfo.m b/Riot/Modules/Room/DataSources/TypingUserInfo.m
new file mode 100644
index 000000000..fa59cde01
--- /dev/null
+++ b/Riot/Modules/Room/DataSources/TypingUserInfo.m
@@ -0,0 +1,46 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import "TypingUserInfo.h"
+
+@implementation TypingUserInfo
+
+- (instancetype) initWithMember:(MXRoomMember*)member
+{
+    self = [self initWithUserId:member.userId];
+    
+    if (self)
+    {
+        self.displayName = member.displayname;
+        self.avatarUrl = member.avatarUrl;
+    }
+    
+    return self;
+}
+
+- (instancetype) initWithUserId:(NSString*)userId
+{
+    self = [super init];
+    
+    if (self)
+    {
+        self.userId = userId;
+    }
+    
+    return self;
+}
+
+@end
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index e3379981e..e7c07ec93 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -124,6 +124,8 @@
 #import "SettingsViewController.h"
 #import "SecurityViewController.h"
 
+#import "TypingUserInfo.h"
+
 #import "Riot-Swift.h"
 
 NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNotification";
@@ -4134,8 +4136,17 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
     for (NSUInteger i = 0 ; i < currentTypingUsers.count ; i++) {
         NSString *userId = currentTypingUsers[i];
         MXRoomMember* member = [self.roomDataSource.roomState.members memberWithUserId:userId];
-        [typingUsers addObject:member];
-        needsUpdate = needsUpdate || member.userId != ((MXRoomMember *) roomDataSource.currentTypingUsers[i]).userId;
+        TypingUserInfo *userInfo;
+        if (member)
+        {
+            userInfo = [[TypingUserInfo alloc] initWithMember: member];
+        }
+        else
+        {
+            userInfo = [[TypingUserInfo alloc] initWithUserId: userId];
+        }
+        [typingUsers addObject:userInfo];
+        needsUpdate = needsUpdate || userInfo.userId != ((MXRoomMember *) roomDataSource.currentTypingUsers[i]).userId;
     }
 
     if (needsUpdate)
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
index ae06ed057..551dca621 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
@@ -82,7 +82,7 @@ class RoomTypingBubbleCell: UITableViewCell {
     
     // MARK: - Business methods
     
-    func updateTypingUsers(_ typingUsers: Array<MXRoomMember>, mediaManager: MXMediaManager) {
+    func updateTypingUsers(_ typingUsers: Array<TypingUserInfo>, mediaManager: MXMediaManager) {
         for pictureView in userPictureViews {
             pictureView.removeFromSuperview()
         }
@@ -97,7 +97,7 @@ class RoomTypingBubbleCell: UITableViewCell {
             pictureView.layer.masksToBounds = true
             pictureView.layer.cornerRadius = pictureView.bounds.midX
             
-            let defaultavatarImage = AvatarGenerator.generateAvatar(forMatrixItem: user.userId, withDisplayName: user.displayname)
+            let defaultavatarImage = AvatarGenerator.generateAvatar(forMatrixItem: user.userId, withDisplayName: user.displayName)
             pictureView.setImageURI(user.avatarUrl, withType: nil, andImageOrientation: .up, toFitViewSize: pictureView.bounds.size, with: MXThumbnailingMethodCrop, previewImage: defaultavatarImage, mediaManager: mediaManager)
             
             userPictureViews.append(pictureView)
@@ -115,11 +115,11 @@ class RoomTypingBubbleCell: UITableViewCell {
         self.setNeedsLayout()
     }
     
-    private func firstUserNameFor(_ typingUsers: Array<MXRoomMember>) -> String? {
+    private func firstUserNameFor(_ typingUsers: Array<TypingUserInfo>) -> String? {
         guard let firstUser = typingUsers.first else {
             return nil
         }
         
-        return firstUser.displayname.isEmptyOrNil ? firstUser.userId : firstUser.displayname
+        return firstUser.displayName.isEmptyOrNil ? firstUser.userId : firstUser.displayName
     }
 }
diff --git a/Riot/SupportingFiles/Riot-Bridging-Header.h b/Riot/SupportingFiles/Riot-Bridging-Header.h
index f8ff71ea5..7daa40759 100644
--- a/Riot/SupportingFiles/Riot-Bridging-Header.h
+++ b/Riot/SupportingFiles/Riot-Bridging-Header.h
@@ -31,3 +31,4 @@
 #import "AuthFallBackViewController.h"
 #import "CallViewController.h"
 #import "MatrixContactsDataSource.h"
+#import "TypingUserInfo.h"

From 370db5372dba621a19332727b4d226c8699ef9ec Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Wed, 7 Apr 2021 13:11:07 +0200
Subject: [PATCH 17/38] too much vertical whitespace when replying

---
 .../Room/Views/InputToolbar/RoomInputToolbarView.m   |  2 +-
 .../Room/Views/InputToolbar/RoomInputToolbarView.xib | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index aef222b14..ec9afdc99 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -27,7 +27,7 @@
 #import "WidgetManager.h"
 #import "IntegrationManagerViewController.h"
 
-const double RoomInputToolbarViewContextBarHeight = 30;
+const double RoomInputToolbarViewContextBarHeight = 20;
 
 @interface RoomInputToolbarView()
 {
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib
index e99b0ef66..403a83a59 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib
@@ -45,16 +45,16 @@
                                     <rect key="frame" x="0.0" y="0.0" width="528" height="32"/>
                                     <subviews>
                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="input_edit_icon" translatesAutoresizingMaskIntoConstraints="NO" id="PZ4-0Y-TmL">
-                                            <rect key="frame" x="12" y="11" width="10.5" height="10"/>
+                                            <rect key="frame" x="12" y="20" width="10.5" height="10"/>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dVr-ZM-kkX">
-                                            <rect key="frame" x="26.5" y="9" width="461.5" height="14.5"/>
+                                            <rect key="frame" x="26.5" y="17.5" width="461.5" height="14.5"/>
                                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="48y-kn-7b5">
-                                            <rect key="frame" x="492" y="1" width="30" height="30"/>
+                                            <rect key="frame" x="492" y="10" width="30" height="30"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="30" id="I17-S0-9fp"/>
                                                 <constraint firstAttribute="width" constant="30" id="cCe-RB-ET2"/>
@@ -67,14 +67,14 @@
                                     </subviews>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <constraints>
+                                        <constraint firstAttribute="bottom" secondItem="dVr-ZM-kkX" secondAttribute="bottom" id="58M-yd-hhK"/>
+                                        <constraint firstItem="PZ4-0Y-TmL" firstAttribute="centerY" secondItem="dVr-ZM-kkX" secondAttribute="centerY" id="Bu1-sl-qDk"/>
                                         <constraint firstAttribute="height" constant="32" id="KNn-ng-NHK"/>
                                         <constraint firstItem="dVr-ZM-kkX" firstAttribute="leading" secondItem="PZ4-0Y-TmL" secondAttribute="trailing" constant="4" id="RbN-mc-y2P"/>
-                                        <constraint firstItem="48y-kn-7b5" firstAttribute="centerY" secondItem="jXI-9E-Bgl" secondAttribute="centerY" id="XbN-rm-nDw"/>
                                         <constraint firstItem="48y-kn-7b5" firstAttribute="leading" secondItem="dVr-ZM-kkX" secondAttribute="trailing" constant="4" id="bmi-rg-TNM"/>
-                                        <constraint firstItem="PZ4-0Y-TmL" firstAttribute="centerY" secondItem="jXI-9E-Bgl" secondAttribute="centerY" id="f9O-vU-41g"/>
                                         <constraint firstItem="PZ4-0Y-TmL" firstAttribute="leading" secondItem="jXI-9E-Bgl" secondAttribute="leading" constant="12" id="mp0-tl-IIe"/>
                                         <constraint firstAttribute="trailing" secondItem="48y-kn-7b5" secondAttribute="trailing" constant="6" id="qPb-EI-csl"/>
-                                        <constraint firstItem="dVr-ZM-kkX" firstAttribute="centerY" secondItem="jXI-9E-Bgl" secondAttribute="centerY" id="yb4-bq-XNb"/>
+                                        <constraint firstItem="48y-kn-7b5" firstAttribute="centerY" secondItem="dVr-ZM-kkX" secondAttribute="centerY" id="z5v-Vy-6tc"/>
                                     </constraints>
                                 </view>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wgb-ON-N29" customClass="KeyboardGrowingTextView">

From 5e6ab4a61b1135f816f1f1574577e1d0d8051644 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Wed, 7 Apr 2021 14:11:27 +0200
Subject: [PATCH 18/38] too much vertical whitespace when replying

---
 .../Views/InputToolbar/RoomInputToolbarView.m  |  2 +-
 .../InputToolbar/RoomInputToolbarView.xib      | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index ec9afdc99..bbf3a0611 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -27,7 +27,7 @@
 #import "WidgetManager.h"
 #import "IntegrationManagerViewController.h"
 
-const double RoomInputToolbarViewContextBarHeight = 20;
+const double RoomInputToolbarViewContextBarHeight = 24;
 
 @interface RoomInputToolbarView()
 {
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib
index 403a83a59..aef8b2f81 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib
@@ -45,16 +45,16 @@
                                     <rect key="frame" x="0.0" y="0.0" width="528" height="32"/>
                                     <subviews>
                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="input_edit_icon" translatesAutoresizingMaskIntoConstraints="NO" id="PZ4-0Y-TmL">
-                                            <rect key="frame" x="12" y="20" width="10.5" height="10"/>
+                                            <rect key="frame" x="8" y="16" width="10.5" height="10"/>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dVr-ZM-kkX">
-                                            <rect key="frame" x="26.5" y="17.5" width="461.5" height="14.5"/>
+                                            <rect key="frame" x="22.5" y="13.5" width="471.5" height="14.5"/>
                                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="48y-kn-7b5">
-                                            <rect key="frame" x="492" y="10" width="30" height="30"/>
+                                            <rect key="frame" x="498" y="6" width="30" height="30"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="30" id="I17-S0-9fp"/>
                                                 <constraint firstAttribute="width" constant="30" id="cCe-RB-ET2"/>
@@ -67,30 +67,30 @@
                                     </subviews>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <constraints>
-                                        <constraint firstAttribute="bottom" secondItem="dVr-ZM-kkX" secondAttribute="bottom" id="58M-yd-hhK"/>
+                                        <constraint firstAttribute="bottom" secondItem="dVr-ZM-kkX" secondAttribute="bottom" constant="4" id="58M-yd-hhK"/>
                                         <constraint firstItem="PZ4-0Y-TmL" firstAttribute="centerY" secondItem="dVr-ZM-kkX" secondAttribute="centerY" id="Bu1-sl-qDk"/>
                                         <constraint firstAttribute="height" constant="32" id="KNn-ng-NHK"/>
                                         <constraint firstItem="dVr-ZM-kkX" firstAttribute="leading" secondItem="PZ4-0Y-TmL" secondAttribute="trailing" constant="4" id="RbN-mc-y2P"/>
                                         <constraint firstItem="48y-kn-7b5" firstAttribute="leading" secondItem="dVr-ZM-kkX" secondAttribute="trailing" constant="4" id="bmi-rg-TNM"/>
-                                        <constraint firstItem="PZ4-0Y-TmL" firstAttribute="leading" secondItem="jXI-9E-Bgl" secondAttribute="leading" constant="12" id="mp0-tl-IIe"/>
-                                        <constraint firstAttribute="trailing" secondItem="48y-kn-7b5" secondAttribute="trailing" constant="6" id="qPb-EI-csl"/>
+                                        <constraint firstItem="PZ4-0Y-TmL" firstAttribute="leading" secondItem="jXI-9E-Bgl" secondAttribute="leading" constant="8" id="mp0-tl-IIe"/>
+                                        <constraint firstAttribute="trailing" secondItem="48y-kn-7b5" secondAttribute="trailing" id="qPb-EI-csl"/>
                                         <constraint firstItem="48y-kn-7b5" firstAttribute="centerY" secondItem="dVr-ZM-kkX" secondAttribute="centerY" id="z5v-Vy-6tc"/>
                                     </constraints>
                                 </view>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wgb-ON-N29" customClass="KeyboardGrowingTextView">
-                                    <rect key="frame" x="4" y="33" width="520" height="4"/>
+                                    <rect key="frame" x="5" y="33" width="518" height="4"/>
                                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     <accessibility key="accessibilityConfiguration" identifier="GrowingTextView"/>
                                 </view>
                             </subviews>
                             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
-                                <constraint firstAttribute="trailing" secondItem="wgb-ON-N29" secondAttribute="trailing" constant="4" id="30f-rE-CKj"/>
+                                <constraint firstAttribute="trailing" secondItem="wgb-ON-N29" secondAttribute="trailing" constant="5" id="30f-rE-CKj"/>
                                 <constraint firstAttribute="trailing" secondItem="jXI-9E-Bgl" secondAttribute="trailing" id="3EM-Mc-ZaI"/>
                                 <constraint firstItem="jXI-9E-Bgl" firstAttribute="top" secondItem="QWp-NV-uh5" secondAttribute="top" id="Bp8-45-jvJ"/>
                                 <constraint firstItem="uH7-Q7-hpZ" firstAttribute="leading" secondItem="QWp-NV-uh5" secondAttribute="leading" id="Fli-kz-OcS"/>
                                 <constraint firstItem="uH7-Q7-hpZ" firstAttribute="top" secondItem="QWp-NV-uh5" secondAttribute="top" id="Gqc-ya-F1W"/>
-                                <constraint firstItem="wgb-ON-N29" firstAttribute="leading" secondItem="QWp-NV-uh5" secondAttribute="leading" constant="4" id="N7q-ch-iRz"/>
+                                <constraint firstItem="wgb-ON-N29" firstAttribute="leading" secondItem="QWp-NV-uh5" secondAttribute="leading" constant="5" id="N7q-ch-iRz"/>
                                 <constraint firstItem="wgb-ON-N29" firstAttribute="top" secondItem="jXI-9E-Bgl" secondAttribute="bottom" constant="1" id="UV2-Sh-peE"/>
                                 <constraint firstAttribute="bottom" secondItem="uH7-Q7-hpZ" secondAttribute="bottom" id="dAX-uO-gvm"/>
                                 <constraint firstAttribute="bottom" secondItem="wgb-ON-N29" secondAttribute="bottom" constant="-1" id="fFG-SH-Hjh"/>

From fab5cefb47078aacc08bdb88d875a1b6b852a713 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Wed, 7 Apr 2021 14:41:17 +0200
Subject: [PATCH 19/38] Updated CHANGES.rst

---
 CHANGES.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7c971f5c2..153b2bb8d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,15 +2,20 @@ Changes to be released in next version
 =================================================
 
 ✨ Features
- * 
+ * Composer Update - Typing and sending a message (#4085)
+ * Switching composer between text mode & action mode (#4087)
 
 🙌 Improvements
  * Make the application settings more configurable (#4171)
  * Possibility to lock some room creation parameters from settings (#4181)
  * Enable / disable external friends invite (#4173)
+ * Composer update - UI enhancements (#4133)
 
 🐛 Bugfix
- * 
+ * if you start typing while the new attachment sending mode is on, the send button appears (#4155)
+ * The final frames of the appearance animation of the new composer buttons are missing (#4160)
+ * Crash in [RoomViewController setupActions] (#4162)
+ * too much vertical whitespace when replying (#4164)
 
 ⚠️ API Changes
  * 

From 8d64f3e59b06b283f736f4a99c80727da737f05f Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Wed, 7 Apr 2021 14:43:44 +0200
Subject: [PATCH 20/38] Updated CHANGES.rst

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 153b2bb8d..08ad8e0e1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,18 +4,23 @@ Changes to be released in next version
 ✨ Features
  * Composer Update - Typing and sending a message (#4085)
  * Switching composer between text mode & action mode (#4087)
+ * Explore typing notifications inspired by web (#4134)
 
 🙌 Improvements
  * Make the application settings more configurable (#4171)
  * Possibility to lock some room creation parameters from settings (#4181)
  * Enable / disable external friends invite (#4173)
  * Composer update - UI enhancements (#4133)
+ * Limit typing notifications timeline jumps (#4176)
+ * Consider displaying names in typing notifications (#4175)
 
 🐛 Bugfix
  * if you start typing while the new attachment sending mode is on, the send button appears (#4155)
  * The final frames of the appearance animation of the new composer buttons are missing (#4160)
  * Crash in [RoomViewController setupActions] (#4162)
  * too much vertical whitespace when replying (#4164)
+ * vertical layout of typing notifs can go wonky (#4159)
+ * Crash in [RoomViewController refreshTypingNotification] (#4161)
 
 ⚠️ API Changes
  * 

From ff36b5bc26aa1518e47d98ade6224e1cdb28df45 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Wed, 7 Apr 2021 20:15:09 +0200
Subject: [PATCH 21/38] Black theme uses dark background for composer

---
 CHANGES.rst                            | 1 +
 Riot/Modules/Room/RoomViewController.m | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 153b2bb8d..834c016c9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -16,6 +16,7 @@ Changes to be released in next version
  * The final frames of the appearance animation of the new composer buttons are missing (#4160)
  * Crash in [RoomViewController setupActions] (#4162)
  * too much vertical whitespace when replying (#4164)
+ * Black theme uses dark background for composer (#4192)
 
 ⚠️ API Changes
  * 
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 50661d37e..9246c3c94 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -465,7 +465,7 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
     self.scrollToBottomButton.layer.shadowRadius = 6;
     self.scrollToBottomButton.layer.shadowOffset = CGSizeMake(0, 4);
 
-    self.inputBackgroundView.backgroundColor = [ThemeService.shared.theme.searchBackgroundColor colorWithAlphaComponent:0.98];
+    self.inputBackgroundView.backgroundColor = [ThemeService.shared.theme.backgroundColor colorWithAlphaComponent:0.98];
     
     if ([ThemeService.shared.themeId isEqualToString:@"light"])
     {

From f18e615db0e5487dbb6254ca963a2d69ff8c6dce Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Wed, 7 Apr 2021 21:01:07 +0200
Subject: [PATCH 22/38] Increase grow/shrink animation speed in new composer

---
 CHANGES.rst                            | 1 +
 Riot/Modules/Room/RoomViewController.m | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 834c016c9..b24fd44cb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,7 @@ Changes to be released in next version
  * Possibility to lock some room creation parameters from settings (#4181)
  * Enable / disable external friends invite (#4173)
  * Composer update - UI enhancements (#4133)
+ * Increase grow/shrink animation speed in new composer (#4187)
 
 🐛 Bugfix
  * if you start typing while the new attachment sending mode is on, the send button appears (#4155)
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 9246c3c94..8f84471bb 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -286,7 +286,7 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
 {
     [super finalizeInit];
     
-    self.resizeComposerAnimationDuration = 0.15;
+    self.resizeComposerAnimationDuration = 0.05;
     
     // Setup `MXKViewControllerHandling` properties
     self.enableBarTintColorStatusChange = NO;

From 60cabff3e9e532191e30a90aec817585ee58bdc0 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 07:56:38 +0200
Subject: [PATCH 23/38] back button chevron looks really weird

---
 Riot/Modules/Room/Views/Title/RoomTitleView.m   | 2 --
 Riot/Modules/Room/Views/Title/RoomTitleView.xib | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Riot/Modules/Room/Views/Title/RoomTitleView.m b/Riot/Modules/Room/Views/Title/RoomTitleView.m
index 6a338590e..4829578ed 100644
--- a/Riot/Modules/Room/Views/Title/RoomTitleView.m
+++ b/Riot/Modules/Room/Views/Title/RoomTitleView.m
@@ -147,7 +147,6 @@
         self.pictureViewHeightConstraint.constant = 28;
         self.displayNameTextField.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
         self.typingLabel.font = [UIFont systemFontOfSize:10];
-        self.dotViewCenterXConstraint.constant = 3;
         self.dotViewCenterYConstraint.constant = -2;
     }
     else
@@ -158,7 +157,6 @@
         self.pictureViewHeightConstraint.constant = 32;
         self.displayNameTextField.font = [UIFont systemFontOfSize:17 weight:UIFontWeightMedium];
         self.typingLabel.font = [UIFont systemFontOfSize:12];
-        self.dotViewCenterXConstraint.constant = 0;
         self.dotViewCenterYConstraint.constant = -1;
    }
 }
diff --git a/Riot/Modules/Room/Views/Title/RoomTitleView.xib b/Riot/Modules/Room/Views/Title/RoomTitleView.xib
index 0d6fc7ca1..d25cbdf79 100644
--- a/Riot/Modules/Room/Views/Title/RoomTitleView.xib
+++ b/Riot/Modules/Room/Views/Title/RoomTitleView.xib
@@ -71,7 +71,7 @@
                 <constraint firstItem="6uH-I3-RQg" firstAttribute="leading" secondItem="LDd-c1-ILP" secondAttribute="trailing" constant="12" id="0pG-0z-gpD"/>
                 <constraint firstItem="LDd-c1-ILP" firstAttribute="centerY" secondItem="BkF-x3-7fX" secondAttribute="centerY" id="33h-dC-S1U"/>
                 <constraint firstAttribute="bottom" secondItem="sD9-l7-azQ" secondAttribute="bottom" id="4rX-5O-LrO"/>
-                <constraint firstItem="yTB-Be-bLN" firstAttribute="centerX" secondItem="SUm-iW-DRR" secondAttribute="leading" id="7H4-kh-c2g"/>
+                <constraint firstItem="yTB-Be-bLN" firstAttribute="centerX" secondItem="SUm-iW-DRR" secondAttribute="trailing" id="7H4-kh-c2g"/>
                 <constraint firstItem="sD9-l7-azQ" firstAttribute="leading" secondItem="BkF-x3-7fX" secondAttribute="leading" id="AJc-Aa-sht"/>
                 <constraint firstItem="SUm-iW-DRR" firstAttribute="centerY" secondItem="BkF-x3-7fX" secondAttribute="centerY" id="Blv-SJ-r6v"/>
                 <constraint firstItem="Ky3-cy-HAx" firstAttribute="bottom" secondItem="LDd-c1-ILP" secondAttribute="bottom" id="HZy-1x-eyX"/>

From 6b54882bf5238f8ad5feabcce0cb6905afcf16b8 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 10:38:23 +0200
Subject: [PATCH 24/38] Update CHANGES.rst

Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index b24fd44cb..7d4b29f88 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,7 +13,7 @@ Changes to be released in next version
  * Increase grow/shrink animation speed in new composer (#4187)
 
 🐛 Bugfix
- * if you start typing while the new attachment sending mode is on, the send button appears (#4155)
+ * If you start typing while the new attachment sending mode is on, the send button appears (#4155)
  * The final frames of the appearance animation of the new composer buttons are missing (#4160)
  * Crash in [RoomViewController setupActions] (#4162)
  * too much vertical whitespace when replying (#4164)

From b4fa9aea02f3d99fa82e4b092097dc129367767d Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 10:38:32 +0200
Subject: [PATCH 25/38] Update CHANGES.rst

Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7d4b29f88..2309e5557 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -16,7 +16,7 @@ Changes to be released in next version
  * If you start typing while the new attachment sending mode is on, the send button appears (#4155)
  * The final frames of the appearance animation of the new composer buttons are missing (#4160)
  * Crash in [RoomViewController setupActions] (#4162)
- * too much vertical whitespace when replying (#4164)
+ * Too much vertical whitespace when replying (#4164)
  * Black theme uses dark background for composer (#4192)
 
 ⚠️ API Changes

From 66f33ec42f725cd97659faa70b9aa228c554500d Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 10:47:28 +0200
Subject: [PATCH 26/38] Update
 Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift

Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
---
 Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift b/Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
index e22f9bda5..d23a2631f 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
@@ -18,13 +18,13 @@ import UIKit
 
 @objcMembers
 @objc class RoomActionItem: NSObject {
-    var image: UIImage!
-    var action: (() -> Void)!
+    let image: UIImage
+    let action: (() -> Void)
 
     init(image: UIImage, andAction action: @escaping () -> Void) {
-        super.init()
-        
         self.image = image
         self.action = action
+        
+        super.init()
     }
 }

From a84b5311b76029ef857fbf2f93e94ee4b4a7a213 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 10:47:42 +0200
Subject: [PATCH 27/38] Update
 Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift

Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
---
 Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
index 3f78b9cb3..67a895685 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
@@ -121,9 +121,7 @@ import UIKit
     // MARK: - Private methods
     
     @objc private func buttonAction(_ sender: UIButton) {
-        if let action = actionItems[sender.tag].action {
-            action()
-        }
+        actionItems[sender.tag].action()
     }
     
     private func setupView() {

From 8baef2633de683d10273df702bb228aec405bcf3 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 10:47:57 +0200
Subject: [PATCH 28/38] Update
 Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift

Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
---
 Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
index 67a895685..abdf683cc 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
@@ -58,7 +58,7 @@ import UIKit
     
     override init(frame: CGRect) {
         super.init(frame: frame)
-        self.showsHorizontalScrollIndicator = false
+        setupView()
     }
 
     required init?(coder: NSCoder) {

From 77a462f207febb676c88d73b433d5ed07eeae9de Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 10:48:15 +0200
Subject: [PATCH 29/38] Update
 Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift

Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
---
 Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
index abdf683cc..8bb36e2b8 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
@@ -63,7 +63,7 @@ import UIKit
 
     required init?(coder: NSCoder) {
         super.init(coder: coder)
-        self.showsHorizontalScrollIndicator = false
+        setupView()
     }
     
     override func layoutSubviews() {

From 0a70b0f595200f9e13199eef08ddbba67e115b2a Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 10:52:39 +0200
Subject: [PATCH 30/38] Update
 Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift

Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
---
 Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
index 8bb36e2b8..ee21501ca 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
@@ -17,7 +17,7 @@
 import UIKit
 
 @objcMembers
-@objc class RoomActionsBar: UIScrollView {
+class RoomActionsBar: UIScrollView {
     // MARK: - Properties
     
     var itemSpacing: CGFloat = 20 {

From e56b01e1a70e9c7065d7465957caed009096f05c Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 10:52:51 +0200
Subject: [PATCH 31/38] Update
 Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift

Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
---
 Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift b/Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
index d23a2631f..773e4be3d 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
@@ -17,7 +17,7 @@
 import UIKit
 
 @objcMembers
-@objc class RoomActionItem: NSObject {
+class RoomActionItem: NSObject {
     let image: UIImage
     let action: (() -> Void)
 

From 7c572a96a93b075c084b6f4c6ac7df6b80889a91 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 12:11:36 +0200
Subject: [PATCH 32/38] Update after review

---
 Riot/Modules/Room/RoomViewController.m        | 85 ++++++++-----------
 .../Views/InputToolbar/RoomActionsBar.swift   | 16 ++--
 .../Views/InputToolbar/RoomInputToolbarView.m | 40 +++++----
 3 files changed, 65 insertions(+), 76 deletions(-)

diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 8f84471bb..7acb35ea1 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -127,6 +127,7 @@
 #import "Riot-Swift.h"
 
 NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNotification";
+const NSTimeInterval kResizeComposerAnimationDuration = .05;
 
 @interface RoomViewController () <UISearchBarDelegate, UIGestureRecognizerDelegate, UIScrollViewAccessibilityDelegate, RoomTitleViewTapGestureDelegate, RoomParticipantsViewControllerDelegate, MXKRoomMemberDetailsViewControllerDelegate, ContactsTableViewControllerDelegate, MXServerNoticesDelegate, RoomContextualMenuViewControllerDelegate,
     ReactionsMenuViewModelCoordinatorDelegate, EditHistoryCoordinatorBridgePresenterDelegate, MXKDocumentPickerPresenterDelegate, EmojiPickerCoordinatorBridgePresenterDelegate,
@@ -286,7 +287,7 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
 {
     [super finalizeInit];
     
-    self.resizeComposerAnimationDuration = 0.05;
+    self.resizeComposerAnimationDuration = kResizeComposerAnimationDuration;
     
     // Setup `MXKViewControllerHandling` properties
     self.enableBarTintColorStatusChange = NO;
@@ -1707,47 +1708,35 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
     }
     
     RoomInputToolbarView *roomInputView = ((RoomInputToolbarView *) self.inputToolbarView);
-    __weak typeof(self) weakSelf = self;
+    MXWeakify(self);
     roomInputView.actionsBar.actionItems = @[
         [[RoomActionItem alloc] initWithImage:[UIImage imageNamed:@"action_camera"] andAction:^{
-            if (weakSelf)
-            {
-                typeof(self) self = weakSelf;
-                if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
-                    ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
-                }
-                [self showCameraControllerAnimated:YES];
+            MXStrongifyAndReturnIfNil(self);
+            if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
             }
+            [self showCameraControllerAnimated:YES];
         }],
         [[RoomActionItem alloc] initWithImage:[UIImage imageNamed:@"action_media_library"] andAction:^{
-            if (weakSelf)
-            {
-                typeof(self) self = weakSelf;
-                if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
-                    ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
-                }
-                [self showMediaPickerAnimated:YES];
+            MXStrongifyAndReturnIfNil(self);
+            if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
             }
+            [self showMediaPickerAnimated:YES];
         }],
         [[RoomActionItem alloc] initWithImage:[UIImage imageNamed:@"action_sticker"] andAction:^{
-            if (weakSelf)
-            {
-                typeof(self) self = weakSelf;
-                if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
-                    ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
-                }
-                [self roomInputToolbarViewPresentStickerPicker];
+            MXStrongifyAndReturnIfNil(self);
+            if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
             }
+            [self roomInputToolbarViewPresentStickerPicker];
         }],
         [[RoomActionItem alloc] initWithImage:[UIImage imageNamed:@"action_file"] andAction:^{
-            if (weakSelf)
-            {
-                typeof(self) self = weakSelf;
-                if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
-                    ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
-                }
-                [self roomInputToolbarViewDidTapFileUpload];
+            MXStrongifyAndReturnIfNil(self);
+            if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
             }
+            [self roomInputToolbarViewDidTapFileUpload];
         }],
     ];
 }
@@ -1776,8 +1765,8 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
     else
     {
         // The Sticker picker widget is not installed yet. Propose the user to install it
-        __weak typeof(self) weakSelf = self;
-        
+        MXWeakify(self);
+
         [currentAlert dismissViewControllerAnimated:NO completion:nil];
         
         NSString *alertMessage = [NSString stringWithFormat:@"%@\n%@",
@@ -1791,11 +1780,8 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
                                                          style:UIAlertActionStyleCancel
                                                        handler:^(UIAlertAction * action)
                                  {
-            if (weakSelf)
-            {
-                typeof(self) self = weakSelf;
-                self->currentAlert = nil;
-            }
+            MXStrongifyAndReturnIfNil(self);
+            self->currentAlert = nil;
             
         }]];
         
@@ -1803,20 +1789,17 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action)
                                  {
-            if (weakSelf)
-            {
-                typeof(self) self = weakSelf;
-                self->currentAlert = nil;
-                
-                // Show the sticker picker settings screen
-                IntegrationManagerViewController *modularVC = [[IntegrationManagerViewController alloc]
-                                                               initForMXSession:self.roomDataSource.mxSession
-                                                               inRoom:self.roomDataSource.roomId
-                                                               screen:[IntegrationManagerViewController screenForWidget:kWidgetTypeStickerPicker]
-                                                               widgetId:nil];
-                
-                [self presentViewController:modularVC animated:NO completion:nil];
-            }
+            MXStrongifyAndReturnIfNil(self);
+            self->currentAlert = nil;
+            
+            // Show the sticker picker settings screen
+            IntegrationManagerViewController *modularVC = [[IntegrationManagerViewController alloc]
+                                                           initForMXSession:self.roomDataSource.mxSession
+                                                           inRoom:self.roomDataSource.roomId
+                                                           screen:[IntegrationManagerViewController screenForWidget:kWidgetTypeStickerPicker]
+                                                           widgetId:nil];
+            
+            [self presentViewController:modularVC animated:NO completion:nil];
         }]];
         
         [currentAlert mxk_setAccessibilityIdentifier:@"RoomVCStickerPickerAlert"];
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
index ee21501ca..5482ab833 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
@@ -17,7 +17,7 @@
 import UIKit
 
 @objcMembers
-class RoomActionsBar: UIScrollView {
+class RoomActionsBar: UIScrollView, Themable {
     // MARK: - Properties
     
     var itemSpacing: CGFloat = 20 {
@@ -26,9 +26,9 @@ class RoomActionsBar: UIScrollView {
         }
     }
     
-    var actionItems: Array<RoomActionItem> = [] {
+    var actionItems: [RoomActionItem] = [] {
         didSet {
-            var actionButtons: Array<UIButton> = []
+            var actionButtons: [UIButton] = []
             for (index, item) in actionItems.enumerated() {
                 let button = UIButton(type: .custom)
                 button.setImage(item.image, for: .normal)
@@ -44,7 +44,7 @@ class RoomActionsBar: UIScrollView {
         }
     }
     
-    private var actionButtons: Array<UIButton> = [] {
+    private var actionButtons: [UIButton] = [] {
         willSet {
             for button in actionButtons {
                 button.removeFromSuperview()
@@ -85,14 +85,16 @@ class RoomActionsBar: UIScrollView {
         self.contentSize = CGSize(width: currentX - itemSpacing, height: self.bounds.height)
     }
     
-    // MARK: - Business methods
+    // MARK: - Themable
     
-    func customizeViewRendering() {
+    func update(theme: Theme) {
         for button in actionButtons {
-            button.tintColor = ThemeService.shared().theme.tintColor
+            button.tintColor = theme.tintColor
         }
     }
     
+    // MARK: - Business methods
+    
     func animate(showIn: Bool, completion: ((Bool) -> Void)? = nil) {
         if showIn {
             for button in actionButtons {
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index bbf3a0611..26a2f4c69 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -27,7 +27,13 @@
 #import "WidgetManager.h"
 #import "IntegrationManagerViewController.h"
 
-const double RoomInputToolbarViewContextBarHeight = 24;
+const double kContextBarHeight = 24;
+const NSTimeInterval kSendModeAnimationDuration = .15;
+const NSTimeInterval kActionMenuAttachButtonAnimationDuration = .4;
+const CGFloat kActionMenuAttachButtonSpringVelocity = 7;
+const CGFloat kActionMenuAttachButtonSpringDamping = .45;
+const NSTimeInterval kActionMenuContentAlphaAnimationDuration = .2;
+const NSTimeInterval kActionMenuComposerHeightAnimationDuration = .3;
 
 @interface RoomInputToolbarView()
 {
@@ -120,7 +126,7 @@ const double RoomInputToolbarViewContextBarHeight = 24;
     self.inputContextImageView.tintColor = ThemeService.shared.theme.textSecondaryColor;
     self.inputContextLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
     self.inputContextButton.tintColor = ThemeService.shared.theme.textSecondaryColor;
-    [self.actionsBar customizeViewRendering];
+    [self.actionsBar updateWithTheme:ThemeService.shared.theme];
 }
 
 #pragma mark -
@@ -161,26 +167,26 @@ const double RoomInputToolbarViewContextBarHeight = 24;
             self.inputContextImageView.image = [UIImage imageNamed:@"input_reply_icon"];
             self.inputContextLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_message_replying_to", @"Vector", nil), self.eventSenderDisplayName];
 
-            self.inputContextViewHeightConstraint.constant = RoomInputToolbarViewContextBarHeight;
-            updatedHeight += RoomInputToolbarViewContextBarHeight;
-            self->growingTextView.maxHeight -= RoomInputToolbarViewContextBarHeight;
+            self.inputContextViewHeightConstraint.constant = kContextBarHeight;
+            updatedHeight += kContextBarHeight;
+            self->growingTextView.maxHeight -= kContextBarHeight;
             break;
         case RoomInputToolbarViewSendModeEdit:
             buttonImage = [UIImage imageNamed:@"save_icon"];
             self.inputContextImageView.image = [UIImage imageNamed:@"input_edit_icon"];
             self.inputContextLabel.text = NSLocalizedStringFromTable(@"room_message_editing", @"Vector", nil);
 
-            self.inputContextViewHeightConstraint.constant = RoomInputToolbarViewContextBarHeight;
-            updatedHeight += RoomInputToolbarViewContextBarHeight;
-            self->growingTextView.maxHeight -= RoomInputToolbarViewContextBarHeight;
+            self.inputContextViewHeightConstraint.constant = kContextBarHeight;
+            updatedHeight += kContextBarHeight;
+            self->growingTextView.maxHeight -= kContextBarHeight;
             break;
         default:
             buttonImage = [UIImage imageNamed:@"send_icon"];
 
             if (previousMode != _sendMode)
             {
-                updatedHeight -= RoomInputToolbarViewContextBarHeight;
-                self->growingTextView.maxHeight += RoomInputToolbarViewContextBarHeight;
+                updatedHeight -= kContextBarHeight;
+                self->growingTextView.maxHeight += kContextBarHeight;
             }
             self.inputContextViewHeightConstraint.constant = 0;
             break;
@@ -201,7 +207,7 @@ const double RoomInputToolbarViewContextBarHeight = 24;
 
     if (self.mainToolbarHeightConstraint.constant != updatedHeight)
     {
-        [UIView animateWithDuration:.15 animations:^{
+        [UIView animateWithDuration:kSendModeAnimationDuration animations:^{
             self.mainToolbarHeightConstraint.constant = updatedHeight;
             [self layoutIfNeeded];
             
@@ -393,18 +399,16 @@ const double RoomInputToolbarViewContextBarHeight = 24;
             }];
         }
         
-        [UIView animateWithDuration:.4 delay:0 usingSpringWithDamping:0.45 initialSpringVelocity:7 options:UIViewAnimationOptionCurveEaseIn animations:^{
+        [UIView animateWithDuration:kActionMenuAttachButtonAnimationDuration delay:0 usingSpringWithDamping:kActionMenuAttachButtonSpringDamping initialSpringVelocity:kActionMenuAttachButtonSpringVelocity options:UIViewAnimationOptionCurveEaseIn animations:^{
             self.attachMediaButton.transform = actionMenuOpened ? CGAffineTransformMakeRotation(M_PI * 3 / 4) : CGAffineTransformIdentity;
-        } completion:^(BOOL finished) {
-        }];
+        } completion:nil];
         
-        [UIView animateWithDuration:.2 delay:_actionMenuOpened ? 0 : .1 options:UIViewAnimationOptionCurveEaseIn animations:^{
+        [UIView animateWithDuration:kActionMenuContentAlphaAnimationDuration delay:_actionMenuOpened ? 0 : .1 options:UIViewAnimationOptionCurveEaseIn animations:^{
             self->messageComposerContainer.alpha = actionMenuOpened ? 0 : 1;
             self.rightInputToolbarButton.alpha = self->growingTextView.text.length == 0 || actionMenuOpened ? 0 : 1;
-        } completion:^(BOOL finished) {
-        }];
+        } completion:nil];
         
-        [UIView animateWithDuration:.3 animations:^{
+        [UIView animateWithDuration:kActionMenuComposerHeightAnimationDuration animations:^{
             if (actionMenuOpened)
             {
                 self.mainToolbarHeightConstraint.constant = self.mainToolbarMinHeightConstraint.constant;

From 7687517c167ac394a16f8207840d41699607a7a8 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 13:44:23 +0200
Subject: [PATCH 33/38] Update CHANGES.rst

Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index fcba6ffc8..4c91750e7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -21,7 +21,7 @@ Changes to be released in next version
  * Crash in [RoomViewController setupActions] (#4162)
  * too much vertical whitespace when replying (#4164)
  * Black theme uses dark background for composer (#4192)
- * vertical layout of typing notifs can go wonky (#4159)
+ * Vertical layout of typing notifs can go wonky (#4159)
  * Crash in [RoomViewController refreshTypingNotification] (#4161)
 
 ⚠️ API Changes

From 3c7bc3f1f7e5b0ac82e925992f99f1a02b59f31c Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 13:48:25 +0200
Subject: [PATCH 34/38] Update
 Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift

Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
---
 Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
index 551dca621..0c70f2eae 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
@@ -31,7 +31,7 @@ class RoomTypingBubbleCell: UITableViewCell {
 
     // MARK: - members
     
-    private var userPictureViews: Array<MXKImageView> = Array()
+    private var userPictureViews: [MXKImageView] = []
     
     // MARK: - Lifecycle
     

From 6e27ae3c98ef43e99cef24c55c616cdc7a21ddbf Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 13:48:49 +0200
Subject: [PATCH 35/38] Update Riot/Modules/DotsView/DotsView.swift

Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
---
 Riot/Modules/DotsView/DotsView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Modules/DotsView/DotsView.swift b/Riot/Modules/DotsView/DotsView.swift
index ca69fb6de..5e08329e7 100644
--- a/Riot/Modules/DotsView/DotsView.swift
+++ b/Riot/Modules/DotsView/DotsView.swift
@@ -144,7 +144,7 @@ class DotsView: UIView {
         CATransaction.commit()
     }
     
-    func fireTimer() {
+    @objc private func fireTimer() {
         if Date().timeIntervalSince(lastUpdateDate) >= updateInterval {
             self.highlightedDotIndex = (self.highlightedDotIndex + 1) % self.numberOfDots
         }

From b68a9b06c39de5f3edae5008b7c0954a529db844 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 15:19:02 +0200
Subject: [PATCH 36/38] Update after review

---
 Riot/Modules/DotsView/DotsView.swift          | 10 +---
 .../Modules/Room/DataSources/RoomDataSource.h |  4 +-
 .../Modules/Room/DataSources/RoomDataSource.m |  3 +-
 Riot/Modules/Room/RoomViewController.m        |  8 +--
 .../BubbleCells/RoomTypingBubbleCell.swift    | 57 +++++++++++--------
 5 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/Riot/Modules/DotsView/DotsView.swift b/Riot/Modules/DotsView/DotsView.swift
index 5e08329e7..adcf3ef49 100644
--- a/Riot/Modules/DotsView/DotsView.swift
+++ b/Riot/Modules/DotsView/DotsView.swift
@@ -21,15 +21,9 @@ import UIKit
 class DotsView: UIView {
     // MARK: - Public properties
     
-    @IBInspectable var highlightedDotColor: UIColor = .darkGray {
-        didSet {
-        }
-    }
+    @IBInspectable var highlightedDotColor: UIColor = .darkGray
     
-    @IBInspectable var dotColor: UIColor = .lightGray {
-        didSet {
-        }
-    }
+    @IBInspectable var dotColor: UIColor = .lightGray
     
     @IBInspectable var dotMaxWidth: CGFloat = 10 {
         didSet {
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.h b/Riot/Modules/Room/DataSources/RoomDataSource.h
index d4ec45c91..725171572 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.h
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.h
@@ -21,6 +21,8 @@
 
 #import "MXRoomSummary+Riot.h"
 
+#import "TypingUserInfo.h"
+
 @protocol RoomDataSourceDelegate;
 
 /**
@@ -51,7 +53,7 @@
 /**
  List of members who are typing in the room.
  */
-@property(nonatomic, nullable) NSArray *currentTypingUsers;
+@property(nonatomic, nullable) NSArray<TypingUserInfo *> *currentTypingUsers;
 
 /**
  Check if there is an active jitsi widget in the room and return it.
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 2122a398d..232a56102 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -27,6 +27,7 @@
 
 #import "MXRoom+Riot.h"
 
+const CGFloat kTypingCellHeight = 24;
 
 @interface RoomDataSource() <BubbleReactionsViewModelDelegate>
 {
@@ -191,7 +192,7 @@
 {
     if (index == self.typingCellIndex)
     {
-        return 24;
+        return kTypingCellHeight;
     }
     
     return [super cellHeightAtIndex:index withMaximumWidth:maxWidth];
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index c1625e4af..a25c151bf 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -1354,8 +1354,8 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
         if (roomDataSource.currentTypingUsers && !roomDataSource.currentTypingUsers.count)
         {
             [roomDataSource resetTypingNotification];
-            NSInteger count = [roomDataSource tableView:self.bubblesTableView numberOfRowsInSection:0];
-            [self.bubblesTableView deleteRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:count inSection:0]] withRowAnimation:UITableViewRowAnimationNone];
+            NSInteger count = [self.bubblesTableView numberOfRowsInSection:0];
+            [self.bubblesTableView deleteRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:count - 1 inSection:0]] withRowAnimation:UITableViewRowAnimationNone];
         }
     }
 
@@ -4159,7 +4159,7 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
         }
         else
         {
-            NSInteger count = [self.roomDataSource tableView:self.bubblesTableView numberOfRowsInSection:0];
+            NSInteger count = [self.bubblesTableView numberOfRowsInSection:0];
             NSIndexPath *lastIndexPath = [NSIndexPath indexPathForRow:count - 1 inSection:0];
             [self.bubblesTableView reloadRowsAtIndexPaths:@[lastIndexPath] withRowAnimation:UITableViewRowAnimationFade];
         }
@@ -4168,7 +4168,7 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
             && !self.bubblesTableView.isDragging
             && !self.bubblesTableView.isDecelerating)
         {
-            NSInteger count = [self.roomDataSource tableView:self.bubblesTableView numberOfRowsInSection:0];
+            NSInteger count = [self.bubblesTableView numberOfRowsInSection:0];
             if (count)
             {
                 [self scrollBubblesTableViewToBottomAnimated:YES];
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
index 0c70f2eae..ef357045c 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
@@ -17,17 +17,21 @@
 import UIKit
 
 @objcMembers
-class RoomTypingBubbleCell: UITableViewCell {
+class RoomTypingBubbleCell: UITableViewCell, Themable {
     // MARK: - Constants
     
     static let cellIdentifier = "RoomTypingBubbleCell"
-    
+    private static let maxPictureCount = 4
+    private static let pictureSize: CGFloat = 24
+    private static let pictureMaxMargin: CGFloat = 16
+    private static let pictureMinMargin: CGFloat = 8
+
     // MARK: - Outlets
     
-    @IBOutlet weak var additionalUsersLabel: UILabel?
-    @IBOutlet weak var additionalUsersLabelLeadingConstraint: NSLayoutConstraint?
-    @IBOutlet weak var dotsView: DotsView?
-    @IBOutlet weak var dotsViewLeadingConstraint: NSLayoutConstraint?
+    @IBOutlet private weak var additionalUsersLabel: UILabel!
+    @IBOutlet private weak var additionalUsersLabelLeadingConstraint: NSLayoutConstraint!
+    @IBOutlet private weak var dotsView: DotsView!
+    @IBOutlet private weak var dotsViewLeadingConstraint: NSLayoutConstraint!
 
     // MARK: - members
     
@@ -38,9 +42,7 @@ class RoomTypingBubbleCell: UITableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
         
-        additionalUsersLabel?.textColor = ThemeService.shared().theme.textSecondaryColor
-        dotsView?.highlightedDotColor = ThemeService.shared().theme.textTertiaryColor
-        dotsView?.dotColor = ThemeService.shared().theme.textSecondaryColor
+        update(theme: ThemeService.shared().theme)
     }
     
     override func prepareForReuse() {
@@ -50,15 +52,13 @@ class RoomTypingBubbleCell: UITableViewCell {
             pictureView.removeFromSuperview()
         }
         
-        additionalUsersLabel?.textColor = ThemeService.shared().theme.textSecondaryColor
-        dotsView?.highlightedDotColor = ThemeService.shared().theme.textTertiaryColor
-        dotsView?.dotColor = ThemeService.shared().theme.textSecondaryColor
+        update(theme: ThemeService.shared().theme)
     }
     
     override func layoutSubviews() {
         super.layoutSubviews()
 
-        self.dotsView?.isHidden = userPictureViews.count == 0
+        dotsView.isHidden = userPictureViews.count == 0
 
         guard userPictureViews.count > 0 else {
             return
@@ -69,31 +69,40 @@ class RoomTypingBubbleCell: UITableViewCell {
         var pictureViewsMaxX: CGFloat = 0
         var xOffset: CGFloat = 0
         for pictureView in userPictureViews {
-            pictureView.center = CGPoint(x: 16 + xOffset + pictureView.bounds.midX, y: self.bounds.midY)
+            pictureView.center = CGPoint(x: RoomTypingBubbleCell.pictureMaxMargin + xOffset + pictureView.bounds.midX, y: self.bounds.midY)
             xOffset += round(pictureView.bounds.maxX * 2 / 3)
             pictureViewsMaxX = pictureView.frame.maxX
         }
         
-        let leftMagin: CGFloat = pictureViewsMaxX + (userPictureViews.count == 1 ? 16 : 8)
-        additionalUsersLabelLeadingConstraint?.constant = leftMagin
+        let leftMagin: CGFloat = pictureViewsMaxX + (userPictureViews.count == 1 ? RoomTypingBubbleCell.pictureMaxMargin : RoomTypingBubbleCell.pictureMinMargin)
+        additionalUsersLabelLeadingConstraint.constant = leftMagin
         
-        dotsViewLeadingConstraint?.constant = additionalUsersLabel?.text.isEmptyOrNil == true ? leftMagin : leftMagin + 8 + (additionalUsersLabel?.frame.width ?? 0)
+        dotsViewLeadingConstraint?.constant = additionalUsersLabel.text.isEmptyOrNil == true ? leftMagin : leftMagin + 8 + additionalUsersLabel.frame.width
     }
     
+    // MARK: - Themable
+    
+    func update(theme: Theme) {
+        additionalUsersLabel.textColor = theme.textSecondaryColor
+        dotsView.highlightedDotColor = theme.textTertiaryColor
+        dotsView.dotColor = theme.textSecondaryColor
+    }
+
+    
     // MARK: - Business methods
     
-    func updateTypingUsers(_ typingUsers: Array<TypingUserInfo>, mediaManager: MXMediaManager) {
+    func updateTypingUsers(_ typingUsers: [TypingUserInfo], mediaManager: MXMediaManager) {
         for pictureView in userPictureViews {
             pictureView.removeFromSuperview()
         }
-        userPictureViews = Array()
+        userPictureViews = []
         
         for user in typingUsers {
-            if userPictureViews.count >= 4 {
+            if userPictureViews.count >= RoomTypingBubbleCell.maxPictureCount {
                 break
             }
 
-            let pictureView = MXKImageView(frame: CGRect(x: 0, y: 0, width: 24, height: 24))
+            let pictureView = MXKImageView(frame: CGRect(x: 0, y: 0, width: RoomTypingBubbleCell.pictureSize, height: RoomTypingBubbleCell.pictureSize))
             pictureView.layer.masksToBounds = true
             pictureView.layer.cornerRadius = pictureView.bounds.midX
             
@@ -106,11 +115,11 @@ class RoomTypingBubbleCell: UITableViewCell {
         
         switch typingUsers.count {
         case 0:
-            additionalUsersLabel?.text = nil
+            additionalUsersLabel.text = nil
         case 1:
-            additionalUsersLabel?.text = firstUserNameFor(typingUsers)
+            additionalUsersLabel.text = firstUserNameFor(typingUsers)
         default:
-            additionalUsersLabel?.text = VectorL10n.roomMultipleTypingNotification(firstUserNameFor(typingUsers) ?? "")
+            additionalUsersLabel.text = VectorL10n.roomMultipleTypingNotification(firstUserNameFor(typingUsers) ?? "")
         }
         self.setNeedsLayout()
     }

From 825088553a509221f845d2e3ffa0a9de5ca5e020 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 15:59:53 +0200
Subject: [PATCH 37/38] Update after review

---
 .../Modules/Room/DataSources/RoomDataSource.m |  3 +-
 Riot/Modules/Room/RoomViewController.m        |  2 +-
 .../BubbleCells/RoomTypingBubbleCell.swift    | 40 +++++++++++++------
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 232a56102..5edf5ba24 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -302,7 +302,8 @@ const CGFloat kTypingCellHeight = 24;
 {
     if (indexPath.row == self.typingCellIndex)
     {
-        RoomTypingBubbleCell *cell = [tableView dequeueReusableCellWithIdentifier:RoomTypingBubbleCell.cellIdentifier forIndexPath:indexPath];
+        RoomTypingBubbleCell *cell = [tableView dequeueReusableCellWithIdentifier:RoomTypingBubbleCell.defaultReuseIdentifier forIndexPath:indexPath];
+        [cell updateWithTheme:ThemeService.shared.theme];
         [cell updateTypingUsers:_currentTypingUsers mediaManager:self.mxSession.mediaManager];
         return cell;
     }
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index a25c151bf..f9317fe3a 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -374,7 +374,7 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
     
     [self.bubblesTableView registerClass:RoomCreationIntroCell.class forCellReuseIdentifier:RoomCreationIntroCell.defaultReuseIdentifier];
     
-    [self.bubblesTableView registerNib:[UINib nibWithNibName:@"RoomTypingBubbleCell" bundle:nil] forCellReuseIdentifier:RoomTypingBubbleCell.cellIdentifier];
+    [self.bubblesTableView registerNib:RoomTypingBubbleCell.nib forCellReuseIdentifier:RoomTypingBubbleCell.defaultReuseIdentifier];
     
     [self vc_removeBackTitle];
     
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
index ef357045c..0c2c01b1a 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
@@ -17,14 +17,15 @@
 import UIKit
 
 @objcMembers
-class RoomTypingBubbleCell: UITableViewCell, Themable {
+class RoomTypingBubbleCell: MXKTableViewCell, Themable {
     // MARK: - Constants
     
-    static let cellIdentifier = "RoomTypingBubbleCell"
-    private static let maxPictureCount = 4
-    private static let pictureSize: CGFloat = 24
-    private static let pictureMaxMargin: CGFloat = 16
-    private static let pictureMinMargin: CGFloat = 8
+    private enum Constants {
+        static let maxPictureCount = 4
+        static let pictureSize: CGFloat = 24
+        static let pictureMaxMargin: CGFloat = 16
+        static let pictureMinMargin: CGFloat = 8
+    }
 
     // MARK: - Outlets
     
@@ -51,8 +52,6 @@ class RoomTypingBubbleCell: UITableViewCell, Themable {
         for pictureView in userPictureViews {
             pictureView.removeFromSuperview()
         }
-        
-        update(theme: ThemeService.shared().theme)
     }
     
     override func layoutSubviews() {
@@ -69,17 +68,34 @@ class RoomTypingBubbleCell: UITableViewCell, Themable {
         var pictureViewsMaxX: CGFloat = 0
         var xOffset: CGFloat = 0
         for pictureView in userPictureViews {
-            pictureView.center = CGPoint(x: RoomTypingBubbleCell.pictureMaxMargin + xOffset + pictureView.bounds.midX, y: self.bounds.midY)
+            pictureView.center = CGPoint(x: Constants.pictureMaxMargin + xOffset + pictureView.bounds.midX, y: self.bounds.midY)
             xOffset += round(pictureView.bounds.maxX * 2 / 3)
             pictureViewsMaxX = pictureView.frame.maxX
         }
         
-        let leftMagin: CGFloat = pictureViewsMaxX + (userPictureViews.count == 1 ? RoomTypingBubbleCell.pictureMaxMargin : RoomTypingBubbleCell.pictureMinMargin)
+        let leftMagin: CGFloat = pictureViewsMaxX + (userPictureViews.count == 1 ? Constants.pictureMaxMargin : Constants.pictureMinMargin)
         additionalUsersLabelLeadingConstraint.constant = leftMagin
         
         dotsViewLeadingConstraint?.constant = additionalUsersLabel.text.isEmptyOrNil == true ? leftMagin : leftMagin + 8 + additionalUsersLabel.frame.width
     }
     
+    // MARK: - Overrides
+    
+    override class func defaultReuseIdentifier() -> String {
+        return String(describing: self)
+    }
+    
+    override class func nib() -> UINib {
+        return UINib(nibName: String(describing: self), bundle: nil)
+    }
+    
+    override func customizeRendering() {
+        super.customizeRendering()
+        
+        let theme = ThemeService.shared().theme
+        self.update(theme: theme)
+    }
+    
     // MARK: - Themable
     
     func update(theme: Theme) {
@@ -98,11 +114,11 @@ class RoomTypingBubbleCell: UITableViewCell, Themable {
         userPictureViews = []
         
         for user in typingUsers {
-            if userPictureViews.count >= RoomTypingBubbleCell.maxPictureCount {
+            if userPictureViews.count >= Constants.maxPictureCount {
                 break
             }
 
-            let pictureView = MXKImageView(frame: CGRect(x: 0, y: 0, width: RoomTypingBubbleCell.pictureSize, height: RoomTypingBubbleCell.pictureSize))
+            let pictureView = MXKImageView(frame: CGRect(x: 0, y: 0, width: Constants.pictureSize, height: Constants.pictureSize))
             pictureView.layer.masksToBounds = true
             pictureView.layer.cornerRadius = pictureView.bounds.midX
             

From ccda218ddfce626ddcbb0f201a19069665c76ef0 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gil.eluard@gmail.com>
Date: Thu, 8 Apr 2021 16:13:56 +0200
Subject: [PATCH 38/38] Update
 Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift

Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
---
 .../Room/Views/BubbleCells/RoomTypingBubbleCell.swift      | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
index 0c2c01b1a..f0eba07b2 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
@@ -89,13 +89,6 @@ class RoomTypingBubbleCell: MXKTableViewCell, Themable {
         return UINib(nibName: String(describing: self), bundle: nil)
     }
     
-    override func customizeRendering() {
-        super.customizeRendering()
-        
-        let theme = ThemeService.shared().theme
-        self.update(theme: theme)
-    }
-    
     // MARK: - Themable
     
     func update(theme: Theme) {