Commit Graph

140 Commits

Author SHA1 Message Date
Gil Eluard 1203c7725a 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
Gil Eluard 5eb9445f83 Merge pull request #5836 from vector-im/gil/5401_Instrument_metrics_for_the_IA_project
Instrument metrics for iOS for the IA project #5401
2022-03-17 11:55:55 +01:00
Gil Eluard c5820ba22e Instrument metrics for iOS for the IA project #5401
- Added last needed metrics
2022-03-16 16:56:27 +01:00
Gil Eluard ab8458ebb2 Crash after leaving empty space and all rooms #5825
- fixed
2022-03-16 14:52:06 +01:00
Gil Eluard 67b0df922f 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 4f43793313 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 24de57bb58 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Gil Eluard dcebd89fdf 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 42b4144323 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 06bda465d9 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
Doug c9cc59d006 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Gil Eluard 12f89235f9 Merge pull request #5702 from vector-im/gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists
SP3.2 long press on rooms in space room lists
2022-03-01 08:48:20 +01:00
Gil Eluard bca69bb7c8 SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-28 16:07:09 +01:00
Gil Eluard 03ed36fc7e SP3.2: Long press on rooms in space room lists #5232
- Update after review
2022-02-27 23:13:14 +01:00
Gil Eluard 3d5bec683f Update Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-27 22:57:27 +01:00
Gil Eluard 802ba5f2e6 Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2022-02-25 14:31:22 +01:00
Gil Eluard 079d50e733 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 ceb74c2f6e 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 82d6968091 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
Gil Eluard 68d9aed0ea SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-17 14:02:52 +01:00
Gil Eluard 28ed10c309 SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-17 10:47:44 +01:00
Gil Eluard 408527e106 SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-15 22:23:12 +01:00
Stefan Ceriu 4b1eb75fd3 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Gil Eluard 3f08a5afd3 SP3.2: Long press on rooms in space room lists #5232
- Small tweaks
2022-02-06 21:29:25 +01:00
Gil Eluard 1153e2ec6f Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists
# Conflicts:
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
2022-02-06 21:22:28 +01:00
Gil Eluard fd765a9288 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
Gil Eluard cb7b581fc8 SP2: Adding Rooms to Spaces #523o
- check permission before adding room
- Added join button in explore room screens
2022-02-05 08:20:39 +01:00
Gil Eluard 5025029843 Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces 2022-02-04 16:43:43 +01:00
Gil Eluard f4fa9e97e3 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift
#	Riot/Modules/Room/RoomCoordinatorParameters.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2022-02-04 14:29:57 +01:00
Gil Eluard af120efdb7 SP1.2: Invite to Space in room landing element-ios#5225
- Update after review
2022-02-04 09:05:50 +01:00
Gil Eluard db5f9204bd SP1.2: Invite to Space in room landing element-ios#5225
- Update after review
2022-02-03 23:44:07 +01:00
Gil Eluard bd3ddf0bf6 Update Riot/Modules/Spaces/SpaceMembers/SpaceMembersCoordinator.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-03 20:58:55 +01:00
Gil Eluard 303d5c163c Update Riot/Modules/Spaces/SpaceMembers/SpaceMembersCoordinator.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-03 20:58:39 +01:00
Gil Eluard 13e58f9b14 Merge pull request #5487 from vector-im/gil/5323_Space_list_loses_responsiveness_upon_refresh
Space list loses responsiveness upon refresh
2022-02-03 10:00:08 +01:00
Gil Eluard 59a02f3f37 Space list loses responsiveness upon refresh/update, often in the middle of scrolling
- Fixed
2022-02-02 18:15:26 +01:00
Gil Eluard 07accfb186 joining a space seemed to noop
- Should be fixed
2022-02-02 17:38:33 +01:00
Gil Eluard ea9911cadd Accepting a Space Invite has shouty button labels #5175
- fixed
2022-02-01 16:41:57 +01:00
Gil Eluard 1e1ae6a133 it'd be lovely if tapping on the space avatar was considered a selection too #5454
- Fixed
2022-01-30 21:10:20 +01:00
Gil Eluard 9432d72e20 Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
2022-01-26 10:55:05 +01:00
Gil Eluard fb89b0092e SP1.2: Invite to Space in room landing element-ios#5225
- Check user permissions to invite people
2022-01-26 10:17:42 +01:00
Gil Eluard d23f24b9ce Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
2022-01-24 19:36:02 +01:00
Gil Eluard a8bcd8faa2 Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2022-01-17 20:40:12 +01:00
Gil Eluard ea2b6af636 SP3.2: Long press on rooms in space room lists #5232
- Added context menu for spaces and rooms in Explore rooms screen
2022-01-17 16:44:40 +01:00
Gil Eluard b4eee99d03 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 ea9183d70e 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
Gil Eluard a3bcaf2bfa Merge branch 'gil/SP1_space_creation' into gil/143_create_public_space
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Assets/en.lproj/Vector.strings
2022-01-10 09:50:00 +01:00
Stefan Ceriu 49c787d987 vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
Gil Eluard 7e09ccbf6e SP2: Adding Rooms to Spaces element-ios#5230
- Implemented designs with new & existing tabs in a bottom sheet
- Replaced rough edge warnings from space panel overflow with working journeys
2021-12-23 14:08:00 +01:00
Gil Eluard f1b13374b5 Merge branch 'gil/5225_invite_to_space_in_room_landing' into gil/5224_space_creation 2021-12-15 15:53:38 +01:00
Gil Eluard 6817548452 Invite to Space in room landing #5225
- UI tweaks for members and explore rooms screens
2021-12-15 15:53:21 +01:00