Update Reactions component

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
  specs:
  CFPropertyList (3.0.5)
  rexml
- activesupport (6.1.5)
+ activesupport (6.1.6)
  concurrent-ruby (~> 1.0, >= 1.0.2)
  i18n (>= 1.6, < 2)
  minitest (>= 5.1)
@@ -17,20 +17,20 @@ GEM
  artifactory (3.0.15)
  atomos (0.1.3)
  aws-eventstream (1.2.0)
- aws-partitions (1.568.0)
- aws-sdk-core (3.130.0)
+ aws-partitions (1.598.0)
+ aws-sdk-core (3.131.1)
  aws-eventstream (~> 1, >= 1.0.2)
  aws-partitions (~> 1, >= 1.525.0)
  aws-sigv4 (~> 1.1)
- jmespath (~> 1.0)
- aws-sdk-kms (1.55.0)
+ jmespath (~> 1, >= 1.6.1)
+ aws-sdk-kms (1.57.0)
  aws-sdk-core (~> 3, >= 3.127.0)
  aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.113.0)
+ aws-sdk-s3 (1.114.0)
  aws-sdk-core (~> 3, >= 3.127.0)
  aws-sdk-kms (~> 1)
  aws-sigv4 (~> 1.4)
- aws-sigv4 (1.4.0)
+ aws-sigv4 (1.5.0)
  aws-eventstream (~> 1, >= 1.0.2)
  babosa (1.0.4)
  claide (1.0.3)
@@ -75,7 +75,7 @@ GEM
  colored2 (3.1.2)
  commander (4.6.0)
  highline (~> 2.0.0)
- concurrent-ruby (1.1.9)
+ concurrent-ruby (1.1.10)
  declarative (0.0.20)
  digest-crc (0.6.4)
  rake (>= 12.0.0, < 14.0.0)
@@ -86,7 +86,7 @@ GEM
  escape (0.0.4)
  ethon (0.15.0)
  ffi (>= 1.15.0)
- excon (0.92.1)
+ excon (0.92.3)
  faraday (1.10.0)
  faraday-em_http (~> 1.0)
  faraday-em_synchrony (~> 1.0)
@@ -106,8 +106,8 @@ GEM
  faraday-em_synchrony (1.0.0)
  faraday-excon (1.1.0)
  faraday-httpclient (1.0.1)
- faraday-multipart (1.0.3)
- multipart-post (>= 1.2, < 3)
+ faraday-multipart (1.0.4)
+ multipart-post (~> 2)
  faraday-net_http (1.0.1)
  faraday-net_http_persistent (1.2.0)
  faraday-patron (1.0.0)
@@ -116,7 +116,7 @@ GEM
  faraday_middleware (1.2.0)
  faraday (~> 1.0)
  fastimage (2.2.6)
- fastlane (2.205.0)
+ fastlane (2.206.2)
  CFPropertyList (>= 2.3, < 4.0.0)
  addressable (>= 2.8, < 3.0.0)
  artifactory (~> 3.0)
@@ -165,9 +165,9 @@ GEM
  fourflusher (2.3.1)
  fuzzy_match (2.0.4)
  gh_inspector (1.1.3)
- google-apis-androidpublisher_v3 (0.16.0)
- google-apis-core (>= 0.4, < 2.a)
- google-apis-core (0.4.2)
+ google-apis-androidpublisher_v3 (0.22.0)
+ google-apis-core (>= 0.5, < 2.a)
+ google-apis-core (0.5.0)
  addressable (~> 2.5, >= 2.5.1)
  googleauth (>= 0.16.2, < 2.a)
  httpclient (>= 2.8.1, < 3.a)
@@ -176,27 +176,27 @@ GEM
  retriable (>= 2.0, < 4.a)
  rexml
  webrick
- google-apis-iamcredentials_v1 (0.10.0)
- google-apis-core (>= 0.4, < 2.a)
- google-apis-playcustomapp_v1 (0.7.0)
- google-apis-core (>= 0.4, < 2.a)
- google-apis-storage_v1 (0.11.0)
- google-apis-core (>= 0.4, < 2.a)
+ google-apis-iamcredentials_v1 (0.11.0)
+ google-apis-core (>= 0.5, < 2.a)
+ google-apis-playcustomapp_v1 (0.8.0)
+ google-apis-core (>= 0.5, < 2.a)
+ google-apis-storage_v1 (0.15.0)
+ google-apis-core (>= 0.5, < 2.a)
  google-cloud-core (1.6.0)
  google-cloud-env (~> 1.0)
  google-cloud-errors (~> 1.0)
