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.

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

Jump to bottom

Refactor code of theme/flavors, theme_none() uses blue colors #891

Merged
merged 8 commits into from
Sep 29, 2023
Merged

Refactor code of theme/flavors, theme_none() uses blue colors #891

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
621f493
Add symbolic color for borders in 'light' and 'bw' theme.
OLarionova-HORIS Sep 26, 2023
5dd20d2
Specify colors explicitly for 'pen,paper,brush'.
OLarionova-HORIS Sep 26, 2023
70326db
Change color for toolip rect.
OLarionova-HORIS Sep 26, 2023
1fa8c0a
Add function to prepare ready-made parameters for theme creation.
OLarionova-HORIS Sep 28, 2023
bf1fe1a
Add ThemeBuilder.
OLarionova-HORIS Sep 28, 2023
ec8c934
More code refactoring, renaming.
OLarionova-HORIS Sep 29, 2023
f4f400a
Use blue colors for 'none' (no symbolic colors), not apply flavor to it.
OLarionova-HORIS Sep 29, 2023
88a30d0
Minor cleanup code.
OLarionova-HORIS Sep 29, 2023
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
Prev Previous commit
Next Next commit
Specify colors explicitly for 'pen,paper,brush'.
  • Loading branch information
@OLarionova-HORIS
OLarionova-HORIS committed Sep 28, 2023
commit 5dd20d23c23d40bf2dcd60d57d0362f36fa39db3
90 changes: 55 additions & 35 deletions ...ommonMain/kotlin/org/jetbrains/letsPlot/core/plot/builder/defaultTheme/ThemeFlavorUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ object ThemeFlavorUtil {
fun applyFlavor(themeSettings: Map<String, Any>, flavorName: String): Map<String, Any> {
val flavor = createFlavor(flavorName)

return themeSettings.mapValues { (parameter, options) ->
return mapOf(
ThemeOption.GEOM to mapOf(
ThemeOption.Geom.PEN to flavor.pen,
ThemeOption.Geom.PAPER to flavor.paper,
ThemeOption.Geom.BRUSH to flavor.brush
)
) + themeSettings.mapValues { (parameter, options) ->
if (options !is Map<*, *>) {
return@mapValues options
}
Expand All @@ -25,7 +31,6 @@ object ThemeFlavorUtil {
!is SymbolicColor -> value
else -> flavor.symbolicColors[value]
?: error("Undefined color in flavor scheme = '$flavorName': '$parameter': '${key}' = '${value.name}'")

}
}
}
Expand All @@ -45,7 +50,10 @@ object ThemeFlavorUtil {

private class Flavor(
val symbolicColors: Map<SymbolicColor, Color>,
val specialColors: Map<String, Map<String, Color>>
val specialColors: Map<String, Map<String, Color>>,
val pen: Color,
val brush: Color,
val paper: Color,
)

private val DARK_GREY = parseHex("#474747")
Expand All @@ -71,7 +79,10 @@ object ThemeFlavorUtil {
ThemeOption.RECT to mapOf(
Elem.FILL to LIGHT_GREY
),
)
),
pen = DARK_GREY,
brush = Color.PACIFIC_BLUE,
paper = Color.WHITE
)

ThemeOption.Flavor.GREY -> Flavor(
Expand All @@ -88,8 +99,11 @@ object ThemeFlavorUtil {
ThemeOption.TOOLTIP_RECT to mapOf(
Elem.COLOR to Color.BLACK,
Elem.FILL to Color.WHITE
),
)
)
),
pen = DARK_GREY,
brush = Color.PACIFIC_BLUE,
paper = Color.WHITE
)

ThemeOption.Flavor.LIGHT -> Flavor(
Expand All @@ -106,14 +120,11 @@ object ThemeFlavorUtil {
ThemeOption.TOOLTIP_RECT to mapOf(
Elem.COLOR to Color.BLACK,
Elem.FILL to Color.WHITE
),
ThemeOption.AXIS to mapOf(
Elem.COLOR to parseHex("#C9C9C9")
),
ThemeOption.PANEL_BKGR_RECT to mapOf(
Elem.COLOR to parseHex("#C9C9C9")
),
)
)
),
pen = DARK_GREY,
brush = Color.PACIFIC_BLUE,
paper = Color.WHITE
)

