Commit graph

578 commits

Author SHA1 Message Date
ismailgulek
c23a69c338
Fix review remarks 2022-01-25 23:59:19 +03:00
SBiOSoftWhare
3d8b7c847f RoomVC: Handle new voice location cell identifiers. 2022-01-25 16:43:21 +01:00
SBiOSoftWhare
edc21e4abf RoomVC: Handle new voice message cell identifiers. 2022-01-25 14:53:53 +01:00
ismailgulek
8cc82cf7e1
Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
Gil Eluard
afa77deef7 Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
2022-01-24 19:36:02 +01:00
SBiOSoftWhare
95ee3cf041
Merge pull request #5383 from vector-im/steve/5208_text_msg_layout
Message bubbles: Text message layout
2022-01-21 16:06:57 +01:00
ismailgulek
03977b893b
Implement going back to live room data sources for threads, fix bugs around it 2022-01-21 01:56:51 +03:00
ismailgulek
d2217b5dae
Scroll to highlighted event better 2022-01-21 00:59:01 +03:00
SBiOSoftWhare
6edacd7ffd Refactor RoomTimelineCellProviderProtocol to RoomTimelineCellProvider. 2022-01-20 17:09:34 +01:00
David Langley
0be2787059
Merge pull request #5400 from vector-im/langleyd/5399_fix_crash_uploading_video_ipad
Fix crash uploading video ipad
2022-01-19 09:19:25 +00:00
David Langley
b234a183ac Specify source of alertView popup for selecting video/image size on upload 2022-01-18 21:35:53 +00:00
ismailgulek
ec8acd042d
Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-19 00:12:40 +03:00
ismailgulek
8a1d66f49a
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-19 00:09:26 +03:00
ismailgulek
fe9eeeadd5
Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu
6eb0f6c9ef vector-im/element-ios/issues/5114 - De-labs-ed polls, disabled editing and undisclosed polls until platform parity. 2022-01-18 20:05:10 +02:00
Stefan Ceriu
a23bd0da99 vector-im/element-ios/issues/5114 - Allow editing poll start events. 2022-01-18 20:05:10 +02:00
ismailgulek
240bf6af95
Disable sending polls in threads 2022-01-18 16:32:23 +03:00
ismailgulek
21d6ea5000
Dismiss keyboard when additional menu shown 2022-01-18 02:27:44 +03:00
ismailgulek
d5de3a9b2f
Various design fixes 2022-01-17 16:32:32 +03:00
ismailgulek
696d7003c6
Fix build after merges 2022-01-17 13:35:14 +03:00
ismailgulek
f3e492a300
Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:39:25 +03:00
ismailgulek
e9b24263e7
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-17 11:37:41 +03:00
ismailgulek
aeccbc0dac
Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
SBiOSoftWhare
d2ba53e37b RoomVC: Handle cell provider. 2022-01-14 10:23:15 +01:00
Gil Eluard
be4cd455f1 Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
2022-01-13 16:30:55 +01:00
Gil Eluard
cdb4cc131e 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
ismailgulek
b64a9acaf6
Remove old code 2022-01-12 14:46:54 +03:00
ismailgulek
586f2e523d
Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-12 13:58:48 +03:00
ismailgulek
c1cee57b6e
Add EventMenuBuilder to manage ordering on event menu actions 2022-01-10 17:31:28 +03:00
ismailgulek
357515bd8a
Fix context menu action orders & layout fixes 2022-01-06 03:22:14 +03:00
ismailgulek
42a44dd3f5
Implement toast messages when links are copied 2022-01-06 02:41:57 +03:00
Stefan Ceriu
592acde1c8 vector-im/element-ios/issues/5298 - Displaying a modal when tapping on a location in the timeline. 2022-01-04 17:33:32 +02:00
Stefan Ceriu
e6379c8588 vector-im/element-ios/issues/5298 - Disable forwarding for location messages and allow replies. 2022-01-04 17:33:32 +02:00
Stefan Ceriu
6a46c42cfd vector-im/element-ios/issues/5298 - Implemented location sharing from the input toolbar action menu. 2022-01-04 17:33:32 +02:00
Stefan Ceriu
5a72750f8d vector-im/element-ios/issues/5298 - Replaced "msgtype" strings with new kMXMessageTypeKey. 2022-01-04 17:33:32 +02:00
Stefan Ceriu
01f53bd8d1 Rendering location messages in the timeline. 2022-01-04 17:33:32 +02:00
ismailgulek
2c1324ba74
Update icons & summary view margins 2022-01-04 16:20:40 +03:00
ismailgulek
ca36f99a08
Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00
Gil Eluard
443401838f Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2021-12-27 11:48:36 +01:00
ismailgulek
1412ba724e
Make remove and report actions destructive 2021-12-21 16:45:19 +03:00
ismailgulek
e47c1c4861
Add view in room action for attachments 2021-12-21 16:44:51 +03:00
Doug
3a9d35a50b Add AnalyticsScreenTimer and track more screens.
Update Analytics with new methods in MXAnalyticsDelegate.
2021-12-16 16:59:45 +00:00
Doug
7bdc146b82 Use matrix-analytics-events generated stubs (locally for now).
Track screens, removing any that aren't part of the schema.
2021-12-16 16:59:45 +00:00
Doug
23555b00fd Add specific methods to track analytics and test generated event types. 2021-12-16 16:59:45 +00:00
Doug
6f94303cdc Begin migration from Matomo to PostHog
Add CocoaPods-Keys.
2021-12-16 16:59:26 +00:00
ismailgulek
2f076930fe
Adapt MXEventTimeline changes 2021-12-15 01:44:04 +03:00
Gil Eluard
4e50a1ac46 Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift
2021-12-13 15:09:40 +01:00
ismailgulek
a803aeb1b9
Merge branch 'ismail/5095_thread_search_results' into ismail/5096_thread_notifications 2021-12-10 11:14:55 +03:00
ismailgulek
d5dc6928ea
Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-12-10 11:08:01 +03:00
ismailgulek
da9407f062
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-12-10 11:07:27 +03:00
ismailgulek
1f918c921d
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-12-10 11:03:00 +03:00
ismailgulek
e3a47a59f9
Merge branch 'develop' into ismail/5068_start_thread 2021-12-09 15:25:14 +03:00
Stefan Ceriu
d5982e813b vector-im/element-ios/issues/5114 - Polls in the timeline. 2021-12-09 09:37:02 +02:00
Gil Eluard
26bf2a3719 Invite to Space in room landing #5225
- Added participant invite coordinator
2021-12-08 23:21:55 +01:00
ismailgulek
075495f20a
Hide jump to unread button on threads, override scroll to bottom action, fix #5264 2021-12-08 16:04:11 +03:00
SBiOSoftWhare
dcad18bfb4
Merge pull request #5219 from vector-im/steve/5020_matrixkit_merge
Merge MatrixKit repository into Element
2021-12-03 15:44:30 +01:00
ismailgulek
9eef855e7c
Clear highlighted event when view gone 2021-12-03 02:41:01 +03:00
ismailgulek
1fac638bfd
Mark thread as read when viewed 2021-12-02 16:57:41 +03:00
Stefan Ceriu
ec00c52a0a vector-im/element-ios/issues/4753 - Allow audio file attachments to be played back inline by reusing the existing voice message UI. 2021-12-02 15:38:59 +02:00
ismailgulek
ac29d71634
Update logic for thread list bar button item 2021-12-02 14:45:23 +03:00
ismailgulek
2ddb6540cc
Create BadgedBarButtonItem class and use it for thread list item 2021-12-01 17:24:47 +03:00
SBiOSoftWhare
4081da3ebc Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
ismailgulek
ad5a21edfc
Just highlight event when possible instead of reloading data source 2021-11-30 14:13:57 +03:00
ismailgulek
11ba0958b1
Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-11-30 01:54:56 +03:00
ismailgulek
7f53684742
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-30 01:34:44 +03:00
ismailgulek
5edcb644ea
Make remove actions destructive & move remove action to the bottom 2021-11-30 01:29:52 +03:00
ismailgulek
ed78757991
Merge branch 'ismail/5119_thread_root_removal' into ismail/5094_thread_links 2021-11-30 01:14:51 +03:00
ismailgulek
42a653309b
Merge branch 'ismail/5117_thread_message_actions' into ismail/5119_thread_root_removal 2021-11-30 01:14:23 +03:00
ismailgulek
4c2e8485d7
Fix alert 2021-11-30 01:14:05 +03:00
ismailgulek
24fe4a51ec
Display room title view for non-live timelines too 2021-11-30 01:13:14 +03:00
ismailgulek
b779bf477b
Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-11-26 01:46:32 +03:00
ismailgulek
65335ce825
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-26 01:45:37 +03:00
ismailgulek
7cfa67b704
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-26 01:43:44 +03:00
ismailgulek
68ac7cd49d
Adapt to event changes 2021-11-26 01:42:53 +03:00
ismailgulek
7b57570119
Implement actions for a thread 2021-11-25 14:55:44 +03:00
ismailgulek
310841704b
Fix view in room thread action when navigated from thread list 2021-11-22 17:36:28 +03:00
ismailgulek
e8222ad50c
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-22 14:59:07 +03:00
ismailgulek
415cf36854
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-22 12:26:41 +03:00
ismailgulek
fc87a3534d
Move more button out of the title view & remove weird constraints 2021-11-22 12:22:53 +03:00
ismailgulek
e7190f426f
Don't show thread list button in threads 2021-11-22 11:46:45 +03:00
ismailgulek
2873d1586e
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-19 14:46:51 +03:00
ismailgulek
6751896304
Fix alert 2021-11-19 14:43:38 +03:00
ismailgulek
f56be33f5a
Move view in room action to the top most 2021-11-19 14:37:09 +03:00
ismailgulek
5238165e63
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-19 14:35:11 +03:00
ismailgulek
c9f018f046
Push thread view instead of presenting 2021-11-19 14:19:23 +03:00
ismailgulek
1d76c39f57
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-19 00:24:38 +03:00
ismailgulek
a0d7e1fa33
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-19 00:24:02 +03:00
ismailgulek
8723a69528
Merge branch 'develop' into ismail/5068_start_thread 2021-11-19 00:23:24 +03:00
Doug
e324767d7d Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
ismailgulek
485227b94e
Generate classes 2021-11-16 17:14:57 +03:00
ismailgulek
7c7706a607
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-16 15:55:57 +03:00
ismailgulek
342372b81d
Move copy action into the more action sheet if threading enabled for an event 2021-11-15 17:44:21 +03:00
ismailgulek
c3adbbd7a7
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-15 13:51:11 +03:00
ismailgulek
cc466501b6
Highlight thread root event in the timeline 2021-11-15 13:50:08 +03:00
ismailgulek
1f5f8d1ba4
Hide thread context menu in the thread 2021-11-12 17:30:31 +03:00
ismailgulek
6dd5bf60a6
Implement bridge presenter delegate for opened thread 2021-11-12 17:26:49 +03:00
ismailgulek
ed390db60a
Add new action for the thread root event in thread view 2021-11-12 17:25:58 +03:00
ismailgulek
3766c49e74
Add eventId parameter to delegates 2021-11-12 17:24:58 +03:00
ismailgulek
a319f076b1
Merge branch 'develop' into ismail/5068_start_thread 2021-11-11 21:43:16 +03:00
ismailgulek
1126ae995b
Present threads with custom sized presentable 2021-11-11 15:17:01 +03:00
Stefan Ceriu
30ff8a65fb vector-im/element-ios/issues/5114 - Poll creation screen
- added input toolbar poll creation action.
- reordered input toolbar actions as per designs.
- added multiline text field and extracted common components.
2021-11-11 11:24:28 +02:00
ismailgulek
16b1c8711f
Dismiss thread when close tapped 2021-11-11 01:07:12 +03:00
ismailgulek
c4fbb51fb8
Load correct instance of RoomViewController from the storyboard 2021-11-11 01:06:00 +03:00
ismailgulek
be95c95151
Introduce RoomDisplayConfiguration for room display options 2021-11-10 18:03:02 +03:00
ismailgulek
fe1b6d1e50
Implement opening thread modal when tapped 2021-11-10 15:42:42 +03:00
ismailgulek
d80aba0793
Add thread option to an event if the labs setting enabled 2021-11-09 15:24:08 +03:00
Stefan Ceriu
c961a71f7f vector-im/element-ios/pull/5014 - Forward original message content and remove the need to re-upload media. 2021-11-09 10:41:21 +02:00
Phl-Pro
8246dc93e0
Merge branch 'develop' into phlpro/4722_objc_headers 2021-11-05 14:41:36 +01:00
ismailgulek
0a8952170a
Initialize thread data source 2021-11-04 02:07:50 +03:00
Doug
fd93bb6fab
Merge pull request #5074 from vector-im/doug/5071_fix_presented_views
Fix more button not working.
2021-11-03 16:35:03 +00:00
SBiOSoftWhare
39c94682a9 Merge branch 'hotfix/1.6.7' into hotfix/1.6.7_2 2021-11-03 17:22:21 +01:00
ismailgulek
788e817617
Add context menu item 2021-11-03 13:36:18 +03:00
Doug
458b8543cd Ensure DisabledRoomInputToolbarView is used. Fix previewing rooms. Fix favourited DMs in Home. 2021-11-03 10:18:27 +00:00
Doug
1415155eb6 Present alerts before assigning to currentAlert. 2021-11-01 15:05:02 +00:00
Finn Behrens
f284f2f983 Remember keyboard language for room
This adds a `textInputContextIdentifier` to the RoomViewController to save the current language per room.