- google-cloud-env (1.5.0)
- faraday (>= 0.17.3, < 2.0)
+ google-cloud-env (1.6.0)
+ faraday (>= 0.17.3, < 3.0)
  google-cloud-errors (1.2.0)
- google-cloud-storage (1.36.1)
+ google-cloud-storage (1.36.2)
  addressable (~> 2.8)
  digest-crc (~> 0.4)
  google-apis-iamcredentials_v1 (~> 0.1)
  google-apis-storage_v1 (~> 0.1)
  google-cloud-core (~> 1.6)
  googleauth (>= 0.16.2, < 2.a)
  mini_mime (~> 1.0)
- googleauth (1.1.2)
+ googleauth (1.1.3)
  faraday (>= 0.17.3, < 3.a)
  jwt (>= 1.4, < 3.0)
  memoist (~> 0.16)
@@ -205,14 +205,14 @@ GEM
  signet (>= 0.16, < 2.a)
  highline (2.0.3)
  http-accept (1.7.0)
- http-cookie (1.0.4)
+ http-cookie (1.0.5)
  domain_name (~> 0.5)
  httpclient (2.8.3)
  i18n (1.10.0)
  concurrent-ruby (~> 1.0)
  jmespath (1.6.1)
- json (2.6.1)
- jwt (2.3.0)
+ json (2.6.2)
+ jwt (2.4.1)
  memoist (0.16.2)
  mime-types (3.4.1)
  mime-types-data (~> 3.2015)
@@ -230,9 +230,9 @@ GEM
  optparse (0.1.1)
  os (1.1.4)
  plist (3.6.0)
- public_suffix (4.0.6)
+ public_suffix (4.0.7)
  rake (13.0.6)
- representable (3.1.1)
+ representable (3.2.0)
  declarative (< 0.1.0)
  trailblazer-option (>= 0.1.1, < 0.2.0)
  uber (< 0.2.0)
@@ -271,7 +271,7 @@ GEM
  uber (0.1.0)
  unf (0.1.4)
  unf_ext
- unf_ext (0.0.8.1)
+ unf_ext (0.0.8.2)
  unicode-display_width (1.8.0)
  webrick (1.7.0)
  word_wrap (1.0.0)
@@ -289,7 +289,7 @@ GEM
  rouge (~> 2.0.7)
  xcpretty-travis-formatter (1.0.1)
  xcpretty (~> 0.2, >= 0.0.7)
- zeitwerk (2.5.4)
+ zeitwerk (2.6.0)
 
 PLATFORMS
  ruby

Podfile

@@ -88,8 +88,8 @@ abstract_target 'RiotPods' do
 
  import_SwiftUI_pods
 
- pod 'DGCollectionViewLeftAlignFlowLayout', '~> 1.0.4'
  pod 'UICollectionViewRightAlignedLayout', '~> 0.0.3'
+ pod 'UICollectionViewLeftAlignedLayout', '~> 1.0.2'
  pod 'KTCenterFlowLayout', '~> 1.3.1'
  pod 'ZXingObjC', '~> 3.6.5'
  pod 'FlowCommoniOS', '~> 1.12.0'

Podfile.lock

@@ -18,7 +18,6 @@ PODS:
  - BlueCryptor (1.0.32)
  - BlueECC (1.2.5)
  - BlueRSA (1.0.200)
- - DGCollectionViewLeftAlignFlowLayout (1.0.4)
  - Down (0.11.0)
  - DSBottomSheet (0.3.0)
  - DSWaveformImage (6.1.1)
@@ -95,6 +94,7 @@ PODS:
  - LoggerAPI (~> 1.7)
  - SwiftLint (0.44.0)
  - SwiftyBeaver (1.9.5)
+ - UICollectionViewLeftAlignedLayout (1.0.2)
  - UICollectionViewRightAlignedLayout (0.0.3)
  - WeakDictionary (2.0.2)
  - zxcvbn-ios (1.0.4)
@@ -104,7 +104,6 @@ PODS:
 
 DEPENDENCIES:
  - AnalyticsEvents (from `https:/matrix-org/matrix-analytics-events.git`, branch `release/swift`)
