Commit Graph

82 Commits

Author SHA1 Message Date
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 0abef4312e Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
aringenbach 60f2355e54 Move invites to dedicated sections and enable section collapse (#5683)
* Display invites in dedicated sections

* Activate shrinkable and fix home number of rows for section

* Rework section header

* Display badge in people and room tabs

* Add changelog & remove useless todo

* Improve isSectionShrinked condition, remove useless import and shrinkable sets

* Restore invitation count in tab bar badge

* Display badge for invites section

* Add comment on invites count

* Update right accessory view on data source update

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-28 13:48:07 +01:00
aringenbach 1946b315c2 Remove exclamation mark badge in invites cell (#5684)
* Remove exclamation mark and improve global design in invites cell

* Revert back to current design, only removing exclamation mark badge

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-25 10:45:47 +01:00
David Langley 3fd31f3c7b Use protocol to get title from child VCs. 2022-02-23 11:41:05 +00: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
aringenbach 2f6546799e Add objective C support to SwiftGen assets helpers (#5533)
* Add objective C support to SwiftGen assets helpers

* Use dot notation in ObjC & fix minor issues

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-10 17:13:23 +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
ismailgulek 6a2ac67696 Merge branch 'develop' into ismail/4384_summary_db 2022-01-08 00:54:17 +03:00
Stefan Ceriu 49c787d987 vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
ismailgulek c938a604de Call pagination api from appropriate points 2022-01-04 04:31:18 +03:00
Doug 47348b7f34 Add AnalyticsScreenTimer and track more screens.
Update Analytics with new methods in MXAnalyticsDelegate.
2021-12-16 16:59:45 +00:00
Doug d43bf82bca Use matrix-analytics-events generated stubs (locally for now).
Track screens, removing any that aren't part of the schema.
2021-12-16 16:59:45 +00:00
Gil Eluard 2a09ca3947 Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift
2021-12-13 15:09:40 +01:00
Gil Eluard de4ed81bbc Implement FAB journeys & rough edge warnings element-ios#5226
- List of Space members with search
- Invite interactions
- Join room from list
- Implement add room button, with rough edge warning.
2021-12-10 09:59:10 +01:00
Stefan Ceriu f5410b2060 vector-im/element-ios/issues/5190 - Fix crash when trying to scroll the people's tab to the top. 2021-12-09 09:39:40 +02:00
SBiOSoftWhare 56a51da9f9 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
Philippe Loriaux eaa2450be7 Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
ismailgulek e17627d61c Simplify empty view logic 2021-10-04 17:29:04 +03:00
ismailgulek 6761404d2d Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-30 12:35:46 +03:00
Stefan Ceriu 7b75dec011 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
ismailgulek f76f778e0b Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
ismailgulek e3e713ab1c Refactor recents data source to use new room list data fetchers 2021-09-24 18:50:41 +03:00
ismailgulek 83e5c7ad6e Adapt to cell data changes 2021-09-22 11:47:21 +03: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
Gil Eluard 21f5d73b6f [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 16:59:32 +02:00
Gil Eluard aa931a3c1a [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 11:45:33 +02:00
Gil Eluard 6aa9f0f5c7 [Spaces] M10.8 Browsing users in a space #4682
- Renamed coordinators
2021-09-02 09:34:25 +03:00
Gil Eluard b85ad68591 [Spaces] M10.8 Browsing users in a space #4682
- Present space members screen from people tab if space has been selected
2021-08-22 09:23:58 +03:00
Doug 00c557f23d Remove directRoomBorderView from InviteRecentTableViewCell.xib. 2021-08-12 09:50:18 +01:00
Doug 0b6d7216ee Remove peopleCellDataArray from total item count. 2021-07-27 16:06:41 +01:00
Doug fa182416a6 Remove old MXKRecentsDataSource methods. 2021-07-27 15:59:36 +01:00
Doug 8a3e60c5e7 Remove old conformances. 2021-07-27 14:53:58 +01:00
Doug c6e412e916 Allow recentsTableView to use recentsDataSource now that there are no contacts to insert.
Remove all unnecessary datasource/delegate methods.
2021-07-27 14:51:10 +01:00
Doug f7c5279416 Remove headers from PeopleViewController. 2021-07-09 14:22:33 +01:00
Doug 61e02323ba Tidy up PeopleViewController data source methods. 2021-07-06 17:43:16 +01:00
Doug d99e7ce7b5 Begin removing contacts section from PeopleViewController. 2021-07-06 16:14:32 +01:00
SBiOSoftWhare eefc7c5deb Navigation: Add possibility to instantiate each tab bar item controller programmatically. 2021-05-20 21:29:08 +02:00
ismailgulek 94314a07df Merge branch 'voip_2746' into voip_dialpad 2021-02-10 00:38:23 +03:00
Gil Eluard ba9f22c6b5 The Invite cell behaviour is not driven by MXRoom.isDirect property anymore 2021-02-05 10:25:27 +01:00
ismailgulek 6128a96805 Merge branch 'voip_2746' into voip_dialpad
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2021-01-20 16:25:36 +03:00
ismailgulek 4fd4377b15 Move dialpad into room 2021-01-14 13:38:17 +03:00
ismailgulek ee48d297b0 Fix orientation 2021-01-14 12:13:25 +03:00
ismailgulek 748b0f1e68 Open dialpad on people tab 2021-01-13 22:30:03 +03:00
SBiOSoftWhare 2f60a6db4c Invite friends: Make app name customizable in share text. 2021-01-12 11:34:05 +01:00
SBiOSoftWhare f3c7b900a5 Add InviteFriendsPresenter that enables to share current user contact to someone else. 2021-01-11 18:25:39 +01:00
SBiOSoftWhare 698bd175ee Merge develop into element_3836 2020-11-30 17:54:16 +01:00
SBiOSoftWhare 638fa64958 Empty screens: Use dark artworks when the theme is dark or black. 2020-11-30 16:42:47 +01:00
SBiOSoftWhare 5c6480bbea InviteRecentTableViewCell: Do not show preview button. 2020-11-26 18:17:02 +01:00