Signed-off-by: Finn Behrens <me@kloenk.dev>
2021-10-31 19:58:21 +01:00
SBiOSoftWhare
e33f0779d2 RoomViewController: Fix a crash on before iOS 14. 2021-10-29 13:47:42 +02:00
SBiOSoftWhare
a05c488ed6 Update weak views usage. 2021-10-29 10:50:24 +02:00
SBiOSoftWhare
9fc412f41d RoomVC: Fix typo. 2021-10-28 18:51:25 +02:00
SBiOSoftWhare
03cdf3d732 RoomVC: Prevent retain cycles. 2021-10-28 17:41:16 +02:00
Philippe Loriaux
c6c3eaaec1 Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
SBiOSoftWhare
0d1f8305e9 Rename UniversalLinkPresentationParameters to ScreenPresentationParameters. 2021-10-21 10:00:37 +02:00
SBiOSoftWhare
ee573879a3 Merge develop into 4734_room_stack 2021-10-20 11:14:52 +02:00
SBiOSoftWhare
cb3025da19 RoomVC: Fix typo. 2021-10-20 09:21:02 +02:00
SBiOSoftWhare
9d6946ddf1 RoomVC: Update with UniversalLinkPresentationParameters. 2021-10-20 07:32:04 +02:00
ismailgulek
61ce79e50a
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-19 16:40:34 +03:00
SBiOSoftWhare
c62470bc3c RoomVC: Remove temporary space universal link handling. 2021-10-19 12:29:59 +02:00
Stefan Ceriu
12c167ba6c vector-im/element-ios/issues/5009 - Implemented multi-room forwarding and added various tweaks following code review. 2021-10-18 16:40:53 +03:00
Stefan Ceriu
e3f1bd25a9 vector-im/element-ios/issues/5009 - Refactored away the NSExtensionContext dependency from the ShareManager. Introduced different ShareItemProviders for the share extension and the main application. Improved item loading error handling. 2021-10-18 16:40:53 +03:00
Stefan Ceriu
aa790b24a8 vector-im/element-ios/issues/5009 - Fixed share extension setup and cleaned up code. 2021-10-18 16:40:53 +03:00
Stefan Ceriu
d7ab73524f vector-im/element-ios/issues/5009 - Moved files around, cleaned up imports and logs. 2021-10-18 16:40:53 +03:00
Stefan Ceriu
b6514349fb vector-im/element-ios/issues/5009 - Refactored share extension and started using the shared code directly in the main application. 2021-10-18 16:40:48 +03:00
SBiOSoftWhare
5bd1d6a44f Merge branch 'develop' into steve/4734_room_stack 2021-10-14 16:21:03 +02:00
ismailgulek
ba53cb6d41
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-13 14:34:20 +03:00
Stefan Ceriu
2e0aab11ea #1098 - Added extra top padding on first list item. Fixed various merge problems. 2021-10-13 11:46:43 +03:00
Stefan Ceriu
9b3e68a3db #1098 - Working real user suggestion inside the main application. 2021-10-13 11:26:22 +03:00
Stefan Ceriu
109a4e7157 #1098 - Added user suggestions to the main app timeline. 2021-10-13 11:25:36 +03:00
Stefan Ceriu
7de24ab628 #1098 - Generated UserSuggestion from template, got initial UI working and automatically updating. 2021-10-13 11:24:46 +03:00
SBiOSoftWhare
28278ab47d RoomVC: Update universal link management with UniversalLinkParameters. 2021-10-12 19:12:08 +02:00
ismailgulek
58df3d3309
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-12 11:49:55 +03:00
SBiOSoftWhare
f891cce4bb
Merge pull request #4960 from vector-im/steve/4734_master_tab_bar_refacto
Split view: Improve detail view management and add possibility to stack views on it
2021-10-11 17:23:20 +02:00
ismailgulek
efb495e95f
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-08 16:59:25 +03:00
Stefan Ceriu
d6ffc55477 vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-10-08 11:33:13 +03:00
SBiOSoftWhare
815106f831 Split view: Set navigationItem.leftItemsSupplementBackButton to YES for view controllers used as detail. 2021-10-05 10:48:51 +02: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
bc1d0d7172
Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
Gil Eluard
ca7bf18f76 [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02:00
Gil Eluard
cc8ac58fd5 Merge branch 'spaces' into gil/4498_Handle_space_link 2021-09-23 15:26:29 +02:00
Gil Eluard
cf51612864 Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
David Langley
53563c996f
Merge pull request #4892 from vector-im/langleyd/4772_voice_message_drafts
Voice message draft persistence
2021-09-23 11:21:26 +00:00