Commit Graph

80 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
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
Mauro Romito 2bb571e088 removing useless ios 13 checks 2023-01-12 17:07:02 +01: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 0654136ba6 MESSENGER-3611 accent color 2022-09-19 12:47:39 +02:00
Gil Eluard 049c8996d1 Removed labs flag and enabled New App Layout 2022-09-05 12:03:52 +02:00
Gil Eluard bbb0dc1b5a Added Labs flag for the new App Layout
- Make CI happy
2022-08-29 16:01:34 +02:00
Gil Eluard 8b9c2ad5f1 Added Labs flag for the new App Layout
- Make CI happy
2022-08-29 15:24:10 +02:00
Gil Eluard 5187cf9107 Added Labs flag for the new App Layout 2022-08-29 14:59:09 +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 7d45c9a452 The theme defined in the application is not applied to all UI components (#6532)
* The theme defined in the application is not applied to all UI components
2022-08-05 15:00:22 +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 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
Doug ad4674c0d4 Replace DesignKit with package from ElementX. 2022-07-07 15:42:57 +01:00
MaximeE 903b7cc3f1 6029: Fix issue with rendering colors 2022-04-25 18:05:26 +02:00
MaximeE af91264406 Merge branch 'develop' into maximee/6029_lls_timeline_cell and apply comments 2022-04-25 15:53:58 +02:00
MaximeE 0633d01abe 6029: Refacto how to handle all state of the live location cell 2022-04-22 18:04:19 +02:00
Doug 351cce0128 Make scrollEdgesAppearance singular to match UIKit 2022-03-16 08:58:21 +00:00
Stefan Ceriu 6880a81160 Started applying navigation bar theme styles to iOS 13 and 14 too. 2022-03-01 19:26:50 +02:00
Doug f024d1919d Update the tintColor in ThemeV1 to sRGB to match Compound and ThemeV2. 2022-02-10 15:40:46 +00:00
Doug f50a92d0a8 Tweaks to the Use Case screen ready for review.
Update strings.
Show the custom server field as needed.
Enable scroll edges appearance for white navigation bar.
2022-02-04 16:10:38 +00:00
aringenbach e274fc76f2 Merge pull request #5497 from vector-im/aringenbach/5252_search_results_highlight_color
Display search matching pattern with a highlight color
2022-02-04 10:30:12 +01:00
Doug 70845c7d10 Fix visual issues when building with Xcode 13. 2022-02-03 18:30:39 +00:00
Arnaud Ringenbach ad32158ee6 Display search matching pattern with a highlight color
Signed-off-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-03 18:49:40 +01:00
SBiOSoftWhare 223d1802c1 Message bubbles: Use new background colors. 2022-01-31 17:42:54 +01:00
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
Stefan Ceriu 62cdb29331 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
Doug 546c1e10ca Merge branch 'develop' into doug/4484_contacts_access 2021-09-09 12:24:08 +01:00
Stefan Ceriu 8f46e037f2 Revert "#4693 - Drop iOS 11 support."
This reverts commit a2b359f21960e1b9f75139d94adc7aeb35fa479f.
2021-09-06 18:24:26 +03:00
David Langley c5881e11ae Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4776_extract_swiftui 2021-09-02 10:14:11 +01:00
Stefan Ceriu 0b2616ddb3 #4693 - Drop iOS 11 support. 2021-09-01 15:55:41 +03:00
David Langley ada377dcf2 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 a980d727d0 Add quinary colour to themes. 2021-07-23 16:34:43 +01:00
SBiOSoftWhare 2891b423f1 Theme: Update DarkTheme and DefaultTheme with fonts property. 2021-06-21 21:12:27 +02:00
ismailgulek 5805cfc897 Use new tile theme color 2021-05-04 19:25:24 +03:00
ismailgulek 88b087b979 Merge branch 'voip_design_updates' into voip_jitsi_remover 2021-05-04 19:11:17 +03:00
ismailgulek 7101a7be33 Convert colors to lazy vars 2021-05-04 18:35:03 +03:00
ismailgulek 4d5098894a Update class name to LightColors 2021-05-04 18:30:15 +03:00
ismailgulek 71f6083406 Inject theme v2 into theme 2021-04-30 15:59:50 +03:00
ismailgulek 034988474d Add call tile bg color 2021-04-28 13:46:44 +03:00
ismailgulek d593da21d4 Add shadow color to theme 2021-04-27 01:30:21 +03:00
Gil Eluard f79eccdbb9 Composer update - UI enhancements
- Composer height =58px - Frame = 42px
- Replace current scroll to bottom implementation with a scroll to Bottom FAB on both themes
- The text inside the composer frame should be centered
- The padding between the "reveal plus" button, composer frame and Left + Right sides should be at equal distance on default mode
- Verify that the "Send a message..." String matches with the colour indicated on Figma.
- The padding between each component (buttons and composer frame) should be at equal distance on default mode. E.g : It should be at 12px for each gap.
- The input text jumps down when users start typing. It should be centered at all times.
- Remove the Scroll bar in the text frame.
- DARK THEME
2021-03-20 21:31:17 +01:00
Gil Eluard de5da473fa SR sizing is inconsistent with RR & Message states cosmetic changes 2021-03-17 20:09:44 +01:00
Gil Eluard 100c16b032 Merge branch 'develop' into element_4014
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2021-02-25 15:49:53 +01:00
Gil Eluard cd76369f9d Improve the status of send messages (sending, sent, received, failed)
- First implementation
2021-02-22 13:51:25 +01:00
SBiOSoftWhare 29a5b8068e Room creation intro: New theme color. 2021-02-22 00:11:59 +01:00
ismailgulek 8817996873 Introduce callScreenButtonTintColor on Theme and use it 2021-02-07 20:12:30 +03:00
SBiOSoftWhare 2b0974c611 Theme: Introduce ThemeIdentifier to make theme identification easier in Swift. 2020-12-18 18:44:08 +01:00