Skip to content

Commit

Permalink
Make improvements related to CandlestickCartesianLayer XML attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
@patrickmichalik
patrickmichalik committed Mar 30, 2024
1 parent 2428eee commit 565575a
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 51 deletions.
89 changes: 51 additions & 38 deletions .../views/src/main/java/com/patrykandpatrick/vico/views/common/theme/ChartStyleExtensions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,56 +168,59 @@ internal fun TypedArray.getCandlestickCartesianLayer(context: Context): Candlest

if (hasHollowCandleStyle) {
CandlestickCartesianLayer.Candles(
typedArray.getCandleStyle(
typedArray.getCandle(
context,
R.styleable.CandlestickLayerStyle_absolutelyBearishRelativelyBullishStyle,
R.styleable.CandlestickLayerStyle_absolutelyBearishRelativelyBullishCandleStyle,
green,
),
typedArray.getCandleStyle(
typedArray.getCandle(
context,
R.styleable.CandlestickLayerStyle_absolutelyBearishRelativelyNeutralStyle,
R.styleable.CandlestickLayerStyle_absolutelyBearishRelativelyNeutralCandleStyle,
gray,
),
typedArray.getCandleStyle(
typedArray.getCandle(
context,
R.styleable.CandlestickLayerStyle_absolutelyBearishRelativelyBearishStyle,
R.styleable.CandlestickLayerStyle_absolutelyBearishRelativelyBearishCandleStyle,
red,
),
typedArray.getCandleStyle(
typedArray.getCandle(
context,
R.styleable.CandlestickLayerStyle_absolutelyNeutralRelativelyBullishStyle,
R.styleable.CandlestickLayerStyle_absolutelyNeutralRelativelyBullishCandleStyle,
green,
),
typedArray.getCandleStyle(
typedArray.getCandle(
context,
R.styleable.CandlestickLayerStyle_absolutelyNeutralRelativelyNeutralStyle,
R.styleable.CandlestickLayerStyle_absolutelyNeutralRelativelyNeutralCandleStyle,
gray,
),
typedArray.getCandleStyle(
typedArray.getCandle(
context,
R.styleable.CandlestickLayerStyle_absolutelyNeutralRelativelyBearishStyle,
R.styleable.CandlestickLayerStyle_absolutelyNeutralRelativelyBearishCandleStyle,
red,
),
typedArray.getCandleStyle(
typedArray.getCandle(
context,
R.styleable.CandlestickLayerStyle_absolutelyBullishRelativelyBullishStyle,
R.styleable.CandlestickLayerStyle_absolutelyBullishRelativelyBullishCandleStyle,
green,
),
typedArray.getCandleStyle(
typedArray.getCandle(
context,
R.styleable.CandlestickLayerStyle_absolutelyBullishRelativelyNeutralStyle,
R.styleable.CandlestickLayerStyle_absolutelyBullishRelativelyNeutralCandleStyle,
gray,
),
typedArray.getCandleStyle(
typedArray.getCandle(
context,
R.styleable.CandlestickLayerStyle_absolutelyBullishRelativelyBearishStyle,
R.styleable.CandlestickLayerStyle_absolutelyBullishRelativelyBearishCandleStyle,
red,
),
)
} else {
val bullish = typedArray.getCandleStyle(context, R.styleable.CandlestickLayerStyle_bullishStyle, green)
val neutral = typedArray.getCandleStyle(context, R.styleable.CandlestickLayerStyle_neutralStyle, gray)
val bearish = typedArray.getCandleStyle(context, R.styleable.CandlestickLayerStyle_bearishStyle, red)
val bullish =
typedArray.getCandle(context, R.styleable.CandlestickLayerStyle_bullishCandleStyle, green)
val neutral =
typedArray.getCandle(context, R.styleable.CandlestickLayerStyle_neutralCandleStyle, gray)
val bearish =
typedArray.getCandle(context, R.styleable.CandlestickLayerStyle_bearishCandleStyle, red)
CandlestickCartesianLayer.Candles(
bullish,
bullish,
Expand All @@ -231,31 +234,41 @@ internal fun TypedArray.getCandlestickCartesianLayer(context: Context): Candlest
)
}
}
return CandlestickCartesianLayer(candles)
return CandlestickCartesianLayer(
candles = candles,
minCandleBodyHeightDp =
getRawDimension(
context,
R.styleable.CandlestickLayerStyle_minCandleBodyHeight,
Defaults.MIN_CANDLE_BODY_HEIGHT_DP,
),
candleSpacingDp =
getRawDimension(context, R.styleable.CandlestickLayerStyle_candleSpacing, Defaults.CANDLE_SPACING_DP),
)
}

private fun TypedArray.hasHollowCandleStyle(): Boolean =
hasValue(R.styleable.CandlestickLayerStyle_absolutelyBullishRelativelyBullishStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyBullishRelativelyNeutralStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyBullishRelativelyBearishStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyNeutralRelativelyBullishStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyNeutralRelativelyNeutralStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyNeutralRelativelyBearishStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyBearishRelativelyBullishStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyBearishRelativelyNeutralStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyBearishRelativelyBearishStyle)
hasValue(R.styleable.CandlestickLayerStyle_absolutelyBullishRelativelyBullishCandleStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyBullishRelativelyNeutralCandleStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyBullishRelativelyBearishCandleStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyNeutralRelativelyBullishCandleStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyNeutralRelativelyNeutralCandleStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyNeutralRelativelyBearishCandleStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyBearishRelativelyBullishCandleStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyBearishRelativelyNeutralCandleStyle) ||
hasValue(R.styleable.CandlestickLayerStyle_absolutelyBearishRelativelyBearishCandleStyle)

private fun TypedArray.getCandleStyle(
private fun TypedArray.getCandle(
context: Context,
resourceId: Int,
defaultColor: Int,
): CandlestickCartesianLayer.Candle =
getNestedTypedArray(context, resourceId, R.styleable.Candle).use { typedArray ->
getNestedTypedArray(context, resourceId, R.styleable.CandleStyle).use { typedArray ->
val topWick =
if (typedArray.hasValue(R.styleable.Candle_topWickStyle)) {
if (typedArray.hasValue(R.styleable.CandleStyle_topWickStyle)) {
typedArray.getNestedTypedArray(
context = context,
resourceId = R.styleable.Candle_topWickStyle,
resourceId = R.styleable.CandleStyle_topWickStyle,
styleableResourceId = R.styleable.LineComponent,
).getLineComponent(
context = context,
Expand All @@ -267,10 +280,10 @@ private fun TypedArray.getCandleStyle(
}

val bottomWick =
if (typedArray.hasValue(R.styleable.Candle_bottomWickStyle)) {
if (typedArray.hasValue(R.styleable.CandleStyle_bottomWickStyle)) {
typedArray.getNestedTypedArray(
context = context,
resourceId = R.styleable.Candle_bottomWickStyle,
resourceId = R.styleable.CandleStyle_bottomWickStyle,
styleableResourceId = R.styleable.LineComponent,
).getLineComponent(
context = context,
Expand All @@ -284,7 +297,7 @@ private fun TypedArray.getCandleStyle(
val body =
typedArray.getNestedTypedArray(
context = context,
resourceId = R.styleable.Candle_bodyStyle,
resourceId = R.styleable.CandleStyle_bodyStyle,
styleableResourceId = R.styleable.LineComponent,
).getLineComponent(
context = context,
Expand Down
28 changes: 15 additions & 13 deletions vico/views/src/main/res/values/candlestick_chart_attrs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,23 @@
<attr name="candlestickLayerStyle" format="reference" />

<declare-styleable name="CandlestickLayerStyle">
<attr name="bullishStyle" format="reference" />
<attr name="neutralStyle" format="reference" />
<attr name="bearishStyle" format="reference" />
<attr name="absolutelyBullishRelativelyBullishStyle" format="reference" />
<attr name="absolutelyBullishRelativelyNeutralStyle" format="reference" />
<attr name="absolutelyBullishRelativelyBearishStyle" format="reference" />
<attr name="absolutelyNeutralRelativelyBullishStyle" format="reference" />
<attr name="absolutelyNeutralRelativelyNeutralStyle" format="reference" />
<attr name="absolutelyNeutralRelativelyBearishStyle" format="reference" />
<attr name="absolutelyBearishRelativelyBullishStyle" format="reference" />
<attr name="absolutelyBearishRelativelyNeutralStyle" format="reference" />
<attr name="absolutelyBearishRelativelyBearishStyle" format="reference" />
<attr name="bullishCandleStyle" format="reference" />
<attr name="neutralCandleStyle" format="reference" />
<attr name="bearishCandleStyle" format="reference" />
<attr name="absolutelyBullishRelativelyBullishCandleStyle" format="reference" />
<attr name="absolutelyBullishRelativelyNeutralCandleStyle" format="reference" />
<attr name="absolutelyBullishRelativelyBearishCandleStyle" format="reference" />
<attr name="absolutelyNeutralRelativelyBullishCandleStyle" format="reference" />
<attr name="absolutelyNeutralRelativelyNeutralCandleStyle" format="reference" />
<attr name="absolutelyNeutralRelativelyBearishCandleStyle" format="reference" />
<attr name="absolutelyBearishRelativelyBullishCandleStyle" format="reference" />
<attr name="absolutelyBearishRelativelyNeutralCandleStyle" format="reference" />
<attr name="absolutelyBearishRelativelyBearishCandleStyle" format="reference" />
<attr name="minCandleBodyHeight" format="dimension" />
<attr name="candleSpacing" format="dimension" />
</declare-styleable>

<declare-styleable name="Candle">
<declare-styleable name="CandleStyle">
<attr name="bodyStyle" format="reference" />
<attr name="topWickStyle" format="reference" />
<attr name="bottomWickStyle" format="reference" />
Expand Down

0 comments on commit 565575a

Please sign in to comment.