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

Use material3 ListItem

Browse source
This commit is contained in:
Florian Renaud 2023-05-16 14:29:18 +02:00
parent 029eb876df
commit da57e17dfb
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/avatar/AvatarActionListView.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
@file:OptIn(ExperimentalMaterialApi::class, ExperimentalMaterialApi::class) @file:OptIn(ExperimentalMaterialApi::class)
package io.element.android.features.createroom.impl.configureroom.avatar package io.element.android.features.createroom.impl.configureroom.avatar
@ -25,10 +25,10 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.ListItem
import androidx.compose.material.ModalBottomSheetState import androidx.compose.material.ModalBottomSheetState
import androidx.compose.material.ModalBottomSheetValue import androidx.compose.material.ModalBottomSheetValue
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.material3.ListItem
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
@ -87,13 +87,13 @@ private fun SheetContent(
) { action -> ) { action ->
ListItem( ListItem(
modifier = Modifier.clickable { onActionClicked(action) }, modifier = Modifier.clickable { onActionClicked(action) },
text = { headlineContent = {
Text( Text(
text = stringResource(action.titleResId), text = stringResource(action.titleResId),
color = if (action.destructive) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary, color = if (action.destructive) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary,
) )
}, },
icon = { leadingContent = {
Icon( Icon(
imageVector = action.icon, imageVector = action.icon,
contentDescription = stringResource(action.titleResId), contentDescription = stringResource(action.titleResId),
@ -118,7 +118,7 @@ fun SheetContentDarkPreview() =
@Composable @Composable
private fun ContentToPreview() { private fun ContentToPreview() {
AvatarActionListView( AvatarActionListView(
actions = persistentListOf(AvatarAction.ChoosePhoto, AvatarAction.TakePhoto, AvatarAction.Remove), actions = persistentListOf(AvatarAction.TakePhoto, AvatarAction.ChoosePhoto, AvatarAction.Remove),
modalBottomSheetState = ModalBottomSheetState( modalBottomSheetState = ModalBottomSheetState(
initialValue = ModalBottomSheetValue.Expanded initialValue = ModalBottomSheetValue.Expanded
), ),