Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 00:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
6149 commits 46 branches 261 tags 144 MiB
Commit graph

447 commits

Author SHA1 Message Date
SBiOSoftWhare
55f3a68afb RoomVC: Prevent user interaction in timeline while presenting context menu. 2019-05-24 11:33:44 +02:00
manuroe
90784d13a0
Merge pull request #2438 from dcordero/verification_id_labels_fix 
Verification id labels fix
 2019-05-23 17:57:49 +02:00
SBiOSoftWhare
31feca6f17 Room contextual menu: Update button titles color and disabled opacity. 2019-05-23 17:48:52 +02:00
SBiOSoftWhare
f14cbf759e Registration: Fix infinite loop when register with email and validate from mobile. 2019-05-23 16:46:00 +02:00
David Cordero
627291529b Merge branch 'develop' into verification_id_labels_fix 2019-05-22 19:10:35 +02:00
SBiOSoftWhare
366d27ebab Contextual menu: Improve reactions menu position. 2019-05-22 18:48:50 +02:00
SBiOSoftWhare
09991e53c7
Merge pull request #2464 from vector-im/riot_2446 
BF: Menu actions: Display message time
 2019-05-22 17:41:18 +02:00
SBiOSoftWhare
a62548c545
Update Riot/Modules/Room/CellData/RoomBubbleCellData.h 
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
 2019-05-22 17:27:29 +02:00
SBiOSoftWhare
0fb13febee RoomVC: Display message time when contextual menu is shown. 2019-05-22 16:54:51 +02:00
SBiOSoftWhare
6ce4a826be RoomVC: Show contextual menu on single tap. 2019-05-22 16:37:06 +02:00
SBiOSoftWhare
4bde8a435b Room contextual menu: Dismiss when swipe up or down. 2019-05-22 16:35:46 +02:00
SBiOSoftWhare
b234a09bf1 RoomBubbleCellData: Add a property to display the timestamp of the selected component on the left when there is enough space. 2019-05-22 16:17:55 +02:00
manuroe
98c95fb849 Reactions menu: Patch RoomContextualMenuPresenter while we have a retain cycle 2019-05-21 02:12:14 +02:00
SBiOSoftWhare
3117c4322c Theme: Remove non needed reaction colors 2019-05-21 01:09:42 +02:00
SBiOSoftWhare
321811283a BubbleReactionsView: Use a UICollectionViewFlowLayout subclass with left alignement. 2019-05-21 00:43:10 +02:00
SBiOSoftWhare
d2cfe4891a RoomDataSource: Handle reactions display on bubble cell. 2019-05-20 21:59:18 +02:00
SBiOSoftWhare
75d7b26bfc RoomBubbleCellData: Improve reactions view vertical space calculation 2019-05-20 21:57:29 +02:00
SBiOSoftWhare
4ababf957e Create BubbleReactionsView 2019-05-20 21:54:23 +02:00
SBiOSoftWhare
2caf4e326f Create BubbleReactionsViewModel 2019-05-20 21:52:07 +02:00
SBiOSoftWhare
e5d8910a92 Create BubbleReactionViewCell 2019-05-20 21:51:24 +02:00
SBiOSoftWhare
2d118853a7 Create AutosizedCollectionView a convenient UICollectionView that makes dynamic sizing easier when using Auto Layout 2019-05-20 21:49:57 +02:00
manuroe
aadac45de6 Reactions menu: Do not notify delegate if reaction requires an unreaction 
Fix Steve's remark
 2019-05-20 20:41:05 +02:00
manuroe
86808b16e2 Reactions menu: Do not notify delegate if reaction requires an unreaction 
This avoids to call the delegate twice.
Note: In a short future, we will no more have those 3 state buttons
 2019-05-20 19:48:29 +02:00
manuroe
d72f2eb762 Reactions: Remove the send reaction hack as it is now done in the SDK 2019-05-20 19:40:52 +02:00
manuroe
f105fadc48
Merge branch 'develop' into aggregations 2019-05-20 17:57:50 +02:00
manuroe
6866fe8e2c Reactions: Add a labs setting 
#2441
 2019-05-20 17:31:25 +02:00
manuroe
2b7b2c5a6c Reactions: Use the hack like on riot-android and riot-web if the server has not yet the aggregations API 
Fix Steve's comment
 2019-05-20 17:00:57 +02:00
manuroe
4a7677a667 Reactions: Use the hack like on riot-android and riot-web if the server has not yet the aggregations API 2019-05-20 16:04:54 +02:00
manuroe
0973d3886b Reactions: Reactions menu: highlight reactiosn only our user made 2019-05-20 15:00:47 +02:00
David Cordero
8dfa395647 Remove redundant code 2019-05-19 17:19:23 +02:00
David Cordero
10c1624f7e Fix text color for user display name and device id labels in dark theme 2019-05-19 17:14:41 +02:00
manuroe
80d817c98e Reactions: Reactions menu: plug unreact 2019-05-17 17:39:31 +02:00
manuroe
443b886a34
Merge pull request #2430 from vector-im/reactions_in_context_menu 
RoomVC: ContextualMenu: Plug reactions menu
 2019-05-17 13:33:57 +02:00
