Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ app/src/alpha/res/drawable/ic_launcher_foreground.xml
app/src/beta/res/drawable-v24/ic_launcher_background.xml
app/src/beta/res/drawable/ic_launcher_foreground.xml
app/src/main/res/drawable/ic_border.xml
app/src/main/res/drawable/ic_call.xml
app/src/main/res/drawable/ic_chevron_down.xml
app/src/main/res/drawable/ic_component_atom.xml
app/src/main/res/drawable/ic_copy.xml
Expand All @@ -24,6 +25,7 @@ app/src/main/res/drawable/ic_info.xml
app/src/main/res/drawable/ic_layers.xml
app/src/main/res/drawable/ic_menu_grid.xml
app/src/main/res/drawable/ic_palette.xml
app/src/main/res/drawable/ic_sms_message.xml
app/src/main/res/drawable/ic_solar_palette.xml
app/src/main/res/drawable/ic_typography.xml
app/src/main/res/drawable/ic_ui_dark_mode.xml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,19 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.FavoriteBorder
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.tooling.preview.PreviewLightDark
import com.orange.ouds.app.R
import com.orange.ouds.app.ui.components.Component
import com.orange.ouds.app.ui.components.contentDescriptionArgument
import com.orange.ouds.app.ui.components.painterArgument
import com.orange.ouds.app.ui.utilities.Code
import com.orange.ouds.app.ui.utilities.composable.CustomizationDropdownMenu
import com.orange.ouds.app.ui.utilities.composable.CustomizationFilterChips
Expand Down Expand Up @@ -126,7 +127,7 @@ private fun BadgeDemoContent(state: BadgeDemoState) {
OudsBadge(
modifier = modifier,
icon = OudsBadge.Icon(
imageVector = Icons.Filled.FavoriteBorder,
painter = painterResource(R.drawable.ic_heart),
contentDescription = stringResource(id = R.string.app_components_common_icon_a11y)
),
status = status,
Expand All @@ -149,7 +150,10 @@ private fun Code.Builder.badgeDemoCodeSnippet(state: BadgeDemoState) {
when (type) {
BadgeDemoState.Type.Standard -> {}
BadgeDemoState.Type.Count -> typedArgument("count", count)
BadgeDemoState.Type.Icon -> rawArgument("imageVector", "Icons.Filled.FavoriteBorder")
BadgeDemoState.Type.Icon -> constructorCallArgument<OudsBadge.Icon>("icon") {
painterArgument(R.drawable.ic_heart)
contentDescriptionArgument(R.string.app_components_common_icon_a11y)
}
}
typedArgument("status", status)
typedArgument("size", size)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@ package com.orange.ouds.app.ui.components.chip
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Person
import androidx.compose.material.icons.filled.Phone
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import com.orange.ouds.app.R
import com.orange.ouds.app.ui.components.contentDescriptionArgument
import com.orange.ouds.app.ui.components.enabledArgument
import com.orange.ouds.app.ui.components.labelArgument
import com.orange.ouds.app.ui.components.onClickArgument
import com.orange.ouds.app.ui.components.painterArgument
import com.orange.ouds.app.ui.utilities.FunctionCall
import com.orange.ouds.app.ui.utilities.composable.CustomizationFilterChips
import com.orange.ouds.app.ui.utilities.composable.CustomizationSwitchItem
Expand Down Expand Up @@ -59,13 +58,13 @@ fun ChipDemoBottomSheetContent(state: ChipDemoState) {
@Composable
fun ChipDemoContent(content: @Composable (index: Int, icon: OudsChip.Icon) -> Unit) {
val icons = listOf(
Icons.Filled.Person,
Icons.Filled.Phone
R.drawable.ic_call,
R.drawable.ic_sms_message
)
FlowRow(horizontalArrangement = Arrangement.spacedBy(OudsTheme.spaces.fixed.small)) {
repeat(ChipDemoState.ChipCount) { index ->
val icon = OudsChip.Icon(
imageVector = icons[index % icons.count()],
painter = painterResource(icons[index % icons.count()]),
contentDescription = stringResource(id = R.string.app_components_common_icon_a11y)
)
content(index, icon)
Expand All @@ -77,7 +76,7 @@ fun FunctionCall.Builder.chipArguments(state: ChipDemoState) = with(state) {
onClickArgument()
if (layout in listOf(ChipDemoState.Layout.IconOnly, ChipDemoState.Layout.TextAndIcon)) {
constructorCallArgument<OudsChip.Icon>("icon") {
rawArgument("imageVector", "Icons.Filled.Person")
painterArgument(R.drawable.ic_call)
contentDescriptionArgument(R.string.app_components_common_icon_a11y)
}
}
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_call.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M10.311,13.713c-1.85,-1.849 -3.618,-3.991 -2.771,-4.838 2.125,-2.125 2.268,-1.96 0.12,-4.632 -2.149,-2.672 -2.063,-2.192 -4.755,0.554C1.488,6.322 2.833,11.204 7.826,16.197 12.82,21.189 17.832,22.474 19.228,21.118c2.869,-2.849 3.095,-2.69 0.554,-4.754 -2.672,-2.149 -2.516,-1.996 -4.632,0.12C14.303,17.33 12.161,15.563 10.311,13.713Z"
android:fillColor="#000000"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_sms_message.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M19.8,3C20.794,3 21.6,3.806 21.6,4.8L21.6,17.4L10.2,17.4L6.6,21L6.6,17.4L4.2,17.4C3.206,17.4 2.4,16.594 2.4,15.6L2.4,3ZM12,12.6L6.6,12.6C6.269,12.6 6,12.869 6,13.2C6,13.531 6.269,13.8 6.6,13.8L12,13.8C12.331,13.8 12.6,13.531 12.6,13.2C12.6,12.869 12.331,12.6 12,12.6ZM17.4,9.6L6.6,9.6C6.269,9.6 6,9.869 6,10.2C6,10.531 6.269,10.8 6.6,10.8L17.4,10.8C17.731,10.8 18,10.531 18,10.2C18,9.869 17.731,9.6 17.4,9.6ZM17.4,6.6L6.6,6.6C6.269,6.6 6,6.869 6,7.2C6,7.531 6.269,7.8 6.6,7.8L17.4,7.8C17.731,7.8 18,7.531 18,7.2C18,6.869 17.731,6.6 17.4,6.6Z"
android:fillColor="#000000"/>
</vector>
Loading