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

8
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
View file

@ -85,16 +85,16 @@ class LoginFlowNode @AssistedInject constructor(
sealed interface NavTarget : Parcelable {
@Parcelize
object ConfirmAccountProvider : NavTarget
data object ConfirmAccountProvider : NavTarget
@Parcelize
object ChangeAccountProvider : NavTarget
data object ChangeAccountProvider : NavTarget
@Parcelize
object SearchAccountProvider : NavTarget
data object SearchAccountProvider : NavTarget
@Parcelize
object LoginPassword : NavTarget
data object LoginPassword : NavTarget
@Parcelize
data class WaitList(val loginFormState: LoginFormState) : NavTarget

2
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerEvents.kt
View file

@ -20,5 +20,5 @@ import io.element.android.features.login.impl.accountprovider.AccountProvider
sealed interface ChangeServerEvents {
data class ChangeServer(val accountProvider: AccountProvider) : ChangeServerEvents
object ClearError : ChangeServerEvents
data object ClearError : ChangeServerEvents
}

2
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
View file

@ -27,7 +27,7 @@ sealed class ChangeServerError : Throwable() {
@Composable
fun message(): String = stringResource(messageId)
}
object SlidingSyncAlert : ChangeServerError()
data object SlidingSyncAlert : ChangeServerError()
companion object {
fun from(error: Throwable): ChangeServerError = when (error) {

4
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcEvents.kt
View file

@ -19,7 +19,7 @@ package io.element.android.features.login.impl.oidc.webview
import io.element.android.features.login.api.oidc.OidcAction
sealed interface OidcEvents {
object Cancel : OidcEvents
data object Cancel : OidcEvents
data class OidcActionEvent(val oidcAction: OidcAction): OidcEvents
object ClearError : OidcEvents
data object ClearError : OidcEvents
}

4
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderEvents.kt
View file

@ -17,6 +17,6 @@
package io.element.android.features.login.impl.screens.confirmaccountprovider
sealed interface ConfirmAccountProviderEvents {
object Continue : ConfirmAccountProviderEvents
object ClearError : ConfirmAccountProviderEvents
data object Continue : ConfirmAccountProviderEvents
data object ClearError : ConfirmAccountProviderEvents
}

2
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderState.kt
View file

@ -31,6 +31,6 @@ data class ConfirmAccountProviderState(
}
sealed interface LoginFlow {
object PasswordLogin : LoginFlow
data object PasswordLogin : LoginFlow
data class OidcFlow(val oidcDetails: OidcDetails) : LoginFlow
}

4
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordEvents.kt
View file

@ -19,6 +19,6 @@ package io.element.android.features.login.impl.screens.loginpassword
sealed interface LoginPasswordEvents {
data class SetLogin(val login: String) : LoginPasswordEvents
data class SetPassword(val password: String) : LoginPasswordEvents
object Submit : LoginPasswordEvents
object ClearError : LoginPasswordEvents
data object Submit : LoginPasswordEvents
data object ClearError : LoginPasswordEvents
}

6
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListEvents.kt
View file

@ -17,7 +17,7 @@
package io.element.android.features.login.impl.screens.waitlistscreen
sealed interface WaitListEvents {
object AttemptLogin : WaitListEvents
object ClearError : WaitListEvents
object Continue : WaitListEvents
data object AttemptLogin : WaitListEvents
data object ClearError : WaitListEvents
data object Continue : WaitListEvents
}