Skip to content

Commit 9eeaccd

Browse files
committed
Merge branch 'release/0.3.0' into main
2 parents 3b11124 + 43fe681 commit 9eeaccd

File tree

1,346 files changed

+26997
-1967
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,346 files changed

+26997
-1967
lines changed

.idea/dictionaries/shared.xml

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

.maestro/tests/account/logout.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ appId: ${APP_ID}
33
- tapOn:
44
id: "home_screen-settings"
55
- tapOn: "Sign out"
6-
- takeScreenshot: build/maestro/900-SignOutDialg
6+
- takeScreenshot: build/maestro/900-SignOutScreen
7+
- back
8+
- tapOn: "Sign out"
9+
- tapOn: "Sign out"
710
# Ensure cancel cancels
811
- tapOn: "Cancel"
912
- tapOn: "Sign out"
10-
- tapOn:
11-
text: "Sign out"
12-
index: 1
13+
- tapOn: "Sign out anyway"
1314
- runFlow: ../assertions/assertInitDisplayed.yaml

.maestro/tests/roomList/searchRoomList.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ appId: ${APP_ID}
88
# Back from timeline
99
- back
1010
- assertVisible: "MyR"
11-
# Close keyboard
12-
- hideKeyboard
1311
# Back from search
1412
- back
1513
- runFlow: ../assertions/assertHomeDisplayed.yaml

