Commit Graph

2777 Commits

Author SHA1 Message Date
David Langley 30d053bcee Merge branch 'langleyd/4669_room_notification_settings_swiftui' of https://github.com/vector-im/element-ios into langleyd/4669_room_notification_settings_swiftui 2021-08-18 12:48:50 +01:00
David Langley d5f72ccce1 indentation 2021-08-18 12:48:04 +01:00
David Langley 4e3e394941 Update Riot/Modules/Common/SwiftUI/Inject.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2021-08-18 12:46:41 +01:00
David Langley ec86f8e797 Fix imports and move logic to AvatarViewModel 2021-08-18 12:45:13 +01:00
David Langley 343d5a7017 Add NotificationSettings and Keywords UI and VM 2021-08-18 09:33:56 +01:00
David Langley e8a3640410 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 ee923bbd6e 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 6ac1e6ba52 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 42458feb64 Merge branch 'develop' into doug/4484_contacts_access 2021-08-17 16:15:46 +01:00
David Langley 42801a3ca1 run template, add entrypoint and update BuildSetting 2021-08-17 15:00:20 +01:00
David Langley f59ed76783 run template, add entrypoint and update BuildSetting 2021-08-17 14:59:40 +01:00
David Langley c41a5d4333 Fix tests and try fix build error 2021-08-17 14:17:18 +01:00
David Langley 3526279e54 Move SwiftUI version of ViewModel to a subclass 2021-08-17 13:19:27 +01:00
David Langley 75740f1886 Fix Comment 2021-08-17 11:58:20 +01:00
David Langley 76fdf7ce36 Remove log 2021-08-17 11:56:16 +01:00
David Langley d342590953 Add activity indicator 2021-08-17 11:44:08 +01:00
Doug 174238f0cb Merge branch 'develop' into doug/888_add_url_previews 2021-08-17 10:29:30 +01:00
David Langley 7963915926 Add dependency management, AvatarViewModel and placeholder rendering now in AvatarImage. 2021-08-17 10:19:41 +01:00
Gil Eluard 33f7b26b4d Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 2021-08-16 21:09:47 +02:00
Gil Eluard 9dd957a514 [Spaces] M10.7 Explore rooms #4571
- Update after design review
2021-08-16 20:18:59 +02:00
Doug a9d5d4d5d7 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 e70d3bb67c [Spaces] M10.7 Explore rooms #4571
- Update after design review
2021-08-16 15:44:44 +02:00
David Langley 90bebceb9b 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 9c02c55f84 Merge branch 'spaces' into gil/4571_explore_rooms 2021-08-16 14:00:16 +02:00
Doug 7dea78bae9 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 8287903a9c [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 10:33:10 +02:00
Gil Eluard a6c838df81 [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 07:57:30 +02:00
Gil Eluard cd6693f041 [Spaces] M10.7 Explore rooms #4571
- UI updates after design changes
2021-08-15 22:18:16 +02:00
David Langley 807dfdfce2 Do avatar placeholder in SwiftUI, Add AvatarViewModel, Add dependency injection for MxMediaManager dependency. 2021-08-15 00:36:15 +01:00
Stefan Ceriu 216300e687 Fixes #1482 - Popping the user back to the home screen after leaving a room. 2021-08-13 17:57:50 +03:00
Doug ce84301041 Move function. 2021-08-13 14:45:22 +01:00
Doug 0d5c85f56c Check for unnecessary assignments to contactsAreFilteredWithSearch in the setter. 2021-08-13 14:44:23 +01:00
Doug 85f38a0163 Fix the footer when searching from StartChatViewController. 2021-08-13 14:38:24 +01:00
Doug f55605cf1c Load contacts and/or the footer view before the view appears. 2021-08-13 14:15:42 +01:00
David Langley 90e686efd0 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 17f602b9e6 Merge branch 'develop' into element_4471 2021-08-13 11:52:12 +03:00
David Langley f0ac2ba1ad 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 2718621d10 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 1ccc3b6eba Fix header font size 2021-08-12 17:51:50 +01:00
David Langley 8ab3b0711c Typo 2021-08-12 17:10:19 +01:00
David Langley 7d45fdc50f Cleanup from comments 2021-08-12 16:57:19 +01:00
Gil Eluard 89d606cc71 Merge branch 'spaces' into gil/4571_explore_rooms
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
2021-08-12 17:17:24 +02:00
David Langley 814741edf3 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 728c777790 Merge branch 'spaces' into gil/4501_show_suggested_in_room_lists 2021-08-12 14:35:25 +02:00
David Langley 504349f40a Remove visibility modifier 2021-08-12 12:42:26 +01:00
Doug 4bdecb1e48 Localise contacts disabled alert strings. 2021-08-12 12:29:20 +01:00
Doug 8380f07dff Fix bug where RequestContactsAccessFooterView could still be visible beneath the contacts. 2021-08-12 12:20:08 +01:00
David Langley 3f503b4bc6 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 7464614ff4 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 7f3aa4ebc0 [Spaces] M10.9 Space menu #4494
- Update after code review
- Fixed some points of design review
2021-08-12 11:23:47 +02:00