diff options
Diffstat (limited to 'java')
3 files changed, 0 insertions, 33 deletions
diff --git a/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselCardComposable.kt b/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselCardComposable.kt index 9f31c0e4..dc96e3c1 100644 --- a/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselCardComposable.kt +++ b/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselCardComposable.kt @@ -21,11 +21,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Edit import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -42,7 +38,6 @@ import com.android.intentresolver.R fun ShareouselCard( image: @Composable () -> Unit, selected: Boolean, - onActionClick: () -> Unit, modifier: Modifier = Modifier, ) { Box(modifier) { @@ -51,36 +46,11 @@ fun ShareouselCard( Box(modifier = Modifier.padding(topButtonPadding).matchParentSize()) { SelectionIcon(selected, modifier = Modifier.align(Alignment.TopStart)) AnimationIcon(modifier = Modifier.align(Alignment.TopEnd)) - ActionButton( - onActionClick, - modifier = - Modifier.background( - MaterialTheme.colorScheme.secondary, - shape = RoundedCornerShape(12.dp), - ) - .size(32.dp) - .align(Alignment.BottomEnd) - ) } } } @Composable -private fun ActionButton( - onActionClick: () -> Unit, - modifier: Modifier = Modifier, -) { - IconButton(onClick = { onActionClick() }, modifier = modifier) { - Icon( - Icons.Outlined.Edit, - contentDescription = "edit", - tint = Color(0xFF1B1C14), - modifier = Modifier.padding(8.dp) - ) - } -} - -@Composable private fun AnimationIcon(modifier: Modifier = Modifier) { Icon( painterResource(id = R.drawable.ic_play_circle_filled_24px), diff --git a/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselComposable.kt b/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselComposable.kt index f636966e..0e6e9d7e 100644 --- a/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselComposable.kt +++ b/java/src/com/android/intentresolver/contentpreview/shareousel/ui/composable/ShareouselComposable.kt @@ -116,7 +116,6 @@ private fun ShareouselCard(viewModel: ShareouselImageViewModel) { } }, selected = selected, - onActionClick = { viewModel.onActionClick() }, modifier = Modifier.thenIf(selected) { Modifier.border( diff --git a/java/src/com/android/intentresolver/contentpreview/shareousel/ui/viewmodel/ShareouselViewModel.kt b/java/src/com/android/intentresolver/contentpreview/shareousel/ui/viewmodel/ShareouselViewModel.kt index ff22a6fd..05523c7e 100644 --- a/java/src/com/android/intentresolver/contentpreview/shareousel/ui/viewmodel/ShareouselViewModel.kt +++ b/java/src/com/android/intentresolver/contentpreview/shareousel/ui/viewmodel/ShareouselViewModel.kt @@ -39,7 +39,6 @@ data class ShareouselImageViewModel( val contentDescription: Flow<String>, val isSelected: Flow<Boolean>, val setSelected: (Boolean) -> Unit, - val onActionClick: () -> Unit, ) fun PayloadToggleInteractor.toShareouselViewModel(imageLoader: ImageLoader): ShareouselViewModel { @@ -55,7 +54,6 @@ fun PayloadToggleInteractor.toShareouselViewModel(imageLoader: ImageLoader): Sha contentDescription = MutableStateFlow(""), isSelected = previewInteractor.selected, setSelected = { isSelected -> previewInteractor.setSelected(isSelected) }, - onActionClick = {}, ) }, previewRowKey = { getKey(it) }, |