Arnfried Griesert
28852aa790
merged element-ios 1.10.5 into 4409_basis_update_1_10_5
2023-03-16 12:19:26 +01:00
Mauro Romito
09daa04dd4
refactor completed
2023-03-06 14:59:03 +01:00
JanNiklas Grabowski
b4d4330109
Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' 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
d9057cd0cb
Merge commit '0bf30fc7d2f35f80982c2d6cfd5e844de5f798e6' 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
5b99d71824
Inject AvatarViewMode as EnvironmentObject
2023-01-13 12:57:21 +01:00
Gil Eluard
dc461ee57b
App Layout: Space names in the bottom sheet should wrap to 1 line only
2022-12-28 11:03:15 +01:00
Frank Rotermund
4d1ead2479
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
2c86d91dbb
MESSENGER-3675 Personal Avatar removeable and changelogs
2022-09-27 16:29:49 +02:00
Stefan Ceriu
adf0aaf9b5
Removed deprecated StateStoreViewModel dispatching and reducing
2022-09-27 12:55:44 +03:00
Stefan Ceriu
732dc3cba9
Removed unnecessary comments from RiotSwiftUI templates, fixed StateStoreViewModel typealias formatting
2022-09-27 12:55:44 +03:00
Stefan Ceriu
89bcd92cca
Configured and applied SwiftFormat
2022-09-27 12:55:44 +03:00
Frank Rotermund
09a0f6334c
Merge commit '80bda1906235b6007b98f18fb13681fff587f4a3' 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
0a2fd53134
MESSENGER-3304 string in separate files
2022-09-19 11:53:45 +02:00
Gil Eluard
11b56db2c2
App Layout: Add usage measures
2022-08-24 13:37:47 +03:00
Andy Uhnak
74b369e3af
Track all errors in Sentry
2022-08-23 08:14:59 +01:00
Gil Eluard
20a9183894
App Layout: added space invites in space bottom sheet
...
- fixed build issue
2022-08-22 17:58:02 +02:00
Gil Eluard
9441ce2c2c
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
9c8fc04508
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
a6da0145e9
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
a4c0ae2c34
New App Layout: added suppport for room invites in the all chats screen
2022-08-22 13:00:34 +02:00
Gil Eluard
16701b90a3
App Layout: added space invites in space bottom sheet
...
- Improved UI tests
2022-08-21 11:57:40 +02:00
Gil Eluard
b53f9af823
App Layout: added space invites in space bottom sheet
2022-08-21 11:07:21 +02:00
Gil Eluard
dda63fcf54
New App Layout: Added missing empty states in room list and space bottom sheet
2022-08-19 17:12:33 +02:00
Doug
2b1bd6f772
Revert "Replace DesignKit with package from ElementX."
...
This reverts the following commits:
4858d72afb
6827d2a854
92c5874359
0a9bd1fbe6
2022-08-19 11:06:09 +01:00
Gil Eluard
ed6562b18b
App Layout: Cancel and Back on Spaces Bottom Sheet
...
- Make CI happy
2022-08-17 19:01:58 +02:00
Gil Eluard
8447bdb314
App Layout: Cancel and Back on Spaces Bottom Sheet
...
- Fixed
2022-08-17 17:22:03 +02:00
Gil Eluard
7d54ab5819
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
64fe1d544e
Implement new space selector bottom sheet ( #6518 )
...
* Delight: Edit layout experiment #6079
2022-08-05 13:39:45 +02:00
Gil Eluard
4de0901f36
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
c08ce224b1
Prefix test in-front of UI test methods.
2022-07-18 16:06:27 +01:00
Doug
6827d2a854
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
8b9cd5eaba
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
df048803ef
Remove all @available(iOS 14... annotations
2022-06-23 09:47:38 +02:00
Gil Eluard
07f8d4d52e
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
b40f0b8f0b
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
728a80f328
Wrong copy for upgrade room message ( #6003 )
...
* Wrong copy for upgrade room message
- fixed
2022-04-11 15:46:08 +02:00
Gil Eluard
d221d11905
Add button in create room dialog can be pressed multiple times ( #6005 )
...
- Fixed
2022-04-08 11:25:06 +02:00
Doug
6eefb43113
Remove unused Bindings in RoundedBorderTextField/Editor.
2022-03-24 09:54:53 +00:00
Gil Eluard
7300f06d35
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
cc6afc5f75
Make scrollEdgesAppearance singular to match UIKit
2022-03-16 08:58:21 +00:00
Gil Eluard
0df41c3b90
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
25c21e9653
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
da9c921efb
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
bc55dbb11b
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
5387a96f1a
SP3.1: Update room settings for Spaces #5231
...
- Update after review
2022-02-28 16:07:09 +01:00
Gil Eluard
2d8995d33a
SP3.1: Update room settings for Spaces #5231
...
- Update after review
2022-02-22 18:01:16 +01:00
Gil Eluard
741a3e1a79
SP3.1: Update room settings for Spaces #5231
...
- Fixed SwiftUnitTests issues
2022-02-21 15:58:27 +01:00
Gil Eluard
f820fb3a3d
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
13f55fab91
SP2: Adding Rooms to Spaces #523o
...
- fixed SwiftUI Unit tests
2022-02-17 13:14:45 +01:00
Gil Eluard
ac7318165c
SP2: Adding Rooms to Spaces #523o
...
- update after review
2022-02-17 10:47:44 +01:00