Commit graph

225 commits

Author SHA1 Message Date
David Langley
cff98cdd1d Revert "fix merge"
This reverts commit 0251a01bb0.
2022-03-21 10:39:50 +00:00
David Langley
0251a01bb0 fix merge 2022-03-17 09:16:11 +00: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
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
Gil Eluard
8fa0a673d6 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
2022-02-21 17:20:58 +01:00
Gil Eluard
fa1fc3d2b0 SP3.1: Update room settings for Spaces #5231
- Fixed SwiftUnitTests issues
2022-02-21 15:58:27 +01:00
Gil Eluard
df25a2ce2f Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
#	RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
2022-02-21 15:27:05 +01:00
Stefan Ceriu
f655bc3ae6 vector-im/element-ios/issues/5114 - Fixed arithmetical exception errors when changing poll responses. 2022-02-21 14:04:00 +02:00
Stefan Ceriu
e003b66129 vector-im/element-ios/issues/5114 - Enabled poll editing and undisclosed polls. 2022-02-21 13:20:02 +02:00
Doug
4a0a67ff73
Merge pull request #5591 from vector-im/doug/5590_ftue_analytics
Add support for UserProperties to analytics and capture FTUE use case selection.
2022-02-18 10:49:06 +00:00
Stefan Ceriu
26c98bbabe vector-im/element-ios/issues/5609 - Add open in OSM location sharing option. 2022-02-17 19:11:08 +02:00
Stefan Ceriu
898869061d vector-im/element-ios/issues/5609 - Add attribution to location sharing maps. 2022-02-17 19:11:08 +02:00
Gil Eluard
f4e6b867a2 SP2: Adding Rooms to Spaces #523o
- fixed SwiftUI Unit tests
2022-02-17 13:14:45 +01:00
Doug
3d8160c495 Rename OnboardingUseCase to OnboardingUseCaseSelectionScreen
Same for OnboardingUseCaseCoordinator.
2022-02-17 11:19:32 +00:00
Gil Eluard
b601d6086e SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-17 10:47:44 +01:00
Gil Eluard
bd37bac1b2
Update RiotSwiftUI/Modules/Spaces/AddRoomSelector/Service/AddRoomItemsProcessor.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-17 10:35:23 +01:00
Gil Eluard
06590ff880 SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-15 22:23:12 +01:00
Gil Eluard
bdf26351aa
Update RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-15 19:16:16 +01:00
Gil Eluard
efec0507c8
Update RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-15 19:15:04 +01:00
Gil Eluard
a916e5a3b6
Update RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-15 19:14:30 +01:00
Gil Eluard
ebbf1c80cf
Update RiotSwiftUI/Modules/Spaces/AddRoomSelector/View/AddRoomSelector.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-15 19:14:04 +01:00