Commit graph

182 commits

Author SHA1 Message Date
MaximeE
a503938b64 Merge branch 'develop' into maximee/6029_lls_timeline_cell and apply comments 2022-04-25 15:53:58 +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
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
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
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
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
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
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
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
SBiOSoftWhare
a12c1dc681 Location sharing screen: Handle live location sharing. 2022-03-28 10:19:36 +02:00
MaximeE
064c97497a 5720: Remove useless color, fix some issue with AvatarImage border 2022-03-24 11:00:29 +01: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
MaximeE
49144e1e0e 5720: Update from develop 2022-03-22 09:41:25 +01: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
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
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
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
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
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
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
fa1fc3d2b0 SP3.1: Update room settings for Spaces #5231
- Fixed SwiftUnitTests issues
2022-02-21 15:58:27 +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
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
Stefan Ceriu
01e8b4189c Fix introspect not being able to theme the SwiftUI navigation bars. 2022-02-11 14:39:05 +02:00
Stefan Ceriu
790ad83d77 vector-im/element-ios/issues/5114 - Added support for unstable poll prefixes. 2022-02-11 13:35:22 +02:00
Gil Eluard
c41e541e1d SP3.1: Update room settings for Spaces #5231
- Added list bottom padding to MatrixItemChooser view
2022-02-06 16:08:26 +01:00
Gil Eluard
96cf359703 Merge branch gil/5230_SP2-Adding_Rooms_to_Spaces into gil/5231_SP3-1_Update_room_settings_for_Spaces 2022-02-05 21:43:29 +01:00
Stefan Ceriu
cab5be20cd vector-im/element-ios/issues/5298 - Tweaks following code review. 2022-02-04 11:33:55 +02:00
Stefan Ceriu
9ac722dcad vector-im/element-ios/issues/5298 - Add .well-known configuration support for tile server and map styles. 2022-02-04 11:33:55 +02:00
Stefan Ceriu
c92c46fc99 vector-im/element-ios/issues/5298 - Reusing location sharing coordinator external sharing logic in the timeline. 2022-02-04 11:33:55 +02:00
Stefan Ceriu
351c18cfc6 Fixed location sharing and poll edit form navigation and navigation bar styles. 2022-02-03 18:30:39 +00:00
Doug
50de0dc36c Add context menu to HomeViewController cells. 2022-02-03 18:30:39 +00:00
Stefan Ceriu
7c54bf763c Made StateStoreViewModel state mutable and removed the reducer for all the features using it. 2022-02-02 10:02:12 +02:00
ismailgulek
8cc82cf7e1
Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
Stefan Ceriu
13cfcef9a2 vector-im/element-ios/issues/5298 - Small tweaks following code review. 2022-01-19 16:11:35 +02:00
Stefan Ceriu
821d6066cd vector-im/element-ios/issues/5298 - Removed cocoapods-keys and moved the MapTiler key to the buildSettings. 2022-01-19 16:11:35 +02:00
Stefan Ceriu
a0b683058e vector-im/element-ios/issues/5298 - Added bottom padding on location markers so they point to the location instead of being centered on it. 2022-01-19 16:11:35 +02:00
ismailgulek
fe9eeeadd5
Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu
6eb0f6c9ef vector-im/element-ios/issues/5114 - De-labs-ed polls, disabled editing and undisclosed polls until platform parity. 2022-01-18 20:05:10 +02:00
Stefan Ceriu
e10b200ef8 vector-im/element-ios/issues/5114 - Small answer option count limit code tweak. 2022-01-18 20:05:10 +02:00
Stefan Ceriu
83893acfd8 vector-im/element-ios/issues/5114 - Various tweaks following PR review. 2022-01-18 20:05:10 +02:00
Stefan Ceriu
84c01c2735 vector-im/element-ios/issues/5114 - Cleanup + rename PollTimeline to TimelinePoll. 2022-01-18 20:05:10 +02:00
Stefan Ceriu
2dfbe69a88 vector-im/element-ios/issues/5114 - Added UI for creating undisclosed polls and logic for displaying them in the timeline. 2022-01-18 20:05:10 +02:00
Stefan Ceriu
cc7175f4b8 vector-im/element-ios/issues/5114 - Allow seeing whether a poll has been edited. 2022-01-18 20:05:10 +02:00
Stefan Ceriu
a23bd0da99 vector-im/element-ios/issues/5114 - Allow editing poll start events. 2022-01-18 20:05:10 +02:00
Gil Eluard
4ef27fabf3 SP2: Adding Rooms to Spaces element-ios#5230
- Wait for the entire room upgrade before building the space graph
2022-01-17 22:42:01 +01:00
Gil Eluard
962abb6e79 SP2: Adding Rooms to Spaces element-ios#5230
- Added room ID to cancel callback as the room may have been upgraded
2022-01-17 22:11:12 +01:00
ismailgulek
aeccbc0dac
Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
Gil Eluard
be4cd455f1 Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
2022-01-13 16:30:55 +01:00
Gil Eluard
cdb4cc131e SP3.1: Update room settings for Spaces element-ios#5231
- Changed the Room Settings screen according to the new design
- Implemented the room access flow
- Added room upgrade support
- Implemented the room suggestion screen
2022-01-13 15:53:45 +01:00