Commit Graph

5042 Commits

Author SHA1 Message Date
David Cordero 1a7afc9b02 Merge branch 'develop' into verification_id_labels_fix 2019-05-22 19:10:35 +02:00
SBiOSoftWhare d3be9bad43 Contextual menu: Improve reactions menu position. 2019-05-22 18:48:50 +02:00
SBiOSoftWhare 770c1b3434 MXKRoomBubbleTableViewCell: Add convenient method to calculate a bubble component frame in table view. 2019-05-22 18:46:22 +02:00
Weblate d503b93f4f Merge branch 'origin/develop' into Weblate. 2019-05-22 15:41:22 +00:00
SBiOSoftWhare 1f90be1243 Merge pull request #2464 from vector-im/riot_2446
BF: Menu actions: Display message time
2019-05-22 17:41:18 +02:00
Weblate be57ccd83f Merge branch 'origin/develop' into Weblate. 2019-05-22 15:31:34 +00:00
SBiOSoftWhare 77c208f967 Merge pull request #2463 from vector-im/riot_2446
Menu actions: Display message time
2019-05-22 17:31:30 +02:00
SBiOSoftWhare e619247ea5 Update Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
2019-05-22 17:28:08 +02:00
SBiOSoftWhare 9849682124 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 68c9b5b018 RoomVC: Display message time when contextual menu is shown. 2019-05-22 16:54:51 +02:00
Weblate a42ba6125e Merge branch 'origin/develop' into Weblate. 2019-05-22 14:47:56 +00:00
manuroe 3f1a4b2a76 Merge pull request #2425 from vector-im/giomfo/third_party_licenses
Update third-party licences
2019-05-22 16:47:53 +02:00
Weblate 82df8c2474 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:46:20 +00:00
manuroe 34b48ddc8f Merge pull request #2432 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-05-22 16:46:16 +02:00
Weblate c96184cc0f Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:44 +00:00
manuroe 048b8a61bd Merge pull request #2431 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-05-22 16:45:40 +02:00
Weblate 5744b32d5f Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
manuroe 000da11fe4 Merge pull request #2426 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2019-05-22 16:45:11 +02:00
SBiOSoftWhare ef61ac0702 EventFormatter: Use a 24 hour date format for time. 2019-05-22 16:39:11 +02:00
SBiOSoftWhare ba0e6561de RoomVC: Show contextual menu on single tap. 2019-05-22 16:37:06 +02:00
SBiOSoftWhare d2cd1a4d13 Room contextual menu: Dismiss when swipe up or down. 2019-05-22 16:35:46 +02:00
SBiOSoftWhare b32fda5cb9 Add convenient method on UITouch to determine if touch is inside a given view. 2019-05-22 16:35:26 +02:00
SBiOSoftWhare f76dd3a5bb MXRoomBubbleTableViewCell: Display the timestamp of the selected component on the left when there is enough space. 2019-05-22 16:22:26 +02:00
SBiOSoftWhare de2edce40f 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 cf98e512b6 Reactions menu: Patch RoomContextualMenuPresenter while we have a retain cycle 2019-05-21 02:12:14 +02:00
manuroe ffd2e369cd version++ 2019-05-21 01:39:36 +02:00
SBiOSoftWhare d78a755201 Theme: Remove non needed reaction colors 2019-05-21 01:09:42 +02:00
SBiOSoftWhare fa9fa30920 BubbleReactionsView: Use a UICollectionViewFlowLayout subclass with left alignement. 2019-05-21 00:43:10 +02:00
SBiOSoftWhare 7e1cd2613c RoomDataSource: Handle reactions display on bubble cell. 2019-05-20 21:59:18 +02:00
SBiOSoftWhare 859dfcaf7a RoomBubbleCellData: Improve reactions view vertical space calculation 2019-05-20 21:57:29 +02:00
SBiOSoftWhare ca0896fb1e Create BubbleReactionsView 2019-05-20 21:54:23 +02:00
SBiOSoftWhare ab35ba7998 Create BubbleReactionsViewModel 2019-05-20 21:52:07 +02:00
SBiOSoftWhare 7f1447e9dc Create BubbleReactionViewCell 2019-05-20 21:51:24 +02:00
SBiOSoftWhare c1cb799582 Create AutosizedCollectionView a convenient UICollectionView that makes dynamic sizing easier when using Auto Layout 2019-05-20 21:49:57 +02:00
SBiOSoftWhare fff83b69d6 Theme: Add reaction button colors and update header background color. 2019-05-20 21:49:27 +02:00
manuroe a4b8192473 Reactions menu: Do not notify delegate if reaction requires an unreaction
Fix Steve's remark
2019-05-20 20:41:05 +02:00
manuroe 7bdab43e16 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 6a27075d2b Reactions: Remove the send reaction hack as it is now done in the SDK 2019-05-20 19:40:52 +02:00
manuroe 3ceec59779 Merge branch 'develop' into aggregations 2019-05-20 17:57:50 +02:00
manuroe 824db1fab3 Reactions: Add a labs setting
#2441
2019-05-20 17:31:25 +02:00
manuroe 88d6859bdc 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 06d18e122b 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 da033f69ab Reactions: Reactions menu: highlight reactiosn only our user made 2019-05-20 15:00:47 +02:00
David Cordero 72ca2cc4d9 Remove redundant code 2019-05-19 17:19:23 +02:00
David Cordero ff767cc396 Fix text color for user display name and device id labels in dark theme 2019-05-19 17:14:41 +02:00
Karol Kosek 4380c3f208 Translated using Weblate (Polish)
Currently translated at 73.3% (453 of 618 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/pl/
2019-05-19 08:15:57 +00:00
manuroe 07ec0db48e Reactions: Reactions menu: plug unreact 2019-05-17 17:39:31 +02:00
manuroe 2b56446efb 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 15a9edabc7 RoomVC: ContextualMenu: Plug reactions menu 2019-05-17 12:17:59 +02:00
manuroe 8fb8cb85cb Reactions: Add placeholder for reactions list under message 2019-05-17 01:28:45 +02:00