-
-
Notifications
You must be signed in to change notification settings - Fork 134
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #143 from patrykandpatryk/development
Prepare to release Vico 1.5.1
- Loading branch information
Showing
28 changed files
with
510 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| This release includes the following changes. | ||
|
|
||
| ## Improvements | ||
|
|
||
| - Column charts now support data sets in which positive and negative values are mixed together. | ||
|
|
||
| ## Resolved issues | ||
|
|
||
| - Charts consumed more gestures than necessary in some instances. | ||
| - For scrollable charts, the chart scale wasn’t considered when the maximum scroll distance was being calculated, which caused scrolling-related bugs. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
...in/java/com/patrykandpatryk/vico/sample/preview/ColumnChartsWithNegativeValuesPreviews.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /* | ||
| * Copyright 2022 Patryk Goworowski and Patryk Michalik | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.patrykandpatryk.vico.sample.preview | ||
|
|
||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.material.Surface | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.patrykandpatryk.vico.compose.axis.horizontal.bottomAxis | ||
| import com.patrykandpatryk.vico.compose.axis.vertical.startAxis | ||
| import com.patrykandpatryk.vico.compose.chart.Chart | ||
| import com.patrykandpatryk.vico.compose.chart.column.columnChart | ||
| import com.patrykandpatryk.vico.core.chart.values.AxisValuesOverrider | ||
| import com.patrykandpatryk.vico.core.component.text.textComponent | ||
| import com.patrykandpatryk.vico.core.entry.entryModelOf | ||
| import com.patrykandpatryk.vico.sample.util.marker | ||
|
|
||
| private val model = entryModelOf(2f, -1f, 4f, -2f, 1f, 5f, -3f) | ||
|
|
||
| @Preview | ||
| @Composable | ||
| public fun SingleColumnChartWithNegativeValues() { | ||
| Surface { | ||
| Chart( | ||
| modifier = Modifier.height(250.dp), | ||
| chart = columnChart( | ||
| persistentMarkers = mapOf( | ||
| 2f to marker(), | ||
| 3f to marker(), | ||
| ), | ||
| ), | ||
| model = model, | ||
| startAxis = startAxis(maxLabelCount = 8), | ||
| bottomAxis = bottomAxis(), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| public fun SingleColumnChartWithNegativeValuesAndDataLabels() { | ||
| Surface { | ||
| Chart( | ||
| chart = columnChart( | ||
| dataLabel = textComponent(), | ||
| ), | ||
| model = model, | ||
| startAxis = startAxis(), | ||
| bottomAxis = bottomAxis(), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| public fun SingleColumnChartWithNegativeValuesAndAxisValuesOverridden() { | ||
| Surface { | ||
| Chart( | ||
| chart = columnChart( | ||
| axisValuesOverrider = AxisValuesOverrider.fixed( | ||
| minY = 1f, | ||
| maxY = 4f, | ||
| ), | ||
| ), | ||
| model = model, | ||
| startAxis = startAxis(maxLabelCount = 3), | ||
| bottomAxis = bottomAxis(), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| public fun SingleColumnChartWithNegativeValuesAndAxisValuesOverridden2() { | ||
| Surface { | ||
| Chart( | ||
| chart = columnChart( | ||
| axisValuesOverrider = AxisValuesOverrider.fixed( | ||
| minY = -2f, | ||
| maxY = 0f, | ||
| ), | ||
| ), | ||
| model = model, | ||
| startAxis = startAxis(maxLabelCount = 2), | ||
| bottomAxis = bottomAxis(), | ||
| ) | ||
| } | ||
| } |
126 changes: 126 additions & 0 deletions
126
.../com/patrykandpatryk/vico/sample/preview/StackedColumnChartsWithNegativeValuesPreviews.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| /* | ||
| * Copyright 2022 Patryk Goworowski and Patryk Michalik | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.patrykandpatryk.vico.sample.preview | ||
|
|
||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.material.Surface | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.patrykandpatryk.vico.compose.axis.horizontal.bottomAxis | ||
| import com.patrykandpatryk.vico.compose.axis.vertical.startAxis | ||
| import com.patrykandpatryk.vico.compose.chart.Chart | ||
| import com.patrykandpatryk.vico.compose.chart.column.columnChart | ||
| import com.patrykandpatryk.vico.compose.component.shape.lineComponent | ||
| import com.patrykandpatryk.vico.core.chart.column.ColumnChart.MergeMode.Stack | ||
| import com.patrykandpatryk.vico.core.chart.values.AxisValuesOverrider | ||
| import com.patrykandpatryk.vico.core.component.text.textComponent | ||
| import com.patrykandpatryk.vico.core.entry.entriesOf | ||
| import com.patrykandpatryk.vico.core.entry.entryModelOf | ||
| import com.patrykandpatryk.vico.sample.util.marker | ||
|
|
||
| private val model = entryModelOf( | ||
| entriesOf(2f, -1f, -4f, 2f, 1f, -5f, -2f, -3f), | ||
| entriesOf(3f, -2f, 2f, -1f, 2f, -3f, -4f, -1f), | ||
| entriesOf(1f, -2f, 2f, 1f, -1f, 4f, 4f, -2f), | ||
| ) | ||
|
|
||
| private val columns = listOf( | ||
| lineComponent(color = Color(0xFF494949), thickness = 8.dp), | ||
| lineComponent(color = Color(0xFF7C7A7A), thickness = 8.dp), | ||
| lineComponent(color = Color(0xFFFF5D73), thickness = 8.dp), | ||
| ) | ||
|
|
||
| @Preview | ||
| @Composable | ||
| public fun StackedColumnChartWithNegativeValues() { | ||
| Surface { | ||
| Chart( | ||
| modifier = Modifier.height(250.dp), | ||
| chart = columnChart( | ||
| columns = columns, | ||
| persistentMarkers = mapOf( | ||
| 2f to marker(), | ||
| 3f to marker(), | ||
| ), | ||
| mergeMode = Stack, | ||
| ), | ||
| model = model, | ||
| startAxis = startAxis(maxLabelCount = 7), | ||
| bottomAxis = bottomAxis(), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| public fun StackedColumnChartWithNegativeValuesAndDataLabels() { | ||
| Surface { | ||
| Chart( | ||
| chart = columnChart( | ||
| columns = columns, | ||
| dataLabel = textComponent(), | ||
| mergeMode = Stack, | ||
| ), | ||
| model = model, | ||
| startAxis = startAxis(maxLabelCount = 7), | ||
| bottomAxis = bottomAxis(), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| public fun StackedColumnChartWithNegativeValuesAndAxisValuesOverridden() { | ||
| Surface { | ||
| Chart( | ||
| chart = columnChart( | ||
| columns = columns, | ||
| axisValuesOverrider = AxisValuesOverrider.fixed( | ||
| minY = 1f, | ||
| maxY = 4f, | ||
| ), | ||
| mergeMode = Stack, | ||
| ), | ||
| model = model, | ||
| startAxis = startAxis(maxLabelCount = 3), | ||
| bottomAxis = bottomAxis(), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| public fun StackedColumnChartWithNegativeValuesAndAxisValuesOverridden2() { | ||
| Surface { | ||
| Chart( | ||
| chart = columnChart( | ||
| columns = columns, | ||
| axisValuesOverrider = AxisValuesOverrider.fixed( | ||
| minY = -2f, | ||
| maxY = 0f, | ||
| ), | ||
| mergeMode = Stack, | ||
| ), | ||
| model = model, | ||
| startAxis = startAxis(maxLabelCount = 2), | ||
| bottomAxis = bottomAxis(), | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.