Commit Graph

2954 Commits

Author SHA1 Message Date
David Langley d189c4d618 Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-15 14:33:05 +01:00
Doug fa320d26c7 Improve layout of ServiceTermsModalScreenViewController on 4" devices. 2021-09-15 14:02:36 +01:00
Gil Eluard 9279d17226 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
Doug 4c2bd8ee76 Add ServiceTermsModalTableHeaderView to ServiceTermsModalScreenViewController. 2021-09-15 11:53:30 +01:00
Doug 15a7ded4d6 Fix FindYourContactsFooterView layout on 4" screens. 2021-09-15 10:28:45 +01:00
Gil Eluard 7d1d864edb [Spaces] M10.6 Space preview bottom sheet #4497
- Update after code review
2021-09-15 11:16:20 +02:00
Doug 8ea77dd2cf Rename RequestContactsAccessFooterView to FindYourContactsFooterView. 2021-09-15 10:03:32 +01:00
Doug 11fa6a9f7b Fix rotation layout bug. Update button title. 2021-09-14 17:22:28 +01:00
Gil Eluard 53ae49b199 Merge branch 'spaces' into gil/4497_space_preview_bottom_sheet
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
2021-09-14 17:53:46 +02:00
Gil Eluard 0da7d70b21 [Spaces] M10.8 Browsing users in a space #4682
- Fixed build issue on Jenkins
2021-09-14 17:22:48 +02:00
Gil Eluard 5f8de45e25 [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 16:59:32 +02:00
Doug e0bda2360b Call -MXKContactManager.validateSyncLocalContactsState when the app is launched. 2021-09-14 14:49:07 +01:00
Gil Eluard 99cbeab6f3 [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 15:29:16 +02:00
Gil Eluard de09af397f [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 11:45:33 +02:00
Stefan Ceriu 62cdb29331 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
Gil Eluard bc0c7f36aa [Spaces] M10.6 Space preview bottom sheet #4497
- Update after design review
2021-09-14 09:42:10 +02:00
SBiOSoftWhare 6cbebdf22b Merge pull request #4817 from pengufrost/4785_fix_sso_redirect 2021-09-14 08:43:16 +02:00
Chelsea Finnie 2b48ba3c29 Updated SSOAuthenticationService.swift to append / to redirect path if using an identity provider 2021-09-14 10:57:35 +12:00
Doug 4910ef37ee Override hasLink in RoomBubbleCellData to only check the last component. 2021-09-13 17:47:52 +01:00
Doug 9029aaecda Ensure the last bubble component has a link before loading the URL preview. 2021-09-13 16:49:34 +01:00
Gil Eluard ee0deb258e [Spaces] M10.8 Browsing users in a space #4682
- Update after design review
2021-09-13 16:03:56 +02:00
Doug 806c6d3677 Show an activity indicator whilst preparing the identity service. Show an alert when there's an error. 2021-09-13 14:25:54 +01:00
Doug c1ad2e9ece Update the Service Terms modal from the latest Figma.
Checkboxes have been removed from the individual policies.
Reverse flow so that the service terms are show before the contacts access popup.
Removes outOfContext from the modal as it will only be presented when requested.
Fixes second presentation on swipe to dismiss of the modal.
2021-09-13 11:46:31 +01:00
Gil Eluard eaeed470a9 Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
2021-09-13 10:23:21 +02:00
Gil Eluard e1118b1f57 [Spaces] M10.7 Explore rooms #4571
- Update after code review
2021-09-13 10:06:36 +02:00
David Langley 0d241ddf84 Always get the identifier from the theme. 2021-09-10 11:14:42 +01:00
David Langley 869c45c11f get theme id from theme, always republish theme updates. 2021-09-10 10:54:50 +01:00
Chelsea Finnie 4b74143460 Fix redirection issue when logging in with single sign on. Fixes #4785.
Signed-off-by: Chelsea Finnie <chelseafinnie@catalyst.net.nz>
2021-09-10 15:14:38 +12:00
David Langley 59a54654b1 Add configurable logger for RiotSwiftUI 2021-09-09 22:42:00 +01:00
SBiOSoftWhare 787f78bb82 Merge branch 'develop' into steve/4734_nav_room_stack
# Conflicts:
#	Riot/Modules/Room/RoomViewController.m
2021-09-09 16:45:35 +02:00
Doug 29400b7b19 Update strings in SettingsViewController. 2021-09-09 15:17:29 +01:00
Doug 1f9abbcd10 Revert search bar placeholder. 2021-09-09 14:41:03 +01:00
Doug 3bcec8afb6 Update strings and add localise. Use theme v2. 2021-09-09 13:08:50 +01:00
Doug 546c1e10ca Merge branch 'develop' into doug/4484_contacts_access 2021-09-09 12:24:08 +01:00
Doug a1e508c4ce Merge pull request #4790 from vector-im/doug/888_add_url_previews
Add URL previews as a Labs feature
2021-09-08 17:19:41 +01:00
Doug 0c4357c3b0 Revert height computation for now. 2021-09-08 15:59:30 +01:00
David Langley f965620bfe CoordinatorParamters, Type -> Protocol, remove MX Prefix. 2021-09-08 15:47:24 +01:00
Doug 1963f35d30 Update for PR feedback.
URLPreviewManager becomes URLPreviewService.
addVerticalWhitespaceToString used instead of heightForCellData multiple times.
All newline characters removed.
2021-09-08 15:10:13 +01:00
ismailgulek 58bb1cafe7 Remove forgotten Jitsi call property and function 2021-09-08 14:07:19 +03:00
ismailgulek bb827470a6 Wait for sync response when clearing cache 2021-09-08 14:06:41 +03:00
ismailgulek b5b51297ab Post data ready notification every time 2021-09-08 13:54:08 +03:00
ismailgulek 2d79c7c2e4 Merge pull request #4798 from vector-im/ismail/4797_launch_empty_screen
Show animation instead of empty screen on app launch
2021-09-08 12:24:53 +03:00
Doug 0f88e8e851 Add more docs and comments.
Rename store.store(_:) to store.cache(_:).
2021-09-08 09:51:47 +01:00
ismailgulek 7fe5b9c6c8 Listen for recents data ready notification in an async method 2021-09-08 11:21:04 +03:00
ismailgulek ccb6404fca Move data ready notification to RecentsViewController 2021-09-08 11:18:18 +03:00
David Langley bcc3b23b1c Remove unneeded protocol and methods on VectortHostingController 2021-09-07 22:49:11 +01:00
ismailgulek 18130e5965 Fix search bar clipping issues 2021-09-08 00:29:28 +03:00
Doug bb98bbe1c0 Merge branch 'develop' into doug/888_add_url_previews 2021-09-07 17:51:31 +01:00
SBiOSoftWhare 4709c6c289 RoomVC: Add a delegate, factorize and reduce usage of AppDelegate. 2021-09-07 17:43:49 +02:00
ismailgulek c86ced6dc4 Wait for the room list data to be ready to hide launch animation 2021-09-07 18:23:23 +03:00