Commit Graph

1497 Commits

Author SHA1 Message Date
David Langley d2e4cda28c Merge branch 'develop' into feature/dla/emojibase_integration 2023-08-31 11:38:28 +01:00
David Langley ecf2d06928 Fix colon aligment and load emojis lazily.
- Fix colon aligment
- Load emojis lazily.
2023-08-31 11:37:08 +01:00
Marco Romano 50869d7b28 Focus on question field when opening screen. (#1194) 2023-08-31 12:08:21 +02:00
Marco Romano f0bed85458 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 10060c4476 lint 2023-08-30 12:55:50 +01:00
David Langley 5aeff965b1 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 a5d42f61fa Fix tests and improve structure of CustomReactionState
- Fix tests
- Improve structure of CustomReactionState
2023-08-30 12:47:31 +01:00
Jorge Martin Espinosa 4a88e3fab6 Bug reporter crashes when 'send logs' is disabled. (#1184)
* Bug reporter crashes when 'send logs' is disabled.

* Make sure generated files are cleaned up when uploading the logs fails.
2023-08-30 12:49:58 +02:00
Benoit Marty cbe9c27880 Merge pull request #1177 from vector-im/feature/bma/analyticsSettingLink
Fix issue on analytics setting link
2023-08-30 11:16:46 +02:00
Benoit Marty ed1c1b5048 Compact the code and reorder vals for code clarity 2023-08-30 10:24:57 +02:00
Benoit Marty 1b87565870 Remove unused lambda parameter. The link is opened by the LocalUriHandler now. 2023-08-30 10:21:27 +02:00
Jorge Martín c3f49a2451 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 0b88dac719 Fix test compilation 2023-08-30 09:31:55 +02:00
Florian Renaud 48413bd508 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
renovate[bot] bb75539647 Update kotlin to 1.9.10 (#1123)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-30 08:28:06 +02:00
Marco Romano 633d5282d6 "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
Benoit Marty ece82203eb Fix style (typo and color) for supporting content. 2023-08-29 18:03:29 +02:00
Benoit Marty 7537772d94 format. 2023-08-29 16:46:59 +02:00
Benoit Marty 36bf343a95 OptIn screen: make only the here word be clickable. 2023-08-29 16:46:42 +02:00
Benoit Marty a86100003f Remove preview Text. 2023-08-29 16:39:59 +02:00
Benoit Marty 79af05bc08 Use buildAnnotatedStringWithStyledPart and remove copied code. 2023-08-29 16:38:21 +02:00
Benoit Marty ff47629f6c Make the link open the policy url in the analytics setting screen. 2023-08-29 16:33:03 +02:00
Benoit Marty 1bf2dc1c4d Fix rendering issue of the link. 2023-08-29 16:11:08 +02:00
Benoit Marty 24fc2e77b9 Format. 2023-08-29 16:10:02 +02:00
Benoit Marty 097efc26d2 Migrate AnalyticsPreferencesView from PreferenceSwitch to ListItem. 2023-08-29 16:09:26 +02:00
Florian Renaud 992050c832 Factorize code and remove unused field in TimelineItemPollContent 2023-08-29 16:02:06 +02:00
Florian Renaud 9c6a5bed54 Add unit tests for TimelineItemContentPollFactory 2023-08-29 16:00:18 +02:00
David Langley 1d57d4500c Fix test compilation. 2023-08-28 20:15:00 +01:00
David Langley 6a91521604 Use CommonStrings 2023-08-28 18:20:48 +01:00
David Langley a3e9f66614 lint 2023-08-28 18:11:17 +01:00
David Langley bab8119fb9 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 ce4c12ce74 Integrate emojibase
- Integrate emojibase datasource
- Use element category translations
- Use Material emoji category logos
2023-08-28 16:45:42 +01:00
Benoit Marty 5d889afd21 Merge pull request #1128 from vector-im/feature/bma/cleanupOidc
Cleanup OIDC
2023-08-28 15:08:36 +02:00
Benoit Marty 0752c18f81 Remove useless dependency. 2023-08-28 14:31:36 +02:00
Benoit Marty 35835a876d Fix typo in test class name. 2023-08-28 14:31:36 +02:00
Benoit Marty 5f7c1e9545 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 51d92ae6a8 Fix typo 2023-08-28 13:03:04 +02:00
Benoit Marty f80eece489 Merge branch 'develop' into feature/bma/settingUpAccount 2023-08-28 13:02:44 +02:00
Benoit Marty 55255735d7 Merge branch 'develop' into feature/bma/dataObject 2023-08-28 10:56:02 +02:00
Benoit Marty 64a7fc5f52 Use a safer algorithm, and limit the size of the hashed string.
Fix an issue reported by Sonar.
2023-08-25 15:49:50 +02:00
Benoit Marty 61323a89ad Add test for MigrationScreenPresenter. 2023-08-25 15:49:50 +02:00
Benoit Marty 756af63edb Fix regression on WaitListView. 2023-08-25 14:55:52 +02:00
Benoit Marty 13082285b2 Upgrade DefaultFtueStateTests regarding the new FTUE step MigrationScreen. 2023-08-25 14:51:19 +02:00
Benoit Marty 7055fea895 Add preview for SunsetPage and fix warnings about Modifiers. 2023-08-25 14:38:34 +02:00
Benoit Marty ff749947f8 Add the Migrate session screen (#1145) 2023-08-25 13:52:32 +02:00
Benoit Marty 0ef0accdf6 Localazy: move string screen_migration_ to ftue/impl module and sync the strings. 2023-08-25 13:52:32 +02:00
Benoit Marty 0c5675e307 Extract Composable to new SunsetPage. 2023-08-25 13:49:40 +02:00
Benoit Marty 89f1492233 Remove translation with issue. Will be synced later. 2023-08-25 12:50:53 +02:00
Benoit Marty 8415826a97 Import strings with Localazy. 2023-08-25 12:15:06 +02:00
Florian Renaud f185bb75bf 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