Commit Graph

497 Commits

Author SHA1 Message Date
Benoit Marty
a79e3d41d6 Compute avatar color of users and apply foreground color to the sender displayname. 2023-09-05 12:23:42 +02:00
Benoit Marty
9db45a997d Compute avatar color of users and apply foreground color to the sender displayname. 2023-09-05 12:10:30 +02:00
David Langley
ec3b6bf1ae Merge pull request #1162 from vector-im/feature/dla/emojibase_integration
Emojibase integration
2023-08-31 15:49:15 +01:00
Marco Romano
88eda62f56 New icon for "poll end" in both action menu and timeline item. (#1203)
- Also fixes preview of action list (reply is included as it will soon be added).
2023-08-31 15:40:51 +02:00
David Langley
c4995d0b43 Merge branch 'develop' into feature/dla/emojibase_integration 2023-08-31 14:14:01 +01:00
Marco Romano
d736261317 Poll end (#1182)
- Adds an "End Poll" item in the action list long press menu.
  - Shows only on remote polls that have not ended yet and only if the user is the creator or has redact powers.

Closes https://github.com/vector-im/element-meta/issues/2026
2023-08-31 14:39:11 +02:00
Jorge Martin Espinosa
1c4eb45a60 Protect TimelineItemAspectRatioBox against Float.NaN (#1201)
* Protect `TimelineItemAspectRatioBox` against infinite values.
2023-08-31 10:58:37 +00:00
David Langley
ecbfe20f94 Merge branch 'feature/dla/emojibase_integration' of https://github.com/vector-im/element-x-android into feature/dla/emojibase_integration 2023-08-31 11:41:31 +01:00
David Langley
8c5a8e8a04 Fix FakeEmojibaseProvider 2023-08-31 11:41:06 +01:00
David Langley
1341d827fb Merge branch 'develop' into feature/dla/emojibase_integration 2023-08-31 11:38:28 +01:00
David Langley
f8de314c93 Fix colon aligment and load emojis lazily.
- Fix colon aligment
- Load emojis lazily.
2023-08-31 11:37:08 +01:00
Marco Romano
14791c3628 Poll vote (#1181)
- Adds sendPollVote rust room API (still not operational, need to wait for a rust sdk release)
- Adds an optional EventId in TimelineItemPollContent
- Wires the poll answer click listeners all the way to the TimelinePresenter in order to call the new room API
- Shows question as message summary in long press menu

Closes https://github.com/vector-im/element-meta/issues/2025
2023-08-30 15:05:11 +00:00
David Langley
188df7a4fc lint 2023-08-30 12:55:50 +01:00
David Langley
64c156bd4f Merge branch 'develop' of https://github.com/vector-im/element-x-android into feature/dla/emojibase_integration 2023-08-30 12:48:38 +01:00
David Langley
a4e8f0c8fd Fix tests and improve structure of CustomReactionState
- Fix tests
- Improve structure of CustomReactionState
2023-08-30 12:47:31 +01:00
Benoit Marty
e67c7ac9f1 Merge pull request #1177 from vector-im/feature/bma/analyticsSettingLink
Fix issue on analytics setting link
2023-08-30 11:16:46 +02:00
Jorge Martín
0a77590e76 Split link text into a ListSupportingText component.
This also requires some internal changes to `ListSupportingText`, `ClickableLinkText` and `TimelineTextView` to match the behaviour and design.
2023-08-30 09:33:53 +02:00
Florian Renaud
45a653be03 Fix test compilation 2023-08-30 09:31:55 +02:00
Florian Renaud
e599777b89 Merge pull request #1161 from vector-im/feature/fre/polls_timeline_item_tests
[Polls] Add unit tests for TimelineItemContentPollFactory
2023-08-30 08:32:21 +02:00
Marco Romano
b4e6d83fb7 "Create poll" UI (#1143)
NB: This is missing analytics, which will be added once https://github.com/matrix-org/matrix-analytics-events/pull/85 is merged.

Closes https://github.com/vector-im/element-meta/issues/2011
2023-08-29 22:31:21 +02:00
Florian Renaud
65ee52bb27 Factorize code and remove unused field in TimelineItemPollContent 2023-08-29 16:02:06 +02:00
Florian Renaud
c710cb7432 Add unit tests for TimelineItemContentPollFactory 2023-08-29 16:00:18 +02:00
David Langley
19a6586880 Fix test compilation. 2023-08-28 20:15:00 +01:00
David Langley
a8ad5c5ec1 Use CommonStrings 2023-08-28 18:20:48 +01:00
David Langley
3cf73cf536 lint 2023-08-28 18:11:17 +01:00
David Langley
59d7947cc0 Merge branch 'develop' of https://github.com/vector-im/element-x-android into feature/dla/emojibase_integration 2023-08-28 17:03:00 +01:00
David Langley
685d684359 Integrate emojibase
- Integrate emojibase datasource
- Use element category translations
- Use Material emoji category logos
2023-08-28 16:45:42 +01:00
Benoit Marty
bcede44407 Move module features.analytics.test to services.analytics.test. FakeAnalyticsService was not implemented at the correct location. 2023-08-28 14:31:36 +02:00
Benoit Marty
1a6376e723 Merge branch 'develop' into feature/bma/dataObject 2023-08-28 10:56:02 +02:00
Benoit Marty
fc563f355b Remove translation with issue. Will be synced later. 2023-08-25 12:50:53 +02:00
Benoit Marty
cd558bc09f Import strings with Localazy. 2023-08-25 12:15:06 +02:00
Florian Renaud
a70149d86d Merge pull request #1141 from vector-im/bugfix/fre/improve_timestamp_position
Improve timestamp rendering for poll event content
2023-08-25 10:45:23 +02:00
Florian Renaud
a77571a85b cleanup 2023-08-25 10:12:21 +02:00
Florian Renaud
4eb49383e1 Rename modifier 2023-08-25 09:36:21 +02:00
Florian Renaud
875c38a191 Rename TimestampPosition.Above to Overlay 2023-08-25 09:30:05 +02:00
Florian Renaud
3c8cf0ef67 Add default timestamp position 2023-08-25 09:07:10 +02:00
Florian Renaud
23b8573ad4 Improve timestamp rendering for poll event content 2023-08-25 09:07:10 +02:00
Florian Renaud
ebf6a98c34 Merge remote-tracking branch 'origin/develop' into feature/fre/improve_poll_event_timeline_rendering 2023-08-24 14:42:16 +02:00
Benoit Marty
52853101d9 migrate object to data object (#1135) 2023-08-24 09:32:44 +02:00
renovate[bot]
f9057029cf Update dependency org.matrix.rustcomponents:sdk-android to v0.1.46 (#1130)
* Update dependency org.matrix.rustcomponents:sdk-android to v0.1.46

* Remove poll end code. The poll end event isn't shown in the timeline anymore.

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Marco Romano <marcor@element.io>
2023-08-24 06:43:05 +00:00
Benoit Marty
79aa128377 Add setting entry point to manage account (OIDC) 2023-08-23 12:54:22 +02:00
Florian Renaud
df51615d9b Fix winning answers detection 2023-08-22 15:48:09 +02:00
Florian Renaud
7bef4fbf1b Fix lint 2023-08-22 15:48:09 +02:00
Jorge Martin Espinosa
e45b15165a Make links in messages clickable again (#1115) 2023-08-22 15:21:43 +02:00
Florian Renaud
9f7eddd863 Fix poll enabled condition 2023-08-22 10:55:18 +02:00
Florian Renaud
5ee61a01ad Render ended poll with winning answers 2023-08-22 10:55:18 +02:00
Florian Renaud
8e40224bf1 Do not handle poll end event 2023-08-22 10:55:18 +02:00
Florian Renaud
cfe8430733 Rename progress variable to percentage 2023-08-22 10:55:18 +02:00
Florian Renaud
c1d2114b60 Update option progress when selected 2023-08-22 10:55:17 +02:00
Florian Renaud
00752d851a Update UI for poll in the timeline 2023-08-22 10:55:17 +02:00