Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IconPack] Allow continues drag-and-drop #359

Merged
merged 1 commit into from
Feb 3, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import androidx.compose.ui.draw.drawWithCache
import androidx.compose.ui.draw.drawWithContent
import androidx.compose.ui.graphics.BlendMode
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Path
import androidx.compose.ui.graphics.PathEffect
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.StrokeCap
import androidx.compose.ui.graphics.addOutline
import androidx.compose.ui.graphics.drawOutline
import androidx.compose.ui.graphics.drawscope.Stroke
import androidx.compose.ui.graphics.layer.drawLayer
import androidx.compose.ui.unit.Dp
Expand All @@ -25,23 +25,19 @@ fun Modifier.dashedBorder(
) = this.drawWithContent {
val outline = shape.createOutline(size, layoutDirection, this)

val path = Path()
path.addOutline(outline)

val stroke = Stroke(
cap = cap,
width = strokeWidth.toPx(),
pathEffect = PathEffect.dashPathEffect(
intervals = floatArrayOf(dashWidth.toPx(), gapWidth.toPx()),
phase = 0f,
),
)

drawContent()
drawPath(
path = path,
drawOutline(
outline = outline,
style = stroke,
color = color,
brush = SolidColor(color),
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private fun IntellijDarkTheme(
colorScheme = darkColorScheme(
primary = primary,
onPrimary = Color.White,
background = Color(0xFF1C1D1F),
background = background,
onBackground = onBackground,
surface = background,
surfaceContainerHigh = Color(0xFF3A3A3C),
Expand Down Expand Up @@ -117,7 +117,7 @@ private fun IntellijLightTheme(
colorScheme = lightColorScheme(
primary = primary,
onPrimary = Color.White,
background = Color.White,
background = background,
onBackground = onBackground,
surface = background,
surfaceContainerHigh = Color(0xFFEDEDED),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,20 @@ import com.intellij.openapi.vfs.VirtualFileManager
import io.github.composegears.valkyrie.service.GlobalEventsHandler.PendingPathData
import io.github.composegears.valkyrie.ui.domain.model.PreviewType
import io.github.composegears.valkyrie.ui.foundation.theme.PreviewTheme
import io.github.composegears.valkyrie.ui.platform.rememberMultiSelectDragAndDropHandler
import io.github.composegears.valkyrie.ui.screen.mode.iconpack.conversion.IconPackConversionState.BatchProcessing.ExportingState
import io.github.composegears.valkyrie.ui.screen.mode.iconpack.conversion.IconPackConversionState.BatchProcessing.IconPackCreationState
import io.github.composegears.valkyrie.ui.screen.mode.iconpack.conversion.IconPackConversionState.BatchProcessing.ImportValidationState
import io.github.composegears.valkyrie.ui.screen.mode.iconpack.conversion.IconPackConversionState.IconsPickering
import io.github.composegears.valkyrie.ui.screen.mode.iconpack.conversion.PickerEvent.PickDirectory
import io.github.composegears.valkyrie.ui.screen.mode.iconpack.conversion.PickerEvent.PickFiles
import io.github.composegears.valkyrie.ui.screen.mode.iconpack.conversion.ui.DragAndDropOverlay
import io.github.composegears.valkyrie.ui.screen.mode.iconpack.conversion.ui.batch.BatchProcessingStateUi
import io.github.composegears.valkyrie.ui.screen.mode.iconpack.conversion.ui.picker.IconPackPickerStateUi
import io.github.composegears.valkyrie.ui.screen.preview.CodePreviewScreen
import io.github.composegears.valkyrie.ui.screen.settings.SettingsScreen
import kotlin.io.path.isDirectory
import kotlin.io.path.isRegularFile
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach

Expand Down Expand Up @@ -223,6 +229,22 @@ private fun IconPackConversionUi(
)
}
}
val dragAndDropHandler = rememberMultiSelectDragAndDropHandler(
onDrop = { paths ->
when {
paths.size == 1 -> {
val path = paths.first()

when {
path.isDirectory() -> onPickEvent(PickDirectory(path = path))
path.isRegularFile() -> onPickEvent(PickFiles(paths = paths))
}
}
else -> onPickEvent(PickFiles(paths = paths))
}
},
)
DragAndDropOverlay(isDragging = dragAndDropHandler.isDragging)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,12 @@ class IconPackConversionViewModel(

private fun List<Path>.processFiles() = viewModelScope.launch(Dispatchers.Default) {
val paths = filter { it.isRegularFile() && (it.isXml || it.isSvg) }
val lastIcons = _state.value.safeAs<BatchProcessing.IconPackCreationState>()?.icons.orEmpty()

if (paths.isNotEmpty()) {
_state.updateState { BatchProcessing.ImportValidationState }
_state.updateState {
val icons = paths
val newIcons = paths
.sortedBy { it.name }
.map { path ->
val output = runCatching { SvgXmlParser.toIrImageVector(path) }.getOrNull()
Expand All @@ -307,6 +308,7 @@ class IconPackConversionViewModel(
)
}
}
val icons = lastIcons + newIcons
BatchProcessing.IconPackCreationState(
icons = icons,
exportEnabled = icons.isAllIconsValid(),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
package io.github.composegears.valkyrie.ui.screen.mode.iconpack.conversion.ui

import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState
import androidx.compose.desktop.ui.tooling.preview.Preview
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.widthIn
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import io.github.composegears.valkyrie.ui.foundation.CenterVerticalRow
import io.github.composegears.valkyrie.ui.foundation.dashedBorder
import io.github.composegears.valkyrie.ui.foundation.icons.AddFile
import io.github.composegears.valkyrie.ui.foundation.icons.ValkyrieIcons
import io.github.composegears.valkyrie.ui.foundation.theme.PreviewTheme

@Composable
fun DragAndDropOverlay(
isDragging: Boolean,
modifier: Modifier = Modifier,
) {
val backgroundColor by animateColorAsState(
when {
isDragging -> MaterialTheme.colorScheme.background.copy(alpha = 0.97f)
else -> MaterialTheme.colorScheme.background.copy(alpha = 0.0f)
},
)

Box(
modifier = modifier
.fillMaxSize()
.background(color = backgroundColor)
.padding(32.dp)
.clip(MaterialTheme.shapes.small),
contentAlignment = Alignment.Center,
) {
AnimatedVisibility(
modifier = Modifier
.widthIn(max = 350.dp)
.aspectRatio(1f),
visible = isDragging,
) {
Box(
modifier = Modifier
.dashedBorder(
strokeWidth = 1.dp,
gapWidth = 8.dp,
dashWidth = 8.dp,
color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f),
shape = MaterialTheme.shapes.small,
),
) {
CenterVerticalRow(modifier = Modifier.align(Alignment.Center)) {
Icon(
imageVector = ValkyrieIcons.AddFile,
contentDescription = null,
)
Text(
modifier = Modifier.padding(8.dp),
text = "Add more icons",
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleSmall,
)
}
}
}
}
}

@Preview
@Composable
private fun DragAndDropOverlayPreview() = PreviewTheme {
DragAndDropOverlay(isDragging = true)
}