diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.java index 28a353a176..14b0df95b3 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.java @@ -14,6 +14,7 @@ import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider; import com.github.mikephil.charting.interfaces.datasets.IBarDataSet; import com.github.mikephil.charting.renderer.BarChartRenderer; +import com.github.mikephil.charting.renderer.RoundedBarChartRenderer; import java.util.Locale; @@ -50,8 +51,9 @@ public class BarChart extends BarLineChartBase implements BarDataProvid private float mRoundedBarRadius = 0f; private boolean mFitBars = false; + private boolean mIsOwnRoundedRendererUsed = false; - public BarChart(Context context) { + public BarChart(Context context) { super(context); } @@ -63,12 +65,17 @@ public BarChart(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); } + protected void setRenderer() { + if (isOwnRoundedRendererUsed()) + mRenderer = new RoundedBarChartRenderer(this, mAnimator, mViewPortHandler); + else + mRenderer = new BarChartRenderer(this, mAnimator, mViewPortHandler, mDrawRoundedBars, mRoundedBarRadius); + } + @Override protected void init() { super.init(); - - mRenderer = new BarChartRenderer(this, mAnimator, mViewPortHandler, mDrawRoundedBars, mRoundedBarRadius); - + setRenderer(); setHighlighter(new BarHighlighter(this)); getXAxis().setSpaceMin(0.5f); @@ -298,4 +305,14 @@ public String getAccessibilityDescription() { "Data ranges from %s to %s.", entryCount, entries, minVal, maxVal, minRange, maxRange); } + + @Override + public boolean isOwnRoundedRendererUsed() { + return mIsOwnRoundedRendererUsed; + } + + @Override + public void setOwnRoundedRendererUsed(boolean b) { + mIsOwnRoundedRendererUsed = b; + } } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java index 41e75b1f93..8d723678d1 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java @@ -49,6 +49,16 @@ public class CombinedChart extends BarLineChartBase implements Com protected DrawOrder[] mDrawOrder; + @Override + public boolean isOwnRoundedRendererUsed() { + return false; + } + + @Override + public void setOwnRoundedRendererUsed(boolean b) { + Log.e(LOG_TAG, "CombinedChart does not support rounded bars."); + } + /** * enum that allows to specify the order in which the different data objects * for the combined-chart are drawn diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.java index b4cff03a1d..267e1962c1 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.java @@ -13,6 +13,7 @@ import com.github.mikephil.charting.highlight.HorizontalBarHighlighter; import com.github.mikephil.charting.interfaces.datasets.IBarDataSet; import com.github.mikephil.charting.renderer.HorizontalBarChartRenderer; +import com.github.mikephil.charting.renderer.RoundedHorizontalBarChartRenderer; import com.github.mikephil.charting.renderer.XAxisRendererHorizontalBarChart; import com.github.mikephil.charting.renderer.YAxisRendererHorizontalBarChart; import com.github.mikephil.charting.utils.HorizontalViewPortHandler; @@ -40,6 +41,14 @@ public HorizontalBarChart(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); } + @Override + protected void setRenderer() { + if (isOwnRoundedRendererUsed()) + mRenderer = new RoundedHorizontalBarChartRenderer(this, mAnimator, mViewPortHandler); + else + mRenderer = new HorizontalBarChartRenderer(this, mAnimator, mViewPortHandler); + } + @Override protected void init() { @@ -50,7 +59,6 @@ protected void init() { mLeftAxisTransformer = new TransformerHorizontalBarChart(mViewPortHandler); mRightAxisTransformer = new TransformerHorizontalBarChart(mViewPortHandler); - mRenderer = new HorizontalBarChartRenderer(this, mAnimator, mViewPortHandler); setHighlighter(new HorizontalBarHighlighter(this)); mAxisRendererLeft = new YAxisRendererHorizontalBarChart(mViewPortHandler, mAxisLeft, mLeftAxisTransformer); diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BarDataProvider.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BarDataProvider.kt index 9f176e61c9..634199c094 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BarDataProvider.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BarDataProvider.kt @@ -7,4 +7,5 @@ interface BarDataProvider : BarLineScatterCandleBubbleDataProvider { var isDrawBarShadowEnabled: Boolean var isDrawValueAboveBarEnabled: Boolean var isHighlightFullBarEnabled: Boolean + var isOwnRoundedRendererUsed : Boolean } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt index 6803e7044d..a819ac0eee 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt @@ -11,370 +11,273 @@ import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider import com.github.mikephil.charting.interfaces.datasets.IBarDataSet import com.github.mikephil.charting.utils.ViewPortHandler import com.github.mikephil.charting.utils.convertDpToPixel +import kotlin.math.abs import kotlin.math.min -/** @noinspection unused - */ -class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, viewPortHandler: ViewPortHandler) : - BarChartRenderer(chart, animator, viewPortHandler) { - private val mBarShadowRectBuffer = RectF() - private val mRadius = 20f - private var roundedShadowRadius = 0f - private var roundedPositiveDataSetRadius = 0f - private var roundedNegativeDataSetRadius = 0f +@Suppress("unused") +class RoundedBarChartRenderer( + var dataProvider: BarDataProvider, + animator: ChartAnimator, + viewPortHandler: ViewPortHandler +) : BarChartRenderer(dataProvider, animator, viewPortHandler) { - fun setRoundedNegativeDataSetRadius(roundedNegativeDataSet: Float) { - roundedNegativeDataSetRadius = roundedNegativeDataSet - } + private val shadowRect = RectF() + private val tmpPts = FloatArray(4) + private val ovalPath = Path() - fun setRoundedShadowRadius(roundedShadow: Float) { - roundedShadowRadius = roundedShadow - } + private val defaultRadius = 20f - fun setRoundedPositiveDataSetRadius(roundedPositiveDataSet: Float) { - roundedPositiveDataSetRadius = roundedPositiveDataSet - } + private var roundedShadowRadius = 0f + var roundedPositiveDataSetRadius = 0f + var roundedNegativeDataSetRadius = 0f + /** If true, corner radii = half the bar’s screen‐pixel width at draw‐time. */ + var useAutoFullRadius = false override fun drawDataSet(canvas: Canvas, dataSet: IBarDataSet, index: Int) { initBuffers() - val trans = chart.getTransformer(dataSet.axisDependency) - barBorderPaint.color = dataSet.barBorderColor - barBorderPaint.strokeWidth = dataSet.barBorderWidth.convertDpToPixel() - shadowPaint.color = dataSet.barShadowColor - val drawBorder = dataSet.barBorderWidth > 0f + val trans = dataProvider.getTransformer(dataSet.axisDependency) ?: return + val handler = viewPortHandler + val phaseX = animator.phaseX val phaseY = animator.phaseY - if (chart.isDrawBarShadowEnabled) { - shadowPaint.color = dataSet.barShadowColor - val barData = chart.barData - val barWidth = barData.barWidth - val barWidthHalf = barWidth / 2.0f - var x: Float - var i = 0 - val count = min((dataSet.entryCount.toFloat() * phaseX).toDouble().toInt().toDouble(), dataSet.entryCount.toDouble()) - while (i < count) { - dataSet.getEntryForIndex(i)?.let { barEntry -> - x = barEntry.x - mBarShadowRectBuffer.left = x - barWidthHalf - mBarShadowRectBuffer.right = x + barWidthHalf - } - trans!!.rectValueToPixel(mBarShadowRectBuffer) - if (!viewPortHandler.isInBoundsLeft(mBarShadowRectBuffer.right)) { - i++ - continue - } - if (!viewPortHandler.isInBoundsRight(mBarShadowRectBuffer.left)) { - break - } - mBarShadowRectBuffer.top = viewPortHandler.contentTop() - mBarShadowRectBuffer.bottom = viewPortHandler.contentBottom() + dataProvider.barData.let { barData -> + // 1) auto‐radius? + if (useAutoFullRadius) { + val halfVal = barData.barWidth / 2f + tmpPts[0] = 0f; tmpPts[1] = 0f + tmpPts[2] = halfVal; tmpPts[3] = 0f + trans.pointValuesToPixel(tmpPts) + val pxHalf = abs(tmpPts[2] - tmpPts[0]) + roundedShadowRadius = pxHalf + roundedPositiveDataSetRadius = pxHalf + roundedNegativeDataSetRadius = pxHalf + } + // 2) prep paints + barBorderPaint.color = dataSet.barBorderColor + barBorderPaint.strokeWidth = dataSet.barBorderWidth.convertDpToPixel() + shadowPaint.color = dataSet.barShadowColor - if (roundedShadowRadius > 0) { - canvas.drawRoundRect(barRect, roundedShadowRadius, roundedShadowRadius, shadowPaint) - } else { - canvas.drawRect(mBarShadowRectBuffer, shadowPaint) + // 3) draw shadows + if (dataProvider.isDrawBarShadowEnabled) { + val barWidth = barData.barWidth + val half = barWidth / 2f + val count = min((dataSet.entryCount * phaseX).toInt(), dataSet.entryCount) + for (i in 0 until count) { + dataSet.getEntryForIndex(i)?.let { e -> + val x = e.x + shadowRect.left = x - half + shadowRect.right = x + half + trans.rectValueToPixel(shadowRect) + + if (!handler.isInBoundsLeft(shadowRect.right) || + !handler.isInBoundsRight(shadowRect.left) + ) return@let + + shadowRect.top = handler.contentTop() + shadowRect.bottom = handler.contentBottom() + + if (roundedShadowRadius > 0f) { + canvas.drawRoundRect(shadowRect, roundedShadowRadius, roundedShadowRadius, shadowPaint) + } else { + canvas.drawRect(shadowRect, shadowPaint) + } + } } - i++ } - } - val buffer = barBuffers[index]!! - buffer.setPhases(phaseX, phaseY) - buffer.setDataSet(index) - buffer.setInverted(chart.isInverted(dataSet.axisDependency)) - buffer.setBarWidth(chart.barData.barWidth) - buffer.feed(dataSet) - trans!!.pointValuesToPixel(buffer.buffer) - - // if multiple colors has been assigned to Bar Chart - dataSet.colors?.let { - if (it.size > 1) { + // 4) feed & transform + val buffer = barBuffers[index] ?: return + buffer.setPhases(phaseX, phaseY) + buffer.setDataSet(index) + buffer.setInverted(dataProvider.isInverted(dataSet.axisDependency)) + buffer.setBarWidth(barData.barWidth) + buffer.feed(dataSet) + trans.pointValuesToPixel(buffer.buffer) + + val singleColor = dataSet.colors.size == 1 + + // 5a) multi‐color bars + if (!singleColor) { var j = 0 while (j < buffer.size()) { - if (!viewPortHandler.isInBoundsLeft(buffer.buffer[j + 2])) { - j += 4 - continue - } + val left = buffer.buffer[j] + val top = buffer.buffer[j + 1] + val right = buffer.buffer[j + 2] + val bottom = buffer.buffer[j + 3] - if (!viewPortHandler.isInBoundsRight(buffer.buffer[j])) { - break + if (!handler.isInBoundsLeft(right)) { + j += 4; continue } - - if (chart.isDrawBarShadowEnabled) { - if (roundedShadowRadius > 0) { - canvas.drawRoundRect( - RectF( - buffer.buffer[j], viewPortHandler.contentTop(), - buffer.buffer[j + 2], - viewPortHandler.contentBottom() - ), roundedShadowRadius, roundedShadowRadius, shadowPaint - ) - } else { - canvas.drawRect( - buffer.buffer[j], viewPortHandler.contentTop(), - buffer.buffer[j + 2], - viewPortHandler.contentBottom(), shadowPaint - ) - } + // if bar is off‐right, we're past visible, so stop + if (!handler.isInBoundsRight(left)) break + + // shadow + if (dataProvider.isDrawBarShadowEnabled && roundedShadowRadius > 0f) { + ovalPath.reset() + ovalPath.addRoundRect( + RectF(left, handler.contentTop(), right, handler.contentBottom()), + roundedShadowRadius, roundedShadowRadius, Path.Direction.CW + ) + canvas.drawPath(ovalPath, shadowPaint) } - // Set the color for the currently drawn value. If the index paintRender.color = dataSet.getColorByIndex(j / 4) - - if (roundedPositiveDataSetRadius > 0) { - canvas.drawRoundRect( - RectF( - buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2], - buffer.buffer[j + 3] - ), roundedPositiveDataSetRadius, roundedPositiveDataSetRadius, paintRender + if (roundedPositiveDataSetRadius > 0f) { + ovalPath.reset() + ovalPath.addRoundRect( + RectF(left, top, right, bottom), + roundedPositiveDataSetRadius, + roundedPositiveDataSetRadius, + Path.Direction.CW ) + canvas.drawPath(ovalPath, paintRender) } else { - canvas.drawRect( - buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2], - buffer.buffer[j + 3], paintRender - ) + canvas.drawRect(left, top, right, bottom, paintRender) } j += 4 } - } else { + } + // 5b) single‐color bars + else { paintRender.color = dataSet.color - var j = 0 while (j < buffer.size()) { - if (!viewPortHandler.isInBoundsLeft(buffer.buffer[j + 2])) { - j += 4 - continue - } + val left = buffer.buffer[j] + val top = buffer.buffer[j + 1] + val right = buffer.buffer[j + 2] + val bottom = buffer.buffer[j + 3] - if (!viewPortHandler.isInBoundsRight(buffer.buffer[j])) { - break + if (!handler.isInBoundsLeft(right)) { + j += 4; continue } + if (!handler.isInBoundsRight(left)) break - if (chart.isDrawBarShadowEnabled) { - if (roundedShadowRadius > 0) { - canvas.drawRoundRect( - RectF( - buffer.buffer[j], viewPortHandler.contentTop(), - buffer.buffer[j + 2], - viewPortHandler.contentBottom() - ), roundedShadowRadius, roundedShadowRadius, shadowPaint - ) - } else { - canvas.drawRect( - buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2], - buffer.buffer[j + 3], paintRender - ) - } + if (dataProvider.isDrawBarShadowEnabled && roundedShadowRadius > 0f) { + ovalPath.reset() + ovalPath.addRoundRect( + RectF(left, handler.contentTop(), right, handler.contentBottom()), + roundedShadowRadius, roundedShadowRadius, Path.Direction.CW + ) + canvas.drawPath(ovalPath, shadowPaint) } - if (roundedPositiveDataSetRadius > 0) { - canvas.drawRoundRect( - RectF( - buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2], - buffer.buffer[j + 3] - ), roundedPositiveDataSetRadius, roundedPositiveDataSetRadius, paintRender + if (roundedPositiveDataSetRadius > 0f) { + ovalPath.reset() + ovalPath.addRoundRect( + RectF(left, top, right, bottom), + roundedPositiveDataSetRadius, + roundedPositiveDataSetRadius, + Path.Direction.CW ) + canvas.drawPath(ovalPath, paintRender) } else { - canvas.drawRect( - buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2], - buffer.buffer[j + 3], paintRender - ) + canvas.drawRect(left, top, right, bottom, paintRender) } j += 4 } } - } - - - val isSingleColor = dataSet.colors.size == 1 - if (isSingleColor) { - paintRender.color = dataSet.getColorByIndex(index) - } - var j = 0 - while (j < buffer.size()) { - if (!viewPortHandler.isInBoundsLeft(buffer.buffer[j + 2])) { - j += 4 - continue - } - - if (!viewPortHandler.isInBoundsRight(buffer.buffer[j])) { - break - } - - if (!isSingleColor) { - paintRender.color = dataSet.getColorByIndex(j / 4) - } - - paintRender.setShader( - LinearGradient( - buffer.buffer[j], - buffer.buffer[j + 3], - buffer.buffer[j], - buffer.buffer[j + 1], - dataSet.getColorByIndex(j / 4), - dataSet.getColorByIndex(j / 4), - Shader.TileMode.MIRROR - ) - ) + // 6) gradient overlay + var j = 0 + if (singleColor) paintRender.color = dataSet.getColorByIndex(index) + while (j < buffer.size()) { + val left = buffer.buffer[j] + val top = buffer.buffer[j + 1] + val right = buffer.buffer[j + 2] + val bottom = buffer.buffer[j + 3] + + if (!handler.isInBoundsLeft(right)) { + j += 4; continue + } + if (!handler.isInBoundsRight(left)) break - paintRender.setShader( - LinearGradient( - buffer.buffer[j], - buffer.buffer[j + 3], - buffer.buffer[j], - buffer.buffer[j + 1], - dataSet.getColorByIndex(j / 4), - dataSet.getColorByIndex(j / 4), + if (!singleColor) paintRender.color = dataSet.getColorByIndex(j / 4) + paintRender.shader = LinearGradient( + left, bottom, left, top, + paintRender.color, paintRender.color, Shader.TileMode.MIRROR ) - ) - dataSet.getEntryForIndex(j / 4)?.let { barEntry -> - - if ((barEntry.y < 0 && roundedNegativeDataSetRadius > 0)) { - val path2 = roundRect( - RectF( - buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2], - buffer.buffer[j + 3] - ), roundedNegativeDataSetRadius, roundedNegativeDataSetRadius, true, true, true, true - ) - canvas.drawPath(path2, paintRender) - } else if ((barEntry.y > 0 && roundedPositiveDataSetRadius > 0)) { - val path2 = roundRect( - RectF( - buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2], - buffer.buffer[j + 3] - ), roundedPositiveDataSetRadius, roundedPositiveDataSetRadius, true, true, true, true + val entryY = dataSet.getEntryForIndex(j / 4)?.y ?: 0f + val radius = if (entryY < 0f) roundedNegativeDataSetRadius else roundedPositiveDataSetRadius + if (radius > 0f) { + ovalPath.reset() + ovalPath.addRoundRect( + RectF(left, top, right, bottom), + radius, radius, Path.Direction.CW ) - canvas.drawPath(path2, paintRender) + canvas.drawPath(ovalPath, paintRender) } else { - canvas.drawRect( - buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2], - buffer.buffer[j + 3], paintRender - ) + canvas.drawRect(left, top, right, bottom, paintRender) } + j += 4 } - j += 4 } + paintRender.shader = null } override fun drawHighlighted(canvas: Canvas, indices: Array) { - val barData = chart.barData - - for (high in indices) { - val set = barData.getDataSetByIndex(high.dataSetIndex) - - if (set == null || !set.isHighlightEnabled) { - continue - } - - set.getEntryForXValue(high.x, high.y)?.let { barEntry -> - - if (!isInBoundsX(barEntry, set)) { - continue - } - - val trans = chart.getTransformer(set.axisDependency) - - paintHighlight.color = set.highLightColor - paintHighlight.alpha = set.highLightAlpha - - val isStack = high.stackIndex >= 0 && barEntry.isStacked - - val y1: Float - val y2: Float - - if (isStack) { - if (chart.isHighlightFullBarEnabled) { - y1 = barEntry.positiveSum - y2 = -barEntry.negativeSum - } else { - val range = barEntry.ranges[high.stackIndex] - - y1 = range?.from ?: 0f - y2 = range?.to ?: 0f - } + // 1) early exits + val handler = viewPortHandler + val barData = dataProvider.barData + + for (h in indices) { + // 2) only highlight enabled sets + val set = barData.getDataSetByIndex(h.dataSetIndex) ?: continue + if (!set.isHighlightEnabled) continue + + // 3) find the matching Entry + val e = set.getEntryForXValue(h.x, h.y) ?: continue + if (!isInBoundsX(e, set)) continue + + // 4) compute the y‐range of the highlight (stack vs. normal) + val isStack = h.stackIndex >= 0 && e.isStacked + val (y1, y2) = if (isStack) { + if (dataProvider.isHighlightFullBarEnabled) { + e.positiveSum to -e.negativeSum } else { - y1 = barEntry.y - y2 = 0f + val range = e.ranges[h.stackIndex]!! + range.from to range.to } + } else { + e.y to 0f + } - prepareBarHighlight(barEntry.x, y1, y2, barData.barWidth / 2f, trans!!) - - setHighlightDrawPos(high, barRect) + // 5) transform values to pixel‐rect + val trans = dataProvider.getTransformer(set.axisDependency) ?: continue + prepareBarHighlight( + e.x, + y1, + y2, + barData.barWidth / 2f, + trans + ) - val path2 = roundRect( - RectF( - barRect.left, barRect.top, barRect.right, - barRect.bottom - ), mRadius, mRadius, true, true, true, true - ) + // 5b) record the center/top into the Highlight object so markers can be drawn + setHighlightDrawPos(h, barRect) - canvas.drawPath(path2, paintHighlight) + // 6) clip any highlights that are fully off‐screen + if (!handler.isInBoundsLeft(barRect.right) || + !handler.isInBoundsRight(barRect.left) || + !handler.isInBoundsTop(barRect.bottom) || + !handler.isInBoundsBottom(barRect.top) + ) { + continue } - } - } - private fun roundRect(rect: RectF, rx: Float, ry: Float, tl: Boolean, tr: Boolean, br: Boolean, bl: Boolean): Path { - var rx = rx - var ry = ry - val top = rect.top - val left = rect.left - val right = rect.right - val bottom = rect.bottom - val path = Path() - if (rx < 0) { - rx = 0f - } - if (ry < 0) { - ry = 0f - } - val width = right - left - val height = bottom - top - if (rx > width / 2) { - rx = width / 2 - } - if (ry > height / 2) { - ry = height / 2 - } - val widthMinusCorners = (width - (2 * rx)) - val heightMinusCorners = (height - (2 * ry)) - - path.moveTo(right, top + ry) - if (tr) { - path.rQuadTo(0f, -ry, -rx, -ry) //top-right corner - } else { - path.rLineTo(0f, -ry) - path.rLineTo(-rx, 0f) - } - path.rLineTo(-widthMinusCorners, 0f) - if (tl) { - path.rQuadTo(-rx, 0f, -rx, ry) //top-left corner - } else { - path.rLineTo(-rx, 0f) - path.rLineTo(0f, ry) - } - path.rLineTo(0f, heightMinusCorners) - - if (bl) { - path.rQuadTo(0f, ry, rx, ry) //bottom-left corner - } else { - path.rLineTo(0f, ry) - path.rLineTo(rx, 0f) - } + // 7) choose corner radius + val radius = if (useAutoFullRadius) { + abs((barRect.right - barRect.left) / 2f) + } else { + defaultRadius + } - path.rLineTo(widthMinusCorners, 0f) - if (br) path.rQuadTo(rx, 0f, rx, -ry) //bottom-right corner - else { - path.rLineTo(rx, 0f) - path.rLineTo(0f, -ry) + // 8) draw your rounded highlight + paintHighlight.color = set.highLightColor + paintHighlight.alpha = set.highLightAlpha + canvas.drawRoundRect(barRect, radius, radius, paintHighlight) } - - path.rLineTo(0f, -heightMinusCorners) - path.close() - return path } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 05de50e6b7..59472cac5b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,7 +23,9 @@ + + @@ -38,7 +40,7 @@ - + diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt index 755cb0862f..8955e1a805 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt @@ -36,8 +36,8 @@ import info.appdev.chartexample.formatter.MyAxisValueFormatter import info.appdev.chartexample.notimportant.DemoBase import timber.log.Timber -class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener { - private var chart: BarChart? = null +open class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener { + var chart: BarChart? = null private var seekBarX: SeekBar? = null private var seekBarY: SeekBar? = null private var tvX: TextView? = null diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarRoundedChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BarRoundedChartActivity.kt new file mode 100644 index 0000000000..867432eb3e --- /dev/null +++ b/app/src/main/kotlin/info/appdev/chartexample/BarRoundedChartActivity.kt @@ -0,0 +1,12 @@ +package info.appdev.chartexample + +import android.os.Bundle +import info.appdev.chartexample.databinding.ActivityBarchartBinding + +class BarRoundedChartActivity : BarChartActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + chart!!.isOwnRoundedRendererUsed = true + } +} diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt index 9e321fb09c..4e08b8d8d4 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt @@ -27,9 +27,9 @@ import androidx.core.net.toUri import info.appdev.chartexample.databinding.ActivityHorizontalbarchartBinding import timber.log.Timber -class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener { +open class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener { - private lateinit var binding: ActivityHorizontalbarchartBinding + lateinit var binding: ActivityHorizontalbarchartBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarRoundedChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarRoundedChartActivity.kt new file mode 100644 index 0000000000..6118aad6f5 --- /dev/null +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarRoundedChartActivity.kt @@ -0,0 +1,12 @@ +package info.appdev.chartexample + +import android.os.Bundle + +class HorizontalBarRoundedChartActivity : HorizontalBarChartActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + binding.chart1.isOwnRoundedRendererUsed = true + } +} diff --git a/app/src/main/kotlin/info/appdev/chartexample/notimportant/MainActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/notimportant/MainActivity.kt index f4e2bd5de5..92fc956382 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/notimportant/MainActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/notimportant/MainActivity.kt @@ -48,6 +48,7 @@ import info.appdev.chartexample.BarChartActivity import info.appdev.chartexample.BarChartActivityMultiDataset import info.appdev.chartexample.BarChartActivitySinus import info.appdev.chartexample.BarChartPositiveNegative +import info.appdev.chartexample.BarRoundedChartActivity import info.appdev.chartexample.BubbleChartActivity import info.appdev.chartexample.CandleStickChartActivity import info.appdev.chartexample.CombinedChartActivity @@ -56,6 +57,7 @@ import info.appdev.chartexample.DynamicalAddingActivity import info.appdev.chartexample.FilledLineActivity import info.appdev.chartexample.HalfPieChartActivity import info.appdev.chartexample.HorizontalBarChartActivity +import info.appdev.chartexample.HorizontalBarRoundedChartActivity import info.appdev.chartexample.InvertedLineChartActivity import info.appdev.chartexample.LineChartActivity import info.appdev.chartexample.LineChartActivityColored @@ -166,9 +168,11 @@ class MainActivity : ComponentActivity() { add(ContentItem("Bar Charts")) add(ContentItem("Basic", "Simple bar chart.", BarChartActivity::class.java)) + add(ContentItem("Basic with own rounded renderer", "Simple rounded bar chart.", BarRoundedChartActivity::class.java)) add(ContentItem("Basic 2", "Variation of the simple bar chart.", AnotherBarActivity::class.java)) add(ContentItem("Multiple", "Show multiple data sets.", BarChartActivityMultiDataset::class.java)) add(ContentItem("Horizontal", "Render bar chart horizontally.", HorizontalBarChartActivity::class.java)) + add(ContentItem("Horizontal with own rounded renderer", "Render bar rounded chart horizontally.", HorizontalBarRoundedChartActivity::class.java)) add(ContentItem("Stacked", "Stacked bar chart.", StackedBarActivity::class.java)) add(ContentItem("Negative", "Positive and negative values with unique colors.", BarChartPositiveNegative::class.java)) //objects.add(ContentItem("Negative Horizontal", "demonstrates how to create a HorizontalBarChart with positive and negative values.")) diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-1SampleClick.png new file mode 100644 index 0000000000..9b6ff7464b Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-1SampleClick.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-10ToggleBarBorders.png b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-10ToggleBarBorders.png new file mode 100644 index 0000000000..9e8adb95a7 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-10ToggleBarBorders.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-1ToggleValues.png new file mode 100644 index 0000000000..57663ff3a5 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-1ToggleValues.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-24rotateXAxislabels.png b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-24rotateXAxislabels.png new file mode 100644 index 0000000000..07862c867e Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-24rotateXAxislabels.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-4ToggleIcons.png new file mode 100644 index 0000000000..57663ff3a5 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-4ToggleIcons.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-5ToggleHighlight.png new file mode 100644 index 0000000000..57663ff3a5 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-5ToggleHighlight.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-6TogglePinchZoom.png new file mode 100644 index 0000000000..57663ff3a5 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-6TogglePinchZoom.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-7ToggleAutoScale.png new file mode 100644 index 0000000000..57663ff3a5 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-11-BarRoundedChartActivity-Basic-2menu-click-7ToggleAutoScale.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-2menu-click-10ToggleBarBorders.png b/screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-2menu-click-10ToggleBarBorders.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-2menu-click-10ToggleBarBorders.png rename to screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-2menu-click-10ToggleBarBorders.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-2menu-click-1ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-2menu-click-1ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-2menu-click-1ToggleValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-2menu-click-24rotateXAxislabels.png b/screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-2menu-click-24rotateXAxislabels.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-2menu-click-24rotateXAxislabels.png rename to screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-2menu-click-24rotateXAxislabels.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-2menu-click-5ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-2menu-click-5ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-2menu-click-5ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-2menu-click-6TogglePinchZoom.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-2menu-click-6TogglePinchZoom.png rename to screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-2menu-click-6TogglePinchZoom.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-2menu-click-7ToggleAutoScale.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-11-AnotherBarActivity-Basic2-2menu-click-7ToggleAutoScale.png rename to screenshotsToCompare9/StartTest_smokeTestStart-12-AnotherBarActivity-Basic2-2menu-click-7ToggleAutoScale.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-10ToggleBarBorders.png b/screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-10ToggleBarBorders.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-10ToggleBarBorders.png rename to screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-10ToggleBarBorders.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-1ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-1ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-1ToggleValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-24rotateXAxislabels.png b/screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-24rotateXAxislabels.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-24rotateXAxislabels.png rename to screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-24rotateXAxislabels.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-5ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-5ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-5ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-6TogglePinchZoom.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-6TogglePinchZoom.png rename to screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-6TogglePinchZoom.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-7ToggleAutoScale.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-12-BarChartActivityMultiDataset-Multiple-2menu-click-7ToggleAutoScale.png rename to screenshotsToCompare9/StartTest_smokeTestStart-13-BarChartActivityMultiDataset-Multiple-2menu-click-7ToggleAutoScale.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-10ToggleBarBorders.png b/screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-10ToggleBarBorders.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-10ToggleBarBorders.png rename to screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-10ToggleBarBorders.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-1ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-1ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-1ToggleValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-24rotateXAxislabels.png b/screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-24rotateXAxislabels.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-24rotateXAxislabels.png rename to screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-24rotateXAxislabels.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-5ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-5ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-5ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-6TogglePinchZoom.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-6TogglePinchZoom.png rename to screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-6TogglePinchZoom.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-7ToggleAutoScale.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-13-HorizontalBarChartActivity-Horizontal-2menu-click-7ToggleAutoScale.png rename to screenshotsToCompare9/StartTest_smokeTestStart-14-HorizontalBarChartActivity-Horizontal-2menu-click-7ToggleAutoScale.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-1SampleClick.png new file mode 100644 index 0000000000..ac170be401 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-1SampleClick.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-10ToggleBarBorders.png b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-10ToggleBarBorders.png new file mode 100644 index 0000000000..a775036793 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-10ToggleBarBorders.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-1ToggleValues.png new file mode 100644 index 0000000000..c66812055b Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-1ToggleValues.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-24rotateXAxislabels.png b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-24rotateXAxislabels.png new file mode 100644 index 0000000000..0aa64fe867 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-24rotateXAxislabels.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-4ToggleIcons.png new file mode 100644 index 0000000000..0aa64fe867 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-4ToggleIcons.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-5ToggleHighlight.png new file mode 100644 index 0000000000..0aa64fe867 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-5ToggleHighlight.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-6TogglePinchZoom.png new file mode 100644 index 0000000000..0aa64fe867 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-6TogglePinchZoom.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-7ToggleAutoScale.png new file mode 100644 index 0000000000..0aa64fe867 Binary files /dev/null and b/screenshotsToCompare9/StartTest_smokeTestStart-15-HorizontalBarRoundedChartActivity-Horizontal-2menu-click-7ToggleAutoScale.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-10ToggleBarBorders.png b/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-10ToggleBarBorders.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-10ToggleBarBorders.png rename to screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-10ToggleBarBorders.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-1ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-1ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-1ToggleValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-24rotateXAxislabels.png b/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-24rotateXAxislabels.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-24rotateXAxislabels.png rename to screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-24rotateXAxislabels.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-5ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-5ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-5ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-6TogglePinchZoom.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-6TogglePinchZoom.png rename to screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-6TogglePinchZoom.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-7ToggleAutoScale.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-14-StackedBarActivity-Stacked-2menu-click-7ToggleAutoScale.png rename to screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivity-Stacked-2menu-click-7ToggleAutoScale.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-15-BarChartPositiveNegative-Negative-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartPositiveNegative-Negative-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-15-BarChartPositiveNegative-Negative-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartPositiveNegative-Negative-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-10ToggleBarBorders.png b/screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-10ToggleBarBorders.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-10ToggleBarBorders.png rename to screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-10ToggleBarBorders.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-1ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-1ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-1ToggleValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-24rotateXAxislabels.png b/screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-24rotateXAxislabels.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-24rotateXAxislabels.png rename to screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-24rotateXAxislabels.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-5ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-5ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-5ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-6TogglePinchZoom.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-6TogglePinchZoom.png rename to screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-6TogglePinchZoom.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-7ToggleAutoScale.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-16-StackedBarActivityNegative-Stacked2-2menu-click-7ToggleAutoScale.png rename to screenshotsToCompare9/StartTest_smokeTestStart-18-StackedBarActivityNegative-Stacked2-2menu-click-7ToggleAutoScale.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-10ToggleBarBorders.png b/screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-10ToggleBarBorders.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-10ToggleBarBorders.png rename to screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-10ToggleBarBorders.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-1ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-1ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-1ToggleValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-24rotateXAxislabels.png b/screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-24rotateXAxislabels.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-24rotateXAxislabels.png rename to screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-24rotateXAxislabels.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-5ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-5ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-5ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-6TogglePinchZoom.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-6TogglePinchZoom.png rename to screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-6TogglePinchZoom.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-7ToggleAutoScale.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-17-BarChartActivitySinus-Sine-2menu-click-7ToggleAutoScale.png rename to screenshotsToCompare9/StartTest_smokeTestStart-19-BarChartActivitySinus-Sine-2menu-click-7ToggleAutoScale.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-17TogglePercent.png b/screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-17TogglePercent.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-17TogglePercent.png rename to screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-17TogglePercent.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-18ToggleMinimumAngles.png b/screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-18ToggleMinimumAngles.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-18ToggleMinimumAngles.png rename to screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-18ToggleMinimumAngles.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-19ToggleHole.png b/screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-19ToggleHole.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-19ToggleHole.png rename to screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-19ToggleHole.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-20ToggleCurvedSlices.png b/screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-20ToggleCurvedSlices.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-20ToggleCurvedSlices.png rename to screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-20ToggleCurvedSlices.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-23SpinAnimation.png b/screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-23SpinAnimation.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-23SpinAnimation.png rename to screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-23SpinAnimation.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-2ToggleY-Values.png b/screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-2ToggleY-Values.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-2ToggleY-Values.png rename to screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-2ToggleY-Values.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-3ToggleX-Values.png b/screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-3ToggleX-Values.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-3ToggleX-Values.png rename to screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-3ToggleX-Values.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-19-PieChartActivity-Basic-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-21-PieChartActivity-Basic-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-17TogglePercent.png b/screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-17TogglePercent.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-17TogglePercent.png rename to screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-17TogglePercent.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-18ToggleMinimumAngles.png b/screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-18ToggleMinimumAngles.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-18ToggleMinimumAngles.png rename to screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-18ToggleMinimumAngles.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-19ToggleHole.png b/screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-19ToggleHole.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-19ToggleHole.png rename to screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-19ToggleHole.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-20ToggleCurvedSlices.png b/screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-20ToggleCurvedSlices.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-20ToggleCurvedSlices.png rename to screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-20ToggleCurvedSlices.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-23SpinAnimation.png b/screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-23SpinAnimation.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-23SpinAnimation.png rename to screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-23SpinAnimation.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-2ToggleY-Values.png b/screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-2ToggleY-Values.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-2ToggleY-Values.png rename to screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-2ToggleY-Values.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-3ToggleX-Values.png b/screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-3ToggleX-Values.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-3ToggleX-Values.png rename to screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-3ToggleX-Values.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-20-PieChartRoundedActivity-Basic-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-22-PieChartRoundedActivity-Basic-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-17TogglePercent.png b/screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-17TogglePercent.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-17TogglePercent.png rename to screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-17TogglePercent.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-18ToggleMinimumAngles.png b/screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-18ToggleMinimumAngles.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-18ToggleMinimumAngles.png rename to screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-18ToggleMinimumAngles.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-19ToggleHole.png b/screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-19ToggleHole.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-19ToggleHole.png rename to screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-19ToggleHole.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-20ToggleCurvedSlices.png b/screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-20ToggleCurvedSlices.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-20ToggleCurvedSlices.png rename to screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-20ToggleCurvedSlices.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-23SpinAnimation.png b/screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-23SpinAnimation.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-23SpinAnimation.png rename to screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-23SpinAnimation.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-2ToggleY-Values.png b/screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-2ToggleY-Values.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-2ToggleY-Values.png rename to screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-2ToggleY-Values.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-3ToggleX-Values.png b/screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-3ToggleX-Values.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-3ToggleX-Values.png rename to screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-3ToggleX-Values.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-21-PiePolylineChartActivity-ValueLines-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-23-PiePolylineChartActivity-ValueLines-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-22-HalfPieChartActivity-HalfPie-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-24-HalfPieChartActivity-HalfPie-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-22-HalfPieChartActivity-HalfPie-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-24-HalfPieChartActivity-HalfPie-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-11ToggleFilled.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-11ToggleFilled.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-11ToggleFilled.png rename to screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-11ToggleFilled.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-12ToggleCircles.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-12ToggleCircles.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-12ToggleCircles.png rename to screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-12ToggleCircles.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-14ToggleCubic.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-14ToggleCubic.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-14ToggleCubic.png rename to screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-14ToggleCubic.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-15ToggleStepped.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-15ToggleStepped.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-15ToggleStepped.png rename to screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-15ToggleStepped.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-16ToggleHorizontalCubic.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-16ToggleHorizontalCubic.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-16ToggleHorizontalCubic.png rename to screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-16ToggleHorizontalCubic.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-1ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-1ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-1ToggleValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-5ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-5ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-5ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-6TogglePinchZoom.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-6TogglePinchZoom.png rename to screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-6TogglePinchZoom.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-7ToggleAutoScale.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-7ToggleAutoScale.png rename to screenshotsToCompare9/StartTest_smokeTestStart-25-SpecificPositionsLineChartActivity-Specificpositions-2menu-click-7ToggleAutoScale.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-27-CombinedChartActivity-CombinedChart-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-27-CombinedChartActivity-CombinedChart-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-2menu-click-8ToggleLineValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-27-CombinedChartActivity-CombinedChart-2menu-click-8ToggleLineValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-2menu-click-8ToggleLineValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-27-CombinedChartActivity-CombinedChart-2menu-click-8ToggleLineValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-2menu-click-9ToggleBarValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-27-CombinedChartActivity-CombinedChart-2menu-click-9ToggleBarValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-2menu-click-9ToggleBarValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-27-CombinedChartActivity-CombinedChart-2menu-click-9ToggleBarValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-26-ScatterChartActivity-ScatterPlot-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-28-ScatterChartActivity-ScatterPlot-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-26-ScatterChartActivity-ScatterPlot-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-28-ScatterChartActivity-ScatterPlot-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-26-ScatterChartActivity-ScatterPlot-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-28-ScatterChartActivity-ScatterPlot-2menu-click-1ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-26-ScatterChartActivity-ScatterPlot-2menu-click-1ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-28-ScatterChartActivity-ScatterPlot-2menu-click-1ToggleValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-26-ScatterChartActivity-ScatterPlot-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-28-ScatterChartActivity-ScatterPlot-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-26-ScatterChartActivity-ScatterPlot-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-28-ScatterChartActivity-ScatterPlot-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-26-ScatterChartActivity-ScatterPlot-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-28-ScatterChartActivity-ScatterPlot-2menu-click-5ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-26-ScatterChartActivity-ScatterPlot-2menu-click-5ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-28-ScatterChartActivity-ScatterPlot-2menu-click-5ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-26-ScatterChartActivity-ScatterPlot-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-28-ScatterChartActivity-ScatterPlot-2menu-click-6TogglePinchZoom.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-26-ScatterChartActivity-ScatterPlot-2menu-click-6TogglePinchZoom.png rename to screenshotsToCompare9/StartTest_smokeTestStart-28-ScatterChartActivity-ScatterPlot-2menu-click-6TogglePinchZoom.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-26-ScatterChartActivity-ScatterPlot-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-28-ScatterChartActivity-ScatterPlot-2menu-click-7ToggleAutoScale.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-26-ScatterChartActivity-ScatterPlot-2menu-click-7ToggleAutoScale.png rename to screenshotsToCompare9/StartTest_smokeTestStart-28-ScatterChartActivity-ScatterPlot-2menu-click-7ToggleAutoScale.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-27-BubbleChartActivity-BubbleChart-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-29-BubbleChartActivity-BubbleChart-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-27-BubbleChartActivity-BubbleChart-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-29-BubbleChartActivity-BubbleChart-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-27-BubbleChartActivity-BubbleChart-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-29-BubbleChartActivity-BubbleChart-2menu-click-1ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-27-BubbleChartActivity-BubbleChart-2menu-click-1ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-29-BubbleChartActivity-BubbleChart-2menu-click-1ToggleValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-27-BubbleChartActivity-BubbleChart-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-29-BubbleChartActivity-BubbleChart-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-27-BubbleChartActivity-BubbleChart-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-29-BubbleChartActivity-BubbleChart-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-27-BubbleChartActivity-BubbleChart-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-29-BubbleChartActivity-BubbleChart-2menu-click-5ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-27-BubbleChartActivity-BubbleChart-2menu-click-5ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-29-BubbleChartActivity-BubbleChart-2menu-click-5ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-27-BubbleChartActivity-BubbleChart-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-29-BubbleChartActivity-BubbleChart-2menu-click-6TogglePinchZoom.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-27-BubbleChartActivity-BubbleChart-2menu-click-6TogglePinchZoom.png rename to screenshotsToCompare9/StartTest_smokeTestStart-29-BubbleChartActivity-BubbleChart-2menu-click-6TogglePinchZoom.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-27-BubbleChartActivity-BubbleChart-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-29-BubbleChartActivity-BubbleChart-2menu-click-7ToggleAutoScale.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-27-BubbleChartActivity-BubbleChart-2menu-click-7ToggleAutoScale.png rename to screenshotsToCompare9/StartTest_smokeTestStart-29-BubbleChartActivity-BubbleChart-2menu-click-7ToggleAutoScale.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-2menu-click-13ToggleShadowColor.png b/screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-2menu-click-13ToggleShadowColor.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-2menu-click-13ToggleShadowColor.png rename to screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-2menu-click-13ToggleShadowColor.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-2menu-click-1ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-2menu-click-1ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-2menu-click-1ToggleValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-2menu-click-5ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-2menu-click-5ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-2menu-click-5ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-2menu-click-6TogglePinchZoom.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-2menu-click-6TogglePinchZoom.png rename to screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-2menu-click-6TogglePinchZoom.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-2menu-click-7ToggleAutoScale.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-28-CandleStickChartActivity-Candlestick-2menu-click-7ToggleAutoScale.png rename to screenshotsToCompare9/StartTest_smokeTestStart-30-CandleStickChartActivity-Candlestick-2menu-click-7ToggleAutoScale.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-11ToggleFilled.png b/screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-11ToggleFilled.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-11ToggleFilled.png rename to screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-11ToggleFilled.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-1ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-1ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-1ToggleValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-21ToggleHighlightCircle.png b/screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-21ToggleHighlightCircle.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-21ToggleHighlightCircle.png rename to screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-21ToggleHighlightCircle.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-22ToggleRotation.png b/screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-22ToggleRotation.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-22ToggleRotation.png rename to screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-22ToggleRotation.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-23SpinAnimation.png b/screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-23SpinAnimation.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-23SpinAnimation.png rename to screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-23SpinAnimation.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-2ToggleY-Values.png b/screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-2ToggleY-Values.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-2ToggleY-Values.png rename to screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-2ToggleY-Values.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-3ToggleX-Values.png b/screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-3ToggleX-Values.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-3ToggleX-Values.png rename to screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-3ToggleX-Values.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-5ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-29-RadarChartActivity-RadarChart-2menu-click-5ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-31-RadarChartActivity-RadarChart-2menu-click-5ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-31-ListViewMultiChartActivity-Multiple-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-33-ListViewMultiChartActivity-Multiple-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-31-ListViewMultiChartActivity-Multiple-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-33-ListViewMultiChartActivity-Multiple-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-32-ViewPagerSimpleChartDemo-ViewPager-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-34-ViewPagerSimpleChartDemo-ViewPager-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-32-ViewPagerSimpleChartDemo-ViewPager-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-34-ViewPagerSimpleChartDemo-ViewPager-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-33-ScrollViewActivity-TallBarChart-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-35-ScrollViewActivity-TallBarChart-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-33-ScrollViewActivity-TallBarChart-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-35-ScrollViewActivity-TallBarChart-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-34-ListViewBarChartActivity-ManyBarCharts-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-36-ListViewBarChartActivity-ManyBarCharts-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-34-ListViewBarChartActivity-ManyBarCharts-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-36-ListViewBarChartActivity-ManyBarCharts-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-36-DynamicalAddingActivity-Dynamic-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-38-DynamicalAddingActivity-Dynamic-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-36-DynamicalAddingActivity-Dynamic-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-38-DynamicalAddingActivity-Dynamic-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-37-RealtimeLineChartActivity-Realtime-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-39-RealtimeLineChartActivity-Realtime-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-37-RealtimeLineChartActivity-Realtime-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-39-RealtimeLineChartActivity-Realtime-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-11ToggleFilled.png b/screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-11ToggleFilled.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-11ToggleFilled.png rename to screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-11ToggleFilled.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-12ToggleCircles.png b/screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-12ToggleCircles.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-12ToggleCircles.png rename to screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-12ToggleCircles.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-14ToggleCubic.png b/screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-14ToggleCubic.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-14ToggleCubic.png rename to screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-14ToggleCubic.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-15ToggleStepped.png b/screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-15ToggleStepped.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-15ToggleStepped.png rename to screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-15ToggleStepped.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-16ToggleHorizontalCubic.png b/screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-16ToggleHorizontalCubic.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-16ToggleHorizontalCubic.png rename to screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-16ToggleHorizontalCubic.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-1ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-1ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-1ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-1ToggleValues.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-4ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-4ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-4ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-4ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-5ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-5ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-5ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-5ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-6TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-6TogglePinchZoom.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-6TogglePinchZoom.png rename to screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-6TogglePinchZoom.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-7ToggleAutoScale.png b/screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-7ToggleAutoScale.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-38-LineChartTimeActivity-Hourly-2menu-click-7ToggleAutoScale.png rename to screenshotsToCompare9/StartTest_smokeTestStart-40-LineChartTimeActivity-Hourly-2menu-click-7ToggleAutoScale.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-1SampleClick.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-1SampleClick.png rename to screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-1SampleClick.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-ToggleAutoScaleMinMax.png b/screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-ToggleAutoScaleMinMax.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-ToggleAutoScaleMinMax.png rename to screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-ToggleAutoScaleMinMax.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-ToggleBarBorders.png b/screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-ToggleBarBorders.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-ToggleBarBorders.png rename to screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-ToggleBarBorders.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-ToggleHighlight.png b/screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-ToggleHighlight.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-ToggleHighlight.png rename to screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-ToggleHighlight.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-ToggleIcons.png b/screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-ToggleIcons.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-ToggleIcons.png rename to screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-ToggleIcons.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-TogglePinchZoom.png b/screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-TogglePinchZoom.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-TogglePinchZoom.png rename to screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-TogglePinchZoom.png diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-ToggleValues.png b/screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-ToggleValues.png similarity index 100% rename from screenshotsToCompare9/StartTest_smokeTestStart-40-HorizontalBarComposeActivity-Horizontal-ToggleValues.png rename to screenshotsToCompare9/StartTest_smokeTestStart-42-HorizontalBarComposeActivity-Horizontal-ToggleValues.png