Commit Graph

573 Commits

Author SHA1 Message Date
Gil Eluard 3a09ee688c [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02:00
Gil Eluard c3e2bb6880 Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
Gil Eluard 3f0ae67367 [spaces] several fixes for pre release
- [When switching spaces, user and room tabs are not populated](https://github.com/vector-im/element-ios/issues/4889)
- [Explore rooms list in space has odd ordering](https://github.com/vector-im/element-ios/issues/4890)
- Fixed Coming Soon error for Explore rooms
2021-09-22 16:57:31 +02:00
Stefan Ceriu c68bdc54b9 Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings
# Conflicts:
#	Riot/Generated/Strings.swift
2021-09-22 17:17:05 +03:00
Stefan Ceriu f9a4178f2a Fixes #4881 - Replaced InfoPlist.cfBundleDisplayName with AppInfo.current.displayName and removed the now unused InfoPlist generated class. 2021-09-22 16:59:47 +03:00
Gil Eluard 76b62bf536 Merge branch 'spaces' into gil/pre_release_fixes 2021-09-22 15:39:55 +02:00
Gil Eluard 9a7a16220a Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
Stefan Ceriu c69d364ad1 Fixes #4881 - Using the bundle display name as the app name in localizable .strings files. Exposing generated .strings and info.plist members to Objective-C. 2021-09-22 14:10:16 +03:00
David Langley 76fa04766a Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-22 11:39:42 +01:00
Stefan Ceriu a026271690 Fix #4415 - Added back section header when only PIN available. 2021-09-22 08:44:48 +03:00
Gil Eluard bdd912c35e Merge branch 'spaces' into gil/pre_release_fixes 2021-09-20 10:18:59 +02:00
Gil Eluard 9715eb35d9 Merge branch 'develop' into spaces 2021-09-20 10:18:01 +02:00
Gil Eluard 124874d7af [spaces] several fixes for pre release
- [Space home view inherits title from previously viewed tab](https://github.com/vector-im/element-ios/issues/4851)
- [Home view doesn't refresh when new rooms are created](https://github.com/vector-im/element-ios/issues/4849)
- [Odd error message in Space member list](https://github.com/vector-im/element-ios/issues/4845)
- [Bring leaving space experience in line with Web](https://github.com/vector-im/element-ios/issues/4850)
- [No notification for space invitation](https://github.com/vector-im/element-ios/issues/4840)
- [Remove filter when space is switched](https://github.com/vector-im/element-ios/issues/4852)
- [M10.11 Remove community tab](https://github.com/vector-im/element-ios/issues/4493)
2021-09-20 10:10:27 +02:00
David Langley 3ffe69ffee Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-20 08:50:38 +01:00
Doug 3bfe070232 Update setting string. 2021-09-16 17:57:36 +01:00
Doug 0915d01b43 Enable URL Previews by default and remove from Labs. 2021-09-16 17:51:56 +01:00
David Langley 9724bfe8e8 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
Gil Eluard 068f4b3ce0 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 4b058ee154 [Spaces] M10.6 Space preview bottom sheet #4497
- Update after design review
2021-09-14 09:42:10 +02:00
Doug 75a9a19421 Merge branch 'develop' into doug/888_add_url_previews 2021-09-07 17:51:31 +01:00
Doug cf5f07d47b Move url preview setting under labs section. 2021-09-07 16:00:12 +01:00
David Langley 932ee0ac07 Add Simple Template Example
- Add a simple Template example that shows a user profile with avatar, displayName and presence.
- ScreenCoordinator: closure based with less protocols and delegates.
- Reducer: Reducer function that manages all state modifications.
- SwiftUI View: Decomposes UI into appropriate sub components.
- Uses Theme and Dependency Management Infrastructure
2021-09-06 17:12:31 +01:00
Doug 1f2999ea0d Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-09-06 17:04:22 +01:00
Gil Eluard 6952bef72a [Spaces] M10.6 Space preview bottom sheet #4497
- Localized strings for space join rule
2021-09-06 08:47:43 +03:00
Gil Eluard 254e5a1b76 [Spaces] M10.6 Space preview bottom sheet #4497 2021-09-06 07:46:43 +03:00
Doug 72a89e267b Add setting to disable URL previews.
Using a temporary position in the settings screen whilst waiting for feedback.
2021-09-03 10:19:26 +01:00
Doug a599f18be2 Merge remote-tracking branch 'origin/develop' into doug/888_add_url_previews 2021-09-02 17:39:42 +01:00
Gil Eluard 221fe2759a [Spaces] M10.8 Browsing users in a space #4682
- Update after design review
2021-09-02 10:17:09 +03:00
Gil Eluard a22519bcba Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
2021-09-02 07:51:55 +03:00
Gil Eluard 8baebb2a99 [Spaces] M10.7 Explore rooms #4571
- Update after review
2021-09-01 18:12:08 +03:00
David Langley f4cb404df0 Finish extraction
- Moves SwiftUI code out of Riot and into RiotSwiftUI which has no dependency on Matrix SDK.
- Git wasn't smart enough to see the file moves. Most feature function has remain unchanged. 1 change I did make was remove NotificationSettingsViewModel's dependence on MxPushRule, so that the view model could be moved into RiotSwiftUI.
- Add LocaleProvider to abstract VectorL10n's use of Matrix SDK language so it can be used in RiotSwiftUI.
- Split Theme into UKit/SwiftUI version to remove RiotSwiftUI's dependence on ThemeService and ThemeV1.
- Migrated from ThemeObserver to ThemePublisher. We push updates to ThemePublisher so that we can remove ThemeService as dependency.
- Add .DS_Store to .gitignore
2021-09-01 12:34:38 +01:00
Doug e6449c978c Load and store URLPreviewViewData in RoomBubbleCellData.
Implement close button and store the action in Core Data. Hide the preview image view when no image is received. Remove line breaks in description text.
2021-09-01 10:37:37 +01:00
Doug 2f33dd04ab Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-08-27 16:30:01 +01:00
Doug 3b27528c6d Merge branch 'develop' into doug/4479_media_size_selection 2021-08-27 16:28:15 +01:00
David Langley 200fb69993 Extract and start to split theme. 2021-08-27 16:26:56 +01:00
Doug e154f35e32 Update media settings strings. Update share extension image size prompt. 2021-08-27 16:15:46 +01:00
David Langley 4674caac05 Merge pull request #4752 from vector-im/langleyd/4467_account_notification_settings
Account Notification Settings and Keywords
2021-08-26 11:07:11 +01:00
David Langley c23b763729 Remove unneeded string from bad merge 2021-08-25 14:25:57 +01:00
David Langley 7a4554f53d Add Chips, InputStyles, Service Implementation, swift-collections and UI cleanup. 2021-08-25 13:03:36 +01:00
Stefan Ceriu ea699f66e3 Implements #4693 - Alert users of Element on iOS11 deprecation. 2021-08-25 13:57:32 +03:00
Doug a6a995cbd2 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-23 12:49:06 +01:00
Doug 67fcb15cbe Combine confirm image/video size settings into one. 2021-08-23 11:16:32 +01:00
Gil Eluard beb3cd5a05 [Spaces] M10.8 Browsing users in a space #4682
- Added navigation to member detail page
2021-08-22 08:48:54 +03:00
Stefan Ceriu 108f952680 Fixes #4714 - Flickering voice message cells while being sent. 2021-08-18 14:58:32 +03:00
David Langley a7d0fec95d Add NotificationSettings and Keywords UI and VM 2021-08-18 09:33:56 +01:00
David Langley 4865d9d3a5 run template, add entrypoint and update BuildSetting 2021-08-17 15:00:20 +01:00
Gil Eluard ec37251c16 Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 2021-08-16 21:09:47 +02:00
Doug 82bfe5db0a 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 14c6741e1f [Spaces] M10.7 Explore rooms #4571
- Update after design review
2021-08-16 15:44:44 +02:00
Gil Eluard cbd96f2ab7 Merge branch 'spaces' into gil/4571_explore_rooms 2021-08-16 14:00:16 +02:00