Commit Graph

455 Commits

Author SHA1 Message Date
Doug 473511f8c6 Merge remote-tracking branch 'origin/develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
2021-10-08 11:45:43 +01:00
Doug cbd8ef3a3c Track an analytics value on accept/decline of an identity server. 2021-10-05 17:19:19 +01:00
manuroe cea2c9af60 i18n: Standardise casing of identity server and integration manager. 2021-10-01 11:51:30 +01:00
Doug 997ee54f20 Merge branch 'develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Settings/SettingsViewController.m
2021-09-30 11:14:02 +01:00
Stefan Ceriu 313e666017 vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-09-30 09:40:12 +03:00
Stefan Ceriu 7b75dec011 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 21a71abedb Merge pull request #4924 from vector-im/doug/4896_url_previews_string_whitespace
Use attributed string whitespace for URL previews.
2021-09-29 16:18:31 +01:00
Doug 0d8759d286 Conform URLPreviewData to MXKURLPreviewDataProtocol. 2021-09-29 12:12:25 +01:00
Doug 522f4e800c 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
Gil Eluard 137da63d8b App may not start in 1.6.0 #4919
- Update after review
2021-09-28 15:22:30 +02:00
Gil Eluard a42af21f2d App may not start in 1.6.0 #4919
- Update after review
2021-09-28 14:45:34 +02:00
Gil Eluard 5a22063e81 App may not start in 1.6.0 #4919
- Fixed
2021-09-28 13:07:10 +02:00
Gil Eluard 4068c1a55f Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
Gil Eluard d6b824c54f Merge branch 'develop' into spaces 2021-09-20 10:18:01 +02:00
David Langley 370d4271eb Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-20 08:50:38 +01:00
Doug 401e1b3cdf Enable URL Previews by default and remove from Labs. 2021-09-16 17:51:56 +01:00
David Langley e8ff4e9154 Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-15 14:33:05 +01:00
Gil Eluard 6335acc0cd 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
Gil Eluard 21f5d73b6f [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 16:59:32 +02:00
Stefan Ceriu ee417c21d8 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
David Langley eaedefa3c2 Add configurable logger for RiotSwiftUI 2021-09-09 22:42:00 +01:00
Doug 60108e8ef8 Merge branch 'develop' into doug/4484_contacts_access 2021-09-09 12:24:08 +01:00
Doug 790b4cc6cc Log Core Data save errors. Use a static property for the Core Data in memory SQLite URL. 2021-09-08 17:45:02 +01:00
Doug 173b22822c Rename Core Data objects.
URLPreviewCacheData becomes URLPreviewData in the model with a class name of URLPreviewDataMO
ClosedURLData becomes URLPreviewUserData in the model with a class name of URLPreviewUserDataMO
2021-09-08 15:47:14 +01:00
Doug ecf9503dc9 Update for PR feedback.
URLPreviewManager becomes URLPreviewService.
addVerticalWhitespaceToString used instead of heightForCellData multiple times.
All newline characters removed.
2021-09-08 15:10:13 +01:00
Doug a8675e8f27 Add more docs and comments.
Rename store.store(_:) to store.cache(_:).
2021-09-08 09:51:47 +01:00
Doug f92fae96d0 Merge branch 'develop' into doug/888_add_url_previews 2021-09-07 17:51:31 +01:00
Doug 1083516152 Move url preview setting under labs section. 2021-09-07 16:00:12 +01:00
Doug 4df44daf37 Remove unnecessary defaults registration. 2021-09-06 17:10:59 +01:00
Doug c02032d0cf Use a property wrapper for showMediaCompressionPrompt setting. 2021-09-06 17:08:23 +01:00
Doug f6fdb42ff3 Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-09-06 17:04:22 +01:00
Stefan Ceriu 7d6a1cac40 Revert "#4693 - Drop iOS 11 support."
This reverts commit a2b359f21960e1b9f75139d94adc7aeb35fa479f.
2021-09-06 18:24:26 +03:00
Doug ef65feb3de Add setting to disable URL previews.
Using a temporary position in the settings screen whilst waiting for feedback.
2021-09-03 10:19:26 +01:00
Doug f8bc972ff8 Merge remote-tracking branch 'origin/develop' into doug/888_add_url_previews 2021-09-02 17:39:42 +01:00
David Langley 823e526bec Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4776_extract_swiftui 2021-09-02 10:14:11 +01:00
Stefan Ceriu ef3fb0433e #4693 - Drop iOS 11 support. 2021-09-01 15:55:41 +03:00
David Langley 862f30102f Finish extraction
- Moves SwiftUI code out of Riot and into RiotSwiftUI which has no dependency on Matrix SDK.
- Git wasn't smart enough to see the file moves. Most feature function has remain unchanged. 1 change I did make was remove NotificationSettingsViewModel's dependence on MxPushRule, so that the view model could be moved into RiotSwiftUI.
- Add LocaleProvider to abstract VectorL10n's use of Matrix SDK language so it can be used in RiotSwiftUI.
- Split Theme into UKit/SwiftUI version to remove RiotSwiftUI's dependence on ThemeService and ThemeV1.
- Migrated from ThemeObserver to ThemePublisher. We push updates to ThemePublisher so that we can remove ThemeService as dependency.
- Add .DS_Store to .gitignore
2021-09-01 12:34:38 +01:00
Doug f93b96fa50 Refactoring and tidy up.
Make the preview manager a singleton (passing in the MXSession to functions). Fix tests.

PreviewManager → URLPreviewManager
URLPreviewViewData → URLPreviewData
URLPreviewCache → URLPreviewStore
2021-09-01 12:28:56 +01:00
Doug cd87095453 Load and store URLPreviewViewData in RoomBubbleCellData.
Implement close button and store the action in Core Data. Hide the preview image view when no image is received. Remove line breaks in description text.
2021-09-01 10:37:37 +01:00
Stefan Ceriu a331233cf3 Using a property wrapper for UserDefaults backed application settings (RiotSettings). 2021-08-30 11:02:06 +03:00
Doug 1408095129 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-27 16:28:15 +01:00
David Langley 087f848ec5 Extract and start to split theme. 2021-08-27 16:26:56 +01:00
Stefan Ceriu 79c5fe7dab #4693 - Updates following code review. 2021-08-25 13:57:32 +03:00
Doug 5d66333d63 Add PreviewManger with Core Data cache and a URLPreviewView with a view model.
Changes to RoomDataSource still to come.
2021-08-23 17:56:24 +01:00
Doug 9b2e261107 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-23 12:49:28 +01:00
Doug c7f426f977 Combine confirm image/video size settings into one. 2021-08-23 11:16:32 +01:00
Paulo Pinto 3297b00b6d Standardise spelling and casing of integration manager
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-18 17:30:45 +01:00
Doug 42458feb64 Merge branch 'develop' into doug/4484_contacts_access 2021-08-17 16:15:46 +01:00
Doug 174238f0cb Merge branch 'develop' into doug/888_add_url_previews 2021-08-17 10:29:30 +01:00
David Langley 7963915926 Add dependency management, AvatarViewModel and placeholder rendering now in AvatarImage. 2021-08-17 10:19:41 +01:00