Skip to content

Commit 08d33c4

Browse files
committed
Merge branch 'release/0.4.8' into main
2 parents 7994e5d + 14a25d3 commit 08d33c4

File tree

1,015 files changed

+12197
-2832
lines changed

Some content is hidden

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

1,015 files changed

+12197
-2832
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: Task that belongs to a story/epic
3+
about: A skeleton task where the details are all contained within a story or epic
4+
on element-meta.
5+
title: "[Task] "
6+
labels: T-Task
7+
assignees: ''
8+
9+
---
10+
11+
Please see and discuss the details in the meta issue.

.github/workflows/generate_github_pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
mkdir -p screenshots/en
3333
cp tests/uitests/src/test/snapshots/images/* screenshots/en
3434
- name: Deploy GitHub Pages
35-
uses: peaceiris/actions-gh-pages@v3
35+
uses: peaceiris/actions-gh-pages@v4
3636
with:
3737
github_token: ${{ secrets.GITHUB_TOKEN }}
3838
publish_dir: ./screenshots

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.maestro/tests/account/login.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ appId: ${MAESTRO_APP_ID}
2323
- inputText: ${MAESTRO_PASSWORD}
2424
- pressKey: Enter
2525
- tapOn: "Continue"
26+
- runFlow: ../assertions/assertSessionVerificationDisplayed.yaml
27+
- runFlow: ./verifySession.yaml
2628
- runFlow: ../assertions/assertAnalyticsDisplayed.yaml
2729
- tapOn: "Not now"
2830
- runFlow: ../assertions/assertHomeDisplayed.yaml
29-
- runFlow: ./verifySession.yaml
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
appId: ${MAESTRO_APP_ID}
22
---
3-
- tapOn: "Continue"
43
- takeScreenshot: build/maestro/150-Verify
54
- tapOn: "Enter recovery key"
65
- tapOn:
76
id: "verification-recovery_key"
87
- inputText: ${MAESTRO_RECOVERY_KEY}
98
- hideKeyboard
10-
- tapOn: "Confirm"
11-
- runFlow: ../assertions/assertHomeDisplayed.yaml
9+
- tapOn: "Continue"
10+
- extendedWaitUntil:
11+
visible: "Device verified"
12+
timeout: 10000
13+
- tapOn: "Continue"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
appId: ${MAESTRO_APP_ID}
2+
---
3+
- extendedWaitUntil:
4+
visible: "Confirm that it's you"
5+
timeout: 20000

.maestro/tests/roomList/searchRoomList.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,4 @@ appId: ${MAESTRO_APP_ID}
77
- tapOn: ${MAESTRO_ROOM_NAME}
88
# Back from timeline
99
- back
10-
- assertVisible: "MyR"
11-
- hideKeyboard
12-
# Back from search
13-
- back
1410
- runFlow: ../assertions/assertHomeDisplayed.yaml

CHANGES.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
Changes in Element X v0.4.8 (2024-04-10)
2+
========================================
3+
4+
Features ✨
5+
----------
6+
- Move session recovery to the login flow. ([#2579](https://github.com/element-hq/element-x-android/issues/2579))
7+
- Move session verification to the after login flow and make it mandatory. ([#2580](https://github.com/element-hq/element-x-android/issues/2580))
8+
- Add a notification troubleshoot screen ([#2601](https://github.com/element-hq/element-x-android/issues/2601))
9+
- Add action to copy permalink ([#2650](https://github.com/element-hq/element-x-android/issues/2650))
10+
11+
Bugfixes 🐛
12+
----------
13+
- Fix analytics issue around room considered as space by mistake. ([#2612](https://github.com/element-hq/element-x-android/issues/2612))
14+
- Fix crash observed when going back to the room list. ([#2619](https://github.com/element-hq/element-x-android/issues/2619))
15+
- Hide Event org.matrix.msc3401.call.member on the timeline. ([#2625](https://github.com/element-hq/element-x-android/issues/2625))
16+
- Fall back to name-based generated avatars when image avatars don't load. ([#2667](https://github.com/element-hq/element-x-android/issues/2667))
17+
18+
Other changes
19+
-------------
20+
- Improve UI for notification permission screen in onboarding. ([#2581](https://github.com/element-hq/element-x-android/issues/2581))
21+
- Categorise members by role in change roles screen. ([#2593](https://github.com/element-hq/element-x-android/issues/2593))
22+
- Make completed poll more clearly visible ([#2608](https://github.com/element-hq/element-x-android/issues/2608))
23+
- Show users from last visited DM as suggestion when starting a Chat or when creating a Room. ([#2634](https://github.com/element-hq/element-x-android/issues/2634))
24+
- Enable room moderation feature. ([#2678](https://github.com/element-hq/element-x-android/issues/2678))
25+
- Improve analytics opt-in screen UI. ([#2684](https://github.com/element-hq/element-x-android/issues/2684))
26+
27+
128
Changes in Element X v0.4.7 (2024-03-26)
229
========================================
330

app/src/main/kotlin/io/element/android/x/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package io.element.android.x
1919
import android.content.Intent
2020
import android.os.Bundle
2121
import androidx.activity.compose.setContent
22+
import androidx.activity.enableEdgeToEdge
2223
import androidx.compose.foundation.background
2324
import androidx.compose.foundation.layout.Box
2425
import androidx.compose.foundation.layout.fillMaxSize
@@ -31,7 +32,6 @@ import androidx.compose.runtime.remember
3132
import androidx.compose.ui.Modifier
3233
import androidx.compose.ui.platform.LocalUriHandler
3334
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
34-
import androidx.core.view.WindowCompat
3535
import com.bumble.appyx.core.integration.NodeHost
3636
import com.bumble.appyx.core.integrationpoint.NodeActivity
3737
import com.bumble.appyx.core.plugin.NodeReadyObserver
@@ -60,7 +60,7 @@ class MainActivity : NodeActivity() {
6060
super.onCreate(savedInstanceState)
6161
appBindings = bindings()
6262
appBindings.lockScreenService().handleSecureFlag(this)
63-
WindowCompat.setDecorFitsSystemWindows(window, false)
63+
enableEdgeToEdge()
6464
setContent {
6565
MainContent(appBindings)
6666
}

appconfig/build.gradle.kts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
* limitations under the License.
1515
*/
1616
plugins {
17-
id("java-library")
18-
id("com.android.lint")
19-
alias(libs.plugins.kotlin.jvm)
17+
id("io.element.android-library")
2018
alias(libs.plugins.anvil)
2119
alias(libs.plugins.ksp)
2220
}
2321

24-
java {
25-
sourceCompatibility = JavaVersion.VERSION_17
26-
targetCompatibility = JavaVersion.VERSION_17
22+
android {
23+
namespace = "io.element.android.appconfig"
2724
}
2825

2926
anvil {
@@ -33,4 +30,5 @@ anvil {
3330
dependencies {
3431
implementation(libs.dagger)
3532
implementation(projects.libraries.di)
33+
implementation(projects.libraries.matrix.api)
3634
}

0 commit comments

Comments
 (0)