- - DGCollectionViewLeftAlignFlowLayout (~> 1.0.4)
  - Down (~> 0.11.0)
  - DSBottomSheet (~> 0.3)
  - DSWaveformImage (~> 6.1.1)
@@ -128,6 +127,7 @@ DEPENDENCIES:
  - SwiftGen (~> 6.3)
  - SwiftJWT (~> 3.6.200)
  - SwiftLint (~> 0.44.0)
+ - UICollectionViewLeftAlignedLayout (~> 1.0.2)
  - UICollectionViewRightAlignedLayout (~> 0.0.3)
  - WeakDictionary (~> 2.0)
  - zxcvbn-ios
@@ -139,7 +139,6 @@ SPEC REPOS:
  - BlueCryptor
  - BlueECC
  - BlueRSA
- - DGCollectionViewLeftAlignFlowLayout
  - Down
  - DSBottomSheet
  - DSWaveformImage
@@ -171,6 +170,7 @@ SPEC REPOS:
  - SwiftJWT
  - SwiftLint
  - SwiftyBeaver
+ - UICollectionViewLeftAlignedLayout
  - UICollectionViewRightAlignedLayout
  - WeakDictionary
  - zxcvbn-ios
@@ -192,7 +192,6 @@ SPEC CHECKSUMS:
  BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
  BlueECC: 0d18e93347d3ec6d41416de21c1ffa4d4cd3c2cc
  BlueRSA: dfeef51db96bcc4edec654956c1581adbda4e6a3
- DGCollectionViewLeftAlignFlowLayout: a0fa58797373ded039cafba8133e79373d048399
  Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612
  DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a
  DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
@@ -224,11 +223,12 @@ SPEC CHECKSUMS:
  SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae
  SwiftLint: e96c0a8c770c7ebbc4d36c55baf9096bb65c4584
  SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
+ UICollectionViewLeftAlignedLayout: 830bf6fa5bab9f9b464f62e3384f9d2e00b3c0f6
  UICollectionViewRightAlignedLayout: 823eef8c567eba4a44c21bc2ffcb0d0d5f361e2d
  WeakDictionary: 8cd038acd77e5d54ca4ebaec3d20853d732b45e0
  zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: e860e1985e566efae3e629401c255070dd5278a7
+PODFILE CHECKSUM: 0a0d17465abe9c500b13ac0c5c7def68d91c5ebf
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3

Riot/Assets/Images.xcassets/Room/reactions_more_action.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "reactions_more_action.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

Riot/Assets/en.lproj/Untranslated.strings

@@ -79,16 +79,6 @@
 
 "authentication_recaptcha_message" = "This server would like to make sure you are not a robot";
 
-// MARK: Spaces WIP
-"spaces_feature_not_available" = "This feature isn't available here. For now, you can do this with %@ on your computer.";
-
-"leave_space_action" = "Leave space";
-"leave_space_and_one_room" = "Leave space and 1 room";
-"leave_space_and_more_rooms" = "Leave space and %@ rooms";
-"leave_space_selection_title" = "SELECT ROOMS";
-"leave_space_selection_all_rooms" = "Select all rooms";
-"leave_space_selection_no_rooms" = "Select no rooms";
-
 // MARK: Password Validation
 "password_validation_info_header" = "Your password should meet the criteria below:";
 "password_validation_error_header" = "Given password does not meet the criteria below:";

Riot/Assets/en.lproj/Vector.strings

@@ -1947,6 +1947,8 @@ Tap the + to start adding people.";
 "space_settings_update_failed_message" = "Failed to update space settings. Do you want to retry?";
 "space_settings_current_address_message" = "Your space is viewable at\n%@";
 
+"spaces_feature_not_available" = "This feature isn't available here. For now, you can do this with %@ on your computer.";
+
 // Mark: - Space Creation
 
 "spaces_creation_hint" = "Spaces are a new way to group rooms and people.";
@@ -2007,6 +2009,19 @@ Tap the + to start adding people.";
 "spaces_add_room_missing_permission_message" = "You do not have permissions to add rooms to this space.";
 "spaces_add_space" = "Add space";
 