ThemeOption.Flavor.BW -> Flavor(
Expand All @@ -130,17 +141,11 @@ object ThemeFlavorUtil {
ThemeOption.TOOLTIP_RECT to mapOf(
Elem.COLOR to Color.BLACK,
Elem.FILL to Color.WHITE
),
ThemeOption.PANEL_BKGR_RECT to mapOf(
Elem.COLOR to parseHex("#333333")
),
ThemeOption.AXIS to mapOf(
Elem.COLOR to parseHex("#333333")
),
ThemeOption.FACET_STRIP_BGR_RECT to mapOf(
Elem.COLOR to parseHex("#333333")
),
)
)
),
pen = DARK_GREY,
brush = Color.PACIFIC_BLUE,
paper = Color.WHITE
)

ThemeOption.Flavor.DARCULA -> Flavor(
Expand All @@ -156,8 +161,11 @@ object ThemeFlavorUtil {
ThemeOption.TOOLTIP_RECT to mapOf(
Elem.COLOR to parseHex("#BBBBBB"),
Elem.FILL to parseHex("#141414")
),
)
)
),
pen = parseHex("#BBBBBB"),
brush = Color.PACIFIC_BLUE,
paper = parseHex("#303030")
)

ThemeOption.Flavor.SOLARIZED_LIGHT -> Flavor(
Expand All @@ -173,8 +181,11 @@ object ThemeFlavorUtil {
ThemeOption.TOOLTIP_RECT to mapOf(
Elem.COLOR to parseHex("#2E4E58"),
Elem.FILL to parseHex("#FEFBF3")
),
)
)
),
pen = parseHex("#2E4E58"),
brush = Color.PACIFIC_BLUE,
paper = parseHex("#FDF6E3")
)

ThemeOption.Flavor.SOLARIZED_DARK -> Flavor(
Expand All @@ -190,8 +201,11 @@ object ThemeFlavorUtil {
ThemeOption.TOOLTIP_RECT to mapOf(
Elem.COLOR to parseHex("#A7B6BA"),
Elem.FILL to parseHex("#0B2F3A")
),
)
)
),
pen = parseHex("#A7B6BA"),
brush = Color.PACIFIC_BLUE,
paper = parseHex("#0E3C4A")
)

ThemeOption.Flavor.HIGH_CONTRAST_LIGHT -> Flavor(
Expand All @@ -207,8 +221,11 @@ object ThemeFlavorUtil {
ThemeOption.TOOLTIP_RECT to mapOf(
Elem.COLOR to Color.BLACK,
Elem.FILL to Color.WHITE
),
)
)
),
pen = Color.BLACK,
brush = Color.PACIFIC_BLUE,
paper = Color.WHITE
)

ThemeOption.Flavor.HIGH_CONTRAST_DARK -> Flavor(
Expand All @@ -224,8 +241,11 @@ object ThemeFlavorUtil {
ThemeOption.TOOLTIP_RECT to mapOf(
Elem.COLOR to Color.WHITE,
Elem.FILL to parseHex("#460073")
),
)
)
),
pen = Color.WHITE,
brush = Color.PACIFIC_BLUE,
paper = Color.BLACK
)

else -> throw IllegalArgumentException("Unsupported theme flavor: '$name'")
Expand Down
9 changes: 0 additions & 9 deletions ...in/kotlin/org/jetbrains/letsPlot/core/plot/builder/defaultTheme/values/ThemeValuesBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

package org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values

import org.jetbrains.letsPlot.commons.values.Color
import org.jetbrains.letsPlot.commons.values.FontFace
import org.jetbrains.letsPlot.core.plot.base.guide.LegendDirection
import org.jetbrains.letsPlot.core.plot.base.guide.LegendJustification
Expand All @@ -19,8 +18,6 @@ import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.
import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.Elem
import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.FLAVOR
import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.Flavor
import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.GEOM
import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.Geom
import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.LEGEND_BKGR_RECT
import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.LEGEND_DIRECTION
import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.LEGEND_JUSTIFICATION
Expand Down Expand Up @@ -138,12 +135,6 @@ open class ThemeValuesBase : ThemeValues(VALUES) {
Elem.FONT_FACE to FontFace.BOLD,
),

GEOM to mapOf(
Geom.PEN to SymbolicColor.BLACK,
Geom.PAPER to SymbolicColor.WHITE,
Geom.BRUSH to Color.PACIFIC_BLUE,
),

FLAVOR to Flavor.BASE,
)
}
Expand Down