Commit Graph

425 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 f2dd993891 Add final strings. Tweak header. 2021-10-06 17:36:28 +01:00
Doug 634424d288 Small tweaks plus changelog entry.
Use the new generated localisation strings. Add comments.

Address feedback from PR review.
2021-10-01 16:16:26 +01:00
manuroe cea2c9af60 i18n: Standardise casing of identity server and integration manager. 2021-10-01 11:51:30 +01:00
Gil Eluard 5521802bc2 [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02:00
Gil Eluard c03997f97c Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
Gil Eluard 5884c13fe9 [spaces] several fixes for pre release
- [When switching spaces, user and room tabs are not populated](https://github.com/vector-im/element-ios/issues/4889)
- [Explore rooms list in space has odd ordering](https://github.com/vector-im/element-ios/issues/4890)
- Fixed Coming Soon error for Explore rooms
2021-09-22 16:57:31 +02:00
Stefan Ceriu fc3e70891a Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings
# Conflicts:
#	Riot/Generated/Strings.swift
2021-09-22 17:17:05 +03:00
Gil Eluard 28fee23d3c Merge branch 'spaces' into gil/pre_release_fixes 2021-09-22 15:39:55 +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
Stefan Ceriu cc8b6a8d75 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 3bd7b5ee99 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-22 11:39:42 +01:00
Stefan Ceriu eba9b1c65c Fix #4415 - Added back section header when only PIN available. 2021-09-22 08:44:48 +03:00
Gil Eluard 1e7b167cd2 Merge branch 'spaces' into gil/pre_release_fixes 2021-09-20 10:18:59 +02:00
Gil Eluard d6b824c54f Merge branch 'develop' into spaces 2021-09-20 10:18:01 +02:00
Gil Eluard aabd22f6f8 [spaces] several fixes for pre release
- [Space home view inherits title from previously viewed tab](https://github.com/vector-im/element-ios/issues/4851)
- [Home view doesn't refresh when new rooms are created](https://github.com/vector-im/element-ios/issues/4849)
- [Odd error message in Space member list](https://github.com/vector-im/element-ios/issues/4845)
- [Bring leaving space experience in line with Web](https://github.com/vector-im/element-ios/issues/4850)
- [No notification for space invitation](https://github.com/vector-im/element-ios/issues/4840)
- [Remove filter when space is switched](https://github.com/vector-im/element-ios/issues/4852)
- [M10.11 Remove community tab](https://github.com/vector-im/element-ios/issues/4493)
2021-09-20 10:10:27 +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 cfe196cee5 Update setting string. 2021-09-16 17:57:36 +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 204cccb286 [Spaces] M10.6 Space preview bottom sheet #4497
- Update after design review
2021-09-14 09:42:10 +02: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
David Langley 17c6ce6a10 Add Simple Template Example
- Add a simple Template example that shows a user profile with avatar, displayName and presence.
- ScreenCoordinator: closure based with less protocols and delegates.
- Reducer: Reducer function that manages all state modifications.
- SwiftUI View: Decomposes UI into appropriate sub components.
- Uses Theme and Dependency Management Infrastructure
2021-09-06 17:12:31 +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
Gil Eluard 110ad39c6e [Spaces] M10.6 Space preview bottom sheet #4497
- Localized strings for space join rule
2021-09-06 08:47:43 +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
Gil Eluard 15da1e4ff8 [Spaces] M10.8 Browsing users in a space #4682
- Update after design review
2021-09-02 10:17:09 +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 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 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
Doug 240a5e8f5f Update media settings strings. Update share extension image size prompt. 2021-08-27 16:15:46 +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 ee5bd5bc6c Remove unneeded string from bad merge 2021-08-25 14:25:57 +01:00
David Langley b2460204e2 Add Chips, InputStyles, Service Implementation, swift-collections and UI cleanup. 2021-08-25 13:03:36 +01:00
Stefan Ceriu 95572d5e44 Implements #4693 - Alert users of Element on iOS11 deprecation. 2021-08-25 13:57:32 +03:00
Doug 027298f903 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-23 12:49:06 +01:00
Doug c7f426f977 Combine confirm image/video size settings into one. 2021-08-23 11:16:32 +01:00
Gil Eluard 3c39228618 [Spaces] M10.8 Browsing users in a space #4682
- Added navigation to member detail page
2021-08-22 08:48:54 +03:00
Paulo Pinto e14617f434 Standardise casing of terms in source strings
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-18 17:30:45 +01:00
Paulo Pinto 7f643f8f0e Standardise casing of identity server
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-18 17:30:45 +01:00
Stefan Ceriu 3c650f36db Fixes #4714 - Flickering voice message cells while being sent. 2021-08-18 14:58:32 +03:00
David Langley 343d5a7017 Add NotificationSettings and Keywords UI and VM 2021-08-18 09:33:56 +01:00
Doug a9d5d4d5d7 Add an (optional) prompt when sending a video to select its size.
Use high quality when filming video in-app.
2021-08-16 17:48:26 +01:00
Gil Eluard e70d3bb67c [Spaces] M10.7 Explore rooms #4571
- Update after design review
2021-08-16 15:44:44 +02:00
Gil Eluard 9c02c55f84 Merge branch 'spaces' into gil/4571_explore_rooms 2021-08-16 14:00:16 +02:00
Doug 7dea78bae9 Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-08-16 10:01:54 +01:00
Gil Eluard cd6693f041 [Spaces] M10.7 Explore rooms #4571
- UI updates after design changes
2021-08-15 22:18:16 +02:00