Skip to content

Fixing image reload loop #500

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.

Sign up for GitHub

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

Merged
leandroBorgesFerreira merged 2 commits into from
Sep 15, 2025
Merged

Fixing image reload loop #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e13ff0e
Fixing image reload loop
ftrtyfytfjh Sep 15, 2025
4154377
Align images in center
ftrtyfytfjh Sep 15, 2025
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
4 changes: 3 additions & 1 deletion writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/components/SwipeBox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp
import kotlin.math.absoluteValue
Expand Down Expand Up @@ -53,6 +54,7 @@ fun SwipeBox(
defaultColor: Color = MaterialTheme.colorScheme.background,
activeColor: Color,
activeBorderColor: Color = MaterialTheme.colorScheme.primary,
borderWidth: Dp = 1.dp,
cornersShape: Shape = MaterialTheme.shapes.medium,
swipeListener: (Boolean) -> Unit,
content: @Composable BoxScope.() -> Unit
Expand Down Expand Up @@ -103,7 +105,7 @@ fun SwipeBox(
shape = cornersShape
)
.border(
width = 1.dp,
width = borderWidth,
color = colorBorderAnimated,
shape = cornersShape
)
Expand Down
14 changes: 9 additions & 5 deletions writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/drawer/content/ImageDrawer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.hoverable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.CircleShape
Expand Down Expand Up @@ -88,17 +89,18 @@ class ImageDrawer(
val focusRequester = remember { FocusRequester() }

SwipeBox(
modifier = Modifier.hoverable(interactionSource),
modifier = Modifier.hoverable(interactionSource).fillMaxWidth(),
defaultColor = MaterialTheme.colorScheme.surfaceVariant,
activeColor = config.selectedColor(),
activeBorderColor = config.selectedBorderColor(),
borderWidth = 3.dp,
isOnEditState = drawInfo.selectMode,
swipeListener = { isSelected ->
onSelected(isSelected, drawInfo.position)
}
) {
DragCardTarget(
modifier = Modifier.clip(MaterialTheme.shapes.large),
modifier = Modifier.clip(MaterialTheme.shapes.large).align(Alignment.Center),
position = drawInfo.position,
dataToDrop = dropInfo,
iconTintOnHover = MaterialTheme.colorScheme.onBackground,
Expand Down Expand Up @@ -128,9 +130,11 @@ class ImageDrawer(
.build(),
contentScale = ContentScale.Crop,
contentDescription = "",
modifier = Modifier.clip(
shape = RoundedCornerShape(size = 12.dp)
),
modifier = Modifier
.defaultMinSize(minHeight = 300.dp)
.clip(
shape = RoundedCornerShape(size = 12.dp)
),
loading = {
CircularProgressIndicator()
}
Expand Down