Commit Graph

4556 Commits

Author SHA1 Message Date
Gil Eluard 14c6741e1f [Spaces] M10.7 Explore rooms #4571
- Update after design review
2021-08-16 15:44:44 +02:00
David Langley a1dd1cbcad Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4669_room_notification_settings_swiftui 2021-08-16 13:00:41 +01:00
Gil Eluard cbd96f2ab7 Merge branch 'spaces' into gil/4571_explore_rooms 2021-08-16 14:00:16 +02:00
Doug bff0231a96 Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-08-16 10:01:54 +01:00
Gil Eluard 33ba0b3e90 [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 10:33:10 +02:00
Gil Eluard 41bfde7071 [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 07:57:30 +02:00
Gil Eluard 0d2d27fb2b [Spaces] M10.7 Explore rooms #4571
- UI updates after design changes
2021-08-15 22:18:16 +02:00
David Langley c68e901de6 Do avatar placeholder in SwiftUI, Add AvatarViewModel, Add dependency injection for MxMediaManager dependency. 2021-08-15 00:36:15 +01:00
Stefan Ceriu ea40f04b09 Fixes #1482 - Popping the user back to the home screen after leaving a room. 2021-08-13 17:57:50 +03:00
Doug 5ed8e5525f Move function. 2021-08-13 14:45:22 +01:00
Doug 31b50f6a2b Check for unnecessary assignments to contactsAreFilteredWithSearch in the setter. 2021-08-13 14:44:23 +01:00
Doug b8263efe10 Fix the footer when searching from StartChatViewController. 2021-08-13 14:38:24 +01:00
Doug 4cb3a78218 Load contacts and/or the footer view before the view appears. 2021-08-13 14:15:42 +01:00
David Langley 1c1122da98 Merge branch 'langleyd/4669_room_notification_settings_swiftui' of github.com:vector-im/element-ios into langleyd/4669_room_notification_settings_swiftui 2021-08-13 10:01:11 +01:00
ismailgulek 4480efa9bd Merge branch 'develop' into element_4471 2021-08-13 11:52:12 +03:00
David Langley 90ec1db965 Update Riot/Modules/Common/Avatar/AvatarService.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-13 08:24:42 +01:00
David Langley 89ac65b39c Update Riot/Modules/Common/Avatar/AvatarService.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-13 08:24:26 +01:00
David Langley 7d7929b7ea Fix header font size 2021-08-12 17:51:50 +01:00
David Langley 10a38312f3 Typo 2021-08-12 17:10:19 +01:00
David Langley 49eb6ae1ec Cleanup from comments 2021-08-12 16:57:19 +01:00
Gil Eluard f6f31f614a Merge branch 'spaces' into gil/4571_explore_rooms
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
2021-08-12 17:17:24 +02:00
David Langley e7ed51c4df Fix avatar service not returning generated image on network error. Fix padding and make nav buttons private. 2021-08-12 13:49:56 +01:00
Gil Eluard 717de25062 Merge branch 'spaces' into gil/4501_show_suggested_in_room_lists 2021-08-12 14:35:25 +02:00
David Langley 4b639c3937 Remove visibility modifier 2021-08-12 12:42:26 +01:00
Doug 18d47c4ab0 Localise contacts disabled alert strings. 2021-08-12 12:29:20 +01:00
Doug db91583daa Fix bug where RequestContactsAccessFooterView could still be visible beneath the contacts. 2021-08-12 12:20:08 +01:00
David Langley ebf8cddc35 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4669_room_notification_settings_swiftui 2021-08-12 11:52:50 +01:00
David Langley 7ba98a01a9 Add theming support, and support for other top level configuration to swiftui views with VectorHostingViewController, VectorContentModifier. Add VisibilityModifier. Move from List to VStack. 2021-08-12 11:52:06 +01:00
Gil Eluard 55be20ae42 [Spaces] M10.9 Space menu #4494
- Update after code review
- Fixed some points of design review
2021-08-12 11:23:47 +02:00
Doug 69ca6b0536 Remove directRoomBorderView from InviteRecentTableViewCell.xib. 2021-08-12 09:50:18 +01:00
ismailgulek eeeb2f9d5e Merge branch 'develop' into element_4471 2021-08-12 11:08:29 +03:00
Doug dff82d9f95 Merge branch 'develop' into doug/4484_contacts_access 2021-08-11 17:15:23 +01:00
Doug d7b15f8c2f Use areAllTermsAgreed instead of hasAccountDataIdentityServerValue. Move identity server terms modal from LegacyAppDelegate into ContactsTableViewController. 2021-08-11 17:13:15 +01:00
Gil Eluard 9b451a304d [Spaces] M10.8 Browsing users in a space #4682
- Added MVVM classes
- roughly integrated `RoomParticipantsViewController` to the MVVM
2021-08-10 20:26:27 +02:00
Doug 4d3921a574 Match StartChatViewController colours to latest Figma. 2021-08-10 13:05:11 +01:00
Doug fb256b8fb3 Disable the contact access footer view in Unified Search. 2021-08-10 12:32:07 +01:00
Doug f4742142d1 Take into account the identity server when setting the default value of showLocalContacts. 2021-08-10 12:03:28 +01:00
Doug 18635b0277 Merge branch 'develop' into doug/4677_fix_contacts_warnings 2021-08-10 09:41:57 +01:00
ismailgulek 8ff0c44c38 Merge remote-tracking branch 'origin/element_4362' into element_4362 2021-08-09 18:09:54 +03:00
ismailgulek 4b79959fd1 Merge branch 'develop' into element_4362 2021-08-09 18:09:45 +03:00
ismailgulek ba83da8f64 Update Riot/Modules/Authentication/SSO/SSOURLConstants.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2021-08-09 18:06:08 +03:00
Gil Eluard c700a4f4c3 [Spaces] M10.7 Explore rooms #4571
- Added suggested tag to the explore rooms cell
- Implemented join feature
2021-08-09 17:05:36 +02:00
Doug 588a10b9e7 Add missing Weakify/Strongify. 2021-08-09 15:59:46 +01:00
Doug 9821276763 Fix warnings: Block implicitly retains 'self' 2021-08-09 15:45:59 +01:00
Doug 1424262d27 Hide local contacts in Unified Search. 2021-08-09 15:08:05 +01:00
Doug 13a3d91cb9 Replace hasLocalContacts with showLocalContacts.
Update the value of showLocalContacts in ContactsTableViewController.
2021-08-09 12:58:18 +01:00
Doug 9485f1a046 Fix image name. 2021-08-09 12:22:56 +01:00
Gil Eluard 5213b2e9f2 [Spaces] M10.7 Explore rooms #4571
- Added an room detail screen
2021-08-06 15:51:51 +02:00
ismailgulek 23208e5f22 Merge branch 'develop' into ismail/4642_additions 2021-08-06 16:22:38 +03:00
ismailgulek 01d8d55d51 Use new strings for ended calls 2021-08-06 16:20:10 +03:00