Merge branch 'develop' of https://github.com/vector-im/element-x-android into dla/feature/room_list_decoration

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt

@@ -100,6 +100,7 @@ private fun ContentToPreview() {
             "placeholderBackground" to ElementTheme.colors.placeholderBackground,
             "messageFromMeBackground" to ElementTheme.colors.messageFromMeBackground,
             "messageFromOtherBackground" to ElementTheme.colors.messageFromOtherBackground,
+            "progressIndicatorTrackColor" to ElementTheme.colors.progressIndicatorTrackColor,
             "temporaryColorBgSpecial" to ElementTheme.colors.temporaryColorBgSpecial,
         )
     )

libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt

@@ -43,9 +43,4 @@ enum class FeatureFlags(
         title = "Show notification settings",
         defaultValue = true,
     ),
-    RichTextEditor(
-        key = "feature.richtexteditor",
-        title = "Enable rich text editor",
-        defaultValue = true,
-    ),
 }

libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/StaticFeatureFlagProvider.kt

@@ -35,7 +35,6 @@ class StaticFeatureFlagProvider @Inject constructor() :
                 FeatureFlags.LocationSharing -> true
                 FeatureFlags.Polls -> true
                 FeatureFlags.NotificationSettings -> true
-                FeatureFlags.RichTextEditor -> true
             }
         } else {
             false

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt

@@ -57,6 +57,8 @@ class RustMatrixAuthenticationService @Inject constructor(
         userAgent = userAgentProvider.provide(),
         oidcConfiguration = oidcConfiguration,
         customSlidingSyncProxy = null,
+        sessionDelegate = null,
+        crossProcessRefreshLockId = null,
     )
     private var currentHomeserver = MutableStateFlow<MatrixHomeServerDetails?>(null)
 

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt

@@ -71,7 +71,7 @@ class RoomSummaryListProcessor(
         }
     }
 
