Merge branch 'develop' into feature/fga/timeline-multi-forward

libraries/featureflag/api/build.gradle.kts

@@ -15,7 +15,6 @@ android {
 }
 
 dependencies {
-    implementation(projects.appconfig)
     implementation(projects.libraries.core)
     implementation(libs.coroutines.core)
 }

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

@@ -177,13 +177,19 @@ enum class FeatureFlags(
         defaultValue = { false },
         isFinished = false,
     ),
-    ShowAllActivityInRoomList(
-        key = "feature.show_all_activity_in_room_list",
-        title = "Show all activity in room list",
-        description = "Show all activity indicators in the room list, using unread messages instead of notifications.",
-        defaultValue = { true },
-        // To hide it from the developer options, since it's displayed in the notification settings instead
-        isFinished = true,
-        isInLabs = false,
-    )
+}
+
+/**
+ * Feature flag to show all activity indicators in the room list, using unread messages instead of notifications.
+ *
+ * This is separate from the [FeatureFlags] enum because it is not a feature flag that can be toggled in developer options,
+ * but rather a setting that can be toggled in the app settings.
+ */
+object ShowAllActivityInRoomListFeature : Feature {
+    override val key: String = "feature.show_all_activity_in_room_list"
+    override val title: String = "Show all activity in room list"
+    override val description: String = "Show all activity indicators in the room list, using unread messages instead of notifications."
+    override val defaultValue: (BuildMeta) -> Boolean = { true }
+    override val isFinished: Boolean = false
+    override val isInLabs: Boolean = false
 }

libraries/featureflag/impl/build.gradle.kts

@@ -23,9 +23,6 @@ setupDependencyInjection()
 dependencies {
     api(projects.libraries.featureflag.api)
     implementation(libs.androidx.datastore.preferences)
-    implementation(projects.appconfig)
-    implementation(projects.libraries.di)
-    implementation(projects.libraries.androidutils)
     implementation(projects.libraries.core)
     implementation(projects.libraries.preferences.api)
     implementation(libs.coroutines.core)