manuroe
b1ebf79e50 RoomVC: ContextualMenu: Plug reactions menu 2019-05-17 12:17:59 +02:00
manuroe
00bebecc29 Reactions: Add placeholder for reactions list under message 2019-05-17 01:28:45 +02:00
manuroe
3249751dc2 RoomBubbleCellData: Do readReceiptVerticalWhitespace thing in one place 2019-05-16 18:27:48 +02:00
manuroe
0ed0d8cef5 Reactions: Follow small SDK change 2019-05-16 17:44:07 +02:00
manuroe
0bc5c28390 Reactions: Fix Steve's comments 2019-05-16 16:07:07 +02:00
manuroe
8d7f535581
Merge branch 'aggregations' into riot_2393 2019-05-16 14:51:14 +02:00
manuroe
ec758a84b7 Reactions: we cannot like & dislike at the same time 2019-05-16 14:45:42 +02:00
manuroe
13beb50abb Reactions: notify coordinator for every reaction request steps 
so that it can leave the view when it wants
 2019-05-16 08:07:52 +02:00
manuroe
65ec1e9988 Reactions: Plug button actions 2019-05-16 07:47:23 +02:00
manuroe
7cd5e79bc6 Reactions: Customise primary reactions buttons 2019-05-15 23:35:09 +02:00
SBiOSoftWhare
f5887c4774 RoomViewController: Disable reply on single tap selection. 2019-05-15 23:30:33 +02:00
SBiOSoftWhare
c0e313f156 RoomViewController: Show contextual menu toolbar on long press. 2019-05-15 23:24:34 +02:00
SBiOSoftWhare
1f43a8ee5e Create RoomContextualMenuPresenter 2019-05-15 23:10:07 +02:00
SBiOSoftWhare
d682b97441 Create RoomContextualMenuViewController 2019-05-15 23:09:03 +02:00
SBiOSoftWhare
cd238cc2f0 Create RoomContextualMenuToolbarView 2019-05-15 23:07:50 +02:00
SBiOSoftWhare
444a2ee452 Create room contextual menu action enum 2019-05-15 23:02:25 +02:00
SBiOSoftWhare
3be7a5274a RoomDataSource: Add a property to show or hide timestamp when selecting an event. 2019-05-15 21:44:07 +02:00
SBiOSoftWhare
c808ae5057 RoomBubbleCellData: Add a property to show or hide timestamp for selected component. 2019-05-15 21:34:32 +02:00
manuroe
52a480db92 Reactions: Translate primary reactions 2019-05-15 16:38:28 +02:00
manuroe
e419eecfeb Reactions: Add primary reactions as message actions 2019-05-15 16:00:36 +02:00
manuroe
97ffa9bf1e Device Verification: Fix buttons colors in dark theme 2019-05-06 08:21:30 +02:00
manuroe
ef4fed1bb2 RoomVC: When replying, use a "Reply" button instead of "Send" 2019-04-30 17:27:57 +02:00
manuroe
16dc04e18d RoomInputToolbarView: Turn the boolean replyToEnabled into an enum: sendMode 
because message editing (#2404) is coming
 2019-04-30 17:08:52 +02:00
SBiOSoftWhare
3e430e7b45 Fix room details navigation from rooms list. 2019-04-29 14:24:20 +02:00
manuroe
08d83114fe
Merge pull request #2378 from aaronraimist/homeserver 
home server -> homeserver (#2345)
 2019-04-26 11:41:47 +02:00
SBiOSoftWhare
3da89a05ce Handle button title for restore action case in SettingsKeyBackupTableViewSection. 2019-04-25 16:10:22 +02:00
SBiOSoftWhare
cdede7fcce Merge develop into prepare_riot_2231 2019-04-25 15:59:32 +02:00
SBiOSoftWhare
24d7c087fb Remove check for +[UIFont systemFontOfSize:weight:] availability. 2019-04-25 12:27:31 +02:00
SBiOSoftWhare
04b5dd0b58 Remove iOS 10 availability condition in MasterTabBarController. 2019-04-25 11:53:38 +02:00
SBiOSoftWhare
42ddca925f Use a weak reference for mediaPicker property in RoomInputToobarView. 2019-04-24 17:56:59 +02:00
SBiOSoftWhare
87a6d13855 [Media Picker] Fix some retain cycles and fix implicit self warnings. 2019-04-24 17:56:03 +02:00
SBiOSoftWhare
84660597fb Merge develop into riot_1483 2019-04-24 16:28:51 +02:00
manuroe
8d68da4da8
Update Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m 
Co-Authored-By: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2019-04-24 15:55:51 +02:00
manuroe
cab15e7477
Merge pull request #2372 from vector-im/riot_2323 
E2E: SAS Verification
 2019-04-24 14:51:04 +02:00
manuroe
b4c0a77ca1 Device Verification: Add a view model to DeviceVerificationDataLoadingViewController 2019-04-24 14:42:16 +02:00
manuroe
a1901e6238 Device Verification: Update SDK constant names changes 2019-04-24 10:35:56 +02:00
manuroe
c987e80d54 Clarify key backup details when backup exists but is not trusted in banner too 
This follows changes made by https://github.com/vector-im/riot-ios/pull/2375
 2019-04-24 10:23:27 +02:00
manuroe
7bc6ba25af Device Verification: Make incoming requests dialogs dequeueing work without a random sleep 2019-04-24 08:55:45 +02:00
manuroe
6eadbbdae0 Device Verification: Remove a TODO 2019-04-24 08:23:44 +02:00
manuroe
3c0237a4bd Device Verification: Fix Steve's PR comments 2019-04-24 08:18:56 +02:00
Aaron Raimist
d710b3788d
home server -> homeserver (#2345) 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-04-19 21:27:10 -05:00
SBiOSoftWhare
b4c1cd0376 Update JistiViewController to use new JitsiMeet SDK API 2019-04-19 18:34:44 +02:00
SBiOSoftWhare
b6e847c638 Create JitsiService to abstract and configure Jisti Meet SDK 2019-04-19 18:29:53 +02:00
manuroe
e90fa1c323 Device Verification: Update wording "Verify user" -> "Verify device" 2019-04-19 11:38:48 +02:00
manuroe
bffe14f760 Device Verification: Manage display of SAS decimals 2019-04-19 11:31:19 +02:00
manuroe
b838e1c2d5 Device Verification: Clean dev code 2019-04-19 10:35:02 +02:00
manuroe
1df16d8ac7 Device Verification: Start: Fix missing cancelledByMe state 2019-04-18 23:12:01 +02:00
J. Ryan Stinnett
b5ee4a6aa9 Clarify key backup details when backup exists but is not trusted 
This ports the wording changes from Riot Web
https://github.com/matrix-org/matrix-react-sdk/pull/2917.

"Use key backup" as button text feels like it's telling me I haven't set it up
at all. This changes to "Connect this device ..." which seems more reassuring
and applies for both the "add to backup" and "restore from backup" use cases.

This also updates the backup status text for the case where a backup exists, but
it's not being used by the current device so that it's much more clear that you
have a backup at least.
 2019-04-18 13:30:32 +01:00
manuroe
771444573d Device Verification: MXUser.displayname and avatar can be nil 2019-04-17 13:54:51 +02:00
manuroe
bcacc78b3c Device Verification: Display a message when the transaction has been automatically cancelled 2019-04-17 13:05:18 +02:00
manuroe
5cad9743fb Device Verification: Removed unused code from templates 2019-04-17 12:52:45 +02:00
manuroe
d49dce7dcb Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC 2019-04-17 12:47:42 +02:00
manuroe
ce47ea0277 Device Verification: Hack EncryptionInfoView to display the new device verification flow when the user taps on "Verify" 2019-04-17 09:51:32 +02:00
manuroe
8a50ccb077 SettingsVC: Remove dead code using EncryptionInfoView 2019-04-17 08:57:16 +02:00
manuroe
01e699fdf1 Device Verification: Plug it in the code more 2019-04-17 08:09:43 +02:00
manuroe
dd34bfe716 Device Verification: Plug it in the code 2019-04-16 17:55:40 +02:00
manuroe
e8ed9a19f9 Device Verification: Plug the legacy verification modal 2019-04-16 15:00:57 +02:00
manuroe
4889690698 Device Verification: Do not show back button 2019-04-16 11:36:51 +02:00
manuroe
b12c2af145 Device Verification: Translate emoji 2019-04-16 09:33:25 +02:00
manuroe
aeb0031fda Device Verification: Verified screen 2019-04-15 18:40:04 +02:00
manuroe
1a7d642325 Device Verification: Verified screen 2019-04-15 18:22:24 +02:00
manuroe
e721b6cf60 Device Verification: Incoming screen: UI: Use a rounded MXKImageView 2019-04-15 15:28:59 +02:00
manuroe
a4a2064970 Device Verification: Incoming screen: UI: plug data 2019-04-15 14:18:44 +02:00
manuroe
bdefacff0e Device Verification: Incoming screen: UI design 2019-04-15 11:09:37 +02:00
manuroe
db8b3c5648 Device Verification: Incoming screen: working on UI 2019-04-13 00:19:01 +02:00
manuroe
a9502603d6 Device Verification: Incoming screen: beginning 2019-04-12 23:19:07 +02:00
manuroe
785bc7f176 Device Verification: Display the "The other party cancelled the verification." modal 2019-04-11 19:38:46 +02:00