Commit graph

975 commits

Author SHA1 Message Date
SBiOSoftWhare
35d246642b Add RoomCoordinator. 2021-10-05 10:48:52 +02:00
SBiOSoftWhare
3d75153bc1 Use NavigationRouterStore where needed. 2021-10-05 10:48:52 +02:00
SBiOSoftWhare
815106f831 Split view: Set navigationItem.leftItemsSupplementBackButton to YES for view controllers used as detail. 2021-10-05 10:48:51 +02:00
manuroe
2735166155 Merge branch 'master' into develop 2021-09-30 23:51:17 +01:00
Stefan Ceriu
2c0bf1e80f vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-09-30 09:40:12 +03:00
Stefan Ceriu
862464108b vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
Doug
b4569296ac Check whether URL previews should be shown in a single location.
Reset all cell data when this setting is changed to force a refresh.
Rename `hasClosedPreview(from:)` to `shouldShowPreview(for:)` for clarity and potentially adding more rules at a later date.
2021-09-29 11:39:11 +01:00
Doug
4198fa096a Add invalidateLayout to RoomBubbleCellData. 2021-09-29 10:36:35 +01:00
SBiOSoftWhare
e3d649c4ea AvatarViewData: Make mediaManager property optional. 2021-09-29 11:28:13 +02:00
Doug
66c92fbe03 Use bubbleComponentWithLinkForEventId: in RoomDataSource. 2021-09-27 18:43:53 +01:00
Doug
f44e1b098e Move URL preview properties from RoomBubbleCellData in MXKRoomBubbleComponent.
Stop breaking up the bubble data for links now that vertical whitespace is added.
2021-09-27 18:15:48 +01:00
Doug
b35838e268 Merge branch 'develop' into doug/4896_url_previews_string_whitespace 2021-09-27 14:44:17 +01:00
Doug
9c7284c832 Rename refreshAttributedTextMessage to makeAttributedString to indicate that it doesn't affect the attributedTextMessage. 2021-09-24 17:06:50 +01:00
Doug
574779fff3 Rename setNeedsUpdateContent to invalidateTextLayout. 2021-09-24 15:33:04 +01:00
Doug
6293efc155 Use setNeedsUpdateContent instead of setting the attributed string to nil. 2021-09-24 15:19:24 +01:00
Gil Eluard
36541a4dab Try to fix CI build issues 2021-09-23 21:33:23 +02:00
Gil Eluard
578dce8590 Try to fix CI build issues 2021-09-23 21:06:29 +02:00
Doug
0edf6ba7d6 Include URL previews in addVerticalWhitespaceToString:forEvent: and remove heightForCellData:withMaximumWidth: from the various TextMsgBubbleCell subclasses.
Use the bubble cell data's available width when sizing URL previews and update the defaultAvailableWidth and reducedWidthThreshold accordingly.
2021-09-23 17:30:24 +01:00
Gil Eluard
ca7bf18f76 [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02:00
Gil Eluard
cc8ac58fd5 Merge branch 'spaces' into gil/4498_Handle_space_link 2021-09-23 15:26:29 +02:00
Gil Eluard
cf51612864 Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
David Langley
53563c996f
Merge pull request #4892 from vector-im/langleyd/4772_voice_message_drafts
Voice message draft persistence
2021-09-23 11:21:26 +00:00
David Langley
eb92cc9cf8 use roomId for audioPlayerId, remove dead code, make functions private. 2021-09-23 10:55:35 +01:00
David Langley
0df653e244
Merge pull request #4878 from vector-im/langleyd/4774_voice_message_scrubbing
Langleyd/4774 voice message scrubbing
2021-09-23 09:35:38 +00:00
David Langley
c1fd40c5bb Remove space 2021-09-23 09:39:09 +01:00
David Langley
007f72d51e Use RoomId for room by room drafts. 2021-09-23 08:48:15 +01:00
David Langley
442708524e Simplify scrubbing logic. 2021-09-22 16:26:20 +01:00
Gil Eluard
4d1dd1eb0a Merge branch 'gil/pre_release_fixes' into gil/4498_Handle_space_link 2021-09-22 16:58:28 +02:00
Stefan Ceriu
6111382a63 Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings
# Conflicts:
#	Riot/Generated/Strings.swift
2021-09-22 17:17:05 +03:00
Stefan Ceriu
388d828c2b Fixes #4881 - Replaced InfoPlist.cfBundleDisplayName with AppInfo.current.displayName and removed the now unused InfoPlist generated class. 2021-09-22 16:59:47 +03:00
Gil Eluard
f6ea4da656 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
Gil Eluard
14f0533a5a [Spaces] M10.6.1 Handle space link #4498
- Fixed universal links
- Added support for space links
2021-09-22 14:58:19 +02:00
David Langley
3bb50d2a35 Build on xcode 12 2021-09-22 13:53:26 +01:00
David Langley
87e84d2f6c Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4774_voice_message_scrubbing 2021-09-22 13:17:32 +01:00
Stefan Ceriu
0848f66cdb Fixes #4881 - Using the bundle display name as the app name in localizable .strings files. Exposing generated .strings and info.plist members to Objective-C. 2021-09-22 14:10:16 +03:00
David Langley
f87c28318d Simplify scrubbing and reset to stopped if scrub to start/end 2021-09-22 11:12:45 +01:00
David Langley
d3fb3a7e40
Merge pull request #4876 from vector-im/langleyd/4773_pause_resume_voice_messages
Add Pause/Resume support between rooms.
2021-09-22 09:38:35 +00:00
David Langley
87cd6fa209 Add scrubbing 2021-09-22 09:36:20 +01:00
David Langley
1ddd420781 Add Pause/Resume support between rooms. 2021-09-21 15:52:53 +01:00
Stefan Ceriu
abb3259608 Fixes #4830 - Automatically dismissing invites for empty rooms after failing to join. 2021-09-21 16:28:48 +03:00
Gil Eluard
84bdf88fe1 Merge branch 'develop' into spaces 2021-09-20 10:18:01 +02:00
SBiOSoftWhare
521d75e5b7
Merge pull request #4814 from vector-im/steve/4734_room_vc_refacto
RoomVC: Add a delegate, factorize and reduce usage of AppDelegate
2021-09-17 15:58:05 +02:00
SBiOSoftWhare
bdecdfb518 RoomVC: Fix comment mistake. 2021-09-17 14:21:27 +02:00
SBiOSoftWhare
f8e9d15a4a RoomVC: Remove unnecessary nonnull. 2021-09-17 14:19:38 +02:00
SBiOSoftWhare
5859647ddf
Update Riot/Modules/Room/RoomViewController.h
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-09-17 13:21:53 +02:00
Doug
7807b21e09 Use constants. 2021-09-16 17:13:56 +01:00
Doug
38db80ac6b Reduce the width of URL previews on 4" devices. 2021-09-16 16:41:21 +01:00
Gil Eluard
a926960970 Merge branch 'develop' into spaces 2021-09-16 15:47:32 +02:00
manuroe
77fc814221 Merge remote-tracking branch 'origin/master' into develop 2021-09-16 15:01:40 +02:00
Gil Eluard
8ba6c55a87 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2021-09-15 14:42:04 +02:00