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

Rename component. No need for Element prefix

Browse source
This commit is contained in:
Benoit Marty 2023-01-30 16:11:54 +01:00 • committed by Benoit Marty
parent cdfc13cb15
commit 201508678a
33 changed files with 125 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

12
features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt
View file

@ -51,9 +51,9 @@ import io.element.android.libraries.designsystem.components.form.textFieldState
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.designsystem.theme.ElementTheme
import io.element.android.libraries.designsystem.theme.components.ElementButton
import io.element.android.libraries.designsystem.theme.components.ElementCircularProgressIndicator
import io.element.android.libraries.designsystem.theme.components.ElementOutlinedTextField
import io.element.android.libraries.designsystem.theme.components.Button
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
import io.element.android.libraries.designsystem.theme.components.OutlinedTextField
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.testtags.TestTags
import io.element.android.libraries.testtags.testTag
@ -122,7 +122,7 @@ fun ChangeServerView(
color = ElementTheme.colors.secondary,
)
var homeserverFieldState by textFieldState(stateValue = state.homeserver)
ElementOutlinedTextField(
OutlinedTextField(
value = homeserverFieldState,
modifier = Modifier
.fillMaxWidth()
@ -155,7 +155,7 @@ fun ChangeServerView(
modifier = Modifier.padding(start = 16.dp)
)
}
ElementButton(
Button(
onClick = { eventSink(ChangeServerEvents.Submit) },
enabled = state.submitEnabled,
modifier = Modifier
@ -170,7 +170,7 @@ fun ChangeServerView(
}
}
if (state.changeServerAction is Async.Loading) {
ElementCircularProgressIndicator(
CircularProgressIndicator(
modifier = Modifier.align(Alignment.Center)
)
}

18
features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootScreen.kt
View file

@ -52,11 +52,11 @@ import io.element.android.libraries.designsystem.components.form.textFieldState
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.designsystem.theme.ElementTheme
import io.element.android.libraries.designsystem.theme.components.ElementButton
import io.element.android.libraries.designsystem.theme.components.ElementCircularProgressIndicator
import io.element.android.libraries.designsystem.theme.components.ElementOutlinedTextField
import io.element.android.libraries.designsystem.theme.components.Button
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
import io.element.android.libraries.designsystem.theme.components.Icon
import io.element.android.libraries.designsystem.theme.components.IconButton
import io.element.android.libraries.designsystem.theme.components.OutlinedTextField
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.matrix.core.SessionId
import io.element.android.libraries.testtags.TestTags
@ -107,7 +107,7 @@ fun LoginRootScreen(
Box(
modifier = Modifier.fillMaxWidth()
) {
ElementOutlinedTextField(
OutlinedTextField(
value = state.homeserver,
modifier = Modifier.fillMaxWidth(),
onValueChange = { /* no op */ },
@ -119,7 +119,7 @@ fun LoginRootScreen(
keyboardType = KeyboardType.Uri,
),
)
ElementButton(
Button(
onClick = onChangeServer,
modifier = Modifier
.align(Alignment.CenterEnd)
@ -130,7 +130,7 @@ fun LoginRootScreen(
}
)
}
ElementOutlinedTextField(
OutlinedTextField(
value = loginFieldState,
modifier = Modifier
.fillMaxWidth()
@ -153,7 +153,7 @@ fun LoginRootScreen(
// Ensure password is hidden when user submits the form
passwordVisible = false
}
ElementOutlinedTextField(
OutlinedTextField(
value = passwordFieldState,
modifier = Modifier
.fillMaxWidth()
@ -196,7 +196,7 @@ fun LoginRootScreen(
}
}
// Submit
ElementButton(
Button(
onClick = { eventSink(LoginRootEvents.Submit) },
enabled = state.submitEnabled,
modifier = Modifier
@ -212,7 +212,7 @@ fun LoginRootScreen(
}
}
if (state.loggedInState is LoggedInState.LoggingIn) {
ElementCircularProgressIndicator(
CircularProgressIndicator(
modifier = Modifier.align(Alignment.Center)
)
}