-    private suspend fun MutableList<RoomSummary>.applyUpdate(update: RoomListEntriesUpdate) {
+    private fun MutableList<RoomSummary>.applyUpdate(update: RoomListEntriesUpdate) {
         when (update) {
             is RoomListEntriesUpdate.Append -> {
                 val roomSummaries = update.values.map {
@@ -114,7 +114,7 @@ class RoomSummaryListProcessor(
         }
     }
 
-    private suspend fun buildSummaryForRoomListEntry(entry: RoomListEntry): RoomSummary {
+    private fun buildSummaryForRoomListEntry(entry: RoomListEntry): RoomSummary {
         return when (entry) {
             RoomListEntry.Empty -> buildEmptyRoomSummary()
             is RoomListEntry.Filled -> buildAndCacheRoomSummaryForIdentifier(entry.roomId)
@@ -128,9 +128,9 @@ class RoomSummaryListProcessor(
         return RoomSummary.Empty(UUID.randomUUID().toString())
     }
 
-    private suspend fun buildAndCacheRoomSummaryForIdentifier(identifier: String): RoomSummary {
+    private fun buildAndCacheRoomSummaryForIdentifier(identifier: String): RoomSummary {
         val builtRoomSummary = roomListService.roomOrNull(identifier)?.use { roomListItem ->
-            roomListItem.roomInfo().use { roomInfo ->
+            roomListItem.roomInfoBlocking().use { roomInfo ->
                 RoomSummary.Filled(
                     details = roomSummaryDetailsFactory.create(roomInfo)
                 )

libraries/preferences/api/build.gradle.kts

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.preferences.api"
+}
+
+dependencies {
+    implementation(libs.coroutines.core)
+}

libraries/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/store/PreferencesStore.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.preferences.api.store
+
+import kotlinx.coroutines.flow.Flow
+
+interface PreferencesStore {
+    suspend fun setRichTextEditorEnabled(enabled: Boolean)
+    fun isRichTextEditorEnabledFlow(): Flow<Boolean>
+
+    suspend fun setDeveloperModeEnabled(enabled: Boolean)
+    fun isDeveloperModeEnabledFlow(): Flow<Boolean>
+
+    suspend fun reset()
+}

libraries/preferences/impl/build.gradle.kts

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("io.element.android-library")
+    alias(libs.plugins.anvil)
+}
+
+android {
+    namespace = "io.element.android.libraries.preferences.impl"
+}
+
+anvil {
+    generateDaggerFactories.set(true)
+}
+
+dependencies {
+    api(projects.libraries.preferences.api)
+    implementation(libs.dagger)
+    implementation(libs.androidx.datastore.preferences)
+    implementation(projects.libraries.di)
+    implementation(projects.libraries.core)
+}

libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultPreferencesStore.kt

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.preferences.impl.store
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.preferencesDataStore
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.features.preferences.api.store.PreferencesStore
+import io.element.android.libraries.core.bool.orTrue
+import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.core.meta.BuildType
+import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.ApplicationContext
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+
+private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "elementx_preferences")
+
+private val richTextEditorKey = booleanPreferencesKey("richTextEditor")
+private val developerModeKey = booleanPreferencesKey("developerMode")
+
+@ContributesBinding(AppScope::class)
+class DefaultPreferencesStore @Inject constructor(
+    @ApplicationContext context: Context,
+    private val buildMeta: BuildMeta,
+) : PreferencesStore {
+    private val store = context.dataStore
+
+    override suspend fun setRichTextEditorEnabled(enabled: Boolean) {
+        store.edit { prefs ->
+            prefs[richTextEditorKey] = enabled
+        }
+    }
+
+    override fun isRichTextEditorEnabledFlow(): Flow<Boolean> {
+        return store.data.map { prefs ->
+            // enabled by default
+            prefs[richTextEditorKey].orTrue()
+        }
+    }
+
+    override suspend fun setDeveloperModeEnabled(enabled: Boolean) {
+        store.edit { prefs ->
+            prefs[developerModeKey] = enabled
+        }
+    }
+
+    override fun isDeveloperModeEnabledFlow(): Flow<Boolean> {
+        return store.data.map { prefs ->
+            // disabled by default on release and nightly, enabled by default on debug
+            prefs[developerModeKey] ?: (buildMeta.buildType == BuildType.DEBUG)
+        }
+    }
+
+    override suspend fun reset() {
+        store.edit { it.clear() }
+    }
+}

libraries/preferences/test/build.gradle.kts

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.preferences.test"
+
+    dependencies {
+        api(projects.libraries.preferences.api)
+        implementation(libs.coroutines.core)
+    }
+}

libraries/preferences/test/src/main/kotlin/io/element/android/libraries/featureflag/test/InMemoryPreferencesStore.kt

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.featureflag.test
+
+import io.element.android.features.preferences.api.store.PreferencesStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class InMemoryPreferencesStore(
+    isRichTextEditorEnabled: Boolean = false,
+    isDeveloperModeEnabled: Boolean = false,
+) : PreferencesStore {
+    private var _isRichTextEditorEnabled = MutableStateFlow(isRichTextEditorEnabled)
+    private var _isDeveloperModeEnabled = MutableStateFlow(isDeveloperModeEnabled)
+
+    override suspend fun setRichTextEditorEnabled(enabled: Boolean) {
+        _isRichTextEditorEnabled.value = enabled
+    }
+
+    override fun isRichTextEditorEnabledFlow(): Flow<Boolean> {
+        return _isRichTextEditorEnabled
+    }
+
+    override suspend fun setDeveloperModeEnabled(enabled: Boolean) {
+        _isDeveloperModeEnabled.value = enabled
+    }
+
+    override fun isDeveloperModeEnabledFlow(): Flow<Boolean> {
+        return _isDeveloperModeEnabled
+    }
+
+    override suspend fun reset() {
+        // No op
+    }
+}