diff --git a/sample/src/main/res/layout/chart_1.xml b/sample/src/main/res/layout/chart_1.xml index 7f151efb4..ab9fac787 100644 --- a/sample/src/main/res/layout/chart_1.xml +++ b/sample/src/main/res/layout/chart_1.xml @@ -23,12 +23,6 @@ android:id="@+id/chart_view" android:layout_width="match_parent" android:layout_height="wrap_content" - app:bottomAxisStyle="@style/Chart1BottomAxisStyle" - app:layers="line" - app:lineLayerStyle="@style/Chart1LineLayerStyle" - app:scalableEndLayerPadding="16dp" - app:scalableStartLayerPadding="16dp" - app:showBottomAxis="true" - app:showStartAxis="true" + app:chartStyle="@style/Chart1CartesianChartStyle" app:zoomEnabled="false" /> diff --git a/sample/src/main/res/layout/chart_10.xml b/sample/src/main/res/layout/chart_10.xml index 974dc916d..e976ecd19 100644 --- a/sample/src/main/res/layout/chart_10.xml +++ b/sample/src/main/res/layout/chart_10.xml @@ -23,8 +23,5 @@ android:id="@+id/chart_view" android:layout_width="match_parent" android:layout_height="wrap_content" - app:bottomAxisStyle="@style/Chart10BottomAxisStyle" - app:layers="candlestick" - app:showBottomAxis="true" - app:showStartAxis="true" /> + app:chartStyle="@style/Chart10CartesianChartStyle" /> diff --git a/sample/src/main/res/layout/chart_2.xml b/sample/src/main/res/layout/chart_2.xml index 8f936dd2e..7393d1908 100644 --- a/sample/src/main/res/layout/chart_2.xml +++ b/sample/src/main/res/layout/chart_2.xml @@ -23,9 +23,5 @@ android:id="@+id/chart_view" android:layout_width="match_parent" android:layout_height="wrap_content" - app:bottomAxisStyle="@style/Chart2BottomAxisStyle" - app:columnLayerStyle="@style/Chart2ColumnLayerStyle" - app:layers="column" - app:showBottomAxis="true" - app:showStartAxis="true" /> + app:chartStyle="@style/Chart2CartesianChartStyle" /> diff --git a/sample/src/main/res/layout/chart_3.xml b/sample/src/main/res/layout/chart_3.xml index 35750bfaf..b3169ddcb 100644 --- a/sample/src/main/res/layout/chart_3.xml +++ b/sample/src/main/res/layout/chart_3.xml @@ -23,13 +23,6 @@ android:id="@+id/chart_view" android:layout_width="match_parent" android:layout_height="wrap_content" - app:bottomAxisStyle="@style/Chart3BottomAxisStyle" - app:fadingEdgeVisibilityInterpolator="androidx.interpolator.view.animation.FastOutSlowInInterpolator" - app:fadingEdgeWidth="32dp" - app:layers="line" - app:lineLayerStyle="@style/Chart3LineLayerStyle" - app:showBottomAxis="true" - app:showStartAxis="true" - app:startAxisStyle="@style/Chart3StartAxisStyle" + app:chartStyle="@style/Chart3CartesianChartStyle" app:zoomEnabled="false" /> diff --git a/sample/src/main/res/layout/chart_4.xml b/sample/src/main/res/layout/chart_4.xml index 287fbd47c..51b9654ee 100644 --- a/sample/src/main/res/layout/chart_4.xml +++ b/sample/src/main/res/layout/chart_4.xml @@ -23,13 +23,6 @@ android:id="@+id/chart_view" android:layout_width="match_parent" android:layout_height="wrap_content" - app:bottomAxisStyle="@style/Chart4BottomAxisStyle" - app:columnLayerStyle="@style/Chart4ColumnLayerStyle" - app:layers="line|column" - app:lineLayerStyle="@style/Chart4LineLayerStyle" - app:scalableEndLayerPadding="16dp" - app:scalableStartLayerPadding="16dp" - app:showEndAxis="true" - app:showTopAxis="true" + app:chartStyle="@style/Chart4CartesianChartStyle" app:zoomEnabled="false" /> diff --git a/sample/src/main/res/layout/chart_5.xml b/sample/src/main/res/layout/chart_5.xml index 09f9923e1..92a87bccd 100644 --- a/sample/src/main/res/layout/chart_5.xml +++ b/sample/src/main/res/layout/chart_5.xml @@ -23,13 +23,6 @@ android:id="@+id/chart_view" android:layout_width="match_parent" android:layout_height="wrap_content" - app:bottomAxisStyle="@style/Chart5BottomAxisStyle" - app:columnLayerStyle="@style/Chart5ColumnLayerStyle" - app:layers="column" - app:scalableEndLayerPadding="16dp" - app:scalableStartLayerPadding="16dp" - app:showBottomAxis="true" - app:showStartAxis="true" - app:startAxisStyle="@style/Chart5AxisStyle" + app:chartStyle="@style/Chart5CartesianChartStyle" app:zoomEnabled="false" /> diff --git a/sample/src/main/res/layout/chart_6.xml b/sample/src/main/res/layout/chart_6.xml index a8f96df6a..1d35a014b 100644 --- a/sample/src/main/res/layout/chart_6.xml +++ b/sample/src/main/res/layout/chart_6.xml @@ -23,13 +23,6 @@ android:id="@+id/chart_view" android:layout_width="match_parent" android:layout_height="wrap_content" - app:bottomAxisStyle="@style/Chart6BottomAxisStyle" - app:columnLayerStyle="@style/Chart6ColumnLayerStyle" - app:layers="column" - app:previewColumnSeriesCount="3" - app:scalableEndLayerPadding="16dp" - app:scalableStartLayerPadding="16dp" - app:showBottomAxis="true" - app:showStartAxis="true" + app:chartStyle="@style/Chart6CartesianChartStyle" app:zoomEnabled="false" /> diff --git a/sample/src/main/res/layout/chart_7.xml b/sample/src/main/res/layout/chart_7.xml index ab063901a..311e49571 100644 --- a/sample/src/main/res/layout/chart_7.xml +++ b/sample/src/main/res/layout/chart_7.xml @@ -23,12 +23,6 @@ android:id="@+id/chart_view" android:layout_width="match_parent" android:layout_height="wrap_content" - app:bottomAxisStyle="@style/Chart7BottomAxisStyle" - app:layers="line" - app:lineLayerStyle="@style/Chart7LineLayerStyle" - app:scalableEndLayerPadding="16dp" - app:scalableStartLayerPadding="16dp" - app:showBottomAxis="true" - app:showStartAxis="true" + app:chartStyle="@style/Chart7CartesianChartStyle" app:zoomEnabled="false" /> diff --git a/sample/src/main/res/layout/chart_8.xml b/sample/src/main/res/layout/chart_8.xml index 78e162ee8..e506cef28 100644 --- a/sample/src/main/res/layout/chart_8.xml +++ b/sample/src/main/res/layout/chart_8.xml @@ -23,16 +23,6 @@ android:id="@+id/chart_view" android:layout_width="match_parent" android:layout_height="wrap_content" - app:bottomAxisStyle="@style/Chart8BottomAxisStyle" - app:columnLayerStyle="@style/Chart8ColumnLayerStyle" - app:endAxisStyle="@style/Chart8VerticalAxisStyle" - app:layers="line|column" - app:lineLayerStyle="@style/Chart8LineLayerStyle" - app:scalableEndLayerPadding="16dp" - app:scalableStartLayerPadding="16dp" - app:showBottomAxis="true" - app:showEndAxis="true" - app:showStartAxis="true" - app:startAxisStyle="@style/Chart8VerticalAxisStyle" + app:chartStyle="@style/Chart8CartesianChartStyle" app:zoomEnabled="false" /> diff --git a/sample/src/main/res/layout/chart_9.xml b/sample/src/main/res/layout/chart_9.xml index b030e7a3a..eb4d887e6 100644 --- a/sample/src/main/res/layout/chart_9.xml +++ b/sample/src/main/res/layout/chart_9.xml @@ -24,13 +24,5 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/Chart9ThemeOverlay" - app:bottomAxisStyle="@style/Chart9BottomAxisStyle" - app:layers="line" - app:lineLayerStyle="@style/Chart9LineLayerStyle" - app:previewMaxX="8" - app:previewMaxY="10" - app:previewMinY="-7" - app:showBottomAxis="true" - app:showStartAxis="true" - app:startAxisStyle="@style/Chart9StartAxisStyle" /> + app:chartStyle="@style/Chart9CartesianChartStyle" /> diff --git a/sample/src/main/res/values/chart_10_styles.xml b/sample/src/main/res/values/chart_10_styles.xml index c180198cf..59e2a6913 100644 --- a/sample/src/main/res/values/chart_10_styles.xml +++ b/sample/src/main/res/values/chart_10_styles.xml @@ -20,4 +20,11 @@ 3 false + + diff --git a/sample/src/main/res/values/chart_1_styles.xml b/sample/src/main/res/values/chart_1_styles.xml index 1c7c0d34e..dfb28bf41 100644 --- a/sample/src/main/res/values/chart_1_styles.xml +++ b/sample/src/main/res/values/chart_1_styles.xml @@ -17,6 +17,16 @@ #a485e0 + + + + diff --git a/sample/src/main/res/values/chart_4_styles.xml b/sample/src/main/res/values/chart_4_styles.xml index dbdeca150..277a42aa6 100644 --- a/sample/src/main/res/values/chart_4_styles.xml +++ b/sample/src/main/res/values/chart_4_styles.xml @@ -20,6 +20,17 @@ #f094bb #fdc8c4 + + diff --git a/sample/src/main/res/values/chart_5_styles.xml b/sample/src/main/res/values/chart_5_styles.xml index 71eac0568..73d5ca1b3 100644 --- a/sample/src/main/res/values/chart_5_styles.xml +++ b/sample/src/main/res/values/chart_5_styles.xml @@ -19,6 +19,17 @@ #3490de #73e8dc + + + diff --git a/sample/src/main/res/values/chart_7_styles.xml b/sample/src/main/res/values/chart_7_styles.xml index 6b9046964..c3a8350c4 100644 --- a/sample/src/main/res/values/chart_7_styles.xml +++ b/sample/src/main/res/values/chart_7_styles.xml @@ -19,6 +19,16 @@ #91b1fd #8fdaff + + diff --git a/sample/src/main/res/values/chart_8_styles.xml b/sample/src/main/res/values/chart_8_styles.xml index 11ed58afa..fb9e95a3b 100644 --- a/sample/src/main/res/values/chart_8_styles.xml +++ b/sample/src/main/res/values/chart_8_styles.xml @@ -20,6 +20,20 @@ #f09b7d #ffc3a1 + + diff --git a/sample/src/main/res/values/chart_9_styles.xml b/sample/src/main/res/values/chart_9_styles.xml index b5e885c55..8637f8422 100644 --- a/sample/src/main/res/values/chart_9_styles.xml +++ b/sample/src/main/res/values/chart_9_styles.xml @@ -18,6 +18,18 @@ #FF3716FF #FFFF166A + +