Commit graph

442 commits

Author SHA1 Message Date
Doug
b9b4d18124 Add Email/Terms/ReCaptcha into the Authentication flow
Replace ReCaptcha navigation delegate with a WKUserContentController.
Move callback property closures onto the MainActor.
Show a loading indicator whilst waiting for the authentication service to start.
Move nextUncompletedStage into FlowResult.
Handle text field actions during authentication.
Remove scroll view tweaks in server selection screen following EMS banner removal.
2022-05-19 11:43:38 +01:00
Doug
196a889f9a Remove EMS banner from Server Selection screen. 2022-05-19 11:43:38 +01:00
SBiOSoftWhare
d0ec2a652b LocationSharingViewModelTests: Fix missing parameter. 2022-05-16 18:32:19 +02:00
SBiOSoftWhare
ebf4458c23 Fix UI tests. 2022-05-16 18:18:13 +02:00
SBiOSoftWhare
dfd57a55da Merge branch 'develop' into steve/5722_device_location
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2022-05-16 17:11:57 +02:00
SBiOSoftWhare
228da5520e LocationSharingCoordinator: Handle LocationSharingService. 2022-05-16 17:04:42 +02:00
SBiOSoftWhare
46a4c395d3 LocationSharingViewModel: Handle location permission when starting live location sharing. 2022-05-16 17:04:05 +02:00
SBiOSoftWhare
7e759f8674 RiotSwiftUI target: Add location always usage permission and add UIApplication extension. 2022-05-16 16:59:04 +02:00
SBiOSoftWhare
87dad92901 Start location sharing screen: Add LocationSharingService. 2022-05-16 11:36:05 +02:00
Doug
835cddab01
Rename completion to callback and simplify actor usage. (#6141) 2022-05-11 13:18:26 +01:00
Doug
d0494cfb6b
Add ReCaptcha screen (#6135)
Support dark mode in MXKAuthenticationRecaptchaWebView.
Begin implementing the ReCaptcha coordinator.
2022-05-11 09:57:37 +01:00
Doug
77c8bdeff5 Use readableFrame and OnboardingIconImage everywhere.
Fix order of accentColor modifier.
2022-05-11 09:49:24 +01:00
Doug
03e456d26e Fix layout issues in Use Case screen. 2022-05-11 09:49:24 +01:00
Doug
9429bebb53 Remove iOS 13/14 checks from Template/Onboarding/Authentication. 2022-05-11 09:49:24 +01:00
Doug
1b160b5f25
Add registration terms screen. (#6128)
Begin implementing Auth Terms coordinator.
2022-05-10 22:34:35 +01:00
Doug
4a9ace0cf3
Add email verification screen (#6125)
Make a reusable onboarding icon view.
Use a native TextField for better dynamic type support.
Rename completion to callback.
Add readableFrame modifier.
2022-05-10 14:09:43 +01:00
Doug
54a4feb0ea
Send the Signup analytics event (#6118)
* Implement the Signup event from AuthenticationViewController.

Use AuthenticationFlow instead of MXKAuthenticationType.
Create new AuthenticationType that aligns with AnalyticsEvent naming.
Add additional cases from AnalyticsEvents.
2022-05-06 13:08:54 +01:00
Doug
8c98e730e3 Remove StaticLocationViewUITests for now. 2022-05-05 10:11:34 +01:00
Doug
c0451ce413 Fix UI test action and Auth test. 2022-05-05 10:11:34 +01:00
Doug
757244af35 Address PR comments.
Log errors before throwing.
Remove white colour.
Remove AuthenticationCoordinatorState added during rebase.
2022-05-04 19:26:38 +01:00
Doug
c2c2553b8d Remove RegistrationFlowHandling, handling the dummy stage in the wizard. 2022-05-04 19:26:38 +01:00
Doug
3e98964746 Add SessionVerificationListener. 2022-05-04 19:26:38 +01:00
Doug
a8a9f1daaa Allow registration on SSO only servers.
Stop using the homeserver from user defaults.
2022-05-04 19:26:38 +01:00
Doug
7aea1fac63 Fix authentication screens for updated service implementation. 2022-05-04 19:26:38 +01:00
Doug
3161d3d535 Add Authentication Flow WIP.
- Add Registration Screen.
- Add Server Selection Screen.
- Rename AuthenticationCoordinator to LegacyAuthenticationCoordinator.
- Add AuthenticationService and RegistrationWizard.
- Async extensions.
- Add global white and EMS colors to the themes.
- Add tests for server selection and registration screens.
- Accessibility and iPad layout tweaks.
- Remove MainActor from Auth Coordinators/VMs/Views.
(It broke the protocol conformances so now the methods and properties are marked individually.)
2022-05-04 19:26:38 +01:00
SBiOSoftWhare
60d23fa9b2 Merge develop in 6081_lls_screen_integration 2022-05-04 16:53:49 +02:00
SBiOSoftWhare
2eb5023a09 LiveLocationSharingViewerServiceProtocol: Add comments. 2022-05-04 16:03:52 +02:00
SBiOSoftWhare
699bbe79e4 LiveLocationSharingViewerService: Nullify listenner when needed. 2022-05-04 16:00:43 +02:00
SBiOSoftWhare
f35b291d23 RiotSwiftUI target: Remove non needed file. 2022-05-04 15:56:39 +02:00
SBiOSoftWhare
88b50e349d LiveLocationSharingViewerService: Fix typo. 2022-05-04 15:52:45 +02:00
MaximeE
c6e0b4d435 6071: fix failed test 2022-05-04 14:52:02 +02:00
MaximeE
9e1611d68f 6071: refacto according to PR comments 2022-05-04 11:23:43 +02:00
SBiOSoftWhare
93e4295cd3
Update RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/LiveLocationSharingViewerServiceProtocol.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-05-04 10:30:58 +02:00
SBiOSoftWhare
c67cff0e13 LiveLocationSharingViewer: Handle screen refresh, empty state, stop sharing. 2022-05-03 15:57:36 +02:00
SBiOSoftWhare
9cfa091256 LiveLocationSharingViewerService: Handle user location updates and stop sharing. 2022-05-03 15:54:37 +02:00
SBiOSoftWhare
54558ed9cc LiveLocationListItem: Show seconds. 2022-05-03 15:51:16 +02:00
MaximeE
c5c55da854 6071: Add timeout selector when start live sharing 2022-05-03 15:21:51 +02:00
SBiOSoftWhare
8036c5341b LiveLocationSharingViewerService: Handle beacon info summary retrieval. 2022-04-29 11:08:09 +02:00
SBiOSoftWhare
a55120ac3f LiveLocationSharingViewer: Support navigation controller. 2022-04-29 11:08:09 +02:00
Doug
3591a3a403
Add AuthenticationService and RegistrationWizard. (#6056) 2022-04-27 16:02:54 +01:00
Gil Eluard
1a3effb8b6
4850 bring leaving space experience in line with web (#6062)
* Bring leaving space experience in line with Web #4850

- Done
2022-04-27 13:31:14 +02:00
MaximeE
a503938b64 Merge branch 'develop' into maximee/6029_lls_timeline_cell and apply comments 2022-04-25 15:53:58 +02:00
SBiOSoftWhare
98360c0378 Fix SwiftUI tests 2022-04-22 15:23:36 +02:00
SBiOSoftWhare
eb88274569 Update StaticLocationViewingViewModel, MapViewErrorAlertInfoBuilder usage; 2022-04-22 12:35:04 +02:00
SBiOSoftWhare
790604dad1 Merge branch 'develop' into steve/5723_lls_screen
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/ShareLocationActivityController.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/MapViewErrorAlertInfoBuilder.swift
2022-04-22 12:15:34 +02:00
Doug
faea2de85b Fix UI Tests and run on PRs
- Add missing screen states.
- Detect the bottom of the screen list and stop scrolling if screen state wasn't found.
- Remove unimplemented tests to speed up the run.
- Remove failed button checks in MatrixItemChooserUITests
2022-04-21 12:54:53 +01:00
MaximeE
39c625b797 5982: Rename action 2022-04-12 11:48:02 +02:00
MaximeE
586e0295cf 5982: Apply PR comments 2022-04-12 11:35:17 +02:00
MaximeE
fb962a01aa Merge branch 'develop' into maximee/5982_ls_static_share_viewer 2022-04-11 17:26:07 +02:00
Gil Eluard
87e3c64ef6
Wrong copy for upgrade room message (#6003)
* Wrong copy for upgrade room message

- fixed
2022-04-11 15:46:08 +02:00
SBiOSoftWhare
e1f8d7b833
Merge pull request #5928 from vector-im/steve/5903_lls_start
Location sharing: Support live location sharing start
2022-04-11 14:20:26 +02:00
Doug
14f0e53357
Add loading indicators to the SwiftUI templates. (#6014) 2022-04-11 12:57:58 +01:00
SBiOSoftWhare
446ca595c7 Fix LocationSharingViewModelTests 2022-04-11 13:09:55 +02:00
MaximeE
715031ef41 5982: Clean code and add tests 2022-04-11 10:55:23 +02:00
MaximeE
c662598e91 5982: Fix test 2022-04-08 17:54:33 +02:00
MaximeE
05023b0ecb 5982: Factorise error and external sharing 2022-04-08 17:43:57 +02:00
MaximeE
9712546519 5982: Create new screen for static shared coordinate 2022-04-08 17:42:08 +02:00
SBiOSoftWhare
ebe53fcf6d LocationSharingCoordinator: Update location sharing completion handling. 2022-04-08 12:42:27 +02:00
Gil Eluard
71aec774d0
Add button in create room dialog can be pressed multiple times (#6005)
- Fixed
2022-04-08 11:25:06 +02:00
SBiOSoftWhare
3fd0212299 Merge branch 'develop' into steve/5903_lls_start
# Conflicts:
#	Riot/Modules/Room/RoomViewController.h
#	RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
2022-04-08 11:09:06 +02:00
aringenbach
72e35b7a5b Update MXPresence to NS_ENUM 2022-04-06 15:23:36 +02:00
SBiOSoftWhare
2f9942b25b UserAnnotationCalloutContentView: Update layout. 2022-04-06 10:19:43 +02:00
SBiOSoftWhare
94f5455fcd LiveLocationSharingViewer: Fix credits display. 2022-04-06 09:55:45 +02:00
SBiOSoftWhare
7662065d3f LiveLocationSharingViewer: Add navigation title. 2022-04-06 09:41:33 +02:00
SBiOSoftWhare
173c9cd189 Expose UIView extension to SwiftUI target. 2022-04-06 09:19:22 +02:00
SBiOSoftWhare
25df90c23d LiveLocationSharingViewer: Enable map callout display. 2022-04-05 21:34:22 +02:00
SBiOSoftWhare
591d14db5c Update UserAnnotationCalloutView center. 2022-04-05 21:33:05 +02:00
SBiOSoftWhare
b1aa3fd1e6 Fix LocationAnnotatonView not touchable. 2022-04-05 21:32:40 +02:00
SBiOSoftWhare
18526c3599 Update UserLocationAnnotation to handle annotation selection. 2022-04-05 21:31:26 +02:00
Doug
ce38eb853f
Merge pull request #5917 from vector-im/doug/5652_enable_ftue_personalisation
Enable profile personalisation screens after registration.
2022-04-05 17:43:44 +01:00
SBiOSoftWhare
a942ccb7f7 Handle live location sharing viewer screen. 2022-04-05 18:36:41 +02:00
SBiOSoftWhare
6c453a439a Add ShareLocationActivityControllerBuilder to build UIActivityViewController to share a location. 2022-04-05 18:26:20 +02:00
SBiOSoftWhare
972da45960 Add LiveLocationListItemViewData view data for LiveLocationListItem. 2022-04-05 18:25:42 +02:00
SBiOSoftWhare
a1fc672d86 Handle LiveLocationListItem. 2022-04-05 18:19:39 +02:00
SBiOSoftWhare
99ce4865ac Prepare LiveLocationSharingViewerService and handle mock. 2022-04-05 17:56:02 +02:00
SBiOSoftWhare
b6d0760ccd Create MapViewErrorAlertInfoBuilder 2022-04-05 17:51:47 +02:00
SBiOSoftWhare
60c3280b52 Fix UserAnnotationCalloutView 2022-04-05 17:51:18 +02:00
SBiOSoftWhare
9d20d1bc42 LocationSharingMapView: Handle callout view for user annotation. 2022-04-05 17:47:04 +02:00
SBiOSoftWhare
6076ed5ba2 Create map callout view UserAnnotationCalloutView. 2022-04-05 17:43:34 +02:00
SBiOSoftWhare
2559c8b8e0 Create map callout view UserAnnotationCalloutContentView. 2022-04-05 17:30:17 +02:00
Gil Eluard
8ed0f6be24
Add support for Apple context menus in matrix items list screens (#5963) 2022-04-04 20:07:06 +02:00
MaximeE
35db79ba0d 5858: Add specific type for pin location 2022-04-04 17:01:47 +02:00
MaximeE
b2584506dd 5858: Factorise some code according to PR comments 2022-04-04 16:33:55 +02:00
MaximeE
b17333c514 5858: Fix tests 2022-04-01 17:43:30 +02:00
MaximeE
6dc32846ac 5858: Move file on the right target 2022-04-01 17:06:26 +02:00
MaximeE
d8a67e5e1e 5858: Resolve issue with bad import 2022-04-01 15:50:49 +02:00
MaximeE
a4e7992040 5858: Modification of the event send according to coordinate type 2022-03-31 16:52:16 +02:00
Doug
cc110b296d Use consistent padding on action buttons. 2022-03-31 11:30:05 +01:00
Doug
146fdf419f Tweaks to Onboarding following design review.
Use constants for consistent top padding and icon sizes.
Match layout of AnalyticsPrompt on iPad to other views.
Update icon in use case selection screen to allow tinting.
2022-03-30 18:55:22 +01:00
Doug
bf8e0b8542 Refinements to onboarding personalisation flow.
Fix incorrect fonts and use autocapitalization on the display name field.
Fix bug where authentication view controller would become active again after registration.
Improve EffectsView API.
2022-03-30 16:44:19 +01:00
Doug
9ee0e95ada Enable profile personalisation screens after registration. 2022-03-30 16:44:19 +01:00
MaximeE
8be37f76a8 5858: Add pin drop feature 2022-03-30 11:36:31 +02:00
Gil Eluard
1674498e18
m.room.join_rules not properly set for private access (#5944)
- Fixed
2022-03-30 10:04:25 +02:00
Doug
db22d4d040 Add BuildSettings to SwiftUI targets.
Remove RTL change on UIAlertController.
2022-03-28 17:53:34 +01:00
Doug
c8bbd855a3 Add a RTL BuildSetting and use this for SwiftUI views too. 2022-03-28 16:52:07 +01:00
SBiOSoftWhare
a12c1dc681 Location sharing screen: Handle live location sharing. 2022-03-28 10:19:36 +02:00
Doug
ffeeacc600
Merge pull request #5910 from vector-im/doug/swiftui_textfield
Remove unused Bindings in RoundedBorderTextField/Editor.
2022-03-24 12:35:09 +00:00
MaximeEvrard42
5a4c5e55ee
Merge pull request #5859 from vector-im/maximee/5720_location_sharing_UI_change
Update UI in location sharing view #5720
2022-03-24 11:58:09 +01:00
MaximeE
064c97497a 5720: Remove useless color, fix some issue with AvatarImage border 2022-03-24 11:00:29 +01:00
Doug
d475c304a2 Remove unused Bindings in RoundedBorderTextField/Editor. 2022-03-24 09:54:53 +00:00
MaximeE
db8c5cc075 5720: Fix issue with cornered buttons view 2022-03-23 17:25:30 +01:00
MaximeE
e805e415f3 5720: Rework some location sharing related view 2022-03-23 15:48:19 +01:00
Doug
29dffb3d6e Improve celebration screen layout on iPad
Rename OnboardingConstants to OnboardingMetrics.
Fix strings warning about public property in public extension.
Remove unused OnboardingCelebrationViewModelResult.
2022-03-22 12:02:05 +00:00
MaximeE
49144e1e0e 5720: Update from develop 2022-03-22 09:41:25 +01:00
Doug
cbe180cb47 Add effects to the congratulations screen when personalisation is disabled.
Improve the API of the EffectsView to make it more swifty.
2022-03-21 19:04:09 +00:00
Doug
78435972e3 Add OnboardingCelebrationScreen and EffectsSceneView. 2022-03-21 19:04:09 +00:00
Doug
bf08b86a36 Address PR comments
Add more docs.
Rename PhotoPickerPresenter to MediaPickerPresenter.
Use a Character for the placeholder avatar rather than a string.
2022-03-21 17:37:16 +00:00
Doug
a41d25f846 Fix voiceover support in OnboardingAvatarScreen. 2022-03-21 17:37:16 +00:00
Doug
efa97c9669 Updates following self review. 2022-03-21 17:37:16 +00:00
Doug
b663483a6c Add tests to onboarding personalisation. 2022-03-21 17:37:16 +00:00
Doug
bd49ecf5b6 Improve layout on different devices
Fix dynamic type on some fonts.
2022-03-21 17:37:16 +00:00
Doug
293647cf03 Dark mode tweaks and rebase. 2022-03-21 17:37:16 +00:00
Doug
57d396887b Use UserIndicatorPresenter for onboarding personalisation.
Remove the service from the display name screen to match the avatar screen.
Add a loading indicator to PhotoPickerPresenter.
Fix layout issue when selecting non-square avatar image.
2022-03-21 17:37:16 +00:00
Doug
ea8a21c060 Add onboarding avatar screen.
Includes a PhotoPickerPresenter to pick photos without requesting permissions.
2022-03-21 17:36:40 +00:00
Doug
04833e4906 Add FTUE display name screen.
Use UserSession instead of userId & MXSession in OnboardingCoordinator
2022-03-21 17:36:40 +00:00
Johannes Marbach
c734d7c93e Fix retain cycle in UserSuggestionViewModel
Steps to reproduce:

- Launch app
- Enter and leave a bunch of rooms
- Fire up the memory graph debugger
- Filter for `UserSuggestionViewModel`

Relates to: #5058
Signed-off-by: Johannes Marbach <johannesm@element.io>
2022-03-21 10:26:43 +02:00
MaximeE
83a718b38d 5720: Update UI in location sharing View 2022-03-17 16:52:22 +01:00
Gil Eluard
2ba9d4a593 Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event
# Conflicts:
#	Riot/Modules/Analytics/Analytics.swift
2022-03-17 13:59:24 +01:00
Doug
14fddc1d22
Merge pull request #5826 from vector-im/doug/scroll_edge_name
Make scrollEdgesAppearance singular to match UIKit
2022-03-16 14:45:49 +00:00
SBiOSoftWhare
0f8d5045d2
Merge pull request #5828 from vector-im/steve/5827_map_multiple_annot
Location sharing: Support multiple user annotation views on the map
2022-03-16 15:22:04 +01:00
SBiOSoftWhare
2dcd713199 LocationSharingViewModelTests: Fix issues. 2022-03-16 14:39:51 +01:00
SBiOSoftWhare
d9ac23b4a3 LocationSharingView: Update with updated map view and model. 2022-03-16 11:35:15 +01:00
SBiOSoftWhare
9dda19bc8a LocationSharingView: Update state and view model. 2022-03-16 11:33:36 +01:00
SBiOSoftWhare
42d4e4afd4 Create reusable MapCreditsView. 2022-03-16 11:04:58 +01:00
SBiOSoftWhare
27fc574b9c UserLocationAnnotatonView: Handle init with UserLocationAnnotation. 2022-03-16 10:57:00 +01:00
SBiOSoftWhare
8a42d65559 Create custom map annotation UserLocationAnnotation. 2022-03-16 10:50:18 +01:00
SBiOSoftWhare
ae191f1549 LocationSharingMapView: Support displaying multiple annotation views. 2022-03-16 10:49:24 +01:00
Doug
b42c3fa87c Make scrollEdgesAppearance singular to match UIKit 2022-03-16 08:58:21 +00:00
Gil Eluard
18e5d22b92 Add trigger to join and view room metrics events #5769
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
2022-03-15 10:31:24 +01:00
Gil Eluard
996ef72498 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
Gil Eluard
9ebd8a4802
Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Doug
962f2260bb Fix alert button action when not set. 2022-03-07 17:53:38 +00:00
Doug
e8f0696e23 Rename ErrorAlertInfo to AlertInfo. 2022-03-07 13:34:39 +00:00
Doug
37bff41d45 Add alert property to ErrorAlertInfo. 2022-03-07 13:34:39 +00:00
Doug
b85c4570dc Add a generic ErrorAlertInfo type.
Adopt it in Location Sharing and Polls.
2022-03-07 13:34:39 +00:00
Gil Eluard
5fef457fd6
selection impossible when filtering in add room screen #5757 (#5758)
- Fixed
- Other minor code / UI tweaks
2022-03-07 12:25:50 +01:00
Gil Eluard
aadf1b7d67 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Gil Eluard
cd742d972a Merge branch 'gil/SP1_space_creation' of github.com:vector-im/element-ios into gil/SP1_space_creation 2022-03-04 13:06:27 +01:00
Gil Eluard
1fcf96865c
SP4: space settings (#5730)
* SP4: Space Settings

- Space settings screen implemented
- No space upgrade available as per Element web
- Need more insights for the space address field
- Added settings live update
- Added local alias implementation
2022-03-04 12:53:42 +01:00
Gil Eluard
89a16a72c2 Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Gil Eluard
512bac7586 SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-28 19:55:02 +01:00
Doug
318d985f13
Merge pull request #5698 from vector-im/doug/5653_ftue_analytics_prompt
Prepare onboarding flow for personalisation screens.
2022-02-28 17:25:19 +00:00
Gil Eluard
bae3ede4c8 SP3.1: Update room settings for Spaces #5231
- Fixed CI build issues
2022-02-28 16:29:49 +01:00
Gil Eluard
ace8613162 SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-28 16:07:09 +01:00
Doug
f4d223816f Move congratulations strings to Untranslated.strings.
Update after PR Feedback
2022-02-28 14:28:09 +00:00
Doug
be641ef7c4 Fix accessibility/build/changelog 2022-02-25 15:40:04 +00:00
Doug
dc02b24c72 Prepare onboarding flow for personalisation screens.
Add a BuildSetting to control the display of the personalisation screens.
Add a property to delay the AuthenticationCoordinator from showing any screens.
Add Congratulations screen to onboarding flow.
2022-02-25 11:27:27 +00:00
Doug
24056d131c
Disable the default analytics configurations for forks. (#5688)
* Disable the default analytics configurations for forks.

* Check the analytics configuration instead of the PostHog Config.
2022-02-24 15:46:18 +00:00
Gil Eluard
9f9ed8e73b SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-22 18:01:16 +01:00
Gil Eluard
8bd67bdc52 Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Podfile.lock
2022-02-21 17:57:58 +01:00