Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/bma/settingUpAccount

Browse source
This commit is contained in:
Benoit Marty 2023-08-28 13:02:44 +02:00 • committed by GitHub
commit f80eece489
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
100 changed files with 317 additions and 359 deletions
Download patch file Download diff file Expand all files Collapse all files

14
appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
View file

@ -159,10 +159,10 @@ class LoggedInFlowNode @AssistedInject constructor(
sealed interface NavTarget : Parcelable {
@Parcelize
object Permanent : NavTarget
data object Permanent : NavTarget
@Parcelize
object RoomList : NavTarget
data object RoomList : NavTarget
@Parcelize
data class Room(
@ -171,19 +171,19 @@ class LoggedInFlowNode @AssistedInject constructor(
) : NavTarget
@Parcelize
object Settings : NavTarget
data object Settings : NavTarget
@Parcelize
object CreateRoom : NavTarget
data object CreateRoom : NavTarget
@Parcelize
object VerifySession : NavTarget
data object VerifySession : NavTarget
@Parcelize
object InviteList : NavTarget
data object InviteList : NavTarget
@Parcelize
object Ftue : NavTarget
data object Ftue : NavTarget
}
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {

2
appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
View file

@ -64,7 +64,7 @@ class NotLoggedInFlowNode @AssistedInject constructor(
sealed interface NavTarget : Parcelable {
@Parcelize
object OnBoarding : NavTarget
data object OnBoarding : NavTarget
@Parcelize
data class LoginFlow(

6
appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
View file

@ -169,10 +169,10 @@ class RootFlowNode @AssistedInject constructor(
sealed interface NavTarget : Parcelable {
@Parcelize
object SplashScreen : NavTarget
data object SplashScreen : NavTarget
@Parcelize
object NotLoggedInFlow : NavTarget
data object NotLoggedInFlow : NavTarget
@Parcelize
data class LoggedInFlow(
@ -181,7 +181,7 @@ class RootFlowNode @AssistedInject constructor(
) : NavTarget
@Parcelize
object BugReport : NavTarget
data object BugReport : NavTarget
}
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {

2
appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInEvents.kt
View file

@ -17,5 +17,5 @@
package io.element.android.appnav.loggedin
// sealed interface LoggedInEvents {
// object MyEvent : LoggedInEvents
// data object MyEvent : LoggedInEvents
// }

4
appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomState.kt
View file

@ -32,8 +32,8 @@ import kotlinx.coroutines.flow.stateIn
import javax.inject.Inject
sealed interface LoadingRoomState {
object Loading : LoadingRoomState
object Error : LoadingRoomState
data object Loading : LoadingRoomState
data object Error : LoadingRoomState
data class Loaded(val room: MatrixRoom) : LoadingRoomState
}

4
appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
View file

@ -77,10 +77,10 @@ class RoomFlowNode @AssistedInject constructor(
sealed interface NavTarget : Parcelable {
@Parcelize
object Loading : NavTarget
data object Loading : NavTarget
@Parcelize
object Loaded : NavTarget
data object Loaded : NavTarget
}
override fun onBuilt() {

4
appnav/src/main/kotlin/io/element/android/appnav/room/RoomLoadedFlowNode.kt
View file

@ -152,10 +152,10 @@ class RoomLoadedFlowNode @AssistedInject constructor(
sealed interface NavTarget : Parcelable {
@Parcelize
object Messages : NavTarget
data object Messages : NavTarget
@Parcelize
object RoomDetails : NavTarget
data object RoomDetails : NavTarget
@Parcelize
data class RoomMemberDetails(val userId: UserId) : NavTarget