Skip to content
Open
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
6 changes: 6 additions & 0 deletions minecraft/src/main/resources/assets/oneconfig/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,12 @@
"oneconfig.menu.option.paste_value": "Paste value",
"oneconfig.menu.option.copy_hex": "Copy hex",
"oneconfig.menu.option.paste_hex": "Paste hex",
"oneconfig.group.menu.reset": "Reset to defaults",
"oneconfig.group.menu.reset.title": "Reset %s?",
"oneconfig.group.menu.reset.text": "Every setting in this group goes back to its default. This can't be undone.",
"oneconfig.group.menu.reset.confirm": "Reset settings",
"oneconfig.group.menu.reset.disabled": "Nothing in this group has a default to restore.",
"oneconfig.group.menu.reset.locked": "These settings can't be reset while they are switched off.",
"oneconfig.mods.toggle.locked": "This mod is switched on and off somewhere else.",
"oneconfig.format.time.just_now": "just now",
"oneconfig.format.time.moment": "in a moment",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import org.polyfrost.compose.render.PolyColor
import org.polyfrost.oneconfig.api.config.v1.Config
import org.polyfrost.oneconfig.api.config.v1.MetaKeys
import org.polyfrost.oneconfig.api.config.v1.Property
import org.polyfrost.oneconfig.api.config.v1.Tree
import org.polyfrost.oneconfig.api.config.v1.Visualizer
import org.polyfrost.oneconfig.api.config.v1.get
import org.polyfrost.oneconfig.api.platform.v1.Platform
Expand Down Expand Up @@ -134,6 +135,27 @@ fun resetOption(prop: Property<*>, seen: MutableSet<Property<*>> = identitySet()
if (def != null || nullDefault || linked != null) bumpResetEpoch(prop)
}

internal fun treeHasDefault(tree: Tree, seen: MutableSet<Property<*>> = identitySet()): Boolean = tree.map.values.any { node ->
when (node) {
is Property<*> -> if (node.get() is OneConfigKeybind) seen.add(node) else optionHasDefault(node, seen)
is Tree -> treeHasDefault(node, seen)
else -> false
}
}

internal fun resetTree(tree: Tree, seen: MutableSet<Property<*>> = identitySet()) {
for (node in tree.map.values) {
when (node) {
is Property<*> -> if (node.get() is OneConfigKeybind) {
if (seen.add(node)) resetKeybindOption(node)
} else {
resetOption(node, seen)
}
is Tree -> resetTree(node, seen)
}
}
}

