Commit Graph

596 Commits

Author SHA1 Message Date
Stefan Ceriu 9724409fc0 #1098 - Working real user suggestion inside the main application. 2021-10-13 11:26:22 +03:00
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
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
Doug 5d3c3cf5d7 Add an image for the integration manager to ServiceTermsModalScreenViewController. 2021-09-29 17:40:37 +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
Stefan Ceriu b41cd1e1a4 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 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
Doug 59a6826815 Add ServiceTermsModalTableHeaderView to ServiceTermsModalScreenViewController. 2021-09-15 11:53:30 +01:00
Doug e5b76e8efa Rename RequestContactsAccessFooterView to FindYourContactsFooterView. 2021-09-15 10:03:32 +01:00
Doug bf1b7b99c3 Fix rotation layout bug. Update button title. 2021-09-14 17:22:28 +01: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 f87e0fc35d Show an activity indicator whilst preparing the identity service. Show an alert when there's an error. 2021-09-13 14:25:54 +01:00
Doug 4a4bf7d4dc Update the Service Terms modal from the latest Figma.
Checkboxes have been removed from the individual policies.
Reverse flow so that the service terms are show before the contacts access popup.
Removes outOfContext from the modal as it will only be presented when requested.
Fixes second presentation on swipe to dismiss of the modal.
2021-09-13 11:46:31 +01:00
Doug bdf5aa3868 Update strings in SettingsViewController. 2021-09-09 15:17:29 +01:00
Doug 9e8da35bd8 Revert search bar placeholder. 2021-09-09 14:41:03 +01:00
Doug 76107b4ba4 Update strings and add localise. Use theme v2. 2021-09-09 13:08:50 +01:00
Doug 60108e8ef8 Merge branch 'develop' into doug/4484_contacts_access 2021-09-09 12:24:08 +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
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
Gil Eluard 53c3cd7fc6 [Spaces] M10.6 Space preview bottom sheet #4497 2021-09-06 07:46: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
Doug f8bc972ff8 Merge remote-tracking branch 'origin/develop' into doug/888_add_url_previews 2021-09-02 17:39:42 +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
Gil Eluard 8bf8b5d99e Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
2021-09-02 07:51:55 +03:00
Gil Eluard 26b4344fe1 [Spaces] M10.7 Explore rooms #4571
- Update after review
2021-09-01 18:12:08 +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 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
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