Commit Graph

1509 Commits

Author SHA1 Message Date
SBiOSoftWhare 1c14ebc6bc Merge branch 'develop' into steve/bubbles_sender_name_margin
# Conflicts:
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/Cells/TextMessage/Common/TextMessageBaseBubbleCell.swift
2022-02-18 17:31:26 +01:00
SBiOSoftWhare 3454fe7e37 Merge pull request #5633 from vector-im/steve/bubbles_incoming_attachment
Message bubbles: Fix incoming attachment leading margin
2022-02-18 17:25:50 +01:00
SBiOSoftWhare c22d2bbe99 TextMessageBaseBubbleCell: Reduce sender name bottom margin. 2022-02-18 16:26:35 +01:00
SBiOSoftWhare 19d45ddf21 RoomCellContentView: Expose new contraints. 2022-02-18 16:26:09 +01:00
SBiOSoftWhare d673c7cc20 Message bubbles: Fix incoming attachment leading margin. 2022-02-18 16:04:56 +01:00
SBiOSoftWhare 68b5b44d61 Merge branch 'develop' into steve/5553_bubbles_text_link
# Conflicts:
#	Riot/Modules/Room/TimelineCells/Common/MXKRoomBubbleTableViewCell.h
2022-02-18 15:16:59 +01:00
SBiOSoftWhare 7767e37850 Merge pull request #5624 from vector-im/steve/5521_bubbles_readmarker
Message Bubbles: Fix read marker appearing part way thru a message
2022-02-18 15:14:30 +01:00
SBiOSoftWhare 92091d2b24 MXKRoomBubbleTableViewCell: Update setupMessageTextViewLongPressGesture method. 2022-02-18 15:12:28 +01:00
SBiOSoftWhare 7d93d14951 Merge pull request #5616 from vector-im/steve/5555_horizontal_lines
Message bubbles: Fix horizontal lines between messages
2022-02-18 15:05:10 +01:00
SBiOSoftWhare c64488c30f Merge pull request #5613 from vector-im/steve/5550_bubbles_text_width
Message bubbles: Increase text message width
2022-02-18 15:02:32 +01:00
SBiOSoftWhare a795924c02 MXKRoomBubbleTableViewCell: Expose removeReadMarkerView method. 2022-02-17 19:23:48 +01:00
SBiOSoftWhare 28ca4f7703 BaseRoomCell: Handle read marker. 2022-02-17 19:23:19 +01:00
SBiOSoftWhare cf434e70e3 Conform cells to RoomCellReadMarkerDisplayable. 2022-02-17 19:22:56 +01:00
SBiOSoftWhare 07cc1c5c11 SizableBaseRoomCell: Handle read marker view. 2022-02-17 19:22:00 +01:00
SBiOSoftWhare e043a91331 RoomCellContentView: Handle read marker view. 2022-02-17 19:21:33 +01:00
SBiOSoftWhare 1c87ca7881 Add RoomCellReadMarkerDisplayable protocol. 2022-02-17 19:20:39 +01:00
Stefan Ceriu 6c680a73ff vector-im/element-ios/issues/5609 - Add attribution to location sharing maps. 2022-02-17 19:11:08 +02:00
SBiOSoftWhare 3351af3e9d RoomDataSource: Use RoomTimelineCellDecorator to animate read marker dismiss. 2022-02-17 17:46:26 +01:00
SBiOSoftWhare 87d58aa3de RoomDataSource: Use RoomTimelineCellDecorator to add read marker. 2022-02-17 17:45:43 +01:00
SBiOSoftWhare e10c0d95a2 PlainRoomTimelineCellDecorator: Handle read marker add and animation. 2022-02-17 17:45:01 +01:00
SBiOSoftWhare 0340d3435a RoomCellContentView: Fix avatar container view with no clear bg. 2022-02-17 10:38:48 +01:00
SBiOSoftWhare eb7edd4245 BaseRoomCell: Fix sender name tap. Prepare avatar view tap. 2022-02-17 09:39:34 +01:00
SBiOSoftWhare 831e3e6500 TextMessageBaseBubbleCell: Fix message text view gesture recognizers. 2022-02-17 09:38:52 +01:00
SBiOSoftWhare 0b93868adf MXKRoomBubbleTableViewCell: UI components setup. 2022-02-17 09:36:28 +01:00
SBiOSoftWhare 0e53d1a262 Message bubbles: Increase text message width. 2022-02-16 21:28:16 +01:00
SBiOSoftWhare ecc9e16f2d Fix ThreadSummaryView. 2022-02-16 17:37:26 +01:00
SBiOSoftWhare 50beaa49fb Fix BubbleRoomCellLayoutUpdater. 2022-02-16 17:36:49 +01:00
SBiOSoftWhare fb1d530b63 Fix conflicts. 2022-02-16 17:31:55 +01:00
SBiOSoftWhare 5a0cc32009 Merge pull request #5598 from vector-im/steve/bubbles_move_files
Room timeline: Move files in relevant folders
2022-02-16 17:24:29 +01:00
Anderas 4df8f70dab Merge pull request #5580 from vector-im/andy/4829_activity_indicators
Add new loading indicator on Home screen
2022-02-16 15:11:15 +00:00
SBiOSoftWhare 1a8f6fb138 Merge branch 'develop' into steve/bubbles_move_files 2022-02-16 16:07:32 +01:00
aringenbach 4e27be3b98 Remove bubbles background from search screens (#5601)
Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-16 15:37:56 +01:00
Andy Uhnak b0ee449c5d Implement home screen activity indicators 2022-02-16 11:48:26 +00:00
SBiOSoftWhare a2f0985e8f Merge pull request #5588 from vector-im/steve/5409_bubbles_constants
Message bubbles: Use layout constants instead magic numbers
2022-02-16 12:36:12 +01:00
Andy Uhnak e07afc87de Merge branch 'develop' into andy/4829_activity_indicators 2022-02-16 11:32:52 +00:00
SBiOSoftWhare 5ae2ae20ad Fix several MARK comments. 2022-02-16 12:09:55 +01:00
SBiOSoftWhare 5e432d32b4 BubbleRoomCellLayoutUpdater: Fix outgoing message issue. 2022-02-16 11:59:35 +01:00
Stefan Ceriu 02ab8eec9e Merge branch 'master' into develop 2022-02-16 12:45:06 +02:00
Doug b723c9a026 Only no-op the actual sending of a typing notification.
The logic around when to send a typing notification also includes logic around when to exchange encryption keys.
handleTypingNotification renamed to handleTypingState for clarity.
2022-02-16 12:42:00 +02:00
Doug 37a0c72169 Fix for images sometimes being sent unencrypted in an encrypted room. 2022-02-16 12:42:00 +02:00
SBiOSoftWhare 0b3ba64c26 Rename SizableBaseRoomCell to SizableBaseBubbleCell. 2022-02-16 11:00:23 +01:00
SBiOSoftWhare 6276e6de88 Rename RoomBubbleCellLayout to PlainRoomCellLayoutConstants. 2022-02-16 10:56:52 +01:00
SBiOSoftWhare 53a088383b Rename RoomBubbleCellLayout to PlainRoomCellLayoutConstants. 2022-02-16 10:51:06 +01:00
SBiOSoftWhare 756b6d4960 BaseRoomCell make some rename. 2022-02-16 10:48:08 +01:00
SBiOSoftWhare d078e10a7d Rename BubbleCellThreadSummaryDisplayable to RoomCellThreadSummaryDisplayable. 2022-02-16 10:44:11 +01:00
SBiOSoftWhare 2837acfc0a Rename BubbleCellReadReceiptsDisplayable to RoomCellReadReceiptsDisplayable. 2022-02-16 10:43:21 +01:00
SBiOSoftWhare 09520f2de3 Rename BubbleCellReactionsDisplayable to RoomCellReactionsDisplayable. 2022-02-16 10:42:19 +01:00
SBiOSoftWhare b531af320d BaseRoomCell: Rename bubbleCellContentView property to roomCellContentView (2). 2022-02-16 10:41:31 +01:00
SBiOSoftWhare 861faacc7d BaseRoomCell: Rename bubbleCellContentView property to roomCellContentView (2). 2022-02-16 10:40:56 +01:00
SBiOSoftWhare 2382ce857d BaseRoomCell: Rename bubbleCellContentView property to roomCellContentView. 2022-02-16 10:40:39 +01:00