Commit graph

409 commits

Author SHA1 Message Date
ismailgulek
58df3d3309
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-12 11:49:55 +03:00
Doug
93e70896ba
Merge pull request #4980 from vector-im/doug/4978_room_avatar_colours
Fix generated avatar colours not matching Element Web.
2021-10-11 16:54:17 +01:00
Doug
bd56dbe731 Fix generated avatar colours not matching Element Web. 2021-10-11 16:06:15 +01:00
ismailgulek
eb7dbec5f9
Merge remote-tracking branch 'origin/ismail/4384_room_summary_store' into ismail/4384_room_summary_store 2021-10-08 16:58:08 +03:00
ismailgulek
c267fa0ea9
Do not expose session from the protocol 2021-10-08 16:57:54 +03:00
ismailgulek
511c3010af
Update Riot/Modules/Common/Recents/Model/DiscussionsCount.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-10-08 16:52:56 +03:00
ismailgulek
9cb67b96bb
Remove old code piece 2021-10-08 16:52:09 +03:00
ismailgulek
3095ab6a88
Adapt api changes 2021-10-08 14:43:19 +03:00
Gil Eluard
abfddff1cc [Spaces] M10.4.1 Home space data filtering #4570
- Added settings menu for Home space
2021-10-07 15:37:20 +02:00
SBiOSoftWhare
79ff20c3be MasterTabBarController: Clean code. 2021-10-05 16:24:58 +02:00
ismailgulek
72b96af055
Remove extra argument labels 2021-10-05 15:17:30 +03:00
ismailgulek
9e1bef0d51
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-05 13:48:25 +03:00
ismailgulek
914c8f9def
Add comments 2021-10-05 13:29:41 +03:00
ismailgulek
6e44191fa0
Generate server notice rooms 2021-10-05 13:17:15 +03:00
ismailgulek
802ad13958
Generate some mock data 2021-10-05 11:44:24 +03:00
ismailgulek
a76360621a
Simplify empty view logic 2021-10-04 17:29:04 +03:00
ismailgulek
25ac775a47
Architecture update 2021-10-04 17:28:21 +03:00
ismailgulek
5cc9633564
Create suggested rooms fetcher 2021-10-02 02:10:13 +03:00
ismailgulek
f9bd1a7542
Adapt changes 2021-10-02 02:09:36 +03:00
manuroe
5592fd46b8 RecentsDataSource: Memory leak in [RecentsDataSource dataSource:didStateChange:] 2021-10-01 11:34:39 +01:00
manuroe
2735166155 Merge branch 'master' into develop 2021-09-30 23:51:17 +01:00
ismailgulek
0c2efd8687
Add suggested rooms fetcher 2021-09-30 16:01:26 +03:00
ismailgulek
52a4d6ecd6
Refactor recent cell data 2021-09-30 16:00:52 +03:00
ismailgulek
ad9d712c8a
Fix merge conflict 2021-09-30 12:43:49 +03:00
ismailgulek
129eb9553c
Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-30 12:35:46 +03:00
Stefan Ceriu
862464108b vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
ismailgulek
4015b82ee3
Add spaces option 2021-09-29 15:10:41 +03:00
SBiOSoftWhare
e3d649c4ea AvatarViewData: Make mediaManager property optional. 2021-09-29 11:28:13 +02:00
ismailgulek
bc1d0d7172
Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
ismailgulek
fddfe883b3
Refactor recents data source to use new room list data fetchers 2021-09-24 18:50:41 +03:00
Gil Eluard
089d72882b Suggested Spaces appear as suggested rooms #4903
- Fixed
2021-09-24 14:31:35 +02:00
ismailgulek
05f5fc1d23
Fetch room from session when needed 2021-09-23 16:56:39 +03:00
Gil Eluard
cf51612864 Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
ismailgulek
3b6f517089
Merge pull request #4877 from vector-im/ismail/4874_fix_scroll_crash
RecentsViewController: Fix scroll crash
2021-09-22 18:43:34 +03:00
Gil Eluard
f6ea4da656 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
ismailgulek
8c9b6cc576
Adapt to cell data changes 2021-09-22 11:47:21 +03:00
ismailgulek
d50c6f300c
Change method parameter 2021-09-22 11:43:07 +03:00
ismailgulek
c71386a2ba
Adapt sentStatus changes 2021-09-22 11:41:22 +03:00
ismailgulek
f8d39e1b60
Check index path is valid before scrolling 2021-09-22 11:04:56 +03:00
David Langley
fb0f023964 Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-15 14:33:05 +01:00
Gil Eluard
8ba6c55a87 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2021-09-15 14:42:04 +02:00
Stefan Ceriu
d4c7a2b0d1 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
David Langley
89bf79df7d CoordinatorParamters, Type -> Protocol, remove MX Prefix. 2021-09-08 15:47:24 +01:00
ismailgulek
5f82518f11
Post data ready notification every time 2021-09-08 13:54:08 +03:00
ismailgulek
65ffa028cc
Move data ready notification to RecentsViewController 2021-09-08 11:18:18 +03:00
David Langley
f9840f79ba Remove unneeded protocol and methods on VectortHostingController 2021-09-07 22:49:11 +01:00
David Langley
2b2275d0d7 Add Simple Template Example
- Add a simple Template example that shows a user profile with avatar, displayName and presence.
- ScreenCoordinator: closure based with less protocols and delegates.
- Reducer: Reducer function that manages all state modifications.
- SwiftUI View: Decomposes UI into appropriate sub components.
- Uses Theme and Dependency Management Infrastructure
2021-09-06 17:12:31 +01:00
Stefan Ceriu
f2dd0e256b Revert "#4693 - Drop iOS 11 support."
This reverts commit a2b359f219.
2021-09-06 18:24:26 +03:00
Gil Eluard
bb1f93ac6a [Spaces] M10.6 Space preview bottom sheet #4497 2021-09-06 07:46:43 +03:00
David Langley
55c515fe4a 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
a786cbb90a #4693 - Drop iOS 11 support. 2021-09-01 15:55:41 +03:00
David Langley
790301ccb6 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
David Langley
fb67c9d235 Extract and start to split theme. 2021-08-27 16:26:56 +01:00
David Langley
45540f1d4f
Merge pull request #4752 from vector-im/langleyd/4467_account_notification_settings
Account Notification Settings and Keywords
2021-08-26 11:07:11 +01:00
David Langley
f4d51d4648 Add ViewFrameReader 2021-08-25 19:24:33 +01:00
David Langley
cbf6410567 Fix problem showing error message on completion 2021-08-18 15:12:12 +01:00
David Langley
f6ac4ca768
Update Riot/Modules/Common/SwiftUI/Inject.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2021-08-18 12:46:41 +01:00
David Langley
19ff75ddaf Fix imports and move logic to AvatarViewModel 2021-08-18 12:45:13 +01:00
David Langley
62d340ac6b
Update Riot/Modules/Common/SwiftUI/DependencyContainerKey.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-18 09:23:18 +01:00
David Langley
67e09001ac
Update Riot/Modules/Common/SwiftUI/DependencyContainerKey.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-18 09:23:00 +01:00
David Langley
b5cf3ae953
Update Riot/Modules/Common/SwiftUI/Inject.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-18 09:22:44 +01:00
David Langley
48d69ba041 run template, add entrypoint and update BuildSetting 2021-08-17 15:00:20 +01:00
David Langley
4b09985899 Fix tests and try fix build error 2021-08-17 14:17:18 +01:00
David Langley
96554872f3 Fix Comment 2021-08-17 11:58:20 +01:00
David Langley
b3a684ec39 Remove log 2021-08-17 11:56:16 +01:00
David Langley
de33b607b0 Add activity indicator 2021-08-17 11:44:08 +01:00
David Langley
ef25ef54dd Add dependency management, AvatarViewModel and placeholder rendering now in AvatarImage. 2021-08-17 10:19:41 +01:00
Gil Eluard
36bfd3c312 [Spaces] M10.7 Explore rooms #4571
- Update after design review
2021-08-16 20:18:59 +02:00
Gil Eluard
3b1c0119b7 [Spaces] M10.7 Explore rooms #4571
- Update after design review
2021-08-16 15:44:44 +02:00
Gil Eluard
0b7693da85 [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 10:33:10 +02:00
Gil Eluard
cae5f679e9 [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 07:57:30 +02:00
David Langley
e70987d8a7 Do avatar placeholder in SwiftUI, Add AvatarViewModel, Add dependency injection for MxMediaManager dependency. 2021-08-15 00:36:15 +01:00
David Langley
6fae92ce41
Update Riot/Modules/Common/Avatar/AvatarService.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-13 08:24:42 +01:00
David Langley
57719fd15d
Update Riot/Modules/Common/Avatar/AvatarService.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-13 08:24:26 +01:00
David Langley
b792af6594 Cleanup from comments 2021-08-12 16:57:19 +01:00
David Langley
3dfdb0fa83 Fix avatar service not returning generated image on network error. Fix padding and make nav buttons private. 2021-08-12 13:49:56 +01:00
David Langley
33aea8588f Remove visibility modifier 2021-08-12 12:42:26 +01:00
David Langley
7d1b893db6 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4669_room_notification_settings_swiftui 2021-08-12 11:52:50 +01:00
David Langley
c6ba23ec70 Add theming support, and support for other top level configuration to swiftui views with VectorHostingViewController, VectorContentModifier. Add VisibilityModifier. Move from List to VStack. 2021-08-12 11:52:06 +01:00
Doug
a54b10ef7b Remove green border from DM avatars. 2021-08-06 12:04:19 +01:00
Gil Eluard
ef234981a5 Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
2021-08-03 22:07:45 +02:00
Gil Eluard
3e7a875c77 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
2021-08-03 21:22:43 +02:00
Gil Eluard
7aff77f24d [Spaces] Show suggested in room lists #4501
- Preview suggested rooms
2021-08-03 13:45:22 +02:00
Gil Eluard
3797455c29 Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists 2021-08-02 14:40:17 +02:00
Gil Eluard
6cbb494f25 [Spaces] Show spaces in left panel #4509
- update after review
2021-08-02 09:57:30 +02:00
Gil Eluard
49e19c48f0 [Spaces] Show spaces in left panel #4509
- moved space filtering to MatrixKit
2021-07-30 06:56:37 +02:00
Gil Eluard
dd9a05a1bb [Spaces] Show suggested in room lists #4501
- Show suggested rooms section in home screen (no actions)
- Show suggested rooms section in rooms screen (no actions)
2021-07-29 23:24:34 +02:00
Gil Eluard
07fbf1aebb Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
2021-07-27 20:14:53 +02:00
Gil Eluard
8d6bdb7e8c [Spaces] Show spaces in left panel #4509
- filter rooms using `MXSpaceService` new API
2021-07-27 19:53:41 +02:00
Gil Eluard
a80249f4f2 [Spaces] Show spaces in left panel #4509
- filter rooms using `MXSpaceService` new API
- Added logs
2021-07-27 19:50:36 +02:00
Gil Eluard
4adc7238a4 Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists 2021-07-26 12:03:49 +02:00
Gil Eluard
a4336c3ca1 Merge branch 'element_4509' into gil/4509_show_spaces_in_left_panel 2021-07-26 12:03:04 +02:00
Gil Eluard
43ec74b5ca Merge branch 'spaces' into element_4509 2021-07-26 10:42:49 +02:00
SBiOSoftWhare
892f6d7718 RecentsDataSource: Factorize section reset management and do not make it in refreshRoomsSection method. 2021-07-23 10:42:08 +02:00
Gil Eluard
51fba28ed5 [Spaces] Show suggested in room lists #4501
- Request space suggested rooms in `RecentsDataSource`
2021-07-22 22:35:15 +02:00
Doug
d7b77f2fd1
Merge branch 'develop' into doug/4521_remove_directory_from_rooms_tab 2021-07-22 14:37:25 +01:00
Gil Eluard
f1da8c28bd [Spaces] Show spaces in left panel #4509
- Display the none hierarchical list of spaces in the left panel
- Space switching when new space selected
- Refresh space list and recents data after sync
2021-07-15 14:10:01 +02:00
Doug
989f19696d Merge branch 'develop' into doug/fix_warnings
# Conflicts:
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
2021-07-12 17:54:34 +01:00
langleyd
9e7fb75a2f Fix logging, add "Notify me for" label, fix theme on avatar and add changes 2021-07-08 20:54:32 +01:00
Doug
7ae3953167 Remove uninitialised header views. 2021-07-07 15:05:40 +01:00
Doug
ce88d3b7e2 Remove custom section header for room directory from RecentsDataSource. 2021-07-07 14:31:52 +01:00
Doug
b5c3cbe93e Don't include directorySection in RecentsDataSource when in RecentsDataSourceModeRooms mode. 2021-07-07 11:48:23 +01:00
langleyd
ef87cf1f90 Merge branch 'develop' of github.com:vector-im/element-ios into roomNotificationSettings 2021-07-06 19:51:17 +01:00
langleyd
c75ff07fa5 Keep old mute behaviour enabled on slide menu and long press when new build setting is not enabled. 2021-07-06 11:59:54 +01:00
langleyd
aa0056e8aa spacing and cleanup dead code 2021-07-05 16:49:06 +01:00
langleyd
e787d3b695 Add entry points at long press on home view and slide on recents. 2021-07-02 20:19:46 +01:00
Doug
080b3e94bb Fix documentation warnings. 2021-07-02 16:46:27 +01:00
SBiOSoftWhare
0232eeef33 AvatarView: Update AvatarViewDataProtocol, add possibility to set a defaut image. 2021-06-30 23:25:15 +02:00
ismailgulek
787571ba86
Hide invited rooms in recents if auto-accept option enabled 2021-06-21 14:51:09 +03:00
manuroe
848f0cedf8
Update Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-06-18 16:34:38 +02:00
manuroe
ddd1a852be Room lists: Avoid app freezes by building them on a separated thread
#3777
2021-06-18 15:49:20 +02:00
SBiOSoftWhare
88ea743f59 RecentsViewController: Improve room management when select a room id or alias from directory. 2021-06-16 11:22:29 +02:00
SBiOSoftWhare
f60638ccb3 RecentsViewController: Try to open a room preview when select a room id or alias from directory. 2021-06-15 16:17:43 +02:00
SBiOSoftWhare
c8f6bddd08 RecentsViewController: Handle RoomsDirectoryCoordinatorBridgePresenter did select room id or alias. 2021-06-14 16:13:46 +02:00
SBiOSoftWhare
cb432f05fa ShowDirectoryViewModel: Handle tap on search input cell. 2021-06-14 16:13:46 +02:00
simonwiedmer
aa6224e98c
Merge branch 'develop' into dial_pad_home 2021-06-09 11:21:03 +02:00
SBiOSoftWhare
ebf7d1a955 AvatarView: Advertize on subclassing necessity. 2021-06-08 17:49:11 +02:00
Simon Wiedmer
6f59a8f1be Add check for PSTN support to dialpad 2021-06-08 13:39:28 +02:00
Simon Wiedmer
effcae4bd9 Add 'Dial pad' option to plus menu on homescreen 2021-06-08 11:34:30 +02:00
SBiOSoftWhare
7bb1147c7b Add AlertPresentable that absracts an alert presenter. 2021-06-07 18:46:16 +02:00
SBiOSoftWhare
98666790e0 Create AvatarView: Base class to support an avatar view. 2021-06-07 18:46:16 +02:00
Stefan Ceriu
f7a8163947
Adopt consolidated logging mechanism (#4370)
* Adopted the new MXLog and replaced NSLog throughout the application - vector-im/element-ios/issues/4351
* Replaced NSLog() and print() usages with MXLog.debug()
* Added swiftlint rules for NSLog(), print(), println() and os_log()
* Escape paths used to run script build phases for swiftlint and swiftgen
2021-06-03 11:30:07 +03:00
SBiOSoftWhare
ab6e68614b RecentsDataSource: Present the secure backup banner only if key backup is disabled. 2021-05-18 11:05:19 +02:00
SBiOSoftWhare
bb3620135d RecentsDataSource: Do not display secure backup banner when keys upload is in process. 2021-05-17 15:44:29 +02:00
SBiOSoftWhare
c8f25b62c0
Merge branch 'spaces_beta' into spaces_feature_unavailable 2021-05-07 12:24:01 +02:00
SBiOSoftWhare
d0040edfaf BetaAnnounceCell: Update close button. 2021-05-06 15:46:06 +02:00
SBiOSoftWhare
c60861054b SpaceFeatureUnaivableViewController: Update UI. 2021-05-06 13:31:49 +02:00
SBiOSoftWhare
ebf0724907 CloseButton: Update UI. 2021-05-06 12:07:20 +02:00
SBiOSoftWhare
310ccbcbc7 RecentsViewController: Allows to decline space invites. 2021-05-05 11:32:18 +02:00
SBiOSoftWhare
f04105af88 RecentsDataSource: Hide spaces from home and room list but keep space invites. 2021-04-29 16:38:45 +02:00
SBiOSoftWhare
4fabf52ad6 RecentsViewController: Adverstize that spaces are not supported when tapping on a space invite. 2021-04-29 14:36:13 +02:00
Gil Eluard
eb3e7b8813 Make joining public rooms configurable 2021-04-13 19:21:07 +02:00
Johannes Marbach
978ddd4420 Fix memory leak in [RecentsDataSource dataSource:didStateChange:]
The block passed into `[MXSession listenToEventsOfTypes:onEvent:]` is stored with a strong
reference in the `listenerBlock` property of `MXSessionEventListener`. The method also
returns the listener and it is then stored into the `roomTagsListenerByUserId` dictionary
on `self`. Since a strong reference to `self` is captured in the block that means the block
retains `self` (via the capture) and `self` retains the block (via `roomTagsListenerByUserId`)
so there is a memory leak.

The bug is most easily reproduced during testing #4168 which involves closing the current
and creating a new session.

Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
2021-04-08 20:54:03 +02:00
manuroe
332ac1d0f9 Room lists: Do not encryptedRoomIcon in the code
Let it sleep hidden in the xib
2021-03-19 09:19:02 +01:00
manuroe
b88d15242d Room lists: Remove shields on room avatars
#4115

but keep it in the room screen
2021-03-17 15:32:01 +01:00
Gil Eluard
522d6a3eee Retrying & deleting failed messages
- Added unsent notice to tab bar room items
2021-03-11 09:01:44 +01:00
Gil Eluard
877356138b Retrying & deleting failed messages
- Update after code review
2021-03-10 22:19:04 +01:00
Gil Eluard
986a8a8bb0
Update Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-03-10 21:31:24 +01:00
Gil Eluard
d0e0dc856e Merge branch 'element_4014' into element_4013
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2021-03-09 13:22:13 +01:00
Gil Eluard
cde3bf64e6 Retrying & deleting failed messages
- code and UI tweaks
2021-03-03 21:37:04 +01:00
SBiOSoftWhare
3a0d133cd0 Update PublicRoomsDirectoryDataSource with RiotSettings.shared.showNSFWPublicRooms value where needed. 2021-03-03 16:33:11 +01:00
Gil Eluard
9a41f0d4b8 Retrying & deleting failed messages
- Display an exclamation mark (on a red background). In case of a multi-line message
- When a message with an error is selected, show a bottom bar with the 4 following actions: Retry - Delete - Edit - Copy
- If users press on Delete, a confirmation dialog is displayed
- When error messages occur, a general error message appears above the composer. Selecting Delete will delete all error messages. Pressing on Retry will attempt to resend error messages
- If users press on Delete, a confirmation dialog is displayed
- In room lists, decorate rooms with errored messages with the error icon. Rooms with errors should be sorted first
2021-03-02 21:56:50 +01:00
SBiOSoftWhare
c63256ad10 RecentsVC: Handle room directory display. HomeVC now show room directory on join room action. 2021-02-22 17:47:40 +01:00
ismailgulek
d09c4c9f07 Merge branch 'voip_2746' into voip_dialpad 2021-02-10 00:38:23 +03:00
Gil Eluard
771515aaed The Invite cell behaviour is not driven by MXRoom.isDirect property anymore 2021-02-05 10:25:27 +01:00
ismailgulek
bfc82b0b0f Merge branch 'voip_2746' into voip_dialpad
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2021-01-20 16:25:36 +03:00
Gil Eluard
274d5968d1 Prevent navigation controller from pushing same view controller 2021-01-14 10:57:12 +01:00
ismailgulek
d07e1f8825 Fix warnings, pass properties to new instance 2021-01-13 22:28:22 +03:00
ismailgulek
07605980da Implement dialpad view controller 2021-01-13 21:51:47 +03:00
SBiOSoftWhare
199ec0206e Add CustomRoundedButton: Button to customized from the outside. 2021-01-11 18:22:43 +01:00