Commit Graph

4423 Commits

Author SHA1 Message Date
David Langley c7833d86df Add NotificationSettings and Keywords UI and VM 2021-08-18 09:33:56 +01:00
David Langley 845e4f92ca Update Riot/Modules/Common/SwiftUI/DependencyContainerKey.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-18 09:23:18 +01:00
David Langley 5b6c830659 Update Riot/Modules/Common/SwiftUI/DependencyContainerKey.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-18 09:23:00 +01:00
David Langley eae7b1319e Update Riot/Modules/Common/SwiftUI/Inject.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-18 09:22:44 +01:00
Doug 9afb2bcdd6 Merge branch 'develop' into doug/4484_contacts_access 2021-08-17 16:15:46 +01:00
David Langley 0336c80db8 run template, add entrypoint and update BuildSetting 2021-08-17 15:00:20 +01:00
David Langley a22fb6bcbf run template, add entrypoint and update BuildSetting 2021-08-17 14:59:40 +01:00
David Langley 470b4af1b1 Fix tests and try fix build error 2021-08-17 14:17:18 +01:00
David Langley e9622a3766 Move SwiftUI version of ViewModel to a subclass 2021-08-17 13:19:27 +01:00
David Langley 2624565935 Fix Comment 2021-08-17 11:58:20 +01:00
David Langley 00a2fdb8fc Remove log 2021-08-17 11:56:16 +01:00
David Langley fca61e29c7 Add activity indicator 2021-08-17 11:44:08 +01:00
Doug ef92d49456 Merge branch 'develop' into doug/888_add_url_previews 2021-08-17 10:29:30 +01:00
David Langley e09138b572 Add dependency management, AvatarViewModel and placeholder rendering now in AvatarImage. 2021-08-17 10:19:41 +01:00
Gil Eluard 2cf3fdc5d6 Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 2021-08-16 21:09:47 +02:00
Gil Eluard d17fc1f661 [Spaces] M10.7 Explore rooms #4571
- Update after design review
2021-08-16 20:18:59 +02:00
Doug aebec5daeb Add an (optional) prompt when sending a video to select its size.
Use high quality when filming video in-app.
2021-08-16 17:48:26 +01:00
Gil Eluard b824c33013 [Spaces] M10.7 Explore rooms #4571
- Update after design review
2021-08-16 15:44:44 +02:00
David Langley 31b4da8502 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 03de39d9d2 Merge branch 'spaces' into gil/4571_explore_rooms 2021-08-16 14:00:16 +02:00
Doug 09f68529cd 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 caf241f4d6 [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 10:33:10 +02:00
Gil Eluard 3d0be2ddf7 [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 07:57:30 +02:00
Gil Eluard 50475d6f2a [Spaces] M10.7 Explore rooms #4571
- UI updates after design changes
2021-08-15 22:18:16 +02:00
David Langley 4731efd0f2 Do avatar placeholder in SwiftUI, Add AvatarViewModel, Add dependency injection for MxMediaManager dependency. 2021-08-15 00:36:15 +01:00
Stefan Ceriu fa9d3eebb6 Fixes #1482 - Popping the user back to the home screen after leaving a room. 2021-08-13 17:57:50 +03:00
Doug 8432ad0485 Move function. 2021-08-13 14:45:22 +01:00
Doug 04c2f31d1e Check for unnecessary assignments to contactsAreFilteredWithSearch in the setter. 2021-08-13 14:44:23 +01:00
Doug 24d0b62906 Fix the footer when searching from StartChatViewController. 2021-08-13 14:38:24 +01:00
Doug 4614b1b47e Load contacts and/or the footer view before the view appears. 2021-08-13 14:15:42 +01:00
David Langley d6424397e7 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 3d7a4615fc Merge branch 'develop' into element_4471 2021-08-13 11:52:12 +03:00
David Langley c52fd96e0c 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 3ac8b312e0 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 9eae5cfa2c Fix header font size 2021-08-12 17:51:50 +01:00
David Langley 8e57222be9 Typo 2021-08-12 17:10:19 +01:00
David Langley 82b0361647 Cleanup from comments 2021-08-12 16:57:19 +01:00
Gil Eluard c310ed2dd5 Merge branch 'spaces' into gil/4571_explore_rooms
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
2021-08-12 17:17:24 +02:00
David Langley 77144980e3 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 326253b2a9 Merge branch 'spaces' into gil/4501_show_suggested_in_room_lists 2021-08-12 14:35:25 +02:00
David Langley f0120dd567 Remove visibility modifier 2021-08-12 12:42:26 +01:00
Doug a17f29da27 Localise contacts disabled alert strings. 2021-08-12 12:29:20 +01:00
Doug 801d3fbf5f Fix bug where RequestContactsAccessFooterView could still be visible beneath the contacts. 2021-08-12 12:20:08 +01:00
David Langley 90520ecaaa 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 9ff69eaaf0 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 58bf6b63ae [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 9a45b38730 Remove directRoomBorderView from InviteRecentTableViewCell.xib. 2021-08-12 09:50:18 +01:00
ismailgulek 12a754fbc5 Merge branch 'develop' into element_4471 2021-08-12 11:08:29 +03:00
Doug 222e22880b Merge branch 'develop' into doug/4484_contacts_access 2021-08-11 17:15:23 +01:00
Doug 08188e3ffa Use areAllTermsAgreed instead of hasAccountDataIdentityServerValue. Move identity server terms modal from LegacyAppDelegate into ContactsTableViewController. 2021-08-11 17:13:15 +01:00