Commit Graph

78 Commits

Author SHA1 Message Date
Frank Rotermund 67df1a3e95 chore: FOSS Merge 1.27.11 (MESSENGER-7276)
Merge commit 'af0b6d4be985d9f26e5111d3fa01389c7321949f' into feature/7276_FOSS_Merge_1_27_11

# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile.lock
#	IDETemplateMacros.plist
#	Podfile
#	Podfile.lock
#	README.md
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Room/CellData/RoomBubbleCellData.m
#	Riot/target.yml
#	RiotNSE/NotificationService.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionModels.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionViewModel.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/Coordinator/AuthenticationServerSelectionCoordinator.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/View/AuthenticationServerSelectionScreen.swift
#	RiotSwiftUI/Modules/Room/CompletionSuggestion/Service/CompletionSuggestionService.swift
#	fastlane/Fastfile
2025-05-16 14:06:20 +02:00
Mauro Romito 77bae312d0 added commercial license 2025-01-23 12:19:12 +01:00
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 6d38c5fe24 MESSENGER-4769 color changes part 2 2023-06-20 11:32:09 +00: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
Alfonso Grillo 9df4a5a10b Inject AvatarViewMode as EnvironmentObject 2023-01-13 12:57:21 +01:00
Frank Rotermund b23657a4a1 Feature/3616 privacy on login 2022-12-04 10:47:42 +00:00
Frank Rotermund 23021f6cbb MESSENGER-3707 new login flow and welcome integration 2022-11-30 18:10:20 +01:00
Arnfried Griesert 86aa5365bb MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00
Frank Rotermund 84d2f02220 build fix 2022-10-19 20:18:31 +02:00
Arnfried Griesert 6a73791639 Messenger-3620 launchscreen animation 2022-10-18 10:36:49 +00: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
Doug a832bac643 Fix navigation bars inside of VectorHostingController. 2022-10-04 16:05:09 +01: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 fd4542f615 Feature/3557 test element 1 9 5 2022-09-21 09:32:35 +00: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 cbed082e2c MESSENGER-3062 BuM Login flow 2022-09-19 12:23:07 +02:00
Frank Rotermund 226e55caf7 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
Doug 55add0111b Fix build errors. 2022-08-19 11:06:09 +01: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
Doug e6ea10f3a6 Prefix test in-front of UI test methods. 2022-07-18 16:06:27 +01:00
Doug d5b5101420 Update remaining strings for FTUE.
Include homeserver in view models/state as needed.
Pre-fill the user's display name as set by the server.
2022-07-14 16:56:35 +01:00
Doug 5394ed0f4a Update use case, registration and login screens.
Remove "Custom server" button from use case screen.
Remove matrix.org description.
Add username availability to registration screen.
2022-07-14 16:56:35 +01:00
Doug 522d884a2a Fix SwiftUI Unit tests. 2022-07-07 15:42:57 +01:00
Doug 2d4e553cbd Pin DesignKit version and use contantAndAvatars array. 2022-07-07 15:42:57 +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 868fd7e0c8 Remove all @available(iOS 14... annotations 2022-06-23 09:47:38 +02:00
Doug 30283509f7 Simplify the layout of the onboarding splash screen (#6320)
* Simplify the layout of the onboarding splash screen
* Re-organise OnboardingSplashScreen.
* Fix frame drops for real this time.
2022-06-22 09:54:21 +01:00
Doug 51b2a1ce4d Update labels and confetti presentation in new flow. (#6260)
* Update the background of the Celebration screen
2022-06-10 08:17:30 +01:00
ismailgulek 14280c4e1b Fix further PR remarks 2022-06-06 13:32:31 +03:00
ismailgulek 4b4c75a7e4 Fix background on light theme 2022-06-02 01:12:14 +03:00
ismailgulek 24c4872f41 Fix PR remarks 2022-06-02 00:30:28 +03:00
ismailgulek 09cc08d500 Do not start loading on server selection 2022-05-27 17:52:13 +03:00
Doug 9c9b3befcd Add login screen. 2022-05-24 15:47:24 +01:00
Doug 9c5aa0ca1e Add Email/Terms/ReCaptcha into the Authentication flow
Replace ReCaptcha navigation delegate with a WKUserContentController.
Move callback property closures onto the MainActor.
Show a loading indicator whilst waiting for the authentication service to start.
Move nextUncompletedStage into FlowResult.
Handle text field actions during authentication.
Remove scroll view tweaks in server selection screen following EMS banner removal.
2022-05-19 11:43:38 +01:00
Doug e23abd8811 Rename completion to callback and simplify actor usage. (#6141) 2022-05-11 13:18:26 +01:00
Doug 870fc616c5 Use readableFrame and OnboardingIconImage everywhere.
Fix order of accentColor modifier.
2022-05-11 09:49:24 +01:00
Doug dcc6e0d3df Fix layout issues in Use Case screen. 2022-05-11 09:49:24 +01:00
Doug 9494c3ca80 Remove iOS 13/14 checks from Template/Onboarding/Authentication. 2022-05-11 09:49:24 +01:00
Doug aac2511ddc Add email verification screen (#6125)
Make a reusable onboarding icon view.
Use a native TextField for better dynamic type support.
Rename completion to callback.
Add readableFrame modifier.
2022-05-10 14:09:43 +01:00
Doug a870a9a033 Use consistent padding on action buttons. 2022-03-31 11:30:05 +01:00
Doug 512f498ff1 Tweaks to Onboarding following design review.
Use constants for consistent top padding and icon sizes.
Match layout of AnalyticsPrompt on iPad to other views.
Update icon in use case selection screen to allow tinting.
2022-03-30 18:55:22 +01:00
Doug 7b043fabcf Refinements to onboarding personalisation flow.
Fix incorrect fonts and use autocapitalization on the display name field.
Fix bug where authentication view controller would become active again after registration.
Improve EffectsView API.
2022-03-30 16:44:19 +01:00
Doug e1b91b9076 Enable profile personalisation screens after registration. 2022-03-30 16:44:19 +01:00
Doug bb7e928922 Improve celebration screen layout on iPad
Rename OnboardingConstants to OnboardingMetrics.
Fix strings warning about public property in public extension.
Remove unused OnboardingCelebrationViewModelResult.
2022-03-22 12:02:05 +00:00
Doug f80b110f82 Add effects to the congratulations screen when personalisation is disabled.
Improve the API of the EffectsView to make it more swifty.
2022-03-21 19:04:09 +00:00
Doug 1c8622f60a Add OnboardingCelebrationScreen and EffectsSceneView. 2022-03-21 19:04:09 +00:00