Commit Graph

901 Commits

Author SHA1 Message Date
Doug 1c4b09b813 Merge branch 'develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Settings/SettingsViewController.m
2021-09-30 11:14:02 +01:00
Gil Eluard bfe5835082 Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
Gil Eluard 49f815ce9d [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 e6327eb955 Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings
# Conflicts:
#	Riot/Generated/Strings.swift
2021-09-22 17:17:05 +03:00
Gil Eluard 7b1ab21b76 Merge branch 'spaces' into gil/pre_release_fixes 2021-09-22 15:39:55 +02:00
Gil Eluard 3c0a4c0633 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
Stefan Ceriu 4dd70594cc 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 02acac05c8 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 b7b2fff7e3 Fix #4415 - Added back section header when only PIN available. 2021-09-22 08:44:48 +03:00
Gil Eluard 5864f2a55f Merge branch 'spaces' into gil/pre_release_fixes 2021-09-20 10:18:59 +02:00
Gil Eluard ca83d8258f Merge branch 'develop' into spaces 2021-09-20 10:18:01 +02:00
Gil Eluard d879928a96 [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 a94969403c 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 311d19c952 Update setting string. 2021-09-16 17:57:36 +01:00
Doug 6a92f89feb Enable URL Previews by default and remove from Labs. 2021-09-16 17:51:56 +01:00
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
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 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 bc0c7f36aa [Spaces] M10.6 Space preview bottom sheet #4497
- Update after design review
2021-09-14 09:42:10 +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
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 bb98bbe1c0 Merge branch 'develop' into doug/888_add_url_previews 2021-09-07 17:51:31 +01:00
Doug a05b1cab03 Move url preview setting under labs section. 2021-09-07 16:00:12 +01:00
David Langley d82ae75a0b 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
Gil Eluard 122b414433 [Spaces] M10.6 Space preview bottom sheet #4497
- Localized strings for space join rule
2021-09-06 08:47:43 +03:00
Doug 24bfe36712 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
Gil Eluard a3b4bab284 [Spaces] M10.8 Browsing users in a space #4682
- Update after design review
2021-09-02 10:17:09 +03:00
Doug d1eaa90984 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 fc8484b467 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-27 16:28:15 +01:00
Doug 4c59f1bd37 Update media settings strings. Update share extension image size prompt. 2021-08-27 16:15:46 +01:00
David Langley f49af07c11 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 b8fe7ec453 Remove unneeded string from bad merge 2021-08-25 14:25:57 +01:00
David Langley 73d5aaa966 Add Chips, InputStyles, Service Implementation, swift-collections and UI cleanup. 2021-08-25 13:03:36 +01:00
Stefan Ceriu f93ed348c9 Implements #4693 - Alert users of Element on iOS11 deprecation. 2021-08-25 13:57:32 +03:00
Doug 040416d745 Combine confirm image/video size settings into one. 2021-08-23 11:16:32 +01:00
Gil Eluard 3cb06e6822 [Spaces] M10.8 Browsing users in a space #4682
- Added navigation to member detail page
2021-08-22 08:48:54 +03:00
Paulo Pinto ad1581d772 Standardise casing of terms in source strings
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-18 17:30:45 +01:00
David Langley c7833d86df Add NotificationSettings and Keywords UI and VM 2021-08-18 09:33:56 +01:00
David Langley 0336c80db8 run template, add entrypoint and update BuildSetting 2021-08-17 15:00:20 +01: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
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 50475d6f2a [Spaces] M10.7 Explore rooms #4571
- UI updates after design changes
2021-08-15 22:18:16 +02:00