@Composable
fun Option(prop: Property<*>) {
val vis = remember(System.identityHashCode(prop)) {
Expand Down Expand Up @@ -255,6 +277,7 @@ class OptionMenuState internal constructor(private val prop: Property<*>) {
internal var onReset: (() -> Unit)? = null
internal var resetEnabled: Boolean? = null
internal var openPage: ((Property<*>) -> Unit)? = null
internal var extraEntries: (() -> List<MenuEntry>)? = null

private val tracker = MenuCustomItem { TrackOpen() }

Expand All @@ -263,7 +286,10 @@ class OptionMenuState internal constructor(private val prop: Property<*>) {

val isOpen: Boolean get() = openCount > 0

fun entries(): List<MenuEntry> = jumpEntries() + optionMenuEntries(prop, onReset, resetEnabled) + tracker
fun entries(): List<MenuEntry> {
val extras = extraEntries?.invoke().orEmpty()
return jumpEntries() + optionMenuEntries(prop, onReset, resetEnabled) + (if (extras.isEmpty()) emptyList() else listOf(MenuSeparator) + extras) + tracker
}

private fun jumpEntries(): List<MenuEntry> {
val open = openPage ?: return emptyList()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,13 @@ import org.polyfrost.oneconfig.api.ui.v1.TreeHeaderDecorator
import org.polyfrost.oneconfig.api.ui.v1.TreeHeaderDecorators
import org.polyfrost.oneconfig.api.ui.v1.a11y.Motion
import org.polyfrost.oneconfig.api.ui.v1.components.ChipDefaults
import org.polyfrost.oneconfig.api.ui.v1.components.Confirm
import org.polyfrost.oneconfig.api.ui.v1.components.ControlDefaults
import org.polyfrost.oneconfig.api.ui.v1.components.ControlSize
import org.polyfrost.oneconfig.api.ui.v1.components.EmptyState
import org.polyfrost.oneconfig.api.ui.v1.components.LoadState
import org.polyfrost.oneconfig.api.ui.v1.components.MenuAction
import org.polyfrost.oneconfig.api.ui.v1.components.MenuEntry
import org.polyfrost.oneconfig.api.ui.v1.components.ScrollContainer
import org.polyfrost.oneconfig.api.ui.v1.components.SectionChevron
import org.polyfrost.oneconfig.api.ui.v1.components.SectionHeader
Expand All @@ -111,9 +114,12 @@ import org.polyfrost.oneconfig.api.ui.v1.components.Text
import org.polyfrost.oneconfig.api.ui.v1.components.TooltipBox
import org.polyfrost.oneconfig.api.ui.v1.components.TooltipDefaults
import org.polyfrost.oneconfig.api.ui.v1.components.cardSurface
import org.polyfrost.oneconfig.api.ui.v1.components.contextMenu
import org.polyfrost.oneconfig.api.ui.v1.components.oneConfigClickable
import org.polyfrost.oneconfig.api.ui.v1.theme.OneConfigTheme
import org.polyfrost.oneconfig.internal.OneConfigConfig
import org.polyfrost.oneconfig.internal.ui.api.ConfigRegistry
import org.polyfrost.oneconfig.internal.ui.api.PropertyModToggle
import org.polyfrost.oneconfig.internal.ui.api.isLockExempt
import org.polyfrost.oneconfig.internal.ui.api.isMarkedSwitch
import org.polyfrost.oneconfig.internal.ui.api.shown
Expand All @@ -130,11 +136,15 @@ import org.polyfrost.oneconfig.internal.ui.components.settings.LocalOptionWidth
import org.polyfrost.oneconfig.internal.ui.components.settings.LocalOptionWidthOrNull
import org.polyfrost.oneconfig.internal.ui.components.settings.Option
import org.polyfrost.oneconfig.internal.ui.components.settings.OptionControlHeight
import org.polyfrost.oneconfig.internal.ui.components.settings.OptionMenuState
import org.polyfrost.oneconfig.internal.ui.components.settings.OptionMoreButton
import org.polyfrost.oneconfig.internal.ui.components.settings.asPlainLabel
import org.polyfrost.oneconfig.internal.ui.components.settings.asStyledLabel
import org.polyfrost.oneconfig.internal.ui.components.settings.identitySet
import org.polyfrost.oneconfig.internal.ui.components.settings.optionContextMenu
import org.polyfrost.oneconfig.internal.ui.components.settings.rememberOptionMenu
import org.polyfrost.oneconfig.internal.ui.components.settings.resetTree
import org.polyfrost.oneconfig.internal.ui.components.settings.treeHasDefault
import org.polyfrost.oneconfig.internal.ui.components.translated
import org.polyfrost.oneconfig.internal.ui.navigation.graph.ModConfigRoute
import org.polyfrost.oneconfig.internal.ui.search.CategoryGroup
Expand Down Expand Up @@ -930,12 +940,14 @@ private fun GroupHeaderContent(
val labelModifier = if (groupEnabled) Modifier else Modifier.alpha(LocalTheme.current.disabledAlpha)
val showActionButton = OneConfigConfig.showOptionActionButtons && !headLocked
val menu = head?.let { rememberOptionMenu(it) }
val configId = LocalConfigId.current
menu?.extraEntries = { listOf(groupResetEntry(tree, false, configId)) }

BoxWithConstraints(
modifier = Modifier
.fillMaxWidth()
.hoverable(interaction)
.then(if (menu != null) Modifier.optionContextMenu(menu, enabled = !headLocked) else Modifier)
.contextMenu { groupMenuEntries(tree, menu.takeUnless { headLocked }, headLocked, configId) }
.oneConfigClickable(tree.localizedTitle().asPlainLabel(), onClick, indication = false, interactionSource = interaction)
) {
val switch = head != null && isSwitchHead(tree, head)
Expand Down Expand Up @@ -993,6 +1005,39 @@ private fun GroupHeaderContent(
}
}

private fun groupMenuEntries(tree: Tree, headMenu: OptionMenuState?, locked: Boolean, configId: String?): List<MenuEntry> =
headMenu?.entries() ?: listOf(groupResetEntry(tree, locked, configId))

private fun groupResetEntry(tree: Tree, locked: Boolean, configId: String?): MenuEntry {
val ownSwitch = ownSwitchOf(configId)
val resettable = treeHasDefault(tree, identitySet().also { seen -> ownSwitch?.let(seen::add) })
return MenuAction(
translated("oneconfig.group.menu.reset", "Reset to defaults"),
{ confirmGroupReset(tree, ownSwitch) },
icon = "refresh",
danger = true,
enabled = !locked && resettable,
disabledReason = if (locked) {
translated("oneconfig.group.menu.reset.locked", "These settings can't be reset while they are switched off.")
} else {
translated("oneconfig.group.menu.reset.disabled", "Nothing in this group has a default to restore.")
},
)
}

private fun ownSwitchOf(configId: String?): Property<*>? =
(configId?.let { ConfigRegistry.findById(it)?.toggle } as? PropertyModToggle)?.property

private fun confirmGroupReset(tree: Tree, ownSwitch: Property<*>?) {
Confirm.ask(
title = translated("oneconfig.group.menu.reset.title", "Reset %s?", tree.localizedTitle().asPlainLabel()),
text = translated("oneconfig.group.menu.reset.text", "Every setting in this group goes back to its default. This can't be undone."),
confirmLabel = translated("oneconfig.group.menu.reset.confirm", "Reset settings"),
onConfirm = { resetTree(tree, identitySet().also { seen -> ownSwitch?.let(seen::add) }) },
icon = "refresh",
)
}

@Composable
private fun GroupLabel(tree: Tree, modifier: Modifier) {
HeaderLabel(tree.localizedTitle(), tree.localizedDescription(), modifier) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import kotlinx.coroutines.delay
import org.polyfrost.oneconfig.api.config.v1.Config
import org.polyfrost.oneconfig.api.config.v1.Property
import org.polyfrost.oneconfig.api.config.v1.Tree
import org.polyfrost.oneconfig.api.hud.v1.HudManager
import org.polyfrost.oneconfig.api.ui.v1.ModCardTypes
Expand Down Expand Up @@ -104,7 +103,6 @@ import org.polyfrost.oneconfig.api.ui.v1.components.reorderAutoScroll
import org.polyfrost.oneconfig.api.ui.v1.components.reorderContainer
import org.polyfrost.oneconfig.api.ui.v1.components.reorderOverlay
import org.polyfrost.oneconfig.api.ui.v1.components.reorderableItem
import org.polyfrost.oneconfig.api.ui.v1.keybind.OneConfigKeybind
import org.polyfrost.oneconfig.internal.ui.api.ConfigData
import org.polyfrost.oneconfig.internal.ui.api.ConfigRegistry
import org.polyfrost.oneconfig.internal.ui.api.ConfigSource
Expand Down Expand Up @@ -133,8 +131,7 @@ import org.polyfrost.oneconfig.internal.ui.components.rememberInteractionSource
import org.polyfrost.oneconfig.internal.ui.components.rememberModEnabled
import org.polyfrost.oneconfig.internal.ui.components.scrollFade
import org.polyfrost.oneconfig.internal.ui.components.settings.identitySet
import org.polyfrost.oneconfig.internal.ui.components.settings.resetKeybindOption
import org.polyfrost.oneconfig.internal.ui.components.settings.resetOption
import org.polyfrost.oneconfig.internal.ui.components.settings.resetTree
import org.polyfrost.oneconfig.internal.ui.components.translated
import org.polyfrost.oneconfig.internal.ui.navigation.graph.ModConfigRoute
import org.polyfrost.oneconfig.internal.ui.shell.LocalShell
Expand Down Expand Up @@ -518,19 +515,6 @@ private fun confirmReset(mod: ConfigData, tree: Tree) {
)
}

private fun resetTree(tree: Tree, seen: MutableSet<Property<*>>) {
for (node in tree.map.values) {
when (node) {
is Property<*> -> if (node.get() is OneConfigKeybind) {
if (seen.add(node)) resetKeybindOption(node)
} else {
resetOption(node, seen)
}
is Tree -> resetTree(node, seen)
}
}
}

/** Persists the arrangement and the favorite state after a card is dropped at [index] */
private fun commitDrop(entries: List<ModGridEntry>, index: Int) {
val dropped = (entries.getOrNull(index) as? ModGridEntry.Card)?.data ?: return
Expand Down