Commit graph

1470 commits

Author SHA1 Message Date
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
Florian Renaud
2dc2f7c521 cleanup 2023-08-25 10:12:21 +02:00
Florian Renaud
a9846c95e8 Rename modifier 2023-08-25 09:36:21 +02:00
Florian Renaud
dab331b9bf Rename TimestampPosition.Above to Overlay 2023-08-25 09:30:05 +02:00
Florian Renaud
20bd7764ef Add default timestamp position 2023-08-25 09:07:10 +02:00
Florian Renaud
2a29c67b96 Improve timestamp rendering for poll event content 2023-08-25 09:07:10 +02:00
Florian Renaud
e6490b3a89 Merge remote-tracking branch 'origin/develop' into feature/fre/improve_poll_event_timeline_rendering 2023-08-24 14:42:16 +02:00
Jorge Martin Espinosa
c670fc9e9c
Prevent verification while initial sync is in progress (#1138)
* Prevent verification while initial sync is in progress

* Add `canVerifySessionFlow` to simplify the check
2023-08-24 11:43:36 +00:00
Benoit Marty
7083abcf09 migrate object to data object (#1135) 2023-08-24 09:32:44 +02:00
renovate[bot]
53840c1009
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
26e5da94d6 Add a workaround to detect the Chrome Custom Tab closing (when there is no redirection). 2023-08-23 18:11:08 +02:00
Benoit Marty
c84b1747e7 Handle remarks from PR #1127 2023-08-23 17:23:12 +02:00
Benoit Marty
8cf48986e7 Add missing tests. 2023-08-23 13:49:03 +02:00
Benoit Marty
bc57a03a39 Add setting entry point to manage account (OIDC) 2023-08-23 12:54:22 +02:00
Benoit Marty
6928dc6e44 Restore OIDC support. 2023-08-23 12:18:42 +02:00
Florian Renaud
29cd8f287f Add missing modifier 2023-08-22 16:11:57 +02:00
Florian Renaud
dec41460ed Fix winning answers detection 2023-08-22 15:48:09 +02:00
Florian Renaud
962571bec1 Fix lint 2023-08-22 15:48:09 +02:00
Jorge Martin Espinosa
1922c505ef
Make links in messages clickable again (#1115) 2023-08-22 15:21:43 +02:00
Florian Renaud
ed62286eb8 Fix poll enabled condition 2023-08-22 10:55:18 +02:00
Florian Renaud
8657a5dfac Rename previews 2023-08-22 10:55:18 +02:00
Florian Renaud
bb2f5a1330 Render ended poll with winning answers 2023-08-22 10:55:18 +02:00
Florian Renaud
246e9c50e6 Do not handle poll end event 2023-08-22 10:55:18 +02:00
Florian Renaud
d59349184f Rename progress variable to percentage 2023-08-22 10:55:18 +02:00
Florian Renaud
df1be4f6b1 Update option progress when selected 2023-08-22 10:55:17 +02:00
Florian Renaud
81051295a4 Use custom RadioButton 2023-08-22 10:55:17 +02:00
Florian Renaud
079d89ace5 Update UI for poll in the timeline 2023-08-22 10:55:17 +02:00
Benoit Marty
b9f2c9873b
Merge pull request #1100 from vector-im/renovate/accompanist
Update accompanist to v0.32.0
2023-08-21 17:57:59 +02:00