Account provider screen. - Crashing
This commit is contained in:
parent
96f9eb8397
commit
9809969b64
16 changed files with 422 additions and 28 deletions
|
|
@ -63,7 +63,9 @@ class NotLoggedInFlowNode @AssistedInject constructor(
|
||||||
object OnBoarding : NavTarget
|
object OnBoarding : NavTarget
|
||||||
|
|
||||||
@Parcelize
|
@Parcelize
|
||||||
object LoginFlow : NavTarget
|
data class LoginFlow(
|
||||||
|
val isAccountCreation: Boolean,
|
||||||
|
) : NavTarget
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
|
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
|
||||||
|
|
@ -71,11 +73,11 @@ class NotLoggedInFlowNode @AssistedInject constructor(
|
||||||
NavTarget.OnBoarding -> {
|
NavTarget.OnBoarding -> {
|
||||||
val callback = object : OnBoardingEntryPoint.Callback {
|
val callback = object : OnBoardingEntryPoint.Callback {
|
||||||
override fun onSignUp() {
|
override fun onSignUp() {
|
||||||
//NOOP
|
backstack.push(NavTarget.LoginFlow(isAccountCreation = true))
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onSignIn() {
|
override fun onSignIn() {
|
||||||
backstack.push(NavTarget.LoginFlow)
|
backstack.push(NavTarget.LoginFlow(isAccountCreation = false))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
onBoardingEntryPoint
|
onBoardingEntryPoint
|
||||||
|
|
@ -83,8 +85,10 @@ class NotLoggedInFlowNode @AssistedInject constructor(
|
||||||
.callback(callback)
|
.callback(callback)
|
||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
NavTarget.LoginFlow -> {
|
is NavTarget.LoginFlow -> {
|
||||||
loginEntryPoint.createNode(this, buildContext)
|
loginEntryPoint.nodeBuilder(this, buildContext)
|
||||||
|
.params(LoginEntryPoint.Params(isAccountCreation = navTarget.isAccountCreation))
|
||||||
|
.build()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,19 @@
|
||||||
|
|
||||||
package io.element.android.features.login.api
|
package io.element.android.features.login.api
|
||||||
|
|
||||||
import io.element.android.libraries.architecture.SimpleFeatureEntryPoint
|
import com.bumble.appyx.core.modality.BuildContext
|
||||||
|
import com.bumble.appyx.core.node.Node
|
||||||
|
import io.element.android.libraries.architecture.FeatureEntryPoint
|
||||||
|
|
||||||
interface LoginEntryPoint : SimpleFeatureEntryPoint
|
interface LoginEntryPoint : FeatureEntryPoint {
|
||||||
|
data class Params(
|
||||||
|
val isAccountCreation: Boolean,
|
||||||
|
)
|
||||||
|
|
||||||
|
fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
|
||||||
|
|
||||||
|
interface NodeBuilder {
|
||||||
|
fun params(params: Params): NodeBuilder
|
||||||
|
fun build(): Node
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ package io.element.android.features.login.impl
|
||||||
|
|
||||||
import com.bumble.appyx.core.modality.BuildContext
|
import com.bumble.appyx.core.modality.BuildContext
|
||||||
import com.bumble.appyx.core.node.Node
|
import com.bumble.appyx.core.node.Node
|
||||||
|
import com.bumble.appyx.core.plugin.Plugin
|
||||||
import com.squareup.anvil.annotations.ContributesBinding
|
import com.squareup.anvil.annotations.ContributesBinding
|
||||||
import io.element.android.features.login.api.LoginEntryPoint
|
import io.element.android.features.login.api.LoginEntryPoint
|
||||||
import io.element.android.libraries.architecture.createNode
|
import io.element.android.libraries.architecture.createNode
|
||||||
|
|
@ -26,7 +27,19 @@ import javax.inject.Inject
|
||||||
|
|
||||||
@ContributesBinding(AppScope::class)
|
@ContributesBinding(AppScope::class)
|
||||||
class DefaultLoginEntryPoint @Inject constructor() : LoginEntryPoint {
|
class DefaultLoginEntryPoint @Inject constructor() : LoginEntryPoint {
|
||||||
override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
|
override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): LoginEntryPoint.NodeBuilder {
|
||||||
return parentNode.createNode<LoginFlowNode>(buildContext)
|
val plugins = ArrayList<Plugin>()
|
||||||
|
|
||||||
|
return object : LoginEntryPoint.NodeBuilder {
|
||||||
|
|
||||||
|
override fun params(params: LoginEntryPoint.Params): LoginEntryPoint.NodeBuilder {
|
||||||
|
plugins += LoginFlowNode.Inputs(isAccountCreation = params.isAccountCreation)
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun build(): Node {
|
||||||
|
return parentNode.createNode<LoginFlowNode>(buildContext, plugins)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ import android.app.Activity
|
||||||
import android.os.Parcelable
|
import android.os.Parcelable
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.DisposableEffect
|
import androidx.compose.runtime.DisposableEffect
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import com.bumble.appyx.core.composable.Children
|
import com.bumble.appyx.core.composable.Children
|
||||||
|
|
@ -32,14 +31,18 @@ import com.bumble.appyx.navmodel.backstack.operation.push
|
||||||
import dagger.assisted.Assisted
|
import dagger.assisted.Assisted
|
||||||
import dagger.assisted.AssistedInject
|
import dagger.assisted.AssistedInject
|
||||||
import io.element.android.anvilannotations.ContributesNode
|
import io.element.android.anvilannotations.ContributesNode
|
||||||
|
import io.element.android.features.login.impl.accountprovider.AccountProviderNode
|
||||||
import io.element.android.features.login.impl.changeserver.ChangeServerNode
|
import io.element.android.features.login.impl.changeserver.ChangeServerNode
|
||||||
import io.element.android.features.login.impl.oidc.CustomTabAvailabilityChecker
|
import io.element.android.features.login.impl.oidc.CustomTabAvailabilityChecker
|
||||||
import io.element.android.features.login.impl.oidc.customtab.CustomTabHandler
|
import io.element.android.features.login.impl.oidc.customtab.CustomTabHandler
|
||||||
import io.element.android.features.login.impl.oidc.webview.OidcNode
|
import io.element.android.features.login.impl.oidc.webview.OidcNode
|
||||||
import io.element.android.features.login.impl.root.LoginRootNode
|
import io.element.android.features.login.impl.root.LoginRootNode
|
||||||
|
import io.element.android.features.login.impl.util.LoginConstants
|
||||||
import io.element.android.libraries.architecture.BackstackNode
|
import io.element.android.libraries.architecture.BackstackNode
|
||||||
|
import io.element.android.libraries.architecture.NodeInputs
|
||||||
import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
|
import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
|
||||||
import io.element.android.libraries.architecture.createNode
|
import io.element.android.libraries.architecture.createNode
|
||||||
|
import io.element.android.libraries.architecture.inputs
|
||||||
import io.element.android.libraries.designsystem.theme.ElementTheme
|
import io.element.android.libraries.designsystem.theme.ElementTheme
|
||||||
import io.element.android.libraries.di.AppScope
|
import io.element.android.libraries.di.AppScope
|
||||||
import io.element.android.libraries.matrix.api.auth.OidcDetails
|
import io.element.android.libraries.matrix.api.auth.OidcDetails
|
||||||
|
|
@ -53,7 +56,7 @@ class LoginFlowNode @AssistedInject constructor(
|
||||||
private val customTabHandler: CustomTabHandler,
|
private val customTabHandler: CustomTabHandler,
|
||||||
) : BackstackNode<LoginFlowNode.NavTarget>(
|
) : BackstackNode<LoginFlowNode.NavTarget>(
|
||||||
backstack = BackStack(
|
backstack = BackStack(
|
||||||
initialElement = NavTarget.Root,
|
initialElement = NavTarget.AccountProvider, // NavTarget.Root,
|
||||||
savedStateMap = buildContext.savedStateMap,
|
savedStateMap = buildContext.savedStateMap,
|
||||||
),
|
),
|
||||||
buildContext = buildContext,
|
buildContext = buildContext,
|
||||||
|
|
@ -62,10 +65,24 @@ class LoginFlowNode @AssistedInject constructor(
|
||||||
private var activity: Activity? = null
|
private var activity: Activity? = null
|
||||||
private var darkTheme: Boolean = false
|
private var darkTheme: Boolean = false
|
||||||
|
|
||||||
|
data class Inputs(
|
||||||
|
val isAccountCreation: Boolean,
|
||||||
|
) : NodeInputs
|
||||||
|
|
||||||
|
private val inputs: Inputs = inputs()
|
||||||
|
|
||||||
sealed interface NavTarget : Parcelable {
|
sealed interface NavTarget : Parcelable {
|
||||||
|
// Not used anymore
|
||||||
@Parcelize
|
@Parcelize
|
||||||
object Root : NavTarget
|
object Root : NavTarget
|
||||||
|
|
||||||
|
@Parcelize
|
||||||
|
object AccountProvider : NavTarget
|
||||||
|
|
||||||
|
@Parcelize
|
||||||
|
object ChangeAccountProvider : NavTarget
|
||||||
|
|
||||||
|
// Not used anymore
|
||||||
@Parcelize
|
@Parcelize
|
||||||
object ChangeServer : NavTarget
|
object ChangeServer : NavTarget
|
||||||
|
|
||||||
|
|
@ -99,6 +116,26 @@ class LoginFlowNode @AssistedInject constructor(
|
||||||
val input = OidcNode.Inputs(navTarget.oidcDetails)
|
val input = OidcNode.Inputs(navTarget.oidcDetails)
|
||||||
createNode<OidcNode>(buildContext, plugins = listOf(input))
|
createNode<OidcNode>(buildContext, plugins = listOf(input))
|
||||||
}
|
}
|
||||||
|
NavTarget.AccountProvider -> {
|
||||||
|
val inputs = AccountProviderNode.Inputs(
|
||||||
|
homeserver = LoginConstants.DEFAULT_HOMESERVER_URL,
|
||||||
|
isMatrixOrg = LoginConstants.DEFAULT_HOMESERVER_URL == "matrix.org",
|
||||||
|
isAccountCreation = inputs.isAccountCreation
|
||||||
|
)
|
||||||
|
val callback = object : AccountProviderNode.Callback {
|
||||||
|
override fun onContinue() {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onChangeAccountProvider() {
|
||||||
|
backstack.push(NavTarget.ChangeAccountProvider)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
createNode<AccountProviderNode>(buildContext, plugins = listOf(inputs, callback))
|
||||||
|
}
|
||||||
|
NavTarget.ChangeAccountProvider -> {
|
||||||
|
TODO()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
/*
|
||||||
|
* 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.login.impl.accountprovider
|
||||||
|
|
||||||
|
// TODO Add your events or remove the file completely if no events
|
||||||
|
sealed interface AccountProviderEvents {
|
||||||
|
object MyEvent : AccountProviderEvents
|
||||||
|
}
|
||||||
|
|
@ -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.features.login.impl.accountprovider
|
||||||
|
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import com.bumble.appyx.core.modality.BuildContext
|
||||||
|
import com.bumble.appyx.core.node.Node
|
||||||
|
import com.bumble.appyx.core.plugin.Plugin
|
||||||
|
import com.bumble.appyx.core.plugin.plugins
|
||||||
|
import dagger.assisted.Assisted
|
||||||
|
import dagger.assisted.AssistedInject
|
||||||
|
import io.element.android.anvilannotations.ContributesNode
|
||||||
|
import io.element.android.libraries.architecture.NodeInputs
|
||||||
|
import io.element.android.libraries.architecture.inputs
|
||||||
|
import io.element.android.libraries.di.AppScope
|
||||||
|
|
||||||
|
@ContributesNode(AppScope::class)
|
||||||
|
class AccountProviderNode @AssistedInject constructor(
|
||||||
|
@Assisted buildContext: BuildContext,
|
||||||
|
@Assisted plugins: List<Plugin>,
|
||||||
|
presenterFactory: AccountProviderPresenter.Factory,
|
||||||
|
) : Node(buildContext, plugins = plugins) {
|
||||||
|
|
||||||
|
data class Inputs(
|
||||||
|
val homeserver: String,
|
||||||
|
val isMatrixOrg: Boolean,
|
||||||
|
val isAccountCreation: Boolean,
|
||||||
|
) : NodeInputs
|
||||||
|
|
||||||
|
private val inputs: Inputs = inputs()
|
||||||
|
private val presenter = presenterFactory.create(
|
||||||
|
AccountProviderPresenterParams(
|
||||||
|
homeserver = inputs.homeserver,
|
||||||
|
isMatrixOrg = inputs.isMatrixOrg,
|
||||||
|
isAccountCreation = inputs.isAccountCreation,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
interface Callback : Plugin {
|
||||||
|
fun onContinue()
|
||||||
|
fun onChangeAccountProvider()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onContinue() {
|
||||||
|
plugins<Callback>().forEach { it.onContinue() }
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onChangeAccountProvider() {
|
||||||
|
plugins<Callback>().forEach { it.onChangeAccountProvider() }
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
override fun View(modifier: Modifier) {
|
||||||
|
val state = presenter.present()
|
||||||
|
AccountProviderView(
|
||||||
|
state = state,
|
||||||
|
modifier = modifier,
|
||||||
|
onContinue = ::onContinue,
|
||||||
|
onChange = ::onChangeAccountProvider,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,56 @@
|
||||||
|
/*
|
||||||
|
* 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.login.impl.accountprovider
|
||||||
|
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import dagger.assisted.Assisted
|
||||||
|
import dagger.assisted.AssistedFactory
|
||||||
|
import dagger.assisted.AssistedInject
|
||||||
|
import io.element.android.libraries.architecture.Presenter
|
||||||
|
|
||||||
|
data class AccountProviderPresenterParams(
|
||||||
|
val homeserver: String,
|
||||||
|
val isMatrixOrg: Boolean,
|
||||||
|
val isAccountCreation: Boolean,
|
||||||
|
)
|
||||||
|
|
||||||
|
class AccountProviderPresenter @AssistedInject constructor(
|
||||||
|
@Assisted private val params: AccountProviderPresenterParams,
|
||||||
|
) : Presenter<AccountProviderState> {
|
||||||
|
|
||||||
|
@AssistedFactory
|
||||||
|
interface Factory {
|
||||||
|
fun create(params: AccountProviderPresenterParams): AccountProviderPresenter
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
override fun present(): AccountProviderState {
|
||||||
|
|
||||||
|
fun handleEvents(event: AccountProviderEvents) {
|
||||||
|
when (event) {
|
||||||
|
AccountProviderEvents.MyEvent -> Unit
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return AccountProviderState(
|
||||||
|
homeserver = params.homeserver,
|
||||||
|
isMatrix = params.isMatrixOrg,
|
||||||
|
isAccountCreation = params.isAccountCreation,
|
||||||
|
eventSink = ::handleEvents
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
/*
|
||||||
|
* 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.login.impl.accountprovider
|
||||||
|
|
||||||
|
// Do not use default value, so no member get forgotten in the presenters.
|
||||||
|
data class AccountProviderState(
|
||||||
|
val homeserver: String,
|
||||||
|
val isMatrix: Boolean,
|
||||||
|
val isAccountCreation: Boolean,
|
||||||
|
val eventSink: (AccountProviderEvents) -> Unit
|
||||||
|
)
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
/*
|
||||||
|
* 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.login.impl.accountprovider
|
||||||
|
|
||||||
|
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
|
||||||
|
|
||||||
|
open class AccountProviderStateProvider : PreviewParameterProvider<AccountProviderState> {
|
||||||
|
override val values: Sequence<AccountProviderState>
|
||||||
|
get() = sequenceOf(
|
||||||
|
aAccountProviderState(),
|
||||||
|
// Add other state here
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun aAccountProviderState() = AccountProviderState(
|
||||||
|
homeserver = "matrix.org",
|
||||||
|
isMatrix = true,
|
||||||
|
isAccountCreation = false,
|
||||||
|
eventSink = {}
|
||||||
|
)
|
||||||
|
|
@ -0,0 +1,113 @@
|
||||||
|
/*
|
||||||
|
* 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.login.impl.accountprovider
|
||||||
|
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.filled.AccountCircle
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.compose.ui.tooling.preview.PreviewParameter
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import io.element.android.features.login.impl.R
|
||||||
|
import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
|
||||||
|
import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
|
||||||
|
import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
|
||||||
|
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
|
||||||
|
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
|
||||||
|
import io.element.android.libraries.designsystem.theme.components.Button
|
||||||
|
import io.element.android.libraries.designsystem.theme.components.Text
|
||||||
|
import io.element.android.libraries.designsystem.theme.components.TextButton
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun AccountProviderView(
|
||||||
|
state: AccountProviderState,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
onContinue: () -> Unit = {},
|
||||||
|
onChange: () -> Unit = {},
|
||||||
|
) {
|
||||||
|
HeaderFooterPage(
|
||||||
|
modifier = modifier,
|
||||||
|
header = {
|
||||||
|
IconTitleSubtitleMolecule(
|
||||||
|
modifier = Modifier.padding(top = 60.dp),
|
||||||
|
iconImageVector = Icons.Filled.AccountCircle,
|
||||||
|
title = stringResource(
|
||||||
|
id = if (state.isAccountCreation) {
|
||||||
|
R.string.screen_account_provider_signup_title
|
||||||
|
} else {
|
||||||
|
R.string.screen_account_provider_signin_title
|
||||||
|
}
|
||||||
|
),
|
||||||
|
subTitle = stringResource(
|
||||||
|
id = if (state.isAccountCreation) {
|
||||||
|
R.string.screen_account_provider_signup_subtitle
|
||||||
|
} else {
|
||||||
|
// Use same value for now.
|
||||||
|
R.string.screen_account_provider_signup_subtitle
|
||||||
|
},
|
||||||
|
)
|
||||||
|
)
|
||||||
|
},
|
||||||
|
footer = {
|
||||||
|
ButtonColumnMolecule {
|
||||||
|
Button(
|
||||||
|
onClick = {
|
||||||
|
onContinue()
|
||||||
|
},
|
||||||
|
enabled = true,
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
) {
|
||||||
|
Text(text = stringResource(id = R.string.screen_account_provider_continue))
|
||||||
|
}
|
||||||
|
TextButton(
|
||||||
|
onClick = {
|
||||||
|
onChange()
|
||||||
|
},
|
||||||
|
enabled = true,
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
) {
|
||||||
|
Text(text = stringResource(id = R.string.screen_account_provider_change))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
// No content
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview
|
||||||
|
@Composable
|
||||||
|
fun AccountProviderViewLightPreview(@PreviewParameter(AccountProviderStateProvider::class) state: AccountProviderState) =
|
||||||
|
ElementPreviewLight { ContentToPreview(state) }
|
||||||
|
|
||||||
|
@Preview
|
||||||
|
@Composable
|
||||||
|
fun AccountProviderViewDarkPreview(@PreviewParameter(AccountProviderStateProvider::class) state: AccountProviderState) =
|
||||||
|
ElementPreviewDark { ContentToPreview(state) }
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun ContentToPreview(state: AccountProviderState) {
|
||||||
|
AccountProviderView(
|
||||||
|
state = state,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
@ -24,7 +24,6 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
import androidx.compose.foundation.layout.consumeWindowInsets
|
import androidx.compose.foundation.layout.consumeWindowInsets
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.foundation.layout.imePadding
|
import androidx.compose.foundation.layout.imePadding
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
|
|
@ -33,6 +32,7 @@ import androidx.compose.foundation.verticalScroll
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.Home
|
import androidx.compose.material.icons.filled.Home
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.derivedStateOf
|
import androidx.compose.runtime.derivedStateOf
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
|
@ -51,13 +51,10 @@ import io.element.android.features.login.impl.changeserver.SlidingSyncNotSupport
|
||||||
import io.element.android.libraries.architecture.Async
|
import io.element.android.libraries.architecture.Async
|
||||||
import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
|
import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
|
||||||
import io.element.android.libraries.designsystem.components.button.BackButton
|
import io.element.android.libraries.designsystem.components.button.BackButton
|
||||||
import io.element.android.libraries.designsystem.components.button.ButtonWithProgress
|
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
|
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
|
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
|
||||||
import io.element.android.libraries.designsystem.theme.components.Scaffold
|
import io.element.android.libraries.designsystem.theme.components.Scaffold
|
||||||
import io.element.android.libraries.designsystem.theme.components.TopAppBar
|
import io.element.android.libraries.designsystem.theme.components.TopAppBar
|
||||||
import io.element.android.libraries.testtags.TestTags
|
|
||||||
import io.element.android.libraries.testtags.testTag
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* https://www.figma.com/file/o9p34zmiuEpZRyvZXJZAYL/FTUE?type=design&node-id=604-60817
|
* https://www.figma.com/file/o9p34zmiuEpZRyvZXJZAYL/FTUE?type=design&node-id=604-60817
|
||||||
|
|
@ -89,6 +86,7 @@ fun ChangeAccountProviderView(
|
||||||
}
|
}
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
|
modifier = modifier,
|
||||||
topBar = {
|
topBar = {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
title = {},
|
title = {},
|
||||||
|
|
@ -97,7 +95,7 @@ fun ChangeAccountProviderView(
|
||||||
}
|
}
|
||||||
) { padding ->
|
) { padding ->
|
||||||
Box(
|
Box(
|
||||||
modifier = modifier
|
modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.imePadding()
|
.imePadding()
|
||||||
.padding(padding)
|
.padding(padding)
|
||||||
|
|
@ -112,8 +110,9 @@ fun ChangeAccountProviderView(
|
||||||
IconTitleSubtitleMolecule(
|
IconTitleSubtitleMolecule(
|
||||||
modifier = Modifier.padding(top = 16.dp, bottom = 32.dp, start = 16.dp, end = 16.dp),
|
modifier = Modifier.padding(top = 16.dp, bottom = 32.dp, start = 16.dp, end = 16.dp),
|
||||||
iconImageVector = Icons.Filled.Home,
|
iconImageVector = Icons.Filled.Home,
|
||||||
|
iconTint = MaterialTheme.colorScheme.primary,
|
||||||
title = stringResource(id = R.string.screen_change_account_provider_title),
|
title = stringResource(id = R.string.screen_change_account_provider_title),
|
||||||
subTitle = stringResource(id = R.string.screen_change_account_provider_subtitle)
|
subTitle = stringResource(id = R.string.screen_change_account_provider_subtitle),
|
||||||
)
|
)
|
||||||
|
|
||||||
if (slidingSyncNotSupportedError != null) {
|
if (slidingSyncNotSupportedError != null) {
|
||||||
|
|
@ -140,17 +139,7 @@ fun ChangeAccountProviderView(
|
||||||
),
|
),
|
||||||
onClick = onOtherProviderClicked
|
onClick = onOtherProviderClicked
|
||||||
)
|
)
|
||||||
|
|
||||||
Spacer(Modifier.height(32.dp))
|
Spacer(Modifier.height(32.dp))
|
||||||
ButtonWithProgress(
|
|
||||||
text = stringResource(id = R.string.screen_change_server_submit),
|
|
||||||
showProgress = isLoading,
|
|
||||||
onClick = ::submit,
|
|
||||||
enabled = state.submitEnabled,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.testTag(TestTags.changeServerContinue)
|
|
||||||
)
|
|
||||||
if (state.changeServerAction is Async.Success) {
|
if (state.changeServerAction is Async.Success) {
|
||||||
onChangeServerSuccess()
|
onChangeServerSuccess()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,7 @@ fun ChangeAccountProviderItemView(
|
||||||
RoundedIconAtom(
|
RoundedIconAtom(
|
||||||
size = RoundedIconAtomSize.Medium,
|
size = RoundedIconAtomSize.Medium,
|
||||||
imageVector = Icons.Filled.Search,
|
imageVector = Icons.Filled.Search,
|
||||||
|
tint = MaterialTheme.colorScheme.primary,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
Text(
|
Text(
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,10 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||||
|
<string name="screen_account_provider_change">"Change account provider"</string>
|
||||||
|
<string name="screen_account_provider_continue">"Continue"</string>
|
||||||
|
<string name="screen_account_provider_signin_title">"You’re about to sign in to %s"</string>
|
||||||
|
<string name="screen_account_provider_signup_subtitle">"This is where you conversations will live — just like you would use an email provider to keep your emails."</string>
|
||||||
|
<string name="screen_account_provider_signup_title">"You’re about to create an account on %s"</string>
|
||||||
<string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org is an open network for secure, decentralized communication."</string>
|
<string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org is an open network for secure, decentralized communication."</string>
|
||||||
<string name="screen_change_account_provider_other">"Other"</string>
|
<string name="screen_change_account_provider_other">"Other"</string>
|
||||||
<string name="screen_change_account_provider_subtitle">"Use a different account provider, such as your own private server or a work account."</string>
|
<string name="screen_change_account_provider_subtitle">"Use a different account provider, such as your own private server or a work account."</string>
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,7 @@ class OnBoardingNode @AssistedInject constructor(
|
||||||
state = state,
|
state = state,
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
onSignIn = ::onSignIn,
|
onSignIn = ::onSignIn,
|
||||||
|
onCreateAccount = ::onSignUp,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.vector.ImageVector
|
import androidx.compose.ui.graphics.vector.ImageVector
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
|
@ -46,6 +47,7 @@ fun IconTitleSubtitleMolecule(
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
iconResourceId: Int? = null,
|
iconResourceId: Int? = null,
|
||||||
iconImageVector: ImageVector? = null,
|
iconImageVector: ImageVector? = null,
|
||||||
|
iconTint: Color = Color.Unspecified,
|
||||||
) {
|
) {
|
||||||
Column(modifier) {
|
Column(modifier) {
|
||||||
RoundedIconAtom(
|
RoundedIconAtom(
|
||||||
|
|
@ -54,6 +56,7 @@ fun IconTitleSubtitleMolecule(
|
||||||
size = RoundedIconAtomSize.Large,
|
size = RoundedIconAtomSize.Large,
|
||||||
resourceId = iconResourceId,
|
resourceId = iconResourceId,
|
||||||
imageVector = iconImageVector,
|
imageVector = iconImageVector,
|
||||||
|
tint = iconTint,
|
||||||
)
|
)
|
||||||
Spacer(modifier = Modifier.height(16.dp))
|
Spacer(modifier = Modifier.height(16.dp))
|
||||||
Text(
|
Text(
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,8 @@
|
||||||
"includeRegex": [
|
"includeRegex": [
|
||||||
"screen_login_.*",
|
"screen_login_.*",
|
||||||
"screen_change_server_.*",
|
"screen_change_server_.*",
|
||||||
"screen_change_account_provider_.*"
|
"screen_change_account_provider_.*",
|
||||||
|
"screen_account_provider_.*"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue