Benoit Marty
2 years ago
committed by
Benoit Marty
52 changed files with 485 additions and 121 deletions
@ -0,0 +1,36 @@ |
|||||||
|
/* |
||||||
|
* 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.libraries.designsystem.theme.components |
||||||
|
|
||||||
|
import androidx.compose.material3.DividerDefaults |
||||||
|
import androidx.compose.runtime.Composable |
||||||
|
import androidx.compose.ui.Modifier |
||||||
|
import androidx.compose.ui.graphics.Color |
||||||
|
import androidx.compose.ui.unit.Dp |
||||||
|
|
||||||
|
@Composable |
||||||
|
fun Divider( |
||||||
|
modifier: Modifier = Modifier, |
||||||
|
thickness: Dp = DividerDefaults.Thickness, |
||||||
|
color: Color = DividerDefaults.color, |
||||||
|
) { |
||||||
|
androidx.compose.material3.Divider( |
||||||
|
modifier = modifier, |
||||||
|
thickness = thickness, |
||||||
|
color = color, |
||||||
|
) |
||||||
|
} |
||||||
@ -0,0 +1,50 @@ |
|||||||
|
/* |
||||||
|
* 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.libraries.designsystem.theme.components |
||||||
|
|
||||||
|
import androidx.compose.foundation.interaction.MutableInteractionSource |
||||||
|
import androidx.compose.material3.FloatingActionButtonDefaults |
||||||
|
import androidx.compose.material3.FloatingActionButtonElevation |
||||||
|
import androidx.compose.material3.contentColorFor |
||||||
|
import androidx.compose.runtime.Composable |
||||||
|
import androidx.compose.runtime.remember |
||||||
|
import androidx.compose.ui.Modifier |
||||||
|
import androidx.compose.ui.graphics.Color |
||||||
|
import androidx.compose.ui.graphics.Shape |
||||||
|
|
||||||
|
@Composable |
||||||
|
fun FloatingActionButton( |
||||||
|
onClick: () -> Unit, |
||||||
|
modifier: Modifier = Modifier, |
||||||
|
shape: Shape = FloatingActionButtonDefaults.shape, |
||||||
|
containerColor: Color = FloatingActionButtonDefaults.containerColor, |
||||||
|
contentColor: Color = contentColorFor(containerColor), |
||||||
|
elevation: FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(), |
||||||
|
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, |
||||||
|
content: @Composable () -> Unit, |
||||||
|
) { |
||||||
|
androidx.compose.material3.FloatingActionButton( |
||||||
|
onClick = onClick, |
||||||
|
modifier = modifier, |
||||||
|
shape = shape, |
||||||
|
containerColor = containerColor, |
||||||
|
contentColor = contentColor, |
||||||
|
elevation = elevation, |
||||||
|
interactionSource = interactionSource, |
||||||
|
content = content, |
||||||
|
) |
||||||
|
} |
||||||
@ -0,0 +1,54 @@ |
|||||||
|
/* |
||||||
|
* 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.libraries.designsystem.theme.components |
||||||
|
|
||||||
|
import androidx.compose.material3.LocalContentColor |
||||||
|
import androidx.compose.runtime.Composable |
||||||
|
import androidx.compose.ui.Modifier |
||||||
|
import androidx.compose.ui.graphics.Color |
||||||
|
import androidx.compose.ui.graphics.ImageBitmap |
||||||
|
import androidx.compose.ui.graphics.vector.ImageVector |
||||||
|
|
||||||
|
@Composable |
||||||
|
fun Icon( |
||||||
|
imageVector: ImageVector, |
||||||
|
contentDescription: String?, |
||||||
|
modifier: Modifier = Modifier, |
||||||
|
tint: Color = LocalContentColor.current |
||||||
|
) { |
||||||
|
androidx.compose.material3.Icon( |
||||||
|
imageVector = imageVector, |
||||||
|
contentDescription = contentDescription, |
||||||
|
modifier = modifier, |
||||||
|
tint = tint, |
||||||
|
) |
||||||
|
} |
||||||
|
|
||||||
|
@Composable |
||||||
|
fun Icon( |
||||||
|
bitmap: ImageBitmap, |
||||||
|
contentDescription: String?, |
||||||
|
modifier: Modifier = Modifier, |
||||||
|
tint: Color = LocalContentColor.current |
||||||
|
) { |
||||||
|
androidx.compose.material3.Icon( |
||||||
|
bitmap = bitmap, |
||||||
|
contentDescription = contentDescription, |
||||||
|
modifier = modifier, |
||||||
|
tint = tint, |
||||||
|
) |
||||||
|
} |
||||||
@ -0,0 +1,41 @@ |
|||||||
|
/* |
||||||
|
* 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.libraries.designsystem.theme.components |
||||||
|
|
||||||
|
import androidx.compose.foundation.interaction.MutableInteractionSource |
||||||
|
import androidx.compose.material3.IconButtonDefaults |
||||||
|
import androidx.compose.runtime.Composable |
||||||
|
import androidx.compose.runtime.remember |
||||||
|
import androidx.compose.ui.Modifier |
||||||
|
|
||||||
|
@Composable |
||||||
|
fun IconButton( |
||||||
|
onClick: () -> Unit, |
||||||
|
modifier: Modifier = Modifier, |
||||||
|
enabled: Boolean = true, |
||||||
|
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, |
||||||
|
content: @Composable () -> Unit |
||||||
|
) { |
||||||
|
androidx.compose.material3.IconButton( |
||||||
|
onClick = onClick, |
||||||
|
modifier = modifier, |
||||||
|
enabled = enabled, |
||||||
|
colors = IconButtonDefaults.iconButtonColors(), |
||||||
|
interactionSource = interactionSource, |
||||||
|
content = content, |
||||||
|
) |
||||||
|
} |
||||||
@ -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.libraries.designsystem.theme.components |
||||||
|
|
||||||
|
import androidx.compose.foundation.text.InlineTextContent |
||||||
|
import androidx.compose.material3.LocalTextStyle |
||||||
|
import androidx.compose.runtime.Composable |
||||||
|
import androidx.compose.ui.Modifier |
||||||
|
import androidx.compose.ui.graphics.Color |
||||||
|
import androidx.compose.ui.text.AnnotatedString |
||||||
|
import androidx.compose.ui.text.TextLayoutResult |
||||||
|
import androidx.compose.ui.text.TextStyle |
||||||
|
import androidx.compose.ui.text.font.FontFamily |
||||||
|
import androidx.compose.ui.text.font.FontStyle |
||||||
|
import androidx.compose.ui.text.font.FontWeight |
||||||
|
import androidx.compose.ui.text.style.TextAlign |
||||||
|
import androidx.compose.ui.text.style.TextDecoration |
||||||
|
import androidx.compose.ui.text.style.TextOverflow |
||||||
|
import androidx.compose.ui.unit.TextUnit |
||||||
|
|
||||||
|
@Composable |
||||||
|
fun Text( |
||||||
|
text: String, |
||||||
|
modifier: Modifier = Modifier, |
||||||
|
color: Color = Color.Unspecified, |
||||||
|
fontSize: TextUnit = TextUnit.Unspecified, |
||||||
|
fontStyle: FontStyle? = null, |
||||||
|
fontWeight: FontWeight? = null, |
||||||
|
fontFamily: FontFamily? = null, |
||||||
|
letterSpacing: TextUnit = TextUnit.Unspecified, |
||||||
|
textDecoration: TextDecoration? = null, |
||||||
|
textAlign: TextAlign? = null, |
||||||
|
lineHeight: TextUnit = TextUnit.Unspecified, |
||||||
|
overflow: TextOverflow = TextOverflow.Clip, |
||||||
|
softWrap: Boolean = true, |
||||||
|
maxLines: Int = Int.MAX_VALUE, |
||||||
|
onTextLayout: (TextLayoutResult) -> Unit = {}, |
||||||
|
style: TextStyle = LocalTextStyle.current |
||||||
|
) { |
||||||
|
androidx.compose.material3.Text( |
||||||
|
text = text, |
||||||
|
modifier = modifier, |
||||||
|
color = color, |
||||||
|
fontSize = fontSize, |
||||||
|
fontStyle = fontStyle, |
||||||
|
fontWeight = fontWeight, |
||||||
|
fontFamily = fontFamily, |
||||||
|
letterSpacing = letterSpacing, |
||||||
|
textDecoration = textDecoration, |
||||||
|
textAlign = textAlign, |
||||||
|
lineHeight = lineHeight, |
||||||
|
overflow = overflow, |
||||||
|
softWrap = softWrap, |
||||||
|
maxLines = maxLines, |
||||||
|
onTextLayout = onTextLayout, |
||||||
|
style = style, |
||||||
|
) |
||||||
|
} |
||||||
|
|
||||||
|
@Composable |
||||||
|
fun Text( |
||||||
|
text: AnnotatedString, |
||||||
|
modifier: Modifier = Modifier, |
||||||
|
color: Color = Color.Unspecified, |
||||||
|
fontSize: TextUnit = TextUnit.Unspecified, |
||||||
|
fontStyle: FontStyle? = null, |
||||||
|
fontWeight: FontWeight? = null, |
||||||
|
fontFamily: FontFamily? = null, |
||||||
|
letterSpacing: TextUnit = TextUnit.Unspecified, |
||||||
|
textDecoration: TextDecoration? = null, |
||||||
|
textAlign: TextAlign? = null, |
||||||
|
lineHeight: TextUnit = TextUnit.Unspecified, |
||||||
|
overflow: TextOverflow = TextOverflow.Clip, |
||||||
|
softWrap: Boolean = true, |
||||||
|
maxLines: Int = Int.MAX_VALUE, |
||||||
|
inlineContent: Map<String, InlineTextContent> = mapOf(), |
||||||
|
onTextLayout: (TextLayoutResult) -> Unit = {}, |
||||||
|
style: TextStyle = LocalTextStyle.current |
||||||
|
) { |
||||||
|
androidx.compose.material3.Text( |
||||||
|
text = text, |
||||||
|
modifier = modifier, |
||||||
|
color = color, |
||||||
|
fontSize = fontSize, |
||||||
|
fontStyle = fontStyle, |
||||||
|
fontWeight = fontWeight, |
||||||
|
fontFamily = fontFamily, |
||||||
|
letterSpacing = letterSpacing, |
||||||
|
textDecoration = textDecoration, |
||||||
|
textAlign = textAlign, |
||||||
|
lineHeight = lineHeight, |
||||||
|
overflow = overflow, |
||||||
|
softWrap = softWrap, |
||||||
|
maxLines = maxLines, |
||||||
|
inlineContent = inlineContent, |
||||||
|
onTextLayout = onTextLayout, |
||||||
|
style = style, |
||||||
|
) |
||||||
|
} |
||||||
@ -0,0 +1,87 @@ |
|||||||
|
/* |
||||||
|
* 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.libraries.designsystem.theme.components |
||||||
|
|
||||||
|
import androidx.compose.foundation.interaction.MutableInteractionSource |
||||||
|
import androidx.compose.foundation.text.KeyboardActions |
||||||
|
import androidx.compose.foundation.text.KeyboardOptions |
||||||
|
import androidx.compose.material.ContentAlpha |
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api |
||||||
|
import androidx.compose.material3.LocalTextStyle |
||||||
|
import androidx.compose.material3.TextFieldDefaults |
||||||
|
import androidx.compose.runtime.Composable |
||||||
|
import androidx.compose.runtime.remember |
||||||
|
import androidx.compose.ui.Modifier |
||||||
|
import androidx.compose.ui.graphics.Color |
||||||
|
import androidx.compose.ui.graphics.Shape |
||||||
|
import androidx.compose.ui.text.TextStyle |
||||||
|
import androidx.compose.ui.text.input.VisualTransformation |
||||||
|
import io.element.android.libraries.designsystem.theme.ElementTheme |
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class) |
||||||
|
@Composable |
||||||
|
fun TextField( |
||||||
|
value: String, |
||||||
|
onValueChange: (String) -> Unit, |
||||||
|
modifier: Modifier = Modifier, |
||||||
|
enabled: Boolean = true, |
||||||
|
readOnly: Boolean = false, |
||||||
|
textStyle: TextStyle = LocalTextStyle.current, |
||||||
|
label: @Composable (() -> Unit)? = null, |
||||||
|
placeholder: @Composable (() -> Unit)? = null, |
||||||
|
leadingIcon: @Composable (() -> Unit)? = null, |
||||||
|
trailingIcon: @Composable (() -> Unit)? = null, |
||||||
|
supportingText: @Composable (() -> Unit)? = null, |
||||||
|
isError: Boolean = false, |
||||||
|
visualTransformation: VisualTransformation = VisualTransformation.None, |
||||||
|
keyboardOptions: KeyboardOptions = KeyboardOptions.Default, |
||||||
|
keyboardActions: KeyboardActions = KeyboardActions.Default, |
||||||
|
singleLine: Boolean = false, |
||||||
|
maxLines: Int = Int.MAX_VALUE, |
||||||
|
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, |
||||||
|
shape: Shape = TextFieldDefaults.filledShape, |
||||||
|
) { |
||||||
|
androidx.compose.material3.TextField( |
||||||
|
value = value, |
||||||
|
onValueChange = onValueChange, |
||||||
|
modifier = modifier, |
||||||
|
enabled = enabled, |
||||||
|
readOnly = readOnly, |
||||||
|
textStyle = textStyle, |
||||||
|
label = label, |
||||||
|
placeholder = placeholder, |
||||||
|
leadingIcon = leadingIcon, |
||||||
|
trailingIcon = trailingIcon, |
||||||
|
supportingText = supportingText, |
||||||
|
isError = isError, |
||||||
|
visualTransformation = visualTransformation, |
||||||
|
keyboardOptions = keyboardOptions, |
||||||
|
keyboardActions = keyboardActions, |
||||||
|
singleLine = singleLine, |
||||||
|
maxLines = maxLines, |
||||||
|
interactionSource = interactionSource, |
||||||
|
shape = shape, |
||||||
|
colors = TextFieldDefaults.textFieldColors( |
||||||
|
textColor = ElementTheme.colors.onBackground, |
||||||
|
containerColor = Color.Transparent, |
||||||
|
cursorColor = ElementTheme.colors.onBackground.copy(alpha = ContentAlpha.medium), |
||||||
|
focusedIndicatorColor = Color.Transparent, |
||||||
|
unfocusedIndicatorColor = Color.Transparent, |
||||||
|
disabledIndicatorColor = Color.Transparent |
||||||
|
), |
||||||
|
) |
||||||
|
} |
||||||
Loading…
Reference in new issue