Commit Graph

44 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
Alfonso Grillo 9df4a5a10b Inject AvatarViewMode as EnvironmentObject 2023-01-13 12:57:21 +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
Gil Eluard 1a2e6fdb89 Implement new space selector bottom sheet (#6518)
* Delight: Edit layout experiment #6079
2022-08-05 13:39:45 +02:00
Doug e6ea10f3a6 Prefix test in-front of UI test methods. 2022-07-18 16:06:27 +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
Doug b590f72d61 Remove unused Bindings in RoundedBorderTextField/Editor. 2022-03-24 09:54:53 +00: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 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
Gil Eluard f5b0cd2696 SP2: Adding Rooms to Spaces #523o
- fixed SwiftUI Unit tests
2022-02-17 13:14:45 +01:00
Gil Eluard 1cf5a6637d SP3.1: Update room settings for Spaces #5231
- Added list bottom padding to MatrixItemChooser view
2022-02-06 16:08:26 +01:00
Gil Eluard ae27b06f0d Merge branch gil/5230_SP2-Adding_Rooms_to_Spaces into gil/5231_SP3-1_Update_room_settings_for_Spaces 2022-02-05 21:43:29 +01:00
Gil Eluard 57999c30db Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces 2022-02-04 16:43:43 +01:00
Gil Eluard d42f6df82c Merge branch 'gil/143_create_public_space' of github.com:vector-im/element-ios into gil/143_create_public_space 2022-01-24 09:27:45 +01:00
Gil Eluard 9ee1c5067e [iOS] Create public space #143
- Update after code review
2022-01-24 09:27:23 +01:00
Gil Eluard 086afb1835 SP3.1: Update room settings for Spaces element-ios#5231
- Changed the Room Settings screen according to the new design
- Implemented the room access flow
- Added room upgrade support
- Implemented the room suggestion screen
2022-01-13 15:53:45 +01:00
Gil Eluard 7b8512093d Update RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/MatrixSDK/SpaceCreationPostProcessService.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2022-01-10 12:28:50 +01:00
Gil Eluard 34ba641b23 Update RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMatrixItemChooser/Service/MatrixSDK/SpaceCreationMatrixItemChooserService.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2022-01-10 12:28:33 +01:00
Gil Eluard 97b3954fb4 [iOS] Create public space #143
- added changelog + additional tweaks
2021-12-23 16:26:27 +01:00
Gil Eluard 8860bbd2cc [iOS] Create public space #143
- UI tweaks in space settings screen
2021-12-23 15:24:46 +01:00
Gil Eluard 1fb13415f9 SP2: Adding Rooms to Spaces element-ios#5230
- Implemented designs with new & existing tabs in a bottom sheet
- Replaced rough edge warnings from space panel overflow with working journeys
2021-12-23 14:08:00 +01:00
Gil Eluard f3949995e6 [iOS] Create public space #143
- UI tweaks in space settings screen
2021-12-16 10:59:48 +01:00
Gil Eluard 2b3c02754c [iOS] Create public space #143
- UI tweaks in space settings screen
2021-12-16 09:54:54 +01:00
Gil Eluard 1bb5e4517e [iOS] Create public space #143
- Consolidated current flow
2021-12-15 21:04:37 +01:00
Gil Eluard 23f39a0206 [iOS] Create public space #143
- Updated swiftui tests
2021-12-15 20:09:37 +01:00
Gil Eluard cb9a475ac3 [iOS] Create public space #143
- Update after design review
2021-12-13 14:43:05 +01:00
Gil Eluard 2a9ade5c39 [iOS] Create public space #143
- Update after design review
2021-12-09 09:04:21 +01:00
Gil Eluard 4890ce2108 [iOS] Create public space #143
- Update after design review
2021-12-01 23:56:59 +01:00
Gil Eluard 272d778779 [iOS] Create public space #143
- Initial space creation flow
2021-11-23 09:35:32 +01:00