Commit Graph

1035 Commits

Author SHA1 Message Date
Doug f92fae96d0 Merge branch 'develop' into doug/888_add_url_previews 2021-09-07 17:51:31 +01:00
Doug 42e9e0e24a Fix settings toggle not enabled. 2021-09-07 16:12:37 +01:00
Doug 917447ad1f Fix settings toggle not enabled. 2021-09-07 16:12:37 +01:00
Doug a05b1cab03 Move url preview setting under labs section. 2021-09-07 16:00:12 +01:00
Doug 1083516152 Move url preview setting under labs section. 2021-09-07 16:00:12 +01:00
Doug 640c4a562c Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-09-06 17:04:22 +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 8f46e037f2 Revert "#4693 - Drop iOS 11 support."
This reverts commit a2b359f21960e1b9f75139d94adc7aeb35fa479f.
2021-09-06 18:24:26 +03:00
Stefan Ceriu 7d6a1cac40 Revert "#4693 - Drop iOS 11 support."
This reverts commit a2b359f21960e1b9f75139d94adc7aeb35fa479f.
2021-09-06 18:24:26 +03:00
Doug 24bfe36712 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 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
David Langley 14169c6594 Move complete room notification settings module to RiotSwiftUI and fix naming/directory structure. 2021-09-02 14:09:29 +01:00
David Langley 7093f407f7 Move complete room notification settings module to RiotSwiftUI and fix naming/directory structure. 2021-09-02 14:09:29 +01:00
David Langley c5881e11ae Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4776_extract_swiftui 2021-09-02 10:14:11 +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 0b2616ddb3 #4693 - Drop iOS 11 support. 2021-09-01 15:55:41 +03:00
Stefan Ceriu ef3fb0433e #4693 - Drop iOS 11 support. 2021-09-01 15:55:41 +03:00
David Langley ada377dcf2 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
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 d1eaa90984 Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-08-27 16:30:01 +01:00
Doug 69e98ce572 Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-08-27 16:30:01 +01:00
Doug fc8484b467 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-27 16:28:15 +01:00
Doug 1408095129 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-27 16:28:15 +01:00
David Langley cb0403ed8d Extract and start to split theme. 2021-08-27 16:26:56 +01:00
David Langley 087f848ec5 Extract and start to split theme. 2021-08-27 16:26:56 +01:00
Doug 4c59f1bd37 Update media settings strings. Update share extension image size prompt. 2021-08-27 16:15:46 +01:00
Doug 240a5e8f5f Update media settings strings. Update share extension image size prompt. 2021-08-27 16:15:46 +01:00
Stefan Ceriu 4c60dc9a8e Fixes #4746 - It is very easy to make duplicate rooms 2021-08-26 17:48:24 +03:00
Stefan Ceriu 3600d41611 Fixes #4746 - It is very easy to make duplicate rooms 2021-08-26 17:48:24 +03:00
David Langley dc2e3ca367 Merge pull request #4760 from vector-im/langleyd/4467_account_notification_settings
Fix Default State of Keyword Notification Setting
2021-08-26 13:16:56 +01:00
David Langley db4a55724f Merge pull request #4760 from vector-im/langleyd/4467_account_notification_settings
Fix Default State of Keyword Notification Setting
2021-08-26 13:16:56 +01:00
David Langley 41bba11834 Set true as default state for notification settings. Only matters for keywords. 2021-08-26 12:13:17 +01:00
David Langley 319a4fde18 Set true as default state for notification settings. Only matters for keywords. 2021-08-26 12:13:17 +01:00
David Langley f49af07c11 Merge pull request #4752 from vector-im/langleyd/4467_account_notification_settings
Account Notification Settings and Keywords
2021-08-26 11:07:11 +01:00
David Langley b5634b051a Merge pull request #4752 from vector-im/langleyd/4467_account_notification_settings
Account Notification Settings and Keywords
2021-08-26 11:07:11 +01:00
David Langley 0eebae4712 multiline comments 2021-08-25 19:28:19 +01:00
David Langley b55696e446 multiline comments 2021-08-25 19:28:19 +01:00
David Langley 32610816e5 Add ViewFrameReader 2021-08-25 19:24:33 +01:00
David Langley f74d2cadb0 Add ViewFrameReader 2021-08-25 19:24:33 +01:00
David Langley a3c927ffaf Remove 'OrderedSet' 2021-08-25 16:53:15 +01:00
David Langley 41aeac4ee9 Remove 'OrderedSet' 2021-08-25 16:53:15 +01:00
David Langley 391a6ea6c5 Address comments and cleanup version checks 2021-08-25 15:46:02 +01:00
David Langley c1c6c39a3d Address comments and cleanup version checks 2021-08-25 15:46:02 +01:00
David Langley bfd6bac416 Improve comments and correct iOS version check logic. 2021-08-25 15:17:05 +01:00
David Langley ea38ecc6c7 Improve comments and correct iOS version check logic. 2021-08-25 15:17:05 +01:00
David Langley 94b3cc0093 Add comments for flow layout. 2021-08-25 14:49:17 +01:00
David Langley 1164d1c1d8 Add comments for flow layout. 2021-08-25 14:49:17 +01:00
David Langley 43d7abc11e Remove unneeded delegate methods 2021-08-25 14:38:04 +01:00
David Langley e7db1eca52 Remove unneeded delegate methods 2021-08-25 14:38:04 +01:00
David Langley 30faf9b317 typos 2021-08-25 14:32:34 +01:00