Merge branch 'develop' into feature-oled-black

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -424,6 +424,10 @@ class LoggedInFlowNode(
                     override fun navigateToGlobalNotificationSettings() {
                         backstack.push(NavTarget.Settings(PreferencesEntryPoint.InitialTarget.NotificationSettings))
                     }
+
+                    override fun navigateToDeveloperSettings() {
+                        backstack.push(NavTarget.Settings(PreferencesEntryPoint.InitialTarget.DeveloperSettings))
+                    }
                 }
                 val inputs = RoomFlowNode.Inputs(
                     roomIdOrAlias = navTarget.roomIdOrAlias,
@@ -747,11 +751,11 @@ private class AttachRoomOperation(
                     }
                 } + // Always create a new element, otherwise we wouldn't be navigating to the target event id or child node
                     BackStackElement(
-                    key = NavKey(roomTarget),
-                    fromState = CREATED,
-                    targetState = ACTIVE,
-                    operation = this
-                )
+                        key = NavKey(roomTarget),
+                        fromState = CREATED,
+                        targetState = ACTIVE,
+                        operation = this
+                    )
             } else {
                 // Otherwise, just push the new node to the end of the backstack
                 Push<LoggedInFlowNode.NavTarget>(roomTarget).invoke(currentElements)

appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt

@@ -85,6 +85,7 @@ class JoinedRoomLoadedFlowNode(
         fun navigateToRoom(roomId: RoomId, serverNames: List<String>)
         fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
         fun navigateToGlobalNotificationSettings()
+        fun navigateToDeveloperSettings()
     }
 
     data class Inputs(
@@ -145,6 +146,10 @@ class JoinedRoomLoadedFlowNode(
                 callback.navigateToGlobalNotificationSettings()
             }
 
+            override fun navigateToDeveloperSettings() {
+                callback.navigateToDeveloperSettings()
+            }
+
             override fun navigateToRoom(roomId: RoomId, serverNames: List<String>) {
                 callback.navigateToRoom(roomId, serverNames)
             }
@@ -252,6 +257,10 @@ class JoinedRoomLoadedFlowNode(
             override fun navigateToRoom(roomId: RoomId) {
                 callback.navigateToRoom(roomId, emptyList())
             }
+
+            override fun navigateToDeveloperSettings() {
+                callback.navigateToDeveloperSettings()
+            }
         }
         val params = MessagesEntryPoint.Params(
             MessagesEntryPoint.InitialTarget.Messages(navTarget.focusedEventId)

appnav/src/test/kotlin/io/element/android/appnav/room/joined/FakeJoinedRoomLoadedFlowNodeCallback.kt

@@ -16,4 +16,5 @@ class FakeJoinedRoomLoadedFlowNodeCallback : JoinedRoomLoadedFlowNode.Callback {
     override fun navigateToRoom(roomId: RoomId, serverNames: List<String>) = lambdaError()
     override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) = lambdaError()
     override fun navigateToGlobalNotificationSettings() = lambdaError()
+    override fun navigateToDeveloperSettings() = lambdaError()
 }