Commit Graph

78 Commits

Author SHA1 Message Date
JanNiklas Grabowski b298dedc22 chore: update from foss 1.11.19 (MESSENGER-6656)
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19

* commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1':
  finish version++
  version++
  comments
  update submodule
  remove obsolete tests
  removed unused code
  update submodule
  fix
  Libolm removal
  update license macro
  update license
  Prepare for new sprint

# Conflicts:
#	Config/AppVersion.xcconfig
#	IDETemplateMacros.plist
#	LICENSE
#	README.md
#	Riot/Categories/MXSession+Riot.m
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Managers/KeyValueStorage/Extensions/Keychain.swift
#	Riot/Managers/KeyValueStorage/KeyValueStore.swift
#	Riot/Managers/KeyValueStorage/KeychainStore.swift
#	Riot/Managers/KeyValueStorage/MemoryStore.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Managers/Settings/Shared/RiotSharedSettings.swift
#	Riot/Modules/Analytics/AnalyticsUIElement.swift
#	Riot/Modules/Application/AppCoordinator.swift
#	Riot/Modules/Application/LegacyAppDelegate.h
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/Legacy/AuthenticationViewController.h
#	Riot/Modules/Authentication/Legacy/AuthenticationViewController.m
#	Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h
#	Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Common/WebViewController/WebViewViewController.m
#	Riot/Modules/Contacts/Details/ContactDetailsViewController.m
#	Riot/Modules/Contacts/Views/ContactTableViewCell.m
#	Riot/Modules/Favorites/FavouritesViewController.h
#	Riot/Modules/Favorites/FavouritesViewController.m
#	Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
#	Riot/Modules/People/PeopleViewController.h
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift
#	Riot/Modules/Room/DataSources/RoomDataSource.m
#	Riot/Modules/Room/Files/RoomFilesViewController.m
#	Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift
#	Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h
#	Riot/Modules/Rooms/RoomsViewController.h
#	Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift
#	Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift
#	Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift
#	Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift
#	Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift
#	Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift
#	Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift
#	Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift
#	Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
#	Riot/Modules/Settings/Security/SecurityViewController.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/SplitView/SplitViewCoordinator.swift
#	Riot/Modules/SplitView/SplitViewCoordinatorType.swift
#	Riot/Modules/StartChat/StartChatViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/HTMLFormatter.swift
#	Riot/Utils/Tools.m
#	RiotNSE/NotificationService.swift
2024-10-18 15:45:54 +02:00
Mauro Romito 12837d4b89 update license 2024-09-25 12:24:52 +02:00
Arnfried Griesert e5d97ed154 merged element-ios 1.10.5 into 4409_basis_update_1_10_5 2023-03-16 12:19:26 +01:00
Mauro Romito fc1c22c08c refactor completed 2023-03-06 14:59:03 +01:00
JanNiklas Grabowski 1768fb5eee Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' into feature/4260_merge_foss_1_10_2
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile
2023-02-15 14:56:55 +01:00
Frank Rotermund 9f6deb9110 Merge commit '2e9bb7067e9f1596f29b986729822184145906db' into feature/4068_merge_foss_1_9_15
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Assets/de.lproj/Localizable.strings
#	Riot/Modules/Room/RoomViewController.m
#	RiotNSE/NotificationService.swift
#	fastlane/Fastfile
2023-01-16 12:11:51 +01:00
Alfonso Grillo 9df4a5a10b Inject AvatarViewMode as EnvironmentObject 2023-01-13 12:57:21 +01:00
Gil Eluard 3a333eff5d App Layout: Space names in the bottom sheet should wrap to 1 line only 2022-12-28 11:03:15 +01:00
Frank Rotermund a561249ad6 MESSENGER-3671 Merge FOSS 1.9.8
Conflicts:
 - CommonConfiguration.swift
 - BuildSettings.swift
 - Generated/images.Swift
 - RoomMemberDetailsViewController.m
 - LiveLocationSharingViewModell
