diff --git a/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootScreen.kt b/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootScreen.kt index aa75f88005..0e6d8253a3 100644 --- a/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootScreen.kt +++ b/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootScreen.kt @@ -19,6 +19,9 @@ package io.element.android.features.createroom.root import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Search import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.SearchBarDefaults import androidx.compose.runtime.Composable @@ -85,7 +88,7 @@ fun CreateRoomRootScreen( if (!isSearchActive) { TextIconButton( modifier = Modifier.padding(start = 8.dp, top = 16.dp, end = 8.dp), - imageVector = ImageVector.vectorResource(DrawableR.drawable.ic_group), + imageVector = ImageVector.vectorResource(DrawableR.drawable.ic_groups), text = stringResource(id = StringR.string.new_room), onClick = onNewRoomClicked, ) @@ -118,7 +121,7 @@ fun CreateRoomRootViewTopBar( }, actions = { IconButton(onClick = onClosePressed) { - Icon(resourceId = DrawableR.drawable.ic_close, contentDescription = stringResource(id = StringR.string.action_close)) + Icon(imageVector = Icons.Default.Close, contentDescription = stringResource(id = StringR.string.action_close)) } } ) @@ -161,11 +164,11 @@ fun CreateRoomSearchBar( trailingIcon = { if (active) { IconButton(onClick = { onTextChanged("") }) { - Icon(DrawableR.drawable.ic_close, stringResource(StringR.string.a11y_clear)) + Icon(Icons.Default.Close, stringResource(StringR.string.a11y_clear)) } } else { Icon( - resourceId = DrawableR.drawable.ic_search, + imageVector = Icons.Default.Search, contentDescription = stringResource(StringR.string.search), modifier = Modifier.alpha(0.4f), // FIXME align on Design system theme (removing alpha should be fine) ) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/BackButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/BackButton.kt index c6775a418b..957526567f 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/BackButton.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/BackButton.kt @@ -16,25 +16,25 @@ package io.element.android.libraries.designsystem.components.button -import androidx.annotation.DrawableRes import androidx.compose.foundation.layout.Column -import androidx.compose.material.Text +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.IconButton -import io.element.android.libraries.designsystem.R as DrawableR import io.element.android.libraries.ui.strings.R as StringR @Composable fun BackButton( onClick: () -> Unit, modifier: Modifier = Modifier, - @DrawableRes icon: Int = DrawableR.drawable.ic_arrow_back, + imageVector: ImageVector = Icons.Default.ArrowBack, contentDescription: String = stringResource(StringR.string.a11y_back), enabled: Boolean = true ) { @@ -43,7 +43,7 @@ fun BackButton( onClick = onClick, enabled = enabled, ) { - Icon(resourceId = icon, contentDescription = contentDescription) + Icon(imageVector = imageVector, contentDescription = contentDescription) } } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/TextIconButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/TextIconButton.kt index 3fd8d1c348..980dc39aa6 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/TextIconButton.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/TextIconButton.kt @@ -75,7 +75,7 @@ private fun ContentToPreview() { Column { TextIconButton( modifier = Modifier.padding(horizontal = 8.dp), - imageVector = ImageVector.vectorResource(R.drawable.ic_group), + imageVector = ImageVector.vectorResource(R.drawable.ic_groups), text = "Click me!", onClick = {}, ) diff --git a/libraries/designsystem/src/main/res/drawable/ic_arrow_back.xml b/libraries/designsystem/src/main/res/drawable/ic_arrow_back.xml deleted file mode 100644 index 4adfb72ad7..0000000000 --- a/libraries/designsystem/src/main/res/drawable/ic_arrow_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/libraries/designsystem/src/main/res/drawable/ic_close.xml b/libraries/designsystem/src/main/res/drawable/ic_close.xml deleted file mode 100644 index a54429f21f..0000000000 --- a/libraries/designsystem/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/libraries/designsystem/src/main/res/drawable/ic_group.xml b/libraries/designsystem/src/main/res/drawable/ic_group.xml deleted file mode 100644 index 296a7764d9..0000000000 --- a/libraries/designsystem/src/main/res/drawable/ic_group.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/libraries/designsystem/src/main/res/drawable/ic_groups.xml b/libraries/designsystem/src/main/res/drawable/ic_groups.xml new file mode 100644 index 0000000000..9e87f1d533 --- /dev/null +++ b/libraries/designsystem/src/main/res/drawable/ic_groups.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/libraries/designsystem/src/main/res/drawable/ic_search.xml b/libraries/designsystem/src/main/res/drawable/ic_search.xml deleted file mode 100644 index f4b23a8463..0000000000 --- a/libraries/designsystem/src/main/res/drawable/ic_search.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/libraries/designsystem/src/main/res/drawable/ic_share.xml b/libraries/designsystem/src/main/res/drawable/ic_share.xml index 0291c72fb6..d38f7ae5f7 100644 --- a/libraries/designsystem/src/main/res/drawable/ic_share.xml +++ b/libraries/designsystem/src/main/res/drawable/ic_share.xml @@ -15,12 +15,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@android:color/black" + android:pathData="M18.001,21.75C17.237,21.75 16.588,21.483 16.053,20.948C15.518,20.413 15.25,19.764 15.25,19C15.25,18.875 15.26,18.746 15.28,18.612C15.3,18.478 15.33,18.355 15.369,18.242L7.973,13.911C7.709,14.174 7.408,14.38 7.071,14.528C6.734,14.676 6.377,14.75 6,14.75C5.236,14.75 4.587,14.483 4.052,13.948C3.517,13.414 3.25,12.765 3.25,12.001C3.25,11.238 3.517,10.588 4.052,10.053C4.587,9.518 5.236,9.25 6,9.25C6.377,9.25 6.734,9.324 7.071,9.472C7.408,9.62 7.709,9.826 7.973,10.089L15.369,5.758C15.33,5.645 15.3,5.522 15.28,5.388C15.26,5.254 15.25,5.125 15.25,5C15.25,4.236 15.517,3.587 16.052,3.052C16.586,2.517 17.235,2.25 17.999,2.25C18.762,2.25 19.412,2.517 19.947,3.052C20.482,3.586 20.75,4.235 20.75,4.999C20.75,5.762 20.483,6.412 19.948,6.947C19.413,7.482 18.764,7.75 18,7.75C17.623,7.75 17.266,7.676 16.929,7.528C16.592,7.38 16.291,7.174 16.027,6.912L8.631,11.242C8.67,11.355 8.7,11.478 8.72,11.611C8.74,11.745 8.75,11.874 8.75,11.998C8.75,12.122 8.74,12.252 8.72,12.387C8.7,12.521 8.67,12.645 8.631,12.758L16.027,17.088C16.291,16.826 16.592,16.62 16.929,16.472C17.266,16.324 17.623,16.25 18,16.25C18.764,16.25 19.413,16.517 19.948,17.052C20.483,17.586 20.75,18.235 20.75,18.999C20.75,19.762 20.483,20.412 19.948,20.947C19.414,21.482 18.765,21.75 18.001,21.75ZM18,6.25C18.347,6.25 18.643,6.129 18.886,5.886C19.128,5.643 19.25,5.347 19.25,5C19.25,4.653 19.128,4.357 18.886,4.114C18.643,3.871 18.347,3.75 18,3.75C17.653,3.75 17.357,3.871 17.114,4.114C16.871,4.357 16.75,4.653 16.75,5C16.75,5.347 16.871,5.643 17.114,5.886C17.357,6.129 17.653,6.25 18,6.25ZM6,13.25C6.347,13.25 6.643,13.128 6.886,12.886C7.129,12.643 7.25,12.347 7.25,12C7.25,11.653 7.129,11.357 6.886,11.114C6.643,10.871 6.347,10.75 6,10.75C5.653,10.75 5.357,10.871 5.114,11.114C4.871,11.357 4.75,11.653 4.75,12C4.75,12.347 4.871,12.643 5.114,12.886C5.357,13.128 5.653,13.25 6,13.25ZM18,20.25C18.347,20.25 18.643,20.128 18.886,19.886C19.128,19.643 19.25,19.347 19.25,19C19.25,18.653 19.128,18.357 18.886,18.114C18.643,17.871 18.347,17.75 18,17.75C17.653,17.75 17.357,17.871 17.114,18.114C16.871,18.357 16.75,18.653 16.75,19C16.75,19.347 16.871,19.643 17.114,19.886C17.357,20.128 17.653,20.25 18,20.25Z" />