Commit graph

764 commits

Author SHA1 Message Date
Aleksandrs Proskurins
bb7ac190eb Remove verify session button for other sessions when the current session is unverified 2022-10-12 17:22:10 +03:00
David Langley
9050d8fec3 wiftlint 2022-10-12 15:08:50 +01:00
Doug
3d3ccda296 Update strings for unknown sessions. 2022-10-12 14:42:24 +01:00
David Langley
45d1227ee0 More comments 2022-10-12 14:32:48 +01:00
Mauro Romito
a45a14342c Merge branch 'langleyd/6830_wysiwyg_core_formatting' into mauroromito/wysiwyg_edit_reply_UI
# Conflicts:
#	Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift
2022-10-12 15:25:27 +02:00
Aleksandrs Proskurins
d5d5744b23 Added last activity item to session details screen 2022-10-12 16:21:07 +03:00
Mauro Romito
98b47226c5 legacy sendMode code separation to have RiotSwiftUI be able to build. 2022-10-12 15:14:41 +02:00
David Langley
aa6c3a0041 get rid of additional UIHostingController. Cleanup and comments. 2022-10-12 14:14:25 +01:00
Aleksandrs Proskurins
077a828627
Merge pull request #6860 from vector-im/aleksandrs/6838_filter_sessions
Device Manager: Filter sessions
2022-10-12 15:27:42 +03:00
Mauro Romito
ee789595b8 should now be aligned to the designs 2022-10-12 14:26:38 +02:00
Mauro Romito
802e8cd7a0 pr comment + some design improvements 2022-10-12 13:58:44 +02:00
Aleksandrs Proskurins
7a7ed567a4 Added accessibility label to filter menu 2022-10-12 14:34:26 +03:00
David Langley
b6e0340bce Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/6830_wysiwyg_core_formatting 2022-10-12 11:46:24 +01:00
Aleksandrs Proskurins
e66d66d16e Renamed filerWasChanged to filterWasChanged 2022-10-12 13:18:33 +03:00
Aleksandrs Proskurins
a1ae4ec86c
Update RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-10-12 13:11:43 +03:00
Mauro Romito
4bd524966b some UI tweaks 2022-10-12 11:06:01 +02:00
Aleksandrs Proskurins
26a380d56a Formating 2022-10-12 11:00:38 +03:00
Aleksandrs Proskurins
5cb2b25eff Merge branch 'develop' into aleksandrs/6838_filter_sessions
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/Unit/UserOtherSessionsViewModelTests.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
2022-10-12 10:58:04 +03:00
Aleksandrs Proskurins
a6bc478a14 Renamed OtherUserSessionsFilter to UserOtherSessionsFilter 2022-10-12 09:30:41 +03:00
Mauro Romito
16b480d3da edit reply completed, just need to polish the UI a bit more. 2022-10-11 21:04:04 +02:00
Mauro Romito
9931bba4d4 color improvements and implementing the cancel callback 2022-10-11 19:58:22 +02:00
Mauro Romito
80f27c062b right assets 2022-10-11 17:54:27 +02:00
Mauro Romito
7cc98520f5 edit mode changes the send button 2022-10-11 17:25:58 +02:00
Alfonso Grillo
ec746fbb87 Move completions around 2022-10-11 17:18:05 +02:00
Alfonso Grillo
6831a00ad2 Remove loader for live location sharing 2022-10-11 17:15:10 +02:00
Alfonso Grillo
21a8a994f3 Remove loader for static location sharing 2022-10-11 17:15:10 +02:00
Doug
313331708d
Device Manager: Verify session (#6832)
* Initial implementation
* Add verificationState to UserSessionInfo
* Listen for changes device changes in the service.
2022-10-11 16:11:52 +01:00
Aleksandrs Proskurins
1d1a0eb914 UI and unit tests 2022-10-11 17:19:32 +03:00
Doug
c358f28a55
Device Manager: Rename Session (#6826)
* Publish the user sessions overview data.
* Add UserSessionName screen.
* Update logout action to match Figma more closely.
2022-10-11 13:11:15 +01:00
Aleksandrs Proskurins
0af1ac2692 Clear filter button 2022-10-11 14:54:09 +03:00
ismailgulek
d5ac519e8f
Ignore OS version from web based sessions (PSG-826) (#6852)
* Ignore OS version from web based sessions

* Add changelog
2022-10-11 14:39:36 +03:00
Aleksandrs Proskurins
168de8bb78 Verified sessions 2022-10-11 09:42:07 +03:00
Aleksandrs Proskurins
b38288b658 Filter button 2022-10-11 08:42:28 +03:00
David Langley
ceac80f56d Hide Maximise button as animations not working correctly 2022-10-10 13:09:51 +01:00
Aleksandrs Proskurins
61d518572c
Merge pull request #6819 from vector-im/aleksandrs/6817_view_all_button
Device Manager: 'View all' button in other sessions list
2022-10-10 10:18:42 +03:00
Stefan Ceriu
05651f860a Expose AuthenticationRestClient async login token generation method (MSC3882) 2022-10-10 09:44:22 +03:00
Aleksandrs Proskurins
bbc2d957e1 Fixed formatting 2022-10-10 09:27:47 +03:00
David Langley
716878d300 Split out models, add some tests and fix some formatting. 2022-10-09 22:54:39 +01:00
David Langley
573f27a6f1 Add labs flag and strings 2022-10-08 11:57:13 +01:00
David Langley
80254ad01b Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/wysiwyg_integration 2022-10-08 10:58:10 +01:00
David Langley
2a9551c54e Merge branch 'langleyd/wysiwyg_integration' of github.com:vector-im/element-ios into langleyd/wysiwyg_integration 2022-10-08 10:47:39 +01:00
David Langley
a6f52e3b2b Move composer send media selection to it's own coordinator and us e ioS 15 api for sheet 2022-10-08 10:46:05 +01:00
David Langley
507ef9600f
Merge pull request #6821 from Velin92/mauroromito/wysiwyg_dark_mode
WYSIWYG Dark Mode Support
2022-10-08 10:45:08 +01:00
Johannes Marbach
800d5aa082
Merge pull request #6820 from vector-im/johannes/session-name-trumps-device-type-name
Only use device type name as fallback for session display name
2022-10-07 17:31:09 +02:00
ismailgulek
359bfc0445
QR Login additional flags (#6825) 2022-10-07 17:24:29 +03:00
Johannes Marbach
4eb7a36447 Remove current app name from device type name 2022-10-07 16:02:14 +02:00
Aleksandrs Proskurins
61b6392742 Fixed swiftformat warnings 2022-10-07 17:00:15 +03:00
Johannes Marbach
98c5bad12d Remove prefix from tests 2022-10-07 15:44:21 +02:00
aringenbach
d32d619df2 Fix composer resizing animations 2022-10-07 14:05:51 +02:00
Aleksandrs Proskurins
007cb4ad1f Merge from develop 2022-10-07 14:51:30 +03:00
Johannes Marbach
03b0cd80da Merge branch 'develop' into johannes/session-name-trumps-device-type-name 2022-10-07 13:27:16 +02:00
ismailgulek
1ee8c9ca19
QR login from device manager (#6818)
* Add link device button into the sessions overview screen

* Run Swift format

* Fix tests

* Fix a crash in tests

* Fix PR remark
2022-10-07 12:58:26 +03:00
Aleksandrs Proskurins
2b0e7689f6 Merge branch 'develop' into aleksandrs/6817_view_all_button 2022-10-07 11:51:44 +03:00
Mauro Romito
df780ddad9 updated the package and added a circle background to the + button 2022-10-07 10:43:45 +02:00
Johannes Marbach
2554b275c4 Fix copyright year 2022-10-07 10:14:41 +02:00
Johannes Marbach
42f7934f74 Only use device type name as fallback for session display name 2022-10-07 09:48:17 +02:00
Aleksandrs Proskurins
98f18dde0e 'View all' button in other sessions list 2022-10-07 09:45:45 +03:00
Mauro Romito
308b34f41e dark mode support almost completed 2022-10-06 18:21:50 +02:00
ismailgulek
19afad1f18
Login with QR UI components (#6790)
* Display QR button on login screen if HS supports

* Create start screen

* Add build flag

* Connect start screen to the login

* QR display screen

* Move `LabelledDividerView` into separate file

* Show display QR screen on button tap

* Add swift concurreny to CameraAccessManager

* Introduce `QRLoginServiceProtocol`

* Use new service in screens

* Introduce scan QR code screen

* Remove hardcoded service availability

* Remove unnecessary import

* Add confirmation screen

* Add loading screen

* Fix ZXingObjc targets

* Add failure screen

* Add strings

* Various UI tweaks, navigation according to the service state

* Fix tests

* Add string for invalid QR error

* Add QR login service mode
2022-10-06 18:05:46 +03:00
Mauro Romito
439f06beff textColor fix 2022-10-06 16:42:52 +02:00
Gil Eluard
4eb7a87560
Merge pull request #6815 from vector-im/gil/6814-Check_enabled_field_in_notification_settings_push_toggles
Check enabled field in notification settings push toggles
2022-10-06 14:34:57 +02:00
Aleksandrs Proskurins
8a6c8b1212 Renamed sortAndConvertDevices method 2022-10-06 13:16:10 +03:00
Aleksandrs Proskurins
d560c8d61f
Update RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/UI/UserOtherSessionsUITests.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-10-06 13:11:59 +03:00
Gil Eluard
c7232d0bea Check enabled field in notification settings push toggles 2022-10-06 11:40:12 +02:00
Aleksandrs Proskurins
4fa1398a74 Merge branch 'develop' into aleksandrs/6801_unverified_sessions_screen 2022-10-06 10:49:48 +03:00
Aleksandrs Proskurins
7d9b040eeb UI tests 2022-10-06 10:23:33 +03:00
Doug
cb2207ec14 Fix review comments
Also fix a crash on iPad.
2022-10-05 16:48:51 +01:00
Doug
bb07a11e7e Session Manager: Single session logout 2022-10-05 16:48:51 +01:00
Doug
fea894ddcf Use regular titles for sub-screens of Settings. 2022-10-05 16:43:34 +01:00
Aleksandrs Proskurins
a586ed0c33 Renamed sessionsInfo to sessionInfos 2022-10-05 16:59:15 +03:00
Aleksandrs Proskurins
dd8d27bcac Unverified sessions screen 2022-10-05 16:22:52 +03:00
David Langley
d729a37de5 Update sdk, fix composer sizing, margins and re-enabled fullscreen. 2022-10-05 10:21:04 +01:00
Aleksandrs Proskurins
87cc0ddc81 Merge fixes 2022-10-05 12:18:23 +03:00
Aleksandrs Proskurins
7e09a6ece5 Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserSessionDetails/UserSessionDetailsViewModel.swift
2022-10-05 11:51:08 +03:00
Aleksandrs Proskurins
9dad6252e5 Cleanup for UserSessionOverviewViewModelTestsc, UserOtherSessionsViewModelTests 2022-10-05 09:18:33 +03:00
Doug
bf9bb82da7 Merge branch 'develop' of github.com:vector-im/element-ios into develop 2022-10-04 18:14:07 +01:00
Doug
aa46a2002d Fix navigation bars inside of VectorHostingController. 2022-10-04 16:05:09 +01:00
Gil Eluard
c97917b2de Display push toggle for sessions with m.local_notification_settings.<device-id> events in account_data 2022-10-04 16:07:43 +02:00
David Langley
4cc678c9b6 add composer actions/modules and ability to send rich messages 2022-10-04 15:01:01 +01:00
Aleksandrs Proskurins
347724f48e Added tests 2022-10-04 16:58:08 +03:00
Aleksandrs Proskurins
5ec1bb32c3 Formating fixes 2022-10-04 15:44:09 +03:00
Aleksandrs Proskurins
34aa035ead Renamed session to sessionInfo 2022-10-04 15:34:31 +03:00
Aleksandrs Proskurins
3deee90005 Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/UserSessions/Coordinator/UserSessionsFlowCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/Test/Unit/UserSessionOverviewViewModelTests.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Coordinator/UserSessionsOverviewCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/Mock/MockUserSessionsOverviewService.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItemViewData.swift
2022-10-04 15:14:59 +03:00
Doug
55318c9939 Fix failure building tests. 2022-10-04 11:16:20 +01:00
ismailgulek
dadbeca766
Include browser version in parsed user agent (PSG-761) (#6788)
* Update UserSessionInfo structure to include client version

* Add string for browser

* Update user agent parser to parse browser version too

* Add browser row into the session details

* Add changelog

* Fix tests

* Run Swift format
2022-10-04 10:49:26 +03:00
Aleksandrs Proskurins
ca3a401b18 Added translation strings, cleanup 2022-10-04 10:07:04 +03:00
Aleksandrs Proskurins
70f6badf08 Cleanup 2022-10-04 09:38:53 +03:00
Gil Eluard
0ecbf82eee Added support for MSC3881
- Update after review
2022-10-03 15:33:35 +02:00
Aleksandrs Proskurins
899539fbeb Refactored creation of UserSessionListItemViewData, added inactive session icon 2022-10-03 15:47:40 +03:00
Gil Eluard
f6b2be8dc4 Added support for MSC3881 2022-10-03 13:42:30 +02:00
Aleksandrs Proskurins
0b85beb0f4 User other sessions screen template 2022-10-03 11:27:12 +03:00
David Langley
ef3e76b94b add simple formatting and maximise support for replacement toolbar 2022-10-02 09:06:06 +01:00
Stefan Ceriu
52c4ff65db
Improve user session overview tests
* Add sessions overview UI tests
* Expose static methods from the UserSession name and lastActivity formatters; cleaned up the UserSessionsOverview a bit
* Add UserSessionsOverviewViewModel unit tests
* Add UserSessionsOverviewService unit tests
2022-09-30 13:49:16 +03:00
ismailgulek
2f689f4557
Extended device info (PSG-772) (#6766) 2022-09-29 15:07:10 +03:00
Stefan Ceriu
ca0cc12016 Fix member modifier warning 2022-09-28 15:36:11 +03:00
Stefan Ceriu
fd1848195b Fix tests 2022-09-28 15:36:11 +03:00
Stefan Ceriu
d34b8ec478 Cleaned up session overview services 2022-09-28 15:36:11 +03:00
Stefan Ceriu
c21f39c961 Implemented PSG-680 - Sessions overview security recommendations
- remove uppercased strings from localizables
- moved inactivity computation to the service
2022-09-28 15:36:11 +03:00
Aleksandrs Proskurins
49e707d1a1 Removed conditional view modifier 2022-09-28 14:39:01 +03:00
Aleksandrs Proskurins
da21ec34e9 Link current session to session overview 2022-09-27 17:31:40 +03:00
Aleksandrs Proskurins
6a24cf61a7 Moved isCurrentSession into UserSessionInfo 2022-09-27 15:36:44 +03:00
Aleksandrs Proskurins
fbef4fe0fe Made UserSessionInfo Equatable 2022-09-27 14:51:15 +03:00
Aleksandrs Proskurins
622fcf0651 Cleanup 2022-09-27 14:12:40 +03:00
Aleksandrs Proskurins
be371b4ab2 Removed alignment 2022-09-27 14:06:58 +03:00
Aleksandrs Proskurins
66d7915350 Renamed userSession and userSessionInfo to session 2022-09-27 13:57:54 +03:00
Stefan Ceriu
de54ae3da3 Removed deprecated StateStoreViewModel dispatching and reducing 2022-09-27 12:55:44 +03:00
Stefan Ceriu
ae73800352 Removed unnecessary comments from RiotSwiftUI templates, fixed StateStoreViewModel typealias formatting 2022-09-27 12:55:44 +03:00
Stefan Ceriu
ec0634ffb7 Configured and applied SwiftFormat 2022-09-27 12:55:44 +03:00
Stefan Ceriu
2c9596c912 Cleaned up various things around the UserSessionsOverviewService 2022-09-27 09:27:07 +03:00
Stefan Ceriu
cd596c899b Move files around, improve structure 2022-09-27 09:27:07 +03:00
Stefan Ceriu
148bc1624a Cleaned up various things, mostly removed unnecessary selfs, comments and bad formatting 2022-09-27 09:27:07 +03:00
Aleksandrs Proskurins
492b7410b9 Cleanup 2022-09-26 17:37:22 +03:00
Aleksandrs Proskurins
adda004aba Moved SeparatorLine 2022-09-26 17:26:47 +03:00
Aleksandrs Proskurins
d1b4b6de48 Unit and ui tests 2022-09-26 16:58:03 +03:00
Aleksandrs Proskurins
ffc4fcf1c7 Preview added 2022-09-26 16:58:03 +03:00
Aleksandrs Proskurins
68b2bda33c Added translation strings 2022-09-26 16:58:02 +03:00
Aleksandrs Proskurins
412b8b07da Session overview screen 2022-09-26 16:58:02 +03:00
Aleksandrs Proskurins
5635bf7a9f
Merge pull request #6750 from vector-im/alex/6693_dm_session_details
Device manager: User session details screen (PSG-685) #6693
2022-09-22 16:54:44 +03:00
Aleksandrs Proskurins
4bd3979522 Code review fixes 2022-09-22 11:52:42 +03:00
Aleksandrs Proskurins
cf68ca9aaa Refactored UserSessionDetailsViewModel 2022-09-20 16:10:57 +03:00
Aleksandrs Proskurins
e9444751d0 Cleanup 2022-09-20 16:00:35 +03:00
ismailgulek
f201ea59c9
Timeline composer layout loop fix (#6743)
* Publish suitable view height for user suggestions

* Update container view height

* Add changelog

* Fix user suggestions layout for pre iOS 16
2022-09-20 11:40:32 +03:00
Aleksandrs Proskurins
1002c1b1b6 Moved, renamed unit tests 2022-09-20 11:39:53 +03:00
Aleksandrs Proskurins
c0bdd4f1f6 UI tests 2022-09-20 09:43:14 +03:00
Aleksandrs Proskurins
195e862aef Added unit tests 2022-09-19 16:05:28 +03:00
Aleksandrs Proskurins
d77dd5034e Added translation strings 2022-09-19 10:26:42 +03:00
Aleksandrs Proskurins
05aaf8da31 Added layout constants 2022-09-16 14:34:00 +03:00
Doug
9a1c12f53b Put the session creator on the main actor instead.
This covers all login and registration options.
2022-09-16 12:31:25 +01:00
Aleksandrs Proskurins
a06d7d0aaa User session flow coordinator and details view 2022-09-16 13:50:45 +03:00
Johannes Marbach
2a9d7c9d9c Fix login crash on Xcode 14 builds
Fixes #6722
2022-09-15 21:20:47 +02:00
Aleksandrs Proskurins
f17f56b5b0
Merge pull request #6696 from vector-im/steve/6694_dm_overview_current_session
Device manager: User sessions overview - Current session section (PSG-670)
2022-09-14 13:08:42 +03:00
Aleksandrs Proskurins
b5850c1d5d Code review fixes 2022-09-14 11:28:47 +03:00
Doug
940fbddf60
Update RiotSwiftUI/Modules/UserSessions/DeviceAvatar/DeviceAvatarView.swift 2022-09-12 11:39:44 +01:00
SBiOSoftWhare
7c3084212b UserSessionsOverview: Handle current session section view. 2022-09-08 20:01:02 +02:00
SBiOSoftWhare
99b5179a46 Create UserSessionCardView to display session informations. 2022-09-08 20:00:15 +02:00
SBiOSoftWhare
111c829236 UserSessionsOverviewViewModelResult: Remove useless case. 2022-09-08 18:49:41 +02:00
SBiOSoftWhare
30388059ad MockAppScreens: Add MockUserSessionsOverviewScreenState. 2022-09-08 17:26:09 +02:00
SBiOSoftWhare
ea91f5d710 UserSessionListItem: Fix runtime issue. 2022-09-08 08:56:36 +02:00
SBiOSoftWhare
625b6d0d86 UserSessionsOverview: Improve other sessions list layout. 2022-09-08 08:34:21 +02:00
SBiOSoftWhare
f733171f6b UserSessionsOverview: Improve layout. 2022-09-07 15:47:03 +02:00
SBiOSoftWhare
0b061dcef3 UserSessionListItem: Improve layout and handle separator. 2022-09-07 15:42:27 +02:00
SBiOSoftWhare
93a4fc8fd6 Update MockUserSessionsOverviewService. 2022-09-07 12:23:03 +02:00
SBiOSoftWhare
1d71de75e2 UserSessionListItemViewData: Handles session name and details string building. 2022-09-07 12:22:48 +02:00
SBiOSoftWhare
03aaae4d75 Create UserSessionLastActivityFormatter to build last activity date string. 2022-09-07 12:20:56 +02:00
SBiOSoftWhare
d6e2ff5d10 Create UserSessionNameFormatter to build user session name. 2022-09-07 12:20:05 +02:00
SBiOSoftWhare
6a9a8bfea8 UserSessionListItem: Improve layout. 2022-09-07 11:21:05 +02:00
SBiOSoftWhare
8144e1fe9b DeviceAvatarView: SImplify layout. 2022-09-07 11:09:22 +02:00
SBiOSoftWhare
a4d8eb595c
Update RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewViewModel.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-09-07 10:52:37 +02:00
SBiOSoftWhare
702e9b4622
Update RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItem.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-09-07 10:52:29 +02:00
SBiOSoftWhare
af05a62d56
Update RiotSwiftUI/Modules/UserSessions/DeviceAvatar/DeviceAvatarView.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-09-07 10:51:24 +02:00