-  PinCodeEnterViewController.m
2022-10-05 15:47:27 +02:00
Frank Rotermund 79dff21394 MESSENGER-3675 Personal Avatar removeable and changelogs 2022-09-27 16:29:49 +02:00
Stefan Ceriu 1df0be344d Removed deprecated StateStoreViewModel dispatching and reducing 2022-09-27 12:55:44 +03:00
Stefan Ceriu fc2fdc8ae7 Removed unnecessary comments from RiotSwiftUI templates, fixed StateStoreViewModel typealias formatting 2022-09-27 12:55:44 +03:00
Stefan Ceriu 43c28d23b7 Configured and applied SwiftFormat 2022-09-27 12:55:44 +03:00
Frank Rotermund f9409804b1 Merge commit 'a7b7fffd00663340f1684fa8d096dc20b4c9719e' into feature/basis_update_192
# Conflicts:
#	Config/AppVersion.xcconfig
#	Config/BuildSettings.swift
#	DesignKit/Source/ColorsSwiftUI.swift
#	DesignKit/Source/FontsSwiftUI.swift
#	DesignKit/Source/ThemeV2.swift
#	DesignKit/Variants/Colors/Dark/DarkColors.swift
#	DesignKit/Variants/Colors/Light/LightColors.swift
#	Podfile.lock
#	Riot/Assets/de.lproj/InfoPlist.strings
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Communities/Home/GroupHomeViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	fastlane/Fastfile
#	project.yml
2022-09-19 14:42:25 +02:00
Frank Rotermund 226e55caf7 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
Gil Eluard c007f84efd App Layout: Add usage measures 2022-08-24 13:37:47 +03:00
Andy Uhnak a9d1e84252 Track all errors in Sentry 2022-08-23 08:14:59 +01:00
Gil Eluard 4f3035588d App Layout: added space invites in space bottom sheet
- fixed build issue
2022-08-22 17:58:02 +02:00
Gil Eluard 3784b7da0e Merge pull request #6601 from vector-im/gil/6599-Space_invites_in_the_bottom_sheet
App Layout: space invites in the bottom sheet
2022-08-22 17:49:33 +02:00
Gil Eluard 33d2f7d9c0 Update RiotSwiftUI/Modules/Spaces/SpaceSelectorBottomSheet/Coordinator/SpaceSelectorBottomCoordinator.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2022-08-22 16:39:06 +02:00
Gil Eluard 40782cf230 Update RiotSwiftUI/Modules/Spaces/SpaceSelectorBottomSheet/SpaceSelector/Service/Mock/MockSpaceSelectorService.swift
Co-authored-by: Stefan Ceriu <stefanc@matrix.org>
2022-08-22 16:38:51 +02:00
Gil Eluard efe53ee85e New App Layout: added suppport for room invites in the all chats screen 2022-08-22 13:00:34 +02:00
Gil Eluard a203fc0c06 App Layout: added space invites in space bottom sheet
- Improved UI tests
2022-08-21 11:57:40 +02:00
Gil Eluard 03fc5676bb App Layout: added space invites in space bottom sheet 2022-08-21 11:07:21 +02:00
Gil Eluard 74454d11cb New App Layout: Added missing empty states in room list and space bottom sheet 2022-08-19 17:12:33 +02:00
Doug 5fecaea453 Revert "Replace DesignKit with package from ElementX."
This reverts the following commits:
ef5365ab240a1449e0490d2eb011dd69f594e27b
545b641e53a845b722f571b48ab408000048714b
702b7a696dd1a8319d6af907d4766a035cf30234
2398c1534dd1ca5b6329c888c50f55fb1b0ec23f
2022-08-19 11:06:09 +01:00
Gil Eluard 269067f169 App Layout: Cancel and Back on Spaces Bottom Sheet
- Make CI happy
2022-08-17 19:01:58 +02:00
Gil Eluard 55191b3a7c App Layout: Cancel and Back on Spaces Bottom Sheet
- Fixed
2022-08-17 17:22:03 +02:00
Gil Eluard c3c054e9f1 Some UI tweaks for New App Layout (#6535)
* Some UI tweaks for New App Layout
2022-08-05 14:58:48 +02:00
Gil Eluard 1a2e6fdb89 Implement new space selector bottom sheet (#6518)
* Delight: Edit layout experiment #6079
2022-08-05 13:39:45 +02:00
Gil Eluard 0aa5b4f4a1 Delight edit layout experiment (#6384)
* Delight: Edit layout experiment #6079
* Feature flag new App Layout #6406
* Update All chats screen with latest design #6407
2022-08-02 17:27:33 +02:00
Doug e6ea10f3a6 Prefix test in-front of UI test methods. 2022-07-18 16:06:27 +01:00
Doug 7d29bca319 Fixup missing colours and use resolved colours in UIKit.
Fix the confetti colour when using DesignKit.
Pin swift packages.
Fix UI tests target.
2022-07-07 15:42:57 +01:00
Johannes Marbach ce4c8b186c Expand all if and guard constructs involving @available(iOS 14... or #available(iOS 14...
Signed-off-by: Johannes Marbach <johannesm@element.io>
2022-06-23 10:05:46 +02:00
Johannes Marbach 868fd7e0c8 Remove all @available(iOS 14... annotations 2022-06-23 09:47:38 +02:00
Gil Eluard 987eb7d5c0 4850 bring leaving space experience in line with web (#6062)
* Bring leaving space experience in line with Web #4850

- Done
2022-04-27 13:31:14 +02:00
Doug 7c8aa40cac Fix UI Tests and run on PRs
- Add missing screen states.
- Detect the bottom of the screen list and stop scrolling if screen state wasn't found.
- Remove unimplemented tests to speed up the run.
- Remove failed button checks in MatrixItemChooserUITests
2022-04-21 12:54:53 +01:00
Gil Eluard c0f8458371 Wrong copy for upgrade room message (#6003)
* Wrong copy for upgrade room message

- fixed
2022-04-11 15:46:08 +02:00
Gil Eluard 44c1689fa8 Add button in create room dialog can be pressed multiple times (#6005)
- Fixed
2022-04-08 11:25:06 +02:00
Doug b590f72d61 Remove unused Bindings in RoundedBorderTextField/Editor. 2022-03-24 09:54:53 +00:00
Gil Eluard 45797a7384 Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event
# Conflicts:
#	Riot/Modules/Analytics/Analytics.swift
2022-03-17 13:59:24 +01:00
Doug 351cce0128 Make scrollEdgesAppearance singular to match UIKit 2022-03-16 08:58:21 +00:00
Gil Eluard c747ff86ac Add trigger to join and view room metrics events #5769
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
2022-03-15 10:31:24 +01:00
Gil Eluard cf015c4ef2 selection impossible when filtering in add room screen #5757 (#5758)
- Fixed
- Other minor code / UI tweaks
2022-03-07 12:25:50 +01:00
Gil Eluard 59038e18c1 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Gil Eluard 3347354216 SP4: space settings (#5730)
* SP4: Space Settings

- Space settings screen implemented
- No space upgrade available as per Element web
- Need more insights for the space address field
- Added settings live update
- Added local alias implementation
2022-03-04 12:53:42 +01:00
Gil Eluard c84285955b SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-28 16:07:09 +01:00
Gil Eluard bbff0a5c6f SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-22 18:01:16 +01:00
Gil Eluard a477a922d2 SP3.1: Update room settings for Spaces #5231
- Fixed SwiftUnitTests issues
2022-02-21 15:58:27 +01:00
Gil Eluard b6fca44b8f Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
#	RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
2022-02-21 15:27:05 +01:00