CHANGES.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
Changes in Element X v0.3.0 (2023-10-31)
2+
========================================
3+
4+
Features ✨
5+
----------
6+
- Element Call: change the 'join call' button in a chat room when there's an active call. ([#1158](https://github.com/vector-im/element-x-android/issues/1158))
7+
- Mentions: add mentions suggestion view in RTE ([#1452](https://github.com/vector-im/element-x-android/issues/1452))
8+
- Record and send voice messages ([#1596](https://github.com/vector-im/element-x-android/issues/1596))
9+
- Enable voice messages for all users ([#1669](https://github.com/vector-im/element-x-android/issues/1669))
10+
- Receive and play a voice message ([#2084](https://github.com/vector-im/element-x-android/issues/2084))
11+
- Enable Element Call integration in rooms by default, fix several issues when creating or joining calls.
12+
13+
Bugfixes 🐛
14+
----------
15+
- Group fallback notification to avoid having plenty of them displayed. ([#994](https://github.com/vector-im/element-x-android/issues/994))
16+
- Hide keyboard when exiting the chat room screen. ([#1375](https://github.com/vector-im/element-x-android/issues/1375))
17+
- Always register the pusher when application starts ([#1481](https://github.com/vector-im/element-x-android/issues/1481))
18+
- Ensure screen does not turn off when playing a video ([#1519](https://github.com/vector-im/element-x-android/issues/1519))
19+
- Fix issue where text is cleared when cancelling a reply ([#1617](https://github.com/vector-im/element-x-android/issues/1617))
20+
21+
Other changes
22+
-------------
23+
- Remove usage of blocking methods. ([#1563](https://github.com/vector-im/element-x-android/issues/1563))
24+
25+
126
Changes in Element X v0.2.4 (2023-10-12)
227
========================================
328

app/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ plugins {
2727
alias(libs.plugins.anvil)
2828
alias(libs.plugins.ksp)
2929
alias(libs.plugins.kapt)
30-
id("com.google.firebase.appdistribution") version "4.0.0"
30+
id("com.google.firebase.appdistribution") version "4.0.1"
3131
id("org.jetbrains.kotlinx.knit") version "0.4.0"
3232
id("kotlin-parcelize")
3333
// To be able to update the firebase.xml files, uncomment and build the project
@@ -201,9 +201,9 @@ dependencies {
201201
implementation(projects.features.call)
202202
implementation(projects.anvilannotations)
203203
implementation(projects.appnav)
204+
implementation(projects.appconfig)
204205
anvil(projects.anvilcodegen)
205206

206-
coreLibraryDesugaring(libs.android.desugar)
207207
implementation(libs.appyx.core)
208208
implementation(libs.androidx.splash)
209209
implementation(libs.androidx.core)
@@ -230,7 +230,6 @@ dependencies {
230230
testImplementation(libs.test.truth)
231231
testImplementation(libs.test.turbine)
232232
testImplementation(projects.libraries.matrix.test)
233-
testImplementation(libs.test.konsist)
234233

235234
ksp(libs.showkase.processor)
236235
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import androidx.compose.ui.platform.LocalUriHandler
3030
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
3131
import androidx.core.view.WindowCompat
3232
import com.bumble.appyx.core.integration.NodeHost
33-
import com.bumble.appyx.core.integrationpoint.NodeComponentActivity
33+
import com.bumble.appyx.core.integrationpoint.NodeActivity
3434
import com.bumble.appyx.core.plugin.NodeReadyObserver
3535
import io.element.android.libraries.architecture.bindings
3636
import io.element.android.libraries.core.log.logger.LoggerTag
@@ -42,7 +42,7 @@ import timber.log.Timber
4242

4343
private val loggerTag = LoggerTag("MainActivity")
4444

45-
class MainActivity : NodeComponentActivity() {
45+
class MainActivity : NodeActivity() {
4646

4747
private lateinit var mainNode: MainNode
4848

app/src/main/kotlin/io/element/android/x/di/AppModule.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import io.element.android.libraries.core.meta.BuildType
3131
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
3232
import io.element.android.libraries.di.AppScope
3333
import io.element.android.libraries.di.ApplicationContext
34+
import io.element.android.libraries.di.CacheDirectory
3435
import io.element.android.libraries.di.DefaultPreferences
3536
import io.element.android.libraries.di.SingleIn
3637
import io.element.android.x.BuildConfig
@@ -51,6 +52,12 @@ object AppModule {
5152
return File(context.filesDir, "sessions")
5253
}
5354

55+
@Provides
56+
@CacheDirectory
57+
fun providesCacheDirectory(@ApplicationContext context: Context): File {
58+
return context.cacheDir
59+
}
60+
5461
@Provides
5562
fun providesResources(@ApplicationContext context: Context): Resources {
5663
return context.resources

app/src/main/res/values-night/themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
<item name="postSplashScreenTheme">@style/Theme.ElementX</item>
2323
</style>
2424

25-
<style name="Theme.ElementX" parent="Theme.Material3.Dark" />
25+
<style name="Theme.ElementX" parent="Theme.Material3.Dark.NoActionBar" />
2626
</resources>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
<item name="windowSplashScreenAnimatedIcon">@drawable/transparent</item>
2222
<item name="postSplashScreenTheme">@style/Theme.ElementX</item>
2323
</style>
24-
<style name="Theme.ElementX" parent="Theme.Material3.Light" />
24+
<style name="Theme.ElementX" parent="Theme.Material3.Light.NoActionBar" />
2525
</resources>

app/src/test/kotlin/io/element/android/app/KonsistTest.kt

Lines changed: 0 additions & 139 deletions
This file was deleted.

appconfig/build.gradle.kts

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright (c) 2022 New Vector Ltd
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
plugins {
17+
id("java-library")
18+
alias(libs.plugins.kotlin.jvm)
19+
alias(libs.plugins.anvil)
20+
alias(libs.plugins.ksp)
21+
}
22+
23+
java {
24+
sourceCompatibility = JavaVersion.VERSION_17
25+
targetCompatibility = JavaVersion.VERSION_17
26+
}
27+
28+
anvil {
29+
generateDaggerFactories.set(true)
30+
}
31+
32+
dependencies {
33+
implementation(libs.dagger)
34+
implementation(projects.libraries.di)
35+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Copyright (c) 2023 New Vector Ltd
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package io.element.android.appconfig
18+
19+
object AuthenticationConfig {
20+
const val MATRIX_ORG_URL = "https://matrix.org"
21+
22+
const val DEFAULT_HOMESERVER_URL = MATRIX_ORG_URL
23+
const val SLIDING_SYNC_READ_MORE_URL = "https://github.com/matrix-org/sliding-sync/blob/main/docs/Landing.md"
24+
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.element.android.features.logout.api
17+
package io.element.android.appconfig
1818

19-
sealed interface LogoutPreferenceEvents {
20-
data object Logout : LogoutPreferenceEvents
19+
object ElementCallConfig {
20+
const val DEFAULT_BASE_URL = "https://call.element.dev"
2121
}

0 commit comments

Comments
 (0)