Skip to content
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 @@ -3,25 +3,28 @@ package dev.appoutlet.foliary.core.ui.component.card
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.material3.Card
import androidx.compose.material3.CardColors
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import dev.appoutlet.foliary.core.ui.component.modifier.FoliaryShadowColorDefault
import dev.appoutlet.foliary.core.ui.component.modifier.foliaryShadow

@Composable
fun FoliaryCard(
modifier: Modifier = Modifier,
colors: CardColors = FoliaryCardDefaults.colors(),
colors: FoliaryCardColors = FoliaryCardDefaults.colors(),
content: @Composable ColumnScope.() -> Unit
) {
Card(
modifier = modifier.foliaryShadow(),
modifier = modifier.foliaryShadow(color = colors.shadowColor),
shape = MaterialTheme.shapes.extraLarge,
colors = colors,
colors = CardDefaults.cardColors(
containerColor = colors.containerColor,
contentColor = colors.contentColor,
),
border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline),
elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
content = content
Expand All @@ -34,8 +37,16 @@ object FoliaryCardDefaults {
fun colors(
containerColor: Color = MaterialTheme.colorScheme.surface,
contentColor: Color = MaterialTheme.colorScheme.onSurface,
): CardColors = CardDefaults.cardColors(
shadowColor: Color = FoliaryShadowColorDefault
) = FoliaryCardColors(
containerColor = containerColor,
contentColor = contentColor,
shadowColor = shadowColor,
)
}

data class FoliaryCardColors(
val containerColor: Color,
val contentColor: Color,
val shadowColor: Color,
)
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,29 @@ package dev.appoutlet.foliary.core.ui.component.task
import androidx.compose.animation.animateColorAsState
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SwipeToDismissBox
import androidx.compose.material3.Text
import androidx.compose.material3.rememberSwipeToDismissBoxState
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.composables.icons.lucide.CircleCheckBig
import com.composables.icons.lucide.Lucide
import dev.appoutlet.foliary.core.ui.component.card.FoliaryCard
import dev.appoutlet.foliary.core.ui.component.card.FoliaryCardDefaults
import dev.appoutlet.foliary.core.ui.component.checkbox.FoliaryCheckbox
Expand All @@ -39,28 +48,78 @@ fun FoliaryTaskCard(
},
)

FoliaryCard(
modifier = modifier.fillMaxWidth(),
colors = FoliaryCardDefaults.colors(containerColor = cardContainerColor.value),
FoliarySwipeToDismiss(
modifier = modifier,
isTaskComplete = task.isCompleted,
onCompletedChange = onCompletedChange
) {
Row(
modifier = Modifier
.fillMaxWidth()
.clickable(enabled = onClick != null) { onClick?.invoke() }
.padding(16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
FoliaryCard(
modifier = Modifier.fillMaxWidth(),
colors = FoliaryCardDefaults.colors(containerColor = cardContainerColor.value),
) {
FoliaryCheckbox(
checked = task.isCompleted,
onCheckedChange = onCompletedChange,
modifier = Modifier.testTag("FoliaryTaskCard:Checkbox"),
)
Row(
modifier = Modifier
.fillMaxWidth()
.clickable(enabled = onClick != null) { onClick?.invoke() }
.padding(16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
FoliaryCheckbox(
checked = task.isCompleted,
onCheckedChange = onCompletedChange,
modifier = Modifier.testTag("FoliaryTaskCard:Checkbox"),
)

FoliaryTaskCardContent(
task = task,
onPillClick = onPillClick,
modifier = Modifier.weight(1f),
)
}
}
}
}

@Composable
private fun FoliarySwipeToDismiss(
isTaskComplete: Boolean,
onCompletedChange: (Boolean) -> Unit,
modifier: Modifier = Modifier,
content: @Composable RowScope.() -> Unit
) {
val swipeToDismissBoxState = rememberSwipeToDismissBoxState()

SwipeToDismissBox(
modifier = modifier.fillMaxWidth(),
state = swipeToDismissBoxState,
backgroundContent = {
BackgroundContent()
},
enableDismissFromStartToEnd = false,
enableDismissFromEndToStart = isTaskComplete.not(),
onDismiss = {
onCompletedChange(true)
},
content = content,
)
}

FoliaryTaskCardContent(
task = task,
onPillClick = onPillClick,
modifier = Modifier.weight(1f),
@Composable
private fun BackgroundContent() {
FoliaryCard(
modifier = Modifier.fillMaxSize(),
colors = FoliaryCardDefaults.colors(
containerColor = MaterialTheme.colorScheme.primaryContainer,
contentColor = MaterialTheme.colorScheme.onPrimaryContainer,
shadowColor = Color.Transparent
),
) {
Box(modifier = Modifier.fillMaxSize().padding(16.dp)) {
Icon(
modifier = Modifier.align(Alignment.CenterEnd),
imageVector = Lucide.CircleCheckBig,
contentDescription = null
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import androidx.compose.ui.graphics.Color
val primaryLight = Color(0xFF1A4D3E)
val onPrimaryLight = Color(0xFFFFFFFF)
val primaryContainerLight = Color(0xFF1B4D3E)
val onPrimaryContainerLight = Color(0xFF8ABDA9)
val onPrimaryContainerLight = Color(0xFFBBE3D4)
val secondaryLight = Color(0xFFe9f3ee)
val onSecondaryLight = Color(0xFFFFFFFF)
val secondaryContainerLight = Color(0xFFE9F3EE)
Expand Down Expand Up @@ -41,7 +41,7 @@ val surfaceContainerHighestLight = Color(0xFFE5E2E1)
val primaryDark = Color(0xFF00E796)
val onPrimaryDark = Color(0xFF00382A)
val primaryContainerDark = Color(0xFF1D5643)
val onPrimaryContainerDark = Color(0xFFB9E6D3)
val onPrimaryContainerDark = Color(0xFFD0EADD)
val secondaryDark = Color(0xFF16504f)
val onSecondaryDark = Color(0xFFF4FFFB)
val secondaryContainerDark = Color(0xFF35473C)
Expand Down
Loading