+// Mark: Leave space
+
+"leave_space_action" = "Leave space";
+"leave_space_and_one_room" = "Leave space and 1 room";
+"leave_space_and_more_rooms" = "Leave space and %@ rooms";
+"leave_space_selection_title" = "SELECT ROOMS";
+"leave_space_selection_all_rooms" = "Select all rooms";
+"leave_space_selection_no_rooms" = "Select no rooms";
+
+// MARK: Reactions
+
+"room_event_action_reaction_more" = "%@ more";
+
 // Mark: Avatar
 
 "space_avatar_view_accessibility_label" = "avatar";

Riot/Assets/third_party_licenses.html

@@ -1362,33 +1362,6 @@
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  </pre>
  </li>
- <li>
- <b>DGCollectionViewLeftAlignFlowLayout</b> (<a href="https:/Digipolitan/collection-view-left-align-flow-layout">https:/Digipolitan/collection-view-left-align-flow-layout</a>)
- <br/><br/>This is a simple layout that align does not try to fulfill the lines but stick elements to the left.
- <br/><br/>DGCollectionViewLeftAlignFlowLayout is licensed under the BSD 3-Clause license.
- <br/>Copyright (c) 2017, Digipolitan All rights reserved.
- <br/><br/>Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- <br/><br/>- Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- <br/><br/>- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- <br/><br/>- Neither the name of the copyright holder nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
- <br/><br/>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- <br/><br/>
- </li>
  <li>
  <b>KTCenterFlowLayout</b> (<a href="https:/keighl/KTCenterFlowLayout">https:/keighl/KTCenterFlowLayout</a>)
  <br/><br/>KTCenterFlowLayout is a subclass of UICollectionViewFlowLayout which Aligns cells to the center of a collection view.
@@ -1927,6 +1900,8 @@
  </li>
  <li>
  <b>UICollectionViewRightAlignedLayout</b> (<a href="https:/mokagio/UICollectionViewRightAlignedLayout">https:/mokagio/UICollectionViewRightAlignedLayout</a>)
+ <br/>
+ <b>UICollectionViewLeftAlignedLayout</b> (<a href="https:/mokagio/UICollectionViewLeftAlignedLayout">https:/mokagio/UICollectionViewLeftAlignedLayout</a>)
  <br/><br/>
  The MIT License (MIT)
  <br/><br/>

Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h

@@ -32,6 +32,13 @@ extern NSString *const kMXKRoomBubbleCellRiotEditButtonPressed;
  */
 extern NSString *const kMXKRoomBubbleCellTapOnReceiptsContainer;
 
+/**
+ Action identifier used when the user tapped on the add reaction button.
+
+ The 'userInfo' dictionary contains a 'NSString' object under the 'kMXKRoomBubbleCellEventIdKey' key, representing the event id of the event associated with the reactions.
+ */
+extern NSString *const kMXKRoomBubbleCellTapOnAddReaction;
+
 /**
  Action identifier used when the user perform a long press on reactions view.
 

Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m

@@ -29,6 +29,7 @@
 
 NSString *const kMXKRoomBubbleCellRiotEditButtonPressed = @"kMXKRoomBubbleCellRiotEditButtonPressed";
 NSString *const kMXKRoomBubbleCellTapOnReceiptsContainer = @"kMXKRoomBubbleCellTapOnReceiptsContainer";
+NSString *const kMXKRoomBubbleCellTapOnAddReaction = @"kMXKRoomBubbleCellTapOnAddReaction";
 NSString *const kMXKRoomBubbleCellLongPressOnReactionView = @"kMXKRoomBubbleCellLongPressOnReactionView";
 NSString *const kMXKRoomBubbleCellKeyVerificationIncomingRequestAcceptPressed = @"kMXKRoomBubbleCellKeyVerificationAcceptPressed";
 NSString *const kMXKRoomBubbleCellKeyVerificationIncomingRequestDeclinePressed = @"kMXKRoomBubbleCellKeyVerificationDeclinePressed";

Riot/Generated/Images.swift

@@ -236,6 +236,7 @@ internal class Asset: NSObject {
  internal static let modIcon = ImageAsset(name: "mod_icon")
  internal static let moreReactions = ImageAsset(name: "more_reactions")
  internal static let notifications = ImageAsset(name: "notifications")
+ internal static let reactionsMoreAction = ImageAsset(name: "reactions_more_action")
  internal static let roomAccessInfoHeaderIcon = ImageAsset(name: "room_access_info_header_icon")
  internal static let scrollup = ImageAsset(name: "scrollup")
  internal static let roomsEmptyScreenArtwork = ImageAsset(name: "rooms_empty_screen_artwork")