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
8 changes: 6 additions & 2 deletions tools/idea-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Changed

- [IconPack] Replace code snippet tooltip on Package and IconPack name fields with a plain text description tooltip

### Fixed

- [Web Import] Fix side panel closing when clicking inside the panel content area
Expand All @@ -22,8 +26,8 @@
- [Web Import] Add `Tabler` icons provider
- [Web Import] Add `Eva` icons provider
- [Settings] Add "Gutter area" toggle to control visibility of ImageVector gutter icons in the editor
- [Settings] Add "Suppress unused receiver warning" setting to generate `@Suppress("UnusedReceiverParameter")` annotation on
ImageVector extension properties when an icon pack receiver is used (e.g. `ValkyrieIcons`)
- [Settings] Add "Suppress unused receiver warning" setting to generate `@Suppress("UnusedReceiverParameter")`
annotation on ImageVector extension properties when an icon pack receiver is used (e.g. `ValkyrieIcons`)

### Changed

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package io.github.composegears.valkyrie.jewel.settings

import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Column
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import io.github.composegears.valkyrie.jewel.tooling.PreviewTheme
import io.github.composegears.valkyrie.jewel.tooling.lorem
import io.github.composegears.valkyrie.sdk.compose.foundation.layout.CenterVerticalRow
import io.github.composegears.valkyrie.sdk.compose.foundation.layout.Spacer
import io.github.composegears.valkyrie.util.stringResource
import org.jetbrains.annotations.Nls
import org.jetbrains.compose.ui.tooling.preview.Preview
import org.jetbrains.jewel.ui.component.Icon
import org.jetbrains.jewel.ui.component.Text
import org.jetbrains.jewel.ui.component.Tooltip
import org.jetbrains.jewel.ui.icons.AllIconsKeys

@OptIn(ExperimentalFoundationApi::class)
@Composable
fun LabelTooltipRow(
text: String,
@Nls tooltip: String,
modifier: Modifier = Modifier,
) {
CenterVerticalRow(modifier = modifier) {
Text(text)
Spacer(8.dp)
Tooltip(tooltip = { Text(tooltip) }) {
Icon(
key = AllIconsKeys.General.ContextHelp,
contentDescription = stringResource("accessibility.help"),
)
}
}
}

@Preview
@Composable
private fun LabelTooltipRowPreview() = PreviewTheme(alignment = Alignment.Center) {
Column {
LabelTooltipRow(
text = "Package",
tooltip = lorem(10),
)
Spacer(16.dp)
LabelTooltipRow(
text = "IconPack name",
tooltip = lorem(10),
)
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import io.github.composegears.valkyrie.jewel.button.OutlineIconButton
import io.github.composegears.valkyrie.jewel.settings.LabelTooltipRow
import io.github.composegears.valkyrie.jewel.textarea.TextArea
import io.github.composegears.valkyrie.jewel.textfield.validation.ValidationResult
import io.github.composegears.valkyrie.jewel.tooling.ProjectPreviewTheme
Expand Down Expand Up @@ -66,12 +67,9 @@ fun IconPackEditor(
Spacer(32.dp)
}

CodeTooltipHeader(
LabelTooltipRow(
text = stringResource("iconpack.editor.package"),
code = buildPackPackageHighlight(
packageName = packageName.text,
iconPackName = iconPackName.text,
),
tooltip = stringResource("iconpack.editor.package.tooltip"),
)
Spacer(8.dp)
PackageTextField(
Expand All @@ -82,9 +80,9 @@ fun IconPackEditor(
enabled = packageName.enabled,
)
Spacer(32.dp)
CodeTooltipHeader(
text = stringResource("iconpack.editor.iconpack.name"),
code = buildIconPackHighlight(iconPackName.text),
LabelTooltipRow(
text = stringResource("iconpack.editor.iconpack"),
tooltip = stringResource("iconpack.editor.iconpack.tooltip"),
)
Spacer(8.dp)
IconPackTextField(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ edit.action.header=Name
edit.action.textfield.error=Can't be empty
code.preview.title=Code Preview
iconpack.editor.package=Package
iconpack.editor.iconpack.name=IconPack name
iconpack.editor.package.tooltip=Used as a package declaration in generated icon files
iconpack.editor.iconpack=IconPack
iconpack.editor.iconpack.tooltip=Top-level object that groups all generated icons
iconpack.editor.add.nested.pack=Add nested pack
iconpack.newpack.title=New Pack
iconpack.newpack.choose.directory.dnd=Drag \\& Drop destination folder\nor browse
Expand Down