Skip to content

Commit 322dd9a

Browse files
committed
Merge branch 'develop' into feature/fga/advanced_settings_moderation_and_safety
2 parents 14681c5 + 84ff284 commit 322dd9a

File tree

278 files changed

+2632
-1649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+2632
-1649
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Pull Request
22
on:
3-
pull_request:
3+
pull_request_target:
44
types: [ opened, edited, labeled, unlabeled, synchronize ]
55
workflow_call:
66
secrets:

CHANGES.md

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,71 @@
1+
Changes in Element X v25.04.0
2+
=============================
3+
4+
<!-- Release notes generated using configuration in .github/release.yml at v25.04.0 -->
5+
6+
## What's Changed
7+
### ✨ Features
8+
* Enable Rust trace log packs by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4514
9+
* Allow using a hardware keyboard to unlock the app using a pin code by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4530
10+
### 🙌 Improvements
11+
* Change (mention span) : rework and add more cases by @ganfra in https://github.com/element-hq/element-x-android/pull/4476
12+
* Add kick (remove) confirmation and reason by @bmarty in https://github.com/element-hq/element-x-android/pull/4507
13+
* Remove the green badge on a pending invite after a first preview by @bmarty in https://github.com/element-hq/element-x-android/pull/4532
14+
### 🐛 Bugfixes
15+
* Improve touch indicators for the user info UI in the timeline by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4482
16+
* Limit the text length in the 'in reply to' preview by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4491
17+
* Timeline header: ensure that the decoration is clickable by @bmarty in https://github.com/element-hq/element-x-android/pull/4495
18+
* Add video autoplay to media gallery by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4499
19+
* Add `WakeLock` to dismiss ringing call screen when call is cancelled by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4478
20+
* Make sure the live timeline is destroyed before clearing a room's cache by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4515
21+
* Fix bullet points not having leading margin on timeline items by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4536
22+
* Fix the share location URI by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4544
23+
* Add a inderminate progress bar when loging out and in Waiting state. by @bmarty in https://github.com/element-hq/element-x-android/pull/4538
24+
### 🗣 Translations
25+
* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/4506
26+
* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/4543
27+
### 🧱 Build
28+
* Element config by @bmarty in https://github.com/element-hq/element-x-android/pull/4471
29+
* Check if Manifest.permission.REQUEST_INSTALL_PACKAGES is in the manifest by @bmarty in https://github.com/element-hq/element-x-android/pull/4490
30+
* Remove nightly_enterprise.yml. by @bmarty in https://github.com/element-hq/element-x-android/pull/4492
31+
* Log the packageId which is currently built. by @bmarty in https://github.com/element-hq/element-x-android/pull/4494
32+
* Use handy buildConfigFieldStr. by @bmarty in https://github.com/element-hq/element-x-android/pull/4501
33+
* Fix warnings in InMemoryAppPreferencesStore by @bmarty in https://github.com/element-hq/element-x-android/pull/4523
34+
### Dependency upgrades
35+
* fix(deps): update camera to v1.4.2 by @renovate in https://github.com/element-hq/element-x-android/pull/4483
36+
* fix(deps): update dependency org.maplibre.gl:android-sdk to v11.8.5 by @renovate in https://github.com/element-hq/element-x-android/pull/4487
37+
* fix(deps): update dependency com.posthog:posthog-android to v3.13.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4469
38+
* fix(deps): update dependency androidx.compose:compose-bom to v2025.03.01 by @renovate in https://github.com/element-hq/element-x-android/pull/4484
39+
* fix(deps): update dependencyanalysis to v2.13.3 by @renovate in https://github.com/element-hq/element-x-android/pull/4493
40+
* fix(deps): update media3 to v1.6.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4488
41+
* fix(deps): update dependency io.element.android:element-call-embedded to v0.9.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4498
42+
* fix(deps): update dependency com.google.firebase:firebase-bom to v33.12.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4508
43+
* fix(deps): update dependency com.posthog:posthog-android to v3.13.1 by @renovate in https://github.com/element-hq/element-x-android/pull/4516
44+
* fix(deps): update dependency io.sentry:sentry-android to v8.6.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4509
45+
* fix(deps): update kotlin by @renovate in https://github.com/element-hq/element-x-android/pull/4444
46+
* fix(deps): update kotlin by @renovate in https://github.com/element-hq/element-x-android/pull/4522
47+
* fix(deps): update dependencyanalysis to v2.14.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4527
48+
* fix(deps): update dependency io.element.android:compound-android to v25.4.4 by @renovate in https://github.com/element-hq/element-x-android/pull/4537
49+
* chore(deps): update plugin dependencycheck to v12.1.1 by @renovate in https://github.com/element-hq/element-x-android/pull/4540
50+
* fix(deps): update appyx to v1.7.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4547
51+
* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.4.7 by @renovate in https://github.com/element-hq/element-x-android/pull/4548
52+
### Others
53+
* Update screenshots by @bmarty in https://github.com/element-hq/element-x-android/pull/4497
54+
* Update store description. by @bmarty in https://github.com/element-hq/element-x-android/pull/4496
55+
* Improve TextFieldDialog by @bmarty in https://github.com/element-hq/element-x-android/pull/4512
56+
* Make `RustMatrixClient.close` asynchronous by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4513
57+
* Replace OutlinedTextField by our TextField by @bmarty in https://github.com/element-hq/element-x-android/pull/4521
58+
* Remove alias from room invite item by @bmarty in https://github.com/element-hq/element-x-android/pull/4531
59+
* Remember flows by @bmarty in https://github.com/element-hq/element-x-android/pull/4533
60+
* Use colors from compound for badges by @bmarty in https://github.com/element-hq/element-x-android/pull/4545
61+
* Update app icon by @bmarty in https://github.com/element-hq/element-x-android/pull/4534
62+
* Click on userId / room alias to copy value to clipboard. by @bmarty in https://github.com/element-hq/element-x-android/pull/4549
63+
* Run the 'prevent blocked' workflow even if PR has conflicts by @robintown in https://github.com/element-hq/element-x-android/pull/4432
64+
* Update wording for push provider support test. (#4079) by @bmarty in https://github.com/element-hq/element-x-android/pull/4553
65+
66+
67+
**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.03.4...v25.04.0
68+
169
Changes in Element X v25.03.4
270
=============================
371

app/src/main/res/values/colors.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
~ Please see LICENSE files in the repository root for full details.
66
-->
77
<resources>
8-
<!-- Must be equal to DarkDesignTokens.colorThemeBg -->
8+
<!-- Must be equal to DarkColorTokens.colorThemeBg -->
99
<color name="splashscreen_bg_dark">#FF101317</color>
10-
<!-- Must be equal to LightDesignTokens.colorThemeBg -->
10+
<!-- Must be equal to LightColorTokens.colorThemeBg -->
1111
<color name="splashscreen_bg_light">#FFFFFFFF</color>
1212
</resources>
-165 KB
Loading

appicon/element/src/main/kotlin/io/element/android/appicon/element/IconPreview.kt

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,44 @@ package io.element.android.appicon.element
1010
import androidx.compose.foundation.Image
1111
import androidx.compose.foundation.background
1212
import androidx.compose.foundation.layout.Box
13-
import androidx.compose.foundation.layout.size
1413
import androidx.compose.foundation.shape.CircleShape
15-
import androidx.compose.foundation.shape.RoundedCornerShape
1614
import androidx.compose.runtime.Composable
17-
import androidx.compose.ui.Alignment
1815
import androidx.compose.ui.Modifier
1916
import androidx.compose.ui.draw.clip
2017
import androidx.compose.ui.graphics.Color
2118
import androidx.compose.ui.graphics.ColorFilter
2219
import androidx.compose.ui.res.painterResource
2320
import androidx.compose.ui.tooling.preview.Preview
24-
import androidx.compose.ui.unit.dp
2521

2622
@Preview
2723
@Composable
2824
internal fun IconPreview() {
2925
Box {
30-
Image(painter = painterResource(id = R.mipmap.ic_launcher_background), contentDescription = null)
31-
Image(painter = painterResource(id = R.mipmap.ic_launcher_foreground), contentDescription = null)
26+
Image(
27+
modifier = Modifier.matchParentSize(),
28+
painter = painterResource(id = R.drawable.ic_launcher_background),
29+
contentDescription = null,
30+
)
31+
Image(
32+
painter = painterResource(id = R.mipmap.ic_launcher_foreground),
33+
contentDescription = null,
34+
)
3235
}
3336
}
3437

3538
@Preview
3639
@Composable
3740
internal fun RoundIconPreview() {
3841
Box(modifier = Modifier.clip(shape = CircleShape)) {
39-
Image(painter = painterResource(id = R.mipmap.ic_launcher_background), contentDescription = null)
40-
Image(painter = painterResource(id = R.mipmap.ic_launcher_foreground), contentDescription = null)
42+
Image(
43+
modifier = Modifier.matchParentSize(),
44+
painter = painterResource(id = R.drawable.ic_launcher_background),
45+
contentDescription = null,
46+
)
47+
Image(
48+
painter = painterResource(id = R.mipmap.ic_launcher_foreground),
49+
contentDescription = null,
50+
)
4151
}
4252
}
4353

@@ -46,10 +56,7 @@ internal fun RoundIconPreview() {
4656
internal fun MonochromeIconPreview() {
4757
Box(
4858
modifier = Modifier
49-
.size(108.dp)
50-
.background(Color(0xFF2F3133))
51-
.clip(shape = RoundedCornerShape(32.dp)),
52-
contentAlignment = Alignment.Center
59+
.background(Color(0xFF2F3133)),
5360
) {
5461
Image(
5562
painter = painterResource(id = R.mipmap.ic_launcher_monochrome),
-1.46 KB
Loading
-10.2 KB
Binary file not shown.
-1.75 KB
Loading
-1.48 KB
Loading
-1.01 KB
Loading

0 commit comments

Comments
 (0)