From 3dd536c8d24c45e52e19f7213e906cc27163966f Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Fri, 26 Dec 2025 23:25:01 +0100 Subject: [PATCH 1/2] Change source dir --- MPChartLib/proguard-lib.pro | 7 -- .../dataprovider/BubbleDataProvider.kt | 8 --- .../dataprovider/CandleDataProvider.kt | 8 --- .../dataprovider/LineDataProvider.kt | 8 --- .../dataprovider/ScatterDataProvider.kt | 8 --- app/build.gradle.kts | 2 +- .../appdev/chartexample/AnotherBarActivity.kt | 12 ++-- .../appdev/chartexample/BarChartActivity.kt | 30 ++++----- .../BarChartActivityMultiDataset.kt | 20 +++--- .../chartexample/BarChartActivitySinus.kt | 12 ++-- .../chartexample/BarChartPositiveNegative.kt | 18 +++--- .../chartexample/BubbleChartActivity.kt | 22 +++---- .../chartexample/CandleStickChartActivity.kt | 10 +-- .../chartexample/CombinedChartActivity.kt | 44 ++++++------- .../chartexample/CubicLineChartActivity.kt | 14 ++-- .../info/appdev/chartexample/DataTools.kt | 16 ++--- .../appdev/chartexample/DrawChartActivity.kt | 14 ++-- .../chartexample/DynamicalAddingActivity.kt | 14 ++-- .../appdev/chartexample/FilledLineActivity.kt | 14 ++-- .../chartexample/HalfPieChartActivity.kt | 14 ++-- .../HorizontalBarChartActivity.kt | 20 +++--- .../HorizontalBarNegativeChartActivity.kt | 20 +++--- .../chartexample/InvertedLineChartActivity.kt | 14 ++-- .../appdev/chartexample/LineChartActivity.kt | 20 +++--- .../chartexample/LineChartActivityColored.kt | 8 +-- .../chartexample/LineChartDualAxisActivity.kt | 20 +++--- .../chartexample/LineChartTimeActivity.kt | 18 +++--- .../chartexample/ListViewBarChartActivity.kt | 14 ++-- .../ListViewMultiChartActivity.kt | 22 +++---- .../chartexample/MultiLineChartActivity.kt | 20 +++--- .../chartexample/PerformanceLineChart.kt | 6 +- .../appdev/chartexample/PieChartActivity.kt | 22 +++---- .../chartexample/PieChartRoundedActivity.kt | 24 +++---- .../chartexample/PiePolylineChartActivity.kt | 20 +++--- .../appdev/chartexample/RadarChartActivity.kt | 18 +++--- .../chartexample/RealtimeLineChartActivity.kt | 16 ++--- .../chartexample/ScatterChartActivity.kt | 18 +++--- .../appdev/chartexample/ScrollViewActivity.kt | 10 +-- .../SpecificPositionsLineChartActivity.kt | 26 ++++---- .../appdev/chartexample/StackedBarActivity.kt | 20 +++--- .../StackedBarActivityNegative.kt | 26 ++++---- .../compose/HorizontalBarComposeActivity.kt | 22 +++---- .../custom/CustomScatterShapeRenderer.kt | 8 +-- .../chartexample/custom/MyMarkerView.kt | 12 ++-- .../chartexample/custom/RadarMarkerView.kt | 8 +-- .../custom/StackedBarsMarkerView.kt | 12 ++-- .../chartexample/custom/XYMarkerView.kt | 10 +-- .../formatter/DayAxisValueFormatter.kt | 6 +- .../formatter/MyAxisValueFormatter.kt | 4 +- .../chartexample/formatter/MyFillFormatter.kt | 6 +- .../formatter/MyValueFormatter.kt | 6 +- .../formatter/YearXAxisFormatter.kt | 4 +- .../chartexample/fragments/BarChartFrag.kt | 6 +- .../fragments/ComplexityFragment.kt | 2 +- .../chartexample/fragments/PieChartFrag.kt | 4 +- .../fragments/ScatterChartFrag.kt | 4 +- .../chartexample/fragments/SimpleFragment.kt | 34 +++++----- .../fragments/SineCosineFragment.kt | 2 +- .../listviewitems/BarChartItem.kt | 8 +-- .../chartexample/listviewitems/ChartItem.kt | 2 +- .../listviewitems/LineChartItem.kt | 8 +-- .../listviewitems/PieChartItem.kt | 12 ++-- .../chartexample/notimportant/DemoBase.kt | 2 +- .../notimportant/DemoBaseCompose.kt | 2 +- .../chartexample/notimportant/MainActivity.kt | 4 +- .../res/layout/activity_age_distribution.xml | 2 +- app/src/main/res/layout/activity_barchart.xml | 2 +- .../layout/activity_barchart_noseekbar.xml | 2 +- .../res/layout/activity_barchart_sinus.xml | 2 +- .../main/res/layout/activity_bubblechart.xml | 2 +- .../main/res/layout/activity_candlechart.xml | 2 +- .../res/layout/activity_colored_lines.xml | 8 +-- app/src/main/res/layout/activity_combined.xml | 2 +- .../main/res/layout/activity_draw_chart.xml | 2 +- .../layout/activity_horizontalbarchart.xml | 2 +- .../main/res/layout/activity_linechart.xml | 2 +- .../layout/activity_linechart_noseekbar.xml | 2 +- .../res/layout/activity_linechart_time.xml | 2 +- .../layout/activity_performance_linechart.xml | 2 +- app/src/main/res/layout/activity_piechart.xml | 2 +- .../res/layout/activity_piechart_half.xml | 2 +- .../main/res/layout/activity_radarchart.xml | 2 +- .../layout/activity_realtime_linechart.xml | 2 +- .../main/res/layout/activity_scatterchart.xml | 2 +- .../main/res/layout/activity_scrollview.xml | 2 +- app/src/main/res/layout/frag_simple_line.xml | 2 +- app/src/main/res/layout/frag_simple_pie.xml | 2 +- .../main/res/layout/frag_simple_scatter.xml | 2 +- .../main/res/layout/list_item_barchart.xml | 2 +- .../main/res/layout/list_item_linechart.xml | 2 +- .../main/res/layout/list_item_piechart.xml | 2 +- {MPChartLib => chartLib}/build.gradle.kts | 2 +- {MPChartLib => chartLib}/ic_launcher-web.png | Bin chartLib/proguard-lib.pro | 7 ++ .../src/main/AndroidManifest.xml | 0 .../charting/animation/ChartAnimator.kt | 4 +- .../info/appdev}/charting/animation/Easing.kt | 2 +- .../appdev}/charting/buffer/AbstractBuffer.kt | 2 +- .../info/appdev}/charting/buffer/BarBuffer.kt | 4 +- .../charting/buffer/HorizontalBarBuffer.kt | 4 +- .../info/appdev}/charting/charts/BarChart.kt | 16 ++--- .../charting/charts/BarLineChartBase.kt | 56 ++++++++-------- .../appdev}/charting/charts/BubbleChart.kt | 8 +-- .../charting/charts/CandleStickChart.kt | 8 +-- .../info/appdev}/charting/charts/Chart.kt | 60 +++++++++--------- .../appdev}/charting/charts/CombinedChart.kt | 26 ++++---- .../charting/charts/HorizontalBarChart.kt | 36 +++++------ .../info/appdev}/charting/charts/LineChart.kt | 8 +-- .../info/appdev}/charting/charts/PieChart.kt | 22 +++---- .../charting/charts/PieRadarChartBase.kt | 28 ++++---- .../appdev}/charting/charts/RadarChart.kt | 20 +++--- .../appdev}/charting/charts/ScatterChart.kt | 8 +-- .../appdev}/charting/components/AxisBase.kt | 8 +-- .../charting/components/ComponentBase.kt | 4 +- .../charting/components/Description.kt | 6 +- .../appdev}/charting/components/IMarker.kt | 8 +-- .../appdev}/charting/components/Legend.kt | 14 ++-- .../charting/components/LegendEntry.kt | 6 +- .../appdev}/charting/components/LimitLine.kt | 4 +- .../appdev}/charting/components/LimitRange.kt | 6 +- .../charting/components/MarkerImage.kt | 12 ++-- .../appdev}/charting/components/MarkerView.kt | 10 +-- .../info/appdev}/charting/components/XAxis.kt | 4 +- .../info/appdev}/charting/components/YAxis.kt | 8 +-- .../info/appdev}/charting/data/BarData.kt | 4 +- .../info/appdev}/charting/data/BarDataSet.kt | 6 +- .../info/appdev}/charting/data/BarEntry.kt | 4 +- .../data/BarLineScatterCandleBubbleData.kt | 6 +- .../data/BarLineScatterCandleBubbleDataSet.kt | 4 +- .../info/appdev}/charting/data/BaseDataSet.kt | 18 +++--- .../info/appdev}/charting/data/BaseEntry.kt | 2 +- .../info/appdev}/charting/data/BubbleData.kt | 4 +- .../appdev}/charting/data/BubbleDataSet.kt | 6 +- .../info/appdev}/charting/data/BubbleEntry.kt | 2 +- .../info/appdev}/charting/data/CandleData.kt | 4 +- .../appdev}/charting/data/CandleDataSet.kt | 8 +-- .../info/appdev}/charting/data/CandleEntry.kt | 2 +- .../info/appdev}/charting/data/ChartData.kt | 10 +-- .../appdev}/charting/data/CombinedData.kt | 8 +-- .../info/appdev}/charting/data/DataSet.kt | 2 +- .../info/appdev}/charting/data/Entry.kt | 4 +- .../info/appdev}/charting/data/LineData.kt | 4 +- .../info/appdev}/charting/data/LineDataSet.kt | 12 ++-- .../appdev}/charting/data/LineRadarDataSet.kt | 6 +- .../data/LineScatterCandleRadarDataSet.kt | 6 +- .../info/appdev}/charting/data/PieData.kt | 6 +- .../info/appdev}/charting/data/PieDataSet.kt | 6 +- .../info/appdev}/charting/data/PieEntry.kt | 2 +- .../info/appdev}/charting/data/RadarData.kt | 6 +- .../appdev}/charting/data/RadarDataSet.kt | 6 +- .../info/appdev}/charting/data/RadarEntry.kt | 2 +- .../info/appdev}/charting/data/ScatterData.kt | 4 +- .../appdev}/charting/data/ScatterDataSet.kt | 24 +++---- .../charting/data/filter/Approximator.kt | 2 +- .../charting/data/filter/ApproximatorN.kt | 2 +- .../charting/formatter/ColorFormatter.kt | 6 +- .../formatter/DefaultAxisValueFormatter.kt | 4 +- .../formatter/DefaultFillFormatter.kt | 6 +- .../formatter/DefaultValueFormatter.kt | 6 +- .../charting/formatter/IAxisValueFormatter.kt | 4 +- .../charting/formatter/IFillFormatter.kt | 6 +- .../charting/formatter/IValueFormatter.kt | 6 +- .../formatter/IndexAxisValueFormatter.kt | 4 +- .../charting/formatter/LargeValueFormatter.kt | 8 +-- .../charting/formatter/PercentFormatter.kt | 8 +-- .../formatter/StackedValueFormatter.kt | 8 +-- .../charting/highlight/BarHighlighter.kt | 8 +-- .../charting/highlight/ChartHighlighter.kt | 18 +++--- .../charting/highlight/CombinedHighlighter.kt | 12 ++-- .../appdev}/charting/highlight/Highlight.kt | 4 +- .../highlight/HorizontalBarHighlighter.kt | 12 ++-- .../charting/highlight/IHighlighter.kt | 2 +- .../charting/highlight/PieHighlighter.kt | 6 +- .../charting/highlight/PieRadarHighlighter.kt | 4 +- .../charting/highlight/RadarHighlighter.kt | 10 +-- .../info/appdev}/charting/highlight/Range.kt | 2 +- .../dataprovider/BarDataProvider.kt | 6 +- .../dataprovider/BubbleDataProvider.kt | 8 +++ .../dataprovider/CandleDataProvider.kt | 8 +++ .../dataprovider/CombinedDataProvider.kt | 4 +- .../dataprovider/LineDataProvider.kt | 8 +++ .../dataprovider/ScatterDataProvider.kt | 8 +++ .../BarLineScatterCandleBubbleDataProvider.kt | 6 +- .../dataprovider/base/IBaseProvider.kt | 8 +-- .../interfaces/datasets/IBarDataSet.kt | 6 +- .../IBarLineScatterCandleBubbleDataSet.kt | 4 +- .../interfaces/datasets/IBubbleDataSet.kt | 4 +- .../interfaces/datasets/ICandleDataSet.kt | 4 +- .../charting/interfaces/datasets/IDataSet.kt | 14 ++-- .../interfaces/datasets/ILineDataSet.kt | 8 +-- .../interfaces/datasets/ILineRadarDataSet.kt | 4 +- .../ILineScatterCandleRadarDataSet.kt | 4 +- .../interfaces/datasets/IPieDataSet.kt | 6 +- .../interfaces/datasets/IRadarDataSet.kt | 4 +- .../interfaces/datasets/IScatterDataSet.kt | 6 +- .../charting/jobs/AnimatedMoveViewJob.kt | 8 +-- .../charting/jobs/AnimatedViewPortJob.kt | 6 +- .../appdev}/charting/jobs/AnimatedZoomJob.kt | 12 ++-- .../info/appdev}/charting/jobs/MoveViewJob.kt | 8 +-- .../info/appdev}/charting/jobs/ViewPortJob.kt | 8 +-- .../info/appdev}/charting/jobs/ZoomJob.kt | 12 ++-- .../listener/BarLineChartTouchListener.kt | 20 +++--- .../charting/listener/ChartTouchListener.kt | 6 +- .../listener/OnChartGestureListener.kt | 4 +- .../listener/OnChartValueSelectedListener.kt | 6 +- .../listener/OnDrawLineChartTouchListener.kt | 2 +- .../charting/listener/OnDrawListener.kt | 6 +- .../listener/PieRadarChartTouchListener.kt | 8 +-- .../appdev}/charting/renderer/AxisRenderer.kt | 12 ++-- .../charting/renderer/BarChartRenderer.kt | 26 ++++---- .../BarLineScatterCandleBubbleRenderer.kt | 16 ++--- .../charting/renderer/BubbleChartRenderer.kt | 20 +++--- .../renderer/CandleStickChartRenderer.kt | 20 +++--- .../renderer/CombinedChartRenderer.kt | 18 +++--- .../appdev}/charting/renderer/DataRenderer.kt | 18 +++--- .../renderer/HorizontalBarChartRenderer.kt | 28 ++++---- .../charting/renderer/LegendRenderer.kt | 34 +++++----- .../charting/renderer/LineChartRenderer.kt | 30 ++++----- .../charting/renderer/LineRadarRenderer.kt | 8 +-- .../LineScatterCandleRadarRenderer.kt | 8 +-- .../charting/renderer/PieChartRenderer.kt | 24 +++---- .../charting/renderer/RadarChartRenderer.kt | 20 +++--- .../appdev}/charting/renderer/Renderer.kt | 4 +- .../renderer/RoundedBarChartRenderer.kt | 14 ++-- .../RoundedHorizontalBarChartRenderer.kt | 12 ++-- .../charting/renderer/ScatterChartRenderer.kt | 18 +++--- .../charting/renderer/XAxisRenderer.kt | 28 ++++---- .../XAxisRendererHorizontalBarChart.kt | 24 +++---- .../renderer/XAxisRendererRadarChart.kt | 12 ++-- .../charting/renderer/YAxisRenderer.kt | 18 +++--- .../YAxisRendererHorizontalBarChart.kt | 20 +++--- .../renderer/YAxisRendererRadarChart.kt | 14 ++-- .../scatter/ChevronDownShapeRenderer.kt | 8 +-- .../scatter/ChevronUpShapeRenderer.kt | 8 +-- .../renderer/scatter/CircleShapeRenderer.kt | 10 +-- .../renderer/scatter/CrossShapeRenderer.kt | 8 +-- .../renderer/scatter/IShapeRenderer.kt | 6 +- .../renderer/scatter/SquareShapeRenderer.kt | 10 +-- .../renderer/scatter/TriangleShapeRenderer.kt | 10 +-- .../renderer/scatter/XShapeRenderer.kt | 8 +-- .../charting/utils/AssetManagerUtils.kt | 6 +- .../appdev}/charting/utils/CanvasUtils.kt | 4 +- .../appdev}/charting/utils/ColorTemplate.kt | 2 +- .../charting/utils/EntryXComparator.kt | 4 +- .../info/appdev}/charting/utils/FSize.kt | 4 +- .../info/appdev}/charting/utils/Fill.kt | 2 +- .../utils/HorizontalViewPortHandler.kt | 2 +- .../info/appdev}/charting/utils/MPPointD.kt | 4 +- .../info/appdev}/charting/utils/MPPointF.kt | 4 +- .../info/appdev}/charting/utils/ObjectPool.kt | 4 +- .../info/appdev}/charting/utils/SaveUtils.kt | 2 +- .../appdev}/charting/utils/Transformer.kt | 14 ++-- .../utils/TransformerHorizontalBarChart.kt | 2 +- .../info/appdev}/charting/utils/Utils.kt | 8 +-- .../info/appdev}/charting/utils/UtilsKt.kt | 2 +- .../appdev}/charting/utils/ViewPortHandler.kt | 2 +- .../charting/test/ApproximationTest.kt | 4 +- .../charting/test/AxisRendererTest.kt | 10 +-- .../mikephil/charting/test/BarDataTest.kt | 8 +-- .../mikephil/charting/test/ChartDataTest.kt | 16 ++--- .../mikephil/charting/test/DataSetTest.kt | 8 +-- .../charting/test/LargeValueFormatterTest.kt | 4 +- .../mikephil/charting/test/ObjectPoolTest.kt | 6 +- settings.gradle.kts | 2 +- 264 files changed, 1262 insertions(+), 1262 deletions(-) delete mode 100644 MPChartLib/proguard-lib.pro delete mode 100644 MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BubbleDataProvider.kt delete mode 100644 MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/CandleDataProvider.kt delete mode 100644 MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/LineDataProvider.kt delete mode 100644 MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ScatterDataProvider.kt rename {MPChartLib => chartLib}/build.gradle.kts (98%) rename {MPChartLib => chartLib}/ic_launcher-web.png (100%) create mode 100644 chartLib/proguard-lib.pro rename {MPChartLib => chartLib}/src/main/AndroidManifest.xml (100%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/animation/ChartAnimator.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/animation/Easing.kt (99%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/buffer/AbstractBuffer.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/buffer/BarBuffer.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/buffer/HorizontalBarBuffer.kt (95%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/charts/BarChart.kt (95%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/charts/BarLineChartBase.kt (95%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/charts/BubbleChart.kt (79%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/charts/CandleStickChart.kt (76%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/charts/Chart.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/charts/CombinedChart.kt (90%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/charts/HorizontalBarChart.kt (89%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/charts/LineChart.kt (90%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/charts/PieChart.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/charts/PieRadarChartBase.kt (94%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/charts/RadarChart.kt (93%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/charts/ScatterChart.kt (88%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/components/AxisBase.kt (98%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/components/ComponentBase.kt (94%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/components/Description.kt (88%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/components/IMarker.kt (89%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/components/Legend.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/components/LegendEntry.kt (92%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/components/LimitLine.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/components/LimitRange.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/components/MarkerImage.kt (92%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/components/MarkerView.kt (92%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/components/XAxis.kt (93%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/components/YAxis.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/BarData.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/BarDataSet.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/BarEntry.kt (98%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/BarLineScatterCandleBubbleData.kt (71%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/BarLineScatterCandleBubbleDataSet.kt (85%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/BaseDataSet.kt (95%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/BaseEntry.kt (93%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/BubbleData.kt (84%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/BubbleDataSet.kt (88%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/BubbleEntry.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/CandleData.kt (68%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/CandleDataSet.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/CandleEntry.kt (98%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/ChartData.kt (98%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/CombinedData.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/DataSet.kt (99%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/Entry.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/LineData.kt (73%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/LineDataSet.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/LineRadarDataSet.kt (92%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/LineScatterCandleRadarDataSet.kt (94%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/PieData.kt (93%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/PieDataSet.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/PieEntry.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/RadarData.kt (84%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/RadarDataSet.kt (94%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/RadarEntry.kt (93%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/ScatterData.kt (85%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/ScatterDataSet.kt (80%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/filter/Approximator.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/data/filter/ApproximatorN.kt (98%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/formatter/ColorFormatter.kt (75%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/formatter/DefaultAxisValueFormatter.kt (90%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/formatter/DefaultFillFormatter.kt (82%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/formatter/DefaultValueFormatter.kt (89%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/formatter/IAxisValueFormatter.kt (83%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/formatter/IFillFormatter.kt (72%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/formatter/IValueFormatter.kt (87%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/formatter/IndexAxisValueFormatter.kt (90%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/formatter/LargeValueFormatter.kt (92%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/formatter/PercentFormatter.kt (82%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/formatter/StackedValueFormatter.kt (88%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/highlight/BarHighlighter.kt (92%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/highlight/ChartHighlighter.kt (92%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/highlight/CombinedHighlighter.kt (84%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/highlight/Highlight.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/highlight/HorizontalBarHighlighter.kt (85%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/highlight/IHighlighter.kt (80%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/highlight/PieHighlighter.kt (75%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/highlight/PieRadarHighlighter.kt (92%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/highlight/RadarHighlighter.kt (89%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/highlight/Range.kt (92%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/dataprovider/BarDataProvider.kt (51%) create mode 100644 chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/BubbleDataProvider.kt create mode 100644 chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/CandleDataProvider.kt rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/dataprovider/CombinedDataProvider.kt (59%) create mode 100644 chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/LineDataProvider.kt create mode 100644 chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/ScatterDataProvider.kt rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/dataprovider/base/BarLineScatterCandleBubbleDataProvider.kt (59%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/dataprovider/base/IBaseProvider.kt (82%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/datasets/IBarDataSet.kt (89%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/datasets/IBarLineScatterCandleBubbleDataSet.kt (50%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/datasets/IBubbleDataSet.kt (77%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/datasets/ICandleDataSet.kt (91%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/datasets/IDataSet.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/datasets/ILineDataSet.kt (89%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/datasets/ILineRadarDataSet.kt (87%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/datasets/ILineScatterCandleRadarDataSet.kt (86%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/datasets/IPieDataSet.kt (90%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/datasets/IRadarDataSet.kt (84%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/interfaces/datasets/IScatterDataSet.kt (73%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/jobs/AnimatedMoveViewJob.kt (91%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/jobs/AnimatedViewPortJob.kt (92%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/jobs/AnimatedZoomJob.kt (92%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/jobs/MoveViewJob.kt (87%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/jobs/ViewPortJob.kt (82%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/jobs/ZoomJob.kt (87%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/listener/BarLineChartTouchListener.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/listener/ChartTouchListener.kt (95%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/listener/OnChartGestureListener.kt (93%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/listener/OnChartValueSelectedListener.kt (80%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/listener/OnDrawLineChartTouchListener.kt (88%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/listener/OnDrawListener.kt (82%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/listener/PieRadarChartTouchListener.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/AxisRenderer.kt (95%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/BarChartRenderer.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/BarLineScatterCandleBubbleRenderer.kt (81%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/BubbleChartRenderer.kt (94%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/CandleStickChartRenderer.kt (95%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/CombinedChartRenderer.kt (88%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/DataRenderer.kt (86%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/HorizontalBarChartRenderer.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/LegendRenderer.kt (94%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/LineChartRenderer.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/LineRadarRenderer.kt (91%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/LineScatterCandleRadarRenderer.kt (88%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/PieChartRenderer.kt (98%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/RadarChartRenderer.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/Renderer.kt (64%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/RoundedBarChartRenderer.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/RoundedHorizontalBarChartRenderer.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/ScatterChartRenderer.kt (92%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/XAxisRenderer.kt (95%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/XAxisRendererHorizontalBarChart.kt (94%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/XAxisRendererRadarChart.kt (85%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/YAxisRenderer.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/YAxisRendererHorizontalBarChart.kt (94%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/YAxisRendererRadarChart.kt (94%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/scatter/ChevronDownShapeRenderer.kt (76%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/scatter/ChevronUpShapeRenderer.kt (76%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/scatter/CircleShapeRenderer.kt (84%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/scatter/CrossShapeRenderer.kt (76%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/scatter/IShapeRenderer.kt (80%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/scatter/SquareShapeRenderer.kt (86%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/scatter/TriangleShapeRenderer.kt (88%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/renderer/scatter/XShapeRenderer.kt (77%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/AssetManagerUtils.kt (94%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/CanvasUtils.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/ColorTemplate.kt (98%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/EntryXComparator.kt (77%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/FSize.kt (94%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/Fill.kt (99%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/HorizontalViewPortHandler.kt (55%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/MPPointD.kt (90%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/MPPointF.kt (95%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/ObjectPool.kt (98%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/SaveUtils.kt (99%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/Transformer.kt (96%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/TransformerHorizontalBarChart.kt (94%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/Utils.kt (97%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/UtilsKt.kt (99%) rename {MPChartLib/src/main/java/com/github/mikephil => chartLib/src/main/kotlin/info/appdev}/charting/utils/ViewPortHandler.kt (99%) rename {MPChartLib => chartLib}/src/test/kotlin/com/github/mikephil/charting/test/ApproximationTest.kt (81%) rename {MPChartLib => chartLib}/src/test/kotlin/com/github/mikephil/charting/test/AxisRendererTest.kt (92%) rename {MPChartLib => chartLib}/src/test/kotlin/com/github/mikephil/charting/test/BarDataTest.kt (90%) rename {MPChartLib => chartLib}/src/test/kotlin/com/github/mikephil/charting/test/ChartDataTest.kt (95%) rename {MPChartLib => chartLib}/src/test/kotlin/com/github/mikephil/charting/test/DataSetTest.kt (97%) rename {MPChartLib => chartLib}/src/test/kotlin/com/github/mikephil/charting/test/LargeValueFormatterTest.kt (96%) rename {MPChartLib => chartLib}/src/test/kotlin/com/github/mikephil/charting/test/ObjectPoolTest.kt (98%) diff --git a/MPChartLib/proguard-lib.pro b/MPChartLib/proguard-lib.pro deleted file mode 100644 index 398fad22b1..0000000000 --- a/MPChartLib/proguard-lib.pro +++ /dev/null @@ -1,7 +0,0 @@ -# Whitelist AndroidChart -# Preserve all public classes and methods - --keep class com.github.mikephil.charting.** { *; } --keep public class com.github.mikephil.charting.animation.* { - public protected *; -} diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BubbleDataProvider.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BubbleDataProvider.kt deleted file mode 100644 index 49cdf72b95..0000000000 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BubbleDataProvider.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.mikephil.charting.interfaces.dataprovider - -import com.github.mikephil.charting.data.BubbleData -import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider - -interface BubbleDataProvider : BarLineScatterCandleBubbleDataProvider { - val bubbleData: BubbleData? -} diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/CandleDataProvider.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/CandleDataProvider.kt deleted file mode 100644 index a41d3ab238..0000000000 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/CandleDataProvider.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.mikephil.charting.interfaces.dataprovider - -import com.github.mikephil.charting.data.CandleData -import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider - -interface CandleDataProvider : BarLineScatterCandleBubbleDataProvider { - val candleData: CandleData? -} diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/LineDataProvider.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/LineDataProvider.kt deleted file mode 100644 index d4353fc3bf..0000000000 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/LineDataProvider.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.mikephil.charting.interfaces.dataprovider - -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider - -interface LineDataProvider : BarLineScatterCandleBubbleDataProvider { - val lineData: LineData? -} diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ScatterDataProvider.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ScatterDataProvider.kt deleted file mode 100644 index cb3118773f..0000000000 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ScatterDataProvider.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.mikephil.charting.interfaces.dataprovider - -import com.github.mikephil.charting.data.ScatterData -import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider - -interface ScatterDataProvider : BarLineScatterCandleBubbleDataProvider { - val scatterData: ScatterData? -} diff --git a/app/build.gradle.kts b/app/build.gradle.kts index dc8272be27..3ddcf9bd03 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -52,7 +52,7 @@ android { dependencies { implementation("androidx.appcompat:appcompat:1.7.1") implementation("com.google.android.material:material:1.13.0") - implementation(project(":MPChartLib")) + implementation(project(":chartLib")) implementation("androidx.window:window:1.5.1") // Compose BOM diff --git a/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt index c7c137d19c..0dc19759cc 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt @@ -10,12 +10,12 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityBarchartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt index 6c039bd79f..be14587b20 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt @@ -12,21 +12,21 @@ import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.Legend.LegendForm -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.components.YAxis.YAxisLabelPosition -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.formatter.IAxisValueFormatter -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.Fill -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.components.Legend +import info.appdev.charting.components.Legend.LegendForm +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.components.YAxis.YAxisLabelPosition +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.formatter.IAxisValueFormatter +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.Fill +import info.appdev.charting.utils.MPPointF import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.custom.XYMarkerView import info.appdev.chartexample.databinding.ActivityBarchartBinding diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt index 33e119f2a1..bc825244c1 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt @@ -11,16 +11,16 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.AxisBase -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.formatter.IAxisValueFormatter -import com.github.mikephil.charting.formatter.LargeValueFormatter -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.components.AxisBase +import info.appdev.charting.components.Legend +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.formatter.IAxisValueFormatter +import info.appdev.charting.formatter.LargeValueFormatter +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.listener.OnChartValueSelectedListener import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.custom.MyMarkerView import info.appdev.chartexample.databinding.ActivityBarchartBinding diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt index 1e409a6d77..464454339c 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt @@ -11,12 +11,12 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.Legend.LegendForm -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.utils.loadBarEntriesFromAssets +import info.appdev.charting.components.Legend +import info.appdev.charting.components.Legend.LegendForm +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.utils.loadBarEntriesFromAssets import info.appdev.chartexample.databinding.ActivityBarchartSinusBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt index 4daa3996aa..c415352fce 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt @@ -6,15 +6,15 @@ import android.os.Bundle import android.view.Menu import android.view.MenuItem import androidx.core.net.toUri -import com.github.mikephil.charting.components.AxisBase -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.formatter.IAxisValueFormatter -import com.github.mikephil.charting.formatter.IValueFormatter -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.components.AxisBase +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.formatter.IAxisValueFormatter +import info.appdev.charting.formatter.IValueFormatter +import info.appdev.charting.utils.ViewPortHandler import info.appdev.chartexample.databinding.ActivityBarchartNoseekbarBinding import info.appdev.chartexample.notimportant.DemoBase import java.text.DecimalFormat diff --git a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt index af719016a4..e51af7272d 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt @@ -12,17 +12,17 @@ import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.XAxis -import com.github.mikephil.charting.data.BubbleData -import com.github.mikephil.charting.data.BubbleDataSet -import com.github.mikephil.charting.data.BubbleEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IBubbleDataSet -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.components.Legend +import info.appdev.charting.components.XAxis +import info.appdev.charting.data.BubbleData +import info.appdev.charting.data.BubbleDataSet +import info.appdev.charting.data.BubbleEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IBubbleDataSet +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.MPPointF import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityBubblechartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt index aa876025ae..6bc7f3ff13 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt @@ -13,11 +13,11 @@ import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.data.CandleData -import com.github.mikephil.charting.data.CandleDataSet -import com.github.mikephil.charting.data.CandleEntry +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.data.CandleData +import info.appdev.charting.data.CandleDataSet +import info.appdev.charting.data.CandleEntry import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityCandlechartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt index fc26fa008a..43eea94914 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt @@ -6,28 +6,28 @@ import android.os.Bundle import android.view.Menu import android.view.MenuItem import androidx.core.net.toUri -import com.github.mikephil.charting.charts.CombinedChart.DrawOrder -import com.github.mikephil.charting.components.AxisBase -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.BubbleData -import com.github.mikephil.charting.data.BubbleDataSet -import com.github.mikephil.charting.data.BubbleEntry -import com.github.mikephil.charting.data.CandleData -import com.github.mikephil.charting.data.CandleDataSet -import com.github.mikephil.charting.data.CandleEntry -import com.github.mikephil.charting.data.CombinedData -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.data.ScatterData -import com.github.mikephil.charting.data.ScatterDataSet -import com.github.mikephil.charting.formatter.IAxisValueFormatter -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.charts.CombinedChart.DrawOrder +import info.appdev.charting.components.AxisBase +import info.appdev.charting.components.Legend +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.components.YAxis +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.BubbleData +import info.appdev.charting.data.BubbleDataSet +import info.appdev.charting.data.BubbleEntry +import info.appdev.charting.data.CandleData +import info.appdev.charting.data.CandleDataSet +import info.appdev.charting.data.CandleEntry +import info.appdev.charting.data.CombinedData +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.data.ScatterData +import info.appdev.charting.data.ScatterDataSet +import info.appdev.charting.formatter.IAxisValueFormatter +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityCombinedBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt index 329e1b480b..07d8ddf983 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt @@ -12,13 +12,13 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.formatter.IFillFormatter -import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.components.YAxis +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.formatter.IFillFormatter +import info.appdev.charting.interfaces.dataprovider.LineDataProvider +import info.appdev.charting.interfaces.datasets.ILineDataSet import info.appdev.chartexample.DataTools.Companion.getMuchValues import info.appdev.chartexample.databinding.ActivityLinechartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/DataTools.kt b/app/src/main/kotlin/info/appdev/chartexample/DataTools.kt index 9b799886e1..386f658e49 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/DataTools.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/DataTools.kt @@ -4,14 +4,14 @@ import android.content.Context import android.graphics.Color import android.graphics.DashPathEffect import androidx.core.content.ContextCompat -import com.github.mikephil.charting.charts.LineChart -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.formatter.IFillFormatter -import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet -import com.github.mikephil.charting.utils.getSDKInt +import info.appdev.charting.charts.LineChart +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.formatter.IFillFormatter +import info.appdev.charting.interfaces.dataprovider.LineDataProvider +import info.appdev.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.utils.getSDKInt import timber.log.Timber class DataTools { diff --git a/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt index 2ae50d85ae..0e52626dfa 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt @@ -7,13 +7,13 @@ import android.os.Bundle import android.view.Menu import android.view.MenuItem import androidx.core.content.ContextCompat -import com.github.mikephil.charting.data.DataSet -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.listener.OnDrawListener +import info.appdev.charting.data.DataSet +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.listener.OnDrawListener import info.appdev.chartexample.databinding.ActivityDrawChartBinding import info.appdev.chartexample.notimportant.DemoBase import timber.log.Timber diff --git a/app/src/main/kotlin/info/appdev/chartexample/DynamicalAddingActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/DynamicalAddingActivity.kt index 9c3aeb84d7..d96d83e1c9 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/DynamicalAddingActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/DynamicalAddingActivity.kt @@ -9,13 +9,13 @@ import android.view.Menu import android.view.MenuItem import android.widget.Toast import androidx.core.content.ContextCompat -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.notimportant.DemoBase import androidx.core.net.toUri diff --git a/app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt index 638149c84d..07c0c82161 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt @@ -6,13 +6,13 @@ import android.os.Bundle import android.view.Menu import android.view.MenuItem import androidx.core.net.toUri -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.formatter.IFillFormatter -import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.components.YAxis +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.formatter.IFillFormatter +import info.appdev.charting.interfaces.dataprovider.LineDataProvider +import info.appdev.charting.interfaces.datasets.ILineDataSet import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityLinechartNoseekbarBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/HalfPieChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HalfPieChartActivity.kt index 87cba91d06..1f47847e21 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HalfPieChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HalfPieChartActivity.kt @@ -13,13 +13,13 @@ import android.view.MenuItem import android.widget.RelativeLayout import androidx.core.net.toUri import androidx.window.layout.WindowMetricsCalculator -import com.github.mikephil.charting.animation.Easing -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.data.PieData -import com.github.mikephil.charting.data.PieDataSet -import com.github.mikephil.charting.data.PieEntry -import com.github.mikephil.charting.formatter.PercentFormatter -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.animation.Easing +import info.appdev.charting.components.Legend +import info.appdev.charting.data.PieData +import info.appdev.charting.data.PieDataSet +import info.appdev.charting.data.PieEntry +import info.appdev.charting.formatter.PercentFormatter +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityPiechartHalfBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt index 24907a2404..e86a97c17a 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt @@ -12,16 +12,16 @@ import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.components.Legend +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.MPPointF import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityHorizontalbarchartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt index e49a6b4194..8bfb02eefc 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt @@ -12,16 +12,16 @@ import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.components.Legend +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.MPPointF import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityHorizontalbarchartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt index 92c605e5e0..d53c2612b5 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt @@ -10,13 +10,13 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.Legend.LegendForm -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.EntryXComparator +import info.appdev.charting.components.Legend.LegendForm +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.EntryXComparator import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.custom.MyMarkerView import info.appdev.chartexample.databinding.ActivityLinechartBinding diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt index 6e3c4ff40e..aee450764a 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt @@ -11,15 +11,15 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.animation.Easing -import com.github.mikephil.charting.components.Legend.LegendForm -import com.github.mikephil.charting.components.LimitLine -import com.github.mikephil.charting.components.LimitLine.LimitLabelPosition -import com.github.mikephil.charting.components.LimitRange -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.animation.Easing +import info.appdev.charting.components.Legend.LegendForm +import info.appdev.charting.components.LimitLine +import info.appdev.charting.components.LimitLine.LimitLabelPosition +import info.appdev.charting.components.LimitRange +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.listener.OnChartValueSelectedListener import info.appdev.chartexample.DataTools.Companion.setData import info.appdev.chartexample.custom.MyMarkerView import info.appdev.chartexample.databinding.ActivityLinechartBinding @@ -27,7 +27,7 @@ import info.appdev.chartexample.notimportant.DemoBase import timber.log.Timber /** - * Example of a heavily customized [com.github.mikephil.charting.charts.LineChart] with limit lines, custom line shapes, etc. + * Example of a heavily customized [info.appdev.charting.charts.LineChart] with limit lines, custom line shapes, etc. */ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener { diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt index 426d52a954..1362629a77 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt @@ -6,10 +6,10 @@ import android.graphics.Typeface import android.os.Bundle import android.view.Menu import android.view.MenuItem -import com.github.mikephil.charting.charts.LineChart -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet +import info.appdev.charting.charts.LineChart +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.notimportant.DemoBase import androidx.core.net.toUri diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt index 7763868a71..e8fd0a2bb5 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt @@ -11,16 +11,16 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.charts.LineChart -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.Legend.LegendForm -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.charts.LineChart +import info.appdev.charting.components.Legend +import info.appdev.charting.components.Legend.LegendForm +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityLinechartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt index d5f7914fe8..7f68772558 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt @@ -11,15 +11,15 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.AxisBase -import com.github.mikephil.charting.components.XAxis -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.formatter.IAxisValueFormatter -import com.github.mikephil.charting.utils.ColorTemplate.holoBlue +import info.appdev.charting.components.AxisBase +import info.appdev.charting.components.XAxis +import info.appdev.charting.components.YAxis +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.formatter.IAxisValueFormatter +import info.appdev.charting.utils.ColorTemplate.holoBlue import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityLinechartTimeBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/ListViewBarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/ListViewBarChartActivity.kt index 0911785c21..c932af383f 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/ListViewBarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/ListViewBarChartActivity.kt @@ -11,13 +11,13 @@ import android.view.MenuItem import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter -import com.github.mikephil.charting.charts.BarChart -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.charts.BarChart +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.notimportant.DemoBase import androidx.core.net.toUri diff --git a/app/src/main/kotlin/info/appdev/chartexample/ListViewMultiChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/ListViewMultiChartActivity.kt index 54e611c50b..14685e8880 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/ListViewMultiChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/ListViewMultiChartActivity.kt @@ -9,17 +9,17 @@ import android.view.MenuItem import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.data.PieData -import com.github.mikephil.charting.data.PieDataSet -import com.github.mikephil.charting.data.PieEntry -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.data.PieData +import info.appdev.charting.data.PieDataSet +import info.appdev.charting.data.PieEntry +import info.appdev.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.listviewitems.BarChartItem import info.appdev.chartexample.listviewitems.ChartItem diff --git a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt index 97d244d23a..4245a898a1 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt @@ -11,16 +11,16 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet -import com.github.mikephil.charting.listener.ChartTouchListener.ChartGesture -import com.github.mikephil.charting.listener.OnChartGestureListener -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.components.Legend +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.listener.ChartTouchListener.ChartGesture +import info.appdev.charting.listener.OnChartGestureListener +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityLinechartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt b/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt index 62d8e338d8..c512bd7b13 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt @@ -8,9 +8,9 @@ import android.view.MenuItem import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.net.toUri -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet import info.appdev.chartexample.DataTools.Companion.getMuchValues import info.appdev.chartexample.databinding.ActivityPerformanceLinechartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt index 3b3fd799df..70ea858229 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt @@ -17,17 +17,17 @@ import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.net.toUri -import com.github.mikephil.charting.animation.Easing -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.PieData -import com.github.mikephil.charting.data.PieDataSet -import com.github.mikephil.charting.data.PieEntry -import com.github.mikephil.charting.formatter.PercentFormatter -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.animation.Easing +import info.appdev.charting.components.Legend +import info.appdev.charting.data.Entry +import info.appdev.charting.data.PieData +import info.appdev.charting.data.PieDataSet +import info.appdev.charting.data.PieEntry +import info.appdev.charting.formatter.PercentFormatter +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.MPPointF import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityPiechartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt index 9d0b286ef4..2eb686989e 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt @@ -17,18 +17,18 @@ import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.net.toUri -import com.github.mikephil.charting.animation.Easing -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.PieData -import com.github.mikephil.charting.data.PieDataSet -import com.github.mikephil.charting.data.PieEntry -import com.github.mikephil.charting.formatter.PercentFormatter -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.renderer.PieChartRenderer -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.animation.Easing +import info.appdev.charting.components.Legend +import info.appdev.charting.data.Entry +import info.appdev.charting.data.PieData +import info.appdev.charting.data.PieDataSet +import info.appdev.charting.data.PieEntry +import info.appdev.charting.formatter.PercentFormatter +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.renderer.PieChartRenderer +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.MPPointF import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityPiechartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt index 84d0e0f2cb..6cf19f5897 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt @@ -16,16 +16,16 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.animation.Easing -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.PieData -import com.github.mikephil.charting.data.PieDataSet -import com.github.mikephil.charting.data.PieEntry -import com.github.mikephil.charting.formatter.PercentFormatter -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.animation.Easing +import info.appdev.charting.components.Legend +import info.appdev.charting.data.Entry +import info.appdev.charting.data.PieData +import info.appdev.charting.data.PieDataSet +import info.appdev.charting.data.PieEntry +import info.appdev.charting.formatter.PercentFormatter +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityPiechartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt index f5b03ce4da..3713bd775c 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt @@ -9,15 +9,15 @@ import android.view.Menu import android.view.MenuItem import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.animation.Easing -import com.github.mikephil.charting.components.AxisBase -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.MarkerView -import com.github.mikephil.charting.data.RadarData -import com.github.mikephil.charting.data.RadarDataSet -import com.github.mikephil.charting.data.RadarEntry -import com.github.mikephil.charting.formatter.IAxisValueFormatter -import com.github.mikephil.charting.interfaces.datasets.IRadarDataSet +import info.appdev.charting.animation.Easing +import info.appdev.charting.components.AxisBase +import info.appdev.charting.components.Legend +import info.appdev.charting.components.MarkerView +import info.appdev.charting.data.RadarData +import info.appdev.charting.data.RadarDataSet +import info.appdev.charting.data.RadarEntry +import info.appdev.charting.formatter.IAxisValueFormatter +import info.appdev.charting.interfaces.datasets.IRadarDataSet import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.custom.RadarMarkerView import info.appdev.chartexample.databinding.ActivityRadarchartBinding diff --git a/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt index 11a848ccd5..0de1843a81 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt @@ -10,14 +10,14 @@ import android.view.MenuItem import android.widget.Toast import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.Legend.LegendForm -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.components.Legend.LegendForm +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityRealtimeLinechartBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt index f15fa603b4..f1a30ee418 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt @@ -10,15 +10,15 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.net.toUri -import com.github.mikephil.charting.charts.ScatterChart -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.ScatterData -import com.github.mikephil.charting.data.ScatterDataSet -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.charts.ScatterChart +import info.appdev.charting.components.Legend +import info.appdev.charting.data.Entry +import info.appdev.charting.data.ScatterData +import info.appdev.charting.data.ScatterDataSet +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.custom.CustomScatterShapeRenderer import info.appdev.chartexample.databinding.ActivityScatterchartBinding diff --git a/app/src/main/kotlin/info/appdev/chartexample/ScrollViewActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/ScrollViewActivity.kt index 7449a61c8c..e53b1a1684 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/ScrollViewActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/ScrollViewActivity.kt @@ -5,11 +5,11 @@ import android.os.Bundle import android.view.Menu import android.view.MenuItem import androidx.core.net.toUri -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityScrollviewBinding import info.appdev.chartexample.notimportant.DemoBase diff --git a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt index d871913955..315e6153e3 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt @@ -12,19 +12,19 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import android.widget.Toast import androidx.core.content.ContextCompat -import com.github.mikephil.charting.animation.Easing -import com.github.mikephil.charting.components.Legend.LegendForm -import com.github.mikephil.charting.components.LimitLine -import com.github.mikephil.charting.components.LimitLine.LimitLabelPosition -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet -import com.github.mikephil.charting.listener.ChartTouchListener.ChartGesture -import com.github.mikephil.charting.listener.OnChartGestureListener -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.getSDKInt +import info.appdev.charting.animation.Easing +import info.appdev.charting.components.Legend.LegendForm +import info.appdev.charting.components.LimitLine +import info.appdev.charting.components.LimitLine.LimitLabelPosition +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.listener.ChartTouchListener.ChartGesture +import info.appdev.charting.listener.OnChartGestureListener +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.getSDKInt import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.custom.MyMarkerView import info.appdev.chartexample.databinding.ActivityLinechartBinding diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt index 90b62fc07e..c4fb3a3212 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt @@ -12,16 +12,16 @@ import android.widget.SeekBar.OnSeekBarChangeListener import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.components.Legend +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.databinding.ActivityBarchartBinding import info.appdev.chartexample.formatter.MyAxisValueFormatter diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt index 4d87cb338a..58c6263a25 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt @@ -10,19 +10,19 @@ import android.view.MenuItem import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.net.toUri -import com.github.mikephil.charting.components.AxisBase -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.formatter.IAxisValueFormatter -import com.github.mikephil.charting.formatter.IValueFormatter -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.components.AxisBase +import info.appdev.charting.components.Legend +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.components.YAxis +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.formatter.IAxisValueFormatter +import info.appdev.charting.formatter.IValueFormatter +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.ViewPortHandler import info.appdev.chartexample.databinding.ActivityAgeDistributionBinding import info.appdev.chartexample.notimportant.DemoBase import timber.log.Timber diff --git a/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt index 706ec8bb90..ffb9127f03 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt @@ -36,17 +36,17 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import androidx.core.content.res.ResourcesCompat -import com.github.mikephil.charting.charts.HorizontalBarChart -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.charts.HorizontalBarChart +import info.appdev.charting.components.Legend +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.utils.MPPointF import info.appdev.chartexample.DataTools.Companion.getValues import info.appdev.chartexample.R import info.appdev.chartexample.notimportant.DemoBaseCompose diff --git a/app/src/main/kotlin/info/appdev/chartexample/custom/CustomScatterShapeRenderer.kt b/app/src/main/kotlin/info/appdev/chartexample/custom/CustomScatterShapeRenderer.kt index ddfc70d868..ca0fd5c91e 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/custom/CustomScatterShapeRenderer.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/custom/CustomScatterShapeRenderer.kt @@ -2,10 +2,10 @@ package info.appdev.chartexample.custom import android.graphics.Canvas import android.graphics.Paint -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.renderer.scatter.IShapeRenderer -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.renderer.scatter.IShapeRenderer +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel /** * Custom shape renderer that draws a single line. diff --git a/app/src/main/kotlin/info/appdev/chartexample/custom/MyMarkerView.kt b/app/src/main/kotlin/info/appdev/chartexample/custom/MyMarkerView.kt index 29fc5ebf22..11094032a9 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/custom/MyMarkerView.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/custom/MyMarkerView.kt @@ -3,12 +3,12 @@ package info.appdev.chartexample.custom import android.annotation.SuppressLint import android.content.Context import android.widget.TextView -import com.github.mikephil.charting.components.MarkerView -import com.github.mikephil.charting.data.CandleEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.formatNumber +import info.appdev.charting.components.MarkerView +import info.appdev.charting.data.CandleEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.formatNumber import info.appdev.chartexample.R /** diff --git a/app/src/main/kotlin/info/appdev/chartexample/custom/RadarMarkerView.kt b/app/src/main/kotlin/info/appdev/chartexample/custom/RadarMarkerView.kt index f302f29cb4..aa803ea06a 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/custom/RadarMarkerView.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/custom/RadarMarkerView.kt @@ -4,10 +4,10 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Typeface import android.widget.TextView -import com.github.mikephil.charting.components.MarkerView -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.components.MarkerView +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.utils.MPPointF import info.appdev.chartexample.R import java.text.DecimalFormat diff --git a/app/src/main/kotlin/info/appdev/chartexample/custom/StackedBarsMarkerView.kt b/app/src/main/kotlin/info/appdev/chartexample/custom/StackedBarsMarkerView.kt index d44ec965b9..ee6a5c99b7 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/custom/StackedBarsMarkerView.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/custom/StackedBarsMarkerView.kt @@ -3,12 +3,12 @@ package info.appdev.chartexample.custom import android.annotation.SuppressLint import android.content.Context import android.widget.TextView -import com.github.mikephil.charting.components.MarkerView -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.formatNumber +import info.appdev.charting.components.MarkerView +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.formatNumber import info.appdev.chartexample.R /** diff --git a/app/src/main/kotlin/info/appdev/chartexample/custom/XYMarkerView.kt b/app/src/main/kotlin/info/appdev/chartexample/custom/XYMarkerView.kt index 8ac4279194..12a672b4a7 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/custom/XYMarkerView.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/custom/XYMarkerView.kt @@ -3,11 +3,11 @@ package info.appdev.chartexample.custom import android.annotation.SuppressLint import android.content.Context import android.widget.TextView -import com.github.mikephil.charting.components.MarkerView -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.formatter.IAxisValueFormatter -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.components.MarkerView +import info.appdev.charting.data.Entry +import info.appdev.charting.formatter.IAxisValueFormatter +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.utils.MPPointF import info.appdev.chartexample.R import java.text.DecimalFormat diff --git a/app/src/main/kotlin/info/appdev/chartexample/formatter/DayAxisValueFormatter.kt b/app/src/main/kotlin/info/appdev/chartexample/formatter/DayAxisValueFormatter.kt index a3c0012ab8..55fa37c275 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/formatter/DayAxisValueFormatter.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/formatter/DayAxisValueFormatter.kt @@ -1,8 +1,8 @@ package info.appdev.chartexample.formatter -import com.github.mikephil.charting.charts.BarLineChartBase -import com.github.mikephil.charting.components.AxisBase -import com.github.mikephil.charting.formatter.IAxisValueFormatter +import info.appdev.charting.charts.BarLineChartBase +import info.appdev.charting.components.AxisBase +import info.appdev.charting.formatter.IAxisValueFormatter import kotlin.math.max class DayAxisValueFormatter(private val chart: BarLineChartBase<*>) : IAxisValueFormatter { diff --git a/app/src/main/kotlin/info/appdev/chartexample/formatter/MyAxisValueFormatter.kt b/app/src/main/kotlin/info/appdev/chartexample/formatter/MyAxisValueFormatter.kt index f0a4f70e67..1fc6ab2348 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/formatter/MyAxisValueFormatter.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/formatter/MyAxisValueFormatter.kt @@ -1,7 +1,7 @@ package info.appdev.chartexample.formatter -import com.github.mikephil.charting.components.AxisBase -import com.github.mikephil.charting.formatter.IAxisValueFormatter +import info.appdev.charting.components.AxisBase +import info.appdev.charting.formatter.IAxisValueFormatter import java.text.DecimalFormat class MyAxisValueFormatter : IAxisValueFormatter { diff --git a/app/src/main/kotlin/info/appdev/chartexample/formatter/MyFillFormatter.kt b/app/src/main/kotlin/info/appdev/chartexample/formatter/MyFillFormatter.kt index fb213c1745..808db2daff 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/formatter/MyFillFormatter.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/formatter/MyFillFormatter.kt @@ -1,8 +1,8 @@ package info.appdev.chartexample.formatter -import com.github.mikephil.charting.formatter.IFillFormatter -import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.formatter.IFillFormatter +import info.appdev.charting.interfaces.dataprovider.LineDataProvider +import info.appdev.charting.interfaces.datasets.ILineDataSet @Suppress("unused") class MyFillFormatter(private val fillPos: Float) : IFillFormatter { diff --git a/app/src/main/kotlin/info/appdev/chartexample/formatter/MyValueFormatter.kt b/app/src/main/kotlin/info/appdev/chartexample/formatter/MyValueFormatter.kt index 1fc517afbe..77a9460b79 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/formatter/MyValueFormatter.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/formatter/MyValueFormatter.kt @@ -1,8 +1,8 @@ package info.appdev.chartexample.formatter -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.formatter.IValueFormatter -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.data.Entry +import info.appdev.charting.formatter.IValueFormatter +import info.appdev.charting.utils.ViewPortHandler import java.text.DecimalFormat class MyValueFormatter : IValueFormatter { diff --git a/app/src/main/kotlin/info/appdev/chartexample/formatter/YearXAxisFormatter.kt b/app/src/main/kotlin/info/appdev/chartexample/formatter/YearXAxisFormatter.kt index 822d0007a3..b1f1b433f3 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/formatter/YearXAxisFormatter.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/formatter/YearXAxisFormatter.kt @@ -1,7 +1,7 @@ package info.appdev.chartexample.formatter -import com.github.mikephil.charting.components.AxisBase -import com.github.mikephil.charting.formatter.IAxisValueFormatter +import info.appdev.charting.components.AxisBase +import info.appdev.charting.formatter.IAxisValueFormatter @Suppress("unused") class YearXAxisFormatter : IAxisValueFormatter { diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/BarChartFrag.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/BarChartFrag.kt index 872563c230..07ab80636d 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/fragments/BarChartFrag.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/fragments/BarChartFrag.kt @@ -8,9 +8,9 @@ import android.view.View import android.view.ViewGroup import android.widget.FrameLayout import androidx.fragment.app.Fragment -import com.github.mikephil.charting.charts.BarChart -import com.github.mikephil.charting.listener.ChartTouchListener.ChartGesture -import com.github.mikephil.charting.listener.OnChartGestureListener +import info.appdev.charting.charts.BarChart +import info.appdev.charting.listener.ChartTouchListener.ChartGesture +import info.appdev.charting.listener.OnChartGestureListener import info.appdev.chartexample.R import info.appdev.chartexample.custom.MyMarkerView import timber.log.Timber diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/ComplexityFragment.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/ComplexityFragment.kt index 9a39344d57..0464d4d967 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/fragments/ComplexityFragment.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/fragments/ComplexityFragment.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.github.mikephil.charting.charts.LineChart +import info.appdev.charting.charts.LineChart import info.appdev.chartexample.R class ComplexityFragment : SimpleFragment() { diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/PieChartFrag.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/PieChartFrag.kt index 90725a1a33..60ad4d337c 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/fragments/PieChartFrag.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/fragments/PieChartFrag.kt @@ -10,8 +10,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.github.mikephil.charting.charts.PieChart -import com.github.mikephil.charting.components.Legend +import info.appdev.charting.charts.PieChart +import info.appdev.charting.components.Legend import info.appdev.chartexample.R class PieChartFrag : SimpleFragment() { diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/ScatterChartFrag.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/ScatterChartFrag.kt index 7860c75d6b..738c646b49 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/fragments/ScatterChartFrag.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/fragments/ScatterChartFrag.kt @@ -6,8 +6,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.github.mikephil.charting.charts.ScatterChart -import com.github.mikephil.charting.components.XAxis.XAxisPosition +import info.appdev.charting.charts.ScatterChart +import info.appdev.charting.components.XAxis.XAxisPosition import info.appdev.chartexample.R import info.appdev.chartexample.custom.MyMarkerView diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/SimpleFragment.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/SimpleFragment.kt index 5c63fcb588..d2b05bd3b8 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/fragments/SimpleFragment.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/fragments/SimpleFragment.kt @@ -7,23 +7,23 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.github.mikephil.charting.charts.ScatterChart.ScatterShape -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.data.PieData -import com.github.mikephil.charting.data.PieDataSet -import com.github.mikephil.charting.data.PieEntry -import com.github.mikephil.charting.data.ScatterData -import com.github.mikephil.charting.data.ScatterDataSet -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.loadEntriesFromAssets +import info.appdev.charting.charts.ScatterChart.ScatterShape +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.data.PieData +import info.appdev.charting.data.PieDataSet +import info.appdev.charting.data.PieEntry +import info.appdev.charting.data.ScatterData +import info.appdev.charting.data.ScatterDataSet +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.loadEntriesFromAssets import info.appdev.chartexample.DataTools.Companion.getValues abstract class SimpleFragment : Fragment() { diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/SineCosineFragment.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/SineCosineFragment.kt index cb8888e0f1..a7082beda6 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/fragments/SineCosineFragment.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/fragments/SineCosineFragment.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.github.mikephil.charting.charts.LineChart +import info.appdev.charting.charts.LineChart import info.appdev.chartexample.R class SineCosineFragment : SimpleFragment() { diff --git a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/BarChartItem.kt b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/BarChartItem.kt index d1e273c2b0..22364f446a 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/BarChartItem.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/BarChartItem.kt @@ -5,10 +5,10 @@ import android.content.Context import android.graphics.Typeface import android.view.LayoutInflater import android.view.View -import com.github.mikephil.charting.charts.BarChart -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.ChartData +import info.appdev.charting.charts.BarChart +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.data.BarData +import info.appdev.charting.data.ChartData import info.appdev.chartexample.R class BarChartItem(cd: ChartData<*>, c: Context) : ChartItem(cd) { diff --git a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/ChartItem.kt b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/ChartItem.kt index 9f1820e4fa..cc4ecb56be 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/ChartItem.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/ChartItem.kt @@ -2,7 +2,7 @@ package info.appdev.chartexample.listviewitems import android.content.Context import android.view.View -import com.github.mikephil.charting.data.ChartData +import info.appdev.charting.data.ChartData /** * Base class of the Chart ListView items diff --git a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/LineChartItem.kt b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/LineChartItem.kt index 49e18883d8..f7b8af435d 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/LineChartItem.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/LineChartItem.kt @@ -5,10 +5,10 @@ import android.content.Context import android.graphics.Typeface import android.view.LayoutInflater import android.view.View -import com.github.mikephil.charting.charts.LineChart -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.data.ChartData -import com.github.mikephil.charting.data.LineData +import info.appdev.charting.charts.LineChart +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.data.ChartData +import info.appdev.charting.data.LineData import info.appdev.chartexample.R class LineChartItem(cd: ChartData<*>, c: Context) : ChartItem(cd) { diff --git a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/PieChartItem.kt b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/PieChartItem.kt index 0d821ed549..8ba0b3ff46 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/PieChartItem.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/PieChartItem.kt @@ -10,12 +10,12 @@ import android.text.style.RelativeSizeSpan import android.text.style.StyleSpan import android.view.LayoutInflater import android.view.View -import com.github.mikephil.charting.charts.PieChart -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.data.ChartData -import com.github.mikephil.charting.data.PieData -import com.github.mikephil.charting.formatter.PercentFormatter -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.charts.PieChart +import info.appdev.charting.components.Legend +import info.appdev.charting.data.ChartData +import info.appdev.charting.data.PieData +import info.appdev.charting.formatter.PercentFormatter +import info.appdev.charting.utils.ColorTemplate import info.appdev.chartexample.R class PieChartItem(cd: ChartData<*>, c: Context) : ChartItem(cd) { diff --git a/app/src/main/kotlin/info/appdev/chartexample/notimportant/DemoBase.kt b/app/src/main/kotlin/info/appdev/chartexample/notimportant/DemoBase.kt index 1b5f48fb35..3427256600 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/notimportant/DemoBase.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/notimportant/DemoBase.kt @@ -16,7 +16,7 @@ import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat import androidx.core.view.get import androidx.core.view.size -import com.github.mikephil.charting.charts.Chart +import info.appdev.charting.charts.Chart import com.google.android.material.snackbar.Snackbar import info.appdev.chartexample.R import java.text.DateFormatSymbols diff --git a/app/src/main/kotlin/info/appdev/chartexample/notimportant/DemoBaseCompose.kt b/app/src/main/kotlin/info/appdev/chartexample/notimportant/DemoBaseCompose.kt index 6e1f47d717..4b8b44080d 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/notimportant/DemoBaseCompose.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/notimportant/DemoBaseCompose.kt @@ -12,7 +12,7 @@ import androidx.core.net.toUri import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat -import com.github.mikephil.charting.charts.Chart +import info.appdev.charting.charts.Chart open class DemoBaseCompose : ComponentActivity() { protected var tfLight: Typeface? = null 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..86a0874ef8 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/notimportant/MainActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/notimportant/MainActivity.kt @@ -41,8 +41,8 @@ import androidx.core.net.toUri import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.initUtils +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.initUtils import info.appdev.chartexample.AnotherBarActivity import info.appdev.chartexample.BarChartActivity import info.appdev.chartexample.BarChartActivityMultiDataset diff --git a/app/src/main/res/layout/activity_age_distribution.xml b/app/src/main/res/layout/activity_age_distribution.xml index 574510fa0b..33ea233334 100644 --- a/app/src/main/res/layout/activity_age_distribution.xml +++ b/app/src/main/res/layout/activity_age_distribution.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - diff --git a/app/src/main/res/layout/activity_barchart_sinus.xml b/app/src/main/res/layout/activity_barchart_sinus.xml index f39f2c7739..3638ff1453 100644 --- a/app/src/main/res/layout/activity_barchart_sinus.xml +++ b/app/src/main/res/layout/activity_barchart_sinus.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - - diff --git a/app/src/main/res/layout/activity_draw_chart.xml b/app/src/main/res/layout/activity_draw_chart.xml index 5e2f1a21fc..88d72247da 100644 --- a/app/src/main/res/layout/activity_draw_chart.xml +++ b/app/src/main/res/layout/activity_draw_chart.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/app/src/main/res/layout/activity_horizontalbarchart.xml b/app/src/main/res/layout/activity_horizontalbarchart.xml index 901f9b10f4..521b94a9a0 100644 --- a/app/src/main/res/layout/activity_horizontalbarchart.xml +++ b/app/src/main/res/layout/activity_horizontalbarchart.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - diff --git a/app/src/main/res/layout/activity_linechart_time.xml b/app/src/main/res/layout/activity_linechart_time.xml index 3df5d9db21..339c7d83d3 100644 --- a/app/src/main/res/layout/activity_linechart_time.xml +++ b/app/src/main/res/layout/activity_linechart_time.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - diff --git a/app/src/main/res/layout/activity_radarchart.xml b/app/src/main/res/layout/activity_radarchart.xml index aff98010c8..09e0c90101 100644 --- a/app/src/main/res/layout/activity_radarchart.xml +++ b/app/src/main/res/layout/activity_radarchart.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/app/src/main/res/layout/activity_realtime_linechart.xml b/app/src/main/res/layout/activity_realtime_linechart.xml index 9ee392a8f2..00bbd2f285 100644 --- a/app/src/main/res/layout/activity_realtime_linechart.xml +++ b/app/src/main/res/layout/activity_realtime_linechart.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/app/src/main/res/layout/activity_scatterchart.xml b/app/src/main/res/layout/activity_scatterchart.xml index e952d133d3..9a70569c81 100644 --- a/app/src/main/res/layout/activity_scatterchart.xml +++ b/app/src/main/res/layout/activity_scatterchart.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - diff --git a/app/src/main/res/layout/frag_simple_line.xml b/app/src/main/res/layout/frag_simple_line.xml index 7a2757476b..6ea0ccf6db 100644 --- a/app/src/main/res/layout/frag_simple_line.xml +++ b/app/src/main/res/layout/frag_simple_line.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical" > - diff --git a/app/src/main/res/layout/frag_simple_pie.xml b/app/src/main/res/layout/frag_simple_pie.xml index ed490ddbe6..df6c6b4e3b 100644 --- a/app/src/main/res/layout/frag_simple_pie.xml +++ b/app/src/main/res/layout/frag_simple_pie.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical" > - diff --git a/app/src/main/res/layout/frag_simple_scatter.xml b/app/src/main/res/layout/frag_simple_scatter.xml index 2e42332db3..1c8e0e0dc8 100644 --- a/app/src/main/res/layout/frag_simple_scatter.xml +++ b/app/src/main/res/layout/frag_simple_scatter.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical" > - diff --git a/app/src/main/res/layout/list_item_barchart.xml b/app/src/main/res/layout/list_item_barchart.xml index 81dbb27b83..e287b9492e 100644 --- a/app/src/main/res/layout/list_item_barchart.xml +++ b/app/src/main/res/layout/list_item_barchart.xml @@ -4,7 +4,7 @@ android:layout_height="wrap_content" android:orientation="vertical" > - diff --git a/app/src/main/res/layout/list_item_linechart.xml b/app/src/main/res/layout/list_item_linechart.xml index 984f62abf0..92273f8c1d 100644 --- a/app/src/main/res/layout/list_item_linechart.xml +++ b/app/src/main/res/layout/list_item_linechart.xml @@ -4,7 +4,7 @@ android:layout_height="wrap_content" android:orientation="vertical" > - diff --git a/app/src/main/res/layout/list_item_piechart.xml b/app/src/main/res/layout/list_item_piechart.xml index 9ec823e60e..9d32ac8608 100644 --- a/app/src/main/res/layout/list_item_piechart.xml +++ b/app/src/main/res/layout/list_item_piechart.xml @@ -4,7 +4,7 @@ android:layout_height="wrap_content" android:orientation="vertical" > - diff --git a/MPChartLib/build.gradle.kts b/chartLib/build.gradle.kts similarity index 98% rename from MPChartLib/build.gradle.kts rename to chartLib/build.gradle.kts index eced556ba3..92b0d608b9 100644 --- a/MPChartLib/build.gradle.kts +++ b/chartLib/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - namespace = "com.github.mikephil.charting" + namespace = "info.appdev.charting" defaultConfig { minSdk = 23 compileSdk = 36 diff --git a/MPChartLib/ic_launcher-web.png b/chartLib/ic_launcher-web.png similarity index 100% rename from MPChartLib/ic_launcher-web.png rename to chartLib/ic_launcher-web.png diff --git a/chartLib/proguard-lib.pro b/chartLib/proguard-lib.pro new file mode 100644 index 0000000000..9a306f98d4 --- /dev/null +++ b/chartLib/proguard-lib.pro @@ -0,0 +1,7 @@ +# Whitelist AndroidChart +# Preserve all public classes and methods + +-keep class info.appdev.charting.** { *; } +-keep public class info.appdev.charting.animation.* { + public protected *; +} diff --git a/MPChartLib/src/main/AndroidManifest.xml b/chartLib/src/main/AndroidManifest.xml similarity index 100% rename from MPChartLib/src/main/AndroidManifest.xml rename to chartLib/src/main/AndroidManifest.xml diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/animation/ChartAnimator.kt b/chartLib/src/main/kotlin/info/appdev/charting/animation/ChartAnimator.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/animation/ChartAnimator.kt rename to chartLib/src/main/kotlin/info/appdev/charting/animation/ChartAnimator.kt index a1f4eb8c22..e41fed6fb2 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/animation/ChartAnimator.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/animation/ChartAnimator.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.animation +package info.appdev.charting.animation import android.animation.ObjectAnimator import android.animation.ValueAnimator.AnimatorUpdateListener import androidx.annotation.RequiresApi -import com.github.mikephil.charting.animation.Easing.EasingFunction +import info.appdev.charting.animation.Easing.EasingFunction class ChartAnimator { /** object that is updated upon animation update */ diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/animation/Easing.kt b/chartLib/src/main/kotlin/info/appdev/charting/animation/Easing.kt similarity index 99% rename from MPChartLib/src/main/java/com/github/mikephil/charting/animation/Easing.kt rename to chartLib/src/main/kotlin/info/appdev/charting/animation/Easing.kt index 04a447633b..39061aa7d1 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/animation/Easing.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/animation/Easing.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.animation +package info.appdev.charting.animation import android.animation.TimeInterpolator import androidx.annotation.RequiresApi diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/AbstractBuffer.kt b/chartLib/src/main/kotlin/info/appdev/charting/buffer/AbstractBuffer.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/buffer/AbstractBuffer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/buffer/AbstractBuffer.kt index 13e971a5f5..78f7f2c963 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/AbstractBuffer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/buffer/AbstractBuffer.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.buffer +package info.appdev.charting.buffer /** * Buffer class to boost performance while drawing. Concept: Replace instead of recreate. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/BarBuffer.kt b/chartLib/src/main/kotlin/info/appdev/charting/buffer/BarBuffer.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/buffer/BarBuffer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/buffer/BarBuffer.kt index 89b8eda434..2c7812e704 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/BarBuffer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/buffer/BarBuffer.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.buffer +package info.appdev.charting.buffer -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.interfaces.datasets.IBarDataSet import kotlin.math.abs open class BarBuffer(size: Int, dataSetCount: Int, containsStacks: Boolean) : AbstractBuffer(size) { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/HorizontalBarBuffer.kt b/chartLib/src/main/kotlin/info/appdev/charting/buffer/HorizontalBarBuffer.kt similarity index 95% rename from MPChartLib/src/main/java/com/github/mikephil/charting/buffer/HorizontalBarBuffer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/buffer/HorizontalBarBuffer.kt index 7d40b49976..2c88f06ae3 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/HorizontalBarBuffer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/buffer/HorizontalBarBuffer.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.buffer +package info.appdev.charting.buffer -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.interfaces.datasets.IBarDataSet import kotlin.math.abs class HorizontalBarBuffer(size: Int, dataSetCount: Int, containsStacks: Boolean) : BarBuffer(size, dataSetCount, containsStacks) { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/BarChart.kt similarity index 95% rename from MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/charts/BarChart.kt index bd4e5a60e6..bb3166f949 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/BarChart.kt @@ -1,15 +1,15 @@ -package com.github.mikephil.charting.charts +package info.appdev.charting.charts import android.content.Context import android.graphics.RectF import android.util.AttributeSet -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.highlight.BarHighlighter -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider -import com.github.mikephil.charting.renderer.BarChartRenderer +import info.appdev.charting.components.YAxis +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarEntry +import info.appdev.charting.highlight.BarHighlighter +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.dataprovider.BarDataProvider +import info.appdev.charting.renderer.BarChartRenderer import timber.log.Timber import java.util.Locale diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt similarity index 95% rename from MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.kt rename to chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt index c062ac4553..c219a1f185 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.charts +package info.appdev.charting.charts import android.annotation.SuppressLint import android.content.Context @@ -9,33 +9,33 @@ import android.graphics.Paint import android.graphics.RectF import android.util.AttributeSet import android.view.MotionEvent -import com.github.mikephil.charting.components.Legend.LegendHorizontalAlignment -import com.github.mikephil.charting.components.Legend.LegendOrientation -import com.github.mikephil.charting.components.Legend.LegendVerticalAlignment -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.data.BarLineScatterCandleBubbleData -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.ChartHighlighter -import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider -import com.github.mikephil.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet -import com.github.mikephil.charting.jobs.AnimatedMoveViewJob.Companion.getInstance -import com.github.mikephil.charting.jobs.AnimatedZoomJob.Companion.getInstance -import com.github.mikephil.charting.jobs.MoveViewJob.Companion.getInstance -import com.github.mikephil.charting.jobs.ZoomJob.Companion.getInstance -import com.github.mikephil.charting.listener.BarLineChartTouchListener -import com.github.mikephil.charting.listener.OnDrawListener -import com.github.mikephil.charting.renderer.XAxisRenderer -import com.github.mikephil.charting.renderer.YAxisRenderer -import com.github.mikephil.charting.utils.MPPointD -import com.github.mikephil.charting.utils.MPPointD.Companion.getInstance -import com.github.mikephil.charting.utils.MPPointD.Companion.recycleInstance -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.MPPointF.Companion.getInstance -import com.github.mikephil.charting.utils.MPPointF.Companion.recycleInstance -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.components.Legend.LegendHorizontalAlignment +import info.appdev.charting.components.Legend.LegendOrientation +import info.appdev.charting.components.Legend.LegendVerticalAlignment +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.components.YAxis +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.data.BarLineScatterCandleBubbleData +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.ChartHighlighter +import info.appdev.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider +import info.appdev.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet +import info.appdev.charting.jobs.AnimatedMoveViewJob.Companion.getInstance +import info.appdev.charting.jobs.AnimatedZoomJob.Companion.getInstance +import info.appdev.charting.jobs.MoveViewJob.Companion.getInstance +import info.appdev.charting.jobs.ZoomJob.Companion.getInstance +import info.appdev.charting.listener.BarLineChartTouchListener +import info.appdev.charting.listener.OnDrawListener +import info.appdev.charting.renderer.XAxisRenderer +import info.appdev.charting.renderer.YAxisRenderer +import info.appdev.charting.utils.MPPointD +import info.appdev.charting.utils.MPPointD.Companion.getInstance +import info.appdev.charting.utils.MPPointD.Companion.recycleInstance +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.MPPointF.Companion.getInstance +import info.appdev.charting.utils.MPPointF.Companion.recycleInstance +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.convertDpToPixel import timber.log.Timber import kotlin.math.abs import kotlin.math.max diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BubbleChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/BubbleChart.kt similarity index 79% rename from MPChartLib/src/main/java/com/github/mikephil/charting/charts/BubbleChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/charts/BubbleChart.kt index a668226e78..928a637ed1 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BubbleChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/BubbleChart.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.charts +package info.appdev.charting.charts import android.content.Context import android.util.AttributeSet -import com.github.mikephil.charting.data.BubbleData -import com.github.mikephil.charting.interfaces.dataprovider.BubbleDataProvider -import com.github.mikephil.charting.renderer.BubbleChartRenderer +import info.appdev.charting.data.BubbleData +import info.appdev.charting.interfaces.dataprovider.BubbleDataProvider +import info.appdev.charting.renderer.BubbleChartRenderer /** * The BubbleChart. Draws bubbles. Bubble chart implementation: Copyright 2015 diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CandleStickChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/CandleStickChart.kt similarity index 76% rename from MPChartLib/src/main/java/com/github/mikephil/charting/charts/CandleStickChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/charts/CandleStickChart.kt index 5900aaf110..54fb526873 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CandleStickChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/CandleStickChart.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.charts +package info.appdev.charting.charts import android.content.Context import android.util.AttributeSet -import com.github.mikephil.charting.data.CandleData -import com.github.mikephil.charting.interfaces.dataprovider.CandleDataProvider -import com.github.mikephil.charting.renderer.CandleStickChartRenderer +import info.appdev.charting.data.CandleData +import info.appdev.charting.interfaces.dataprovider.CandleDataProvider +import info.appdev.charting.renderer.CandleStickChartRenderer /** * Financial chart type that draws candle-sticks (OHCL chart). diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt index 3b678c7714..221e5c6532 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.charts +package info.appdev.charting.charts import android.animation.ValueAnimator import android.content.Context @@ -15,35 +15,35 @@ import android.util.AttributeSet import android.view.View import android.view.ViewGroup import android.view.accessibility.AccessibilityEvent -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.animation.Easing.EasingFunction -import com.github.mikephil.charting.components.Description -import com.github.mikephil.charting.components.IMarker -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.XAxis -import com.github.mikephil.charting.data.ChartData -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.formatter.DefaultValueFormatter -import com.github.mikephil.charting.formatter.IValueFormatter -import com.github.mikephil.charting.highlight.ChartHighlighter -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.highlight.IHighlighter -import com.github.mikephil.charting.interfaces.dataprovider.base.IBaseProvider -import com.github.mikephil.charting.interfaces.datasets.IDataSet -import com.github.mikephil.charting.listener.ChartTouchListener -import com.github.mikephil.charting.listener.OnChartGestureListener -import com.github.mikephil.charting.listener.OnChartValueSelectedListener -import com.github.mikephil.charting.renderer.DataRenderer -import com.github.mikephil.charting.renderer.LegendRenderer -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.MPPointF.Companion.getInstance -import com.github.mikephil.charting.utils.SaveUtils.saveToGallery -import com.github.mikephil.charting.utils.SaveUtils.saveToPath -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel -import com.github.mikephil.charting.utils.getDecimals -import com.github.mikephil.charting.utils.initUtils +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.animation.Easing.EasingFunction +import info.appdev.charting.components.Description +import info.appdev.charting.components.IMarker +import info.appdev.charting.components.Legend +import info.appdev.charting.components.XAxis +import info.appdev.charting.data.ChartData +import info.appdev.charting.data.Entry +import info.appdev.charting.formatter.DefaultValueFormatter +import info.appdev.charting.formatter.IValueFormatter +import info.appdev.charting.highlight.ChartHighlighter +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.highlight.IHighlighter +import info.appdev.charting.interfaces.dataprovider.base.IBaseProvider +import info.appdev.charting.interfaces.datasets.IDataSet +import info.appdev.charting.listener.ChartTouchListener +import info.appdev.charting.listener.OnChartGestureListener +import info.appdev.charting.listener.OnChartValueSelectedListener +import info.appdev.charting.renderer.DataRenderer +import info.appdev.charting.renderer.LegendRenderer +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.MPPointF.Companion.getInstance +import info.appdev.charting.utils.SaveUtils.saveToGallery +import info.appdev.charting.utils.SaveUtils.saveToPath +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel +import info.appdev.charting.utils.getDecimals +import info.appdev.charting.utils.initUtils import timber.log.Timber import kotlin.math.abs import kotlin.math.max diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/CombinedChart.kt similarity index 90% rename from MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/charts/CombinedChart.kt index 7aa6f0a2b1..00f100d145 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/CombinedChart.kt @@ -1,20 +1,20 @@ -package com.github.mikephil.charting.charts +package info.appdev.charting.charts import android.content.Context import android.graphics.Canvas import android.util.AttributeSet -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BubbleData -import com.github.mikephil.charting.data.CandleData -import com.github.mikephil.charting.data.CombinedData -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.ScatterData -import com.github.mikephil.charting.highlight.CombinedHighlighter -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.dataprovider.CombinedDataProvider -import com.github.mikephil.charting.interfaces.datasets.IDataSet -import com.github.mikephil.charting.renderer.CombinedChartRenderer +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BubbleData +import info.appdev.charting.data.CandleData +import info.appdev.charting.data.CombinedData +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.ScatterData +import info.appdev.charting.highlight.CombinedHighlighter +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.dataprovider.CombinedDataProvider +import info.appdev.charting.interfaces.datasets.IDataSet +import info.appdev.charting.renderer.CombinedChartRenderer import timber.log.Timber /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt similarity index 89% rename from MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt index af7671470e..d04e1e8431 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt @@ -1,25 +1,25 @@ -package com.github.mikephil.charting.charts +package info.appdev.charting.charts import android.content.Context import android.graphics.RectF import android.util.AttributeSet -import com.github.mikephil.charting.components.Legend.LegendHorizontalAlignment -import com.github.mikephil.charting.components.Legend.LegendOrientation -import com.github.mikephil.charting.components.Legend.LegendVerticalAlignment -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.highlight.HorizontalBarHighlighter -import com.github.mikephil.charting.renderer.HorizontalBarChartRenderer -import com.github.mikephil.charting.renderer.XAxisRendererHorizontalBarChart -import com.github.mikephil.charting.renderer.YAxisRendererHorizontalBarChart -import com.github.mikephil.charting.utils.HorizontalViewPortHandler -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.MPPointF.Companion.getInstance -import com.github.mikephil.charting.utils.TransformerHorizontalBarChart -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.components.Legend.LegendHorizontalAlignment +import info.appdev.charting.components.Legend.LegendOrientation +import info.appdev.charting.components.Legend.LegendVerticalAlignment +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.highlight.HorizontalBarHighlighter +import info.appdev.charting.renderer.HorizontalBarChartRenderer +import info.appdev.charting.renderer.XAxisRendererHorizontalBarChart +import info.appdev.charting.renderer.YAxisRendererHorizontalBarChart +import info.appdev.charting.utils.HorizontalViewPortHandler +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.MPPointF.Companion.getInstance +import info.appdev.charting.utils.TransformerHorizontalBarChart +import info.appdev.charting.utils.convertDpToPixel import timber.log.Timber import kotlin.math.max import kotlin.math.min diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/LineChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/LineChart.kt similarity index 90% rename from MPChartLib/src/main/java/com/github/mikephil/charting/charts/LineChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/charts/LineChart.kt index 3a6af3e4ec..528064c799 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/LineChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/LineChart.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.charts +package info.appdev.charting.charts import android.content.Context import android.util.AttributeSet -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider -import com.github.mikephil.charting.renderer.LineChartRenderer +import info.appdev.charting.data.LineData +import info.appdev.charting.interfaces.dataprovider.LineDataProvider +import info.appdev.charting.renderer.LineChartRenderer import java.util.Locale open class LineChart : BarLineChartBase, LineDataProvider { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/PieChart.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/charts/PieChart.kt index 92ddf91a27..dc01bd9722 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/PieChart.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.charts +package info.appdev.charting.charts import android.content.Context import android.graphics.Canvas @@ -6,16 +6,16 @@ import android.graphics.RectF import android.graphics.Typeface import android.text.TextUtils import android.util.AttributeSet -import com.github.mikephil.charting.components.XAxis -import com.github.mikephil.charting.data.PieData -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.highlight.PieHighlighter -import com.github.mikephil.charting.renderer.PieChartRenderer -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.MPPointF.Companion.getInstance -import com.github.mikephil.charting.utils.MPPointF.Companion.recycleInstance -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.components.XAxis +import info.appdev.charting.data.PieData +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.highlight.PieHighlighter +import info.appdev.charting.renderer.PieChartRenderer +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.MPPointF.Companion.getInstance +import info.appdev.charting.utils.MPPointF.Companion.recycleInstance +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.convertDpToPixel import java.util.Locale import java.util.Objects import kotlin.math.abs diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/PieRadarChartBase.kt similarity index 94% rename from MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.kt rename to chartLib/src/main/kotlin/info/appdev/charting/charts/PieRadarChartBase.kt index 5c0aa4ab41..0b25cc2db4 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/PieRadarChartBase.kt @@ -1,23 +1,23 @@ -package com.github.mikephil.charting.charts +package info.appdev.charting.charts import android.animation.ObjectAnimator import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet import android.view.MotionEvent -import com.github.mikephil.charting.animation.Easing.EasingFunction -import com.github.mikephil.charting.components.Legend.LegendHorizontalAlignment -import com.github.mikephil.charting.components.Legend.LegendOrientation -import com.github.mikephil.charting.components.Legend.LegendVerticalAlignment -import com.github.mikephil.charting.data.ChartData -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.interfaces.datasets.IDataSet -import com.github.mikephil.charting.listener.PieRadarChartTouchListener -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.MPPointF.Companion.getInstance -import com.github.mikephil.charting.utils.MPPointF.Companion.recycleInstance -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.animation.Easing.EasingFunction +import info.appdev.charting.components.Legend.LegendHorizontalAlignment +import info.appdev.charting.components.Legend.LegendOrientation +import info.appdev.charting.components.Legend.LegendVerticalAlignment +import info.appdev.charting.data.ChartData +import info.appdev.charting.data.Entry +import info.appdev.charting.interfaces.datasets.IDataSet +import info.appdev.charting.listener.PieRadarChartTouchListener +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.MPPointF.Companion.getInstance +import info.appdev.charting.utils.MPPointF.Companion.recycleInstance +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.convertDpToPixel import timber.log.Timber import kotlin.math.acos import kotlin.math.cos diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/RadarChart.kt similarity index 93% rename from MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/charts/RadarChart.kt index 49d02fa8cd..25d42d8bfe 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/RadarChart.kt @@ -1,18 +1,18 @@ -package com.github.mikephil.charting.charts +package info.appdev.charting.charts import android.content.Context import android.graphics.Canvas import android.graphics.Color import android.util.AttributeSet -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.data.RadarData -import com.github.mikephil.charting.highlight.RadarHighlighter -import com.github.mikephil.charting.renderer.RadarChartRenderer -import com.github.mikephil.charting.renderer.XAxisRendererRadarChart -import com.github.mikephil.charting.renderer.YAxisRendererRadarChart -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.components.YAxis +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.data.RadarData +import info.appdev.charting.highlight.RadarHighlighter +import info.appdev.charting.renderer.RadarChartRenderer +import info.appdev.charting.renderer.XAxisRendererRadarChart +import info.appdev.charting.renderer.YAxisRendererRadarChart +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.convertDpToPixel import kotlin.math.max import kotlin.math.min diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/ScatterChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/ScatterChart.kt similarity index 88% rename from MPChartLib/src/main/java/com/github/mikephil/charting/charts/ScatterChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/charts/ScatterChart.kt index 8cdd0aee53..f27c67880c 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/ScatterChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/ScatterChart.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.charts +package info.appdev.charting.charts import android.content.Context import android.util.AttributeSet -import com.github.mikephil.charting.data.ScatterData -import com.github.mikephil.charting.interfaces.dataprovider.ScatterDataProvider -import com.github.mikephil.charting.renderer.ScatterChartRenderer +import info.appdev.charting.data.ScatterData +import info.appdev.charting.interfaces.dataprovider.ScatterDataProvider +import info.appdev.charting.renderer.ScatterChartRenderer /** * The ScatterChart. Draws dots, triangles, squares and custom shapes into the diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt similarity index 98% rename from MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.kt rename to chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt index aabc367ad5..ee7ba4076e 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt @@ -1,11 +1,11 @@ -package com.github.mikephil.charting.components +package info.appdev.charting.components import android.graphics.Color import android.graphics.DashPathEffect import android.graphics.Paint -import com.github.mikephil.charting.formatter.DefaultAxisValueFormatter -import com.github.mikephil.charting.formatter.IAxisValueFormatter -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.formatter.DefaultAxisValueFormatter +import info.appdev.charting.formatter.IAxisValueFormatter +import info.appdev.charting.utils.convertDpToPixel import timber.log.Timber import kotlin.math.abs diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/ComponentBase.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/ComponentBase.kt similarity index 94% rename from MPChartLib/src/main/java/com/github/mikephil/charting/components/ComponentBase.kt rename to chartLib/src/main/kotlin/info/appdev/charting/components/ComponentBase.kt index c0a1395d03..dd7a3f4ef7 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/ComponentBase.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/ComponentBase.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.components +package info.appdev.charting.components import android.graphics.Color import android.graphics.Typeface -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.utils.convertDpToPixel /** * This class encapsulates everything both Axis, Legend and LimitLines have in common. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/Description.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/Description.kt similarity index 88% rename from MPChartLib/src/main/java/com/github/mikephil/charting/components/Description.kt rename to chartLib/src/main/kotlin/info/appdev/charting/components/Description.kt index be64420441..8601ded2a1 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/Description.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/Description.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.components +package info.appdev.charting.components import android.graphics.Paint.Align -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.convertDpToPixel class Description : ComponentBase() { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/IMarker.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/IMarker.kt similarity index 89% rename from MPChartLib/src/main/java/com/github/mikephil/charting/components/IMarker.kt rename to chartLib/src/main/kotlin/info/appdev/charting/components/IMarker.kt index d3838dcb9e..b82d16aa40 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/IMarker.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/IMarker.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.components +package info.appdev.charting.components import android.graphics.Canvas -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.utils.MPPointF interface IMarker { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.kt rename to chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt index d86c2e64a7..fc61df686d 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt @@ -1,13 +1,13 @@ -package com.github.mikephil.charting.components +package info.appdev.charting.components import android.graphics.DashPathEffect import android.graphics.Paint -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.FSize -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.calcTextHeight -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.FSize +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.calcTextHeight +import info.appdev.charting.utils.convertDpToPixel import java.lang.Float import kotlin.Array import kotlin.Boolean diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/LegendEntry.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/LegendEntry.kt similarity index 92% rename from MPChartLib/src/main/java/com/github/mikephil/charting/components/LegendEntry.kt rename to chartLib/src/main/kotlin/info/appdev/charting/components/LegendEntry.kt index c0aafe36bb..a7d10135df 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/LegendEntry.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/LegendEntry.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.components +package info.appdev.charting.components import android.graphics.DashPathEffect -import com.github.mikephil.charting.components.Legend.LegendForm -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.components.Legend.LegendForm +import info.appdev.charting.utils.ColorTemplate class LegendEntry { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/LimitLine.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/LimitLine.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/components/LimitLine.kt rename to chartLib/src/main/kotlin/info/appdev/charting/components/LimitLine.kt index 7619bd2cb2..cc9558c90b 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/LimitLine.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/LimitLine.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.components +package info.appdev.charting.components import android.graphics.Color import android.graphics.DashPathEffect import android.graphics.Paint -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.utils.convertDpToPixel /** * The limit line is an additional feature for all Line-, Bar- and diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/LimitRange.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/LimitRange.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/components/LimitRange.kt rename to chartLib/src/main/kotlin/info/appdev/charting/components/LimitRange.kt index 2036137e7b..1eabc2cb6e 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/LimitRange.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/LimitRange.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.components +package info.appdev.charting.components import android.graphics.Color import android.graphics.DashPathEffect import android.graphics.Paint -import com.github.mikephil.charting.components.LimitLine.LimitLabelPosition -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.components.LimitLine.LimitLabelPosition +import info.appdev.charting.utils.convertDpToPixel /** * The limit line is an additional feature for all Line-, Bar- and diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/MarkerImage.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/MarkerImage.kt similarity index 92% rename from MPChartLib/src/main/java/com/github/mikephil/charting/components/MarkerImage.kt rename to chartLib/src/main/kotlin/info/appdev/charting/components/MarkerImage.kt index 91599d2737..d2fb15d129 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/MarkerImage.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/MarkerImage.kt @@ -1,14 +1,14 @@ -package com.github.mikephil.charting.components +package info.appdev.charting.components import android.content.Context import android.graphics.Canvas import android.graphics.Rect import android.graphics.drawable.Drawable -import com.github.mikephil.charting.charts.Chart -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.utils.FSize -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.charts.Chart +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.utils.FSize +import info.appdev.charting.utils.MPPointF import java.lang.ref.WeakReference /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/MarkerView.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/MarkerView.kt similarity index 92% rename from MPChartLib/src/main/java/com/github/mikephil/charting/components/MarkerView.kt rename to chartLib/src/main/kotlin/info/appdev/charting/components/MarkerView.kt index de01051a6e..33bfe2913f 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/MarkerView.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/MarkerView.kt @@ -1,13 +1,13 @@ -package com.github.mikephil.charting.components +package info.appdev.charting.components import android.content.Context import android.graphics.Canvas import android.view.LayoutInflater import android.widget.RelativeLayout -import com.github.mikephil.charting.charts.Chart -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.charts.Chart +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.utils.MPPointF import java.lang.ref.WeakReference /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/XAxis.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/XAxis.kt similarity index 93% rename from MPChartLib/src/main/java/com/github/mikephil/charting/components/XAxis.kt rename to chartLib/src/main/kotlin/info/appdev/charting/components/XAxis.kt index e2b75b9890..6d2732fec6 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/XAxis.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/XAxis.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.components +package info.appdev.charting.components -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.utils.convertDpToPixel /** * Class representing the x-axis labels settings. Only use the setter methods to diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/YAxis.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.kt rename to chartLib/src/main/kotlin/info/appdev/charting/components/YAxis.kt index fe9d1ded68..ff5b5e0a54 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/YAxis.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.components +package info.appdev.charting.components import android.graphics.Color import android.graphics.Paint -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.calcTextHeight -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.calcTextHeight +import info.appdev.charting.utils.convertDpToPixel import kotlin.math.abs import kotlin.math.max import kotlin.math.min diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BarData.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/BarData.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/BarData.kt index af0efad060..a0e4322502 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BarData.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.interfaces.datasets.IBarDataSet /** * Data object that represents all data for the BarChart. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BarDataSet.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/BarDataSet.kt index 805cb86cb5..4effeab5cb 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BarDataSet.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.graphics.Color -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.utils.Fill +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.utils.Fill import java.lang.Float import kotlin.Boolean import kotlin.Deprecated diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarEntry.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BarEntry.kt similarity index 98% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/BarEntry.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/BarEntry.kt index 3fc69aaf9c..775c23ed2d 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarEntry.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BarEntry.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.annotation.SuppressLint import android.graphics.drawable.Drawable -import com.github.mikephil.charting.highlight.Range +import info.appdev.charting.highlight.Range import kotlin.math.abs /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarLineScatterCandleBubbleData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BarLineScatterCandleBubbleData.kt similarity index 71% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/BarLineScatterCandleBubbleData.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/BarLineScatterCandleBubbleData.kt index 20c3599238..96c08ef04b 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarLineScatterCandleBubbleData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BarLineScatterCandleBubbleData.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data -import com.github.mikephil.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet -import com.github.mikephil.charting.interfaces.datasets.IDataSet +import info.appdev.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet +import info.appdev.charting.interfaces.datasets.IDataSet /** * Baseclass for all Line, Bar, Scatter, Candle and Bubble data. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarLineScatterCandleBubbleDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BarLineScatterCandleBubbleDataSet.kt similarity index 85% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/BarLineScatterCandleBubbleDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/BarLineScatterCandleBubbleDataSet.kt index c208f1230c..bb24e13dae 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarLineScatterCandleBubbleDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BarLineScatterCandleBubbleDataSet.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.graphics.Color -import com.github.mikephil.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet +import info.appdev.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet /** * Baseclass of all DataSets for Bar-, Line-, Scatter- and CandleStickChart. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BaseDataSet.kt similarity index 95% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/BaseDataSet.kt index c291bfcbfc..33938d421e 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BaseDataSet.kt @@ -1,18 +1,18 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.content.Context import android.graphics.Color import android.graphics.DashPathEffect import android.graphics.Typeface import androidx.core.content.ContextCompat -import com.github.mikephil.charting.components.Legend.LegendForm -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.formatter.IValueFormatter -import com.github.mikephil.charting.interfaces.datasets.IDataSet -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.components.Legend.LegendForm +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.formatter.IValueFormatter +import info.appdev.charting.interfaces.datasets.IDataSet +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.convertDpToPixel /** * This is the base dataset of all DataSets. It's purpose is to implement critical methods diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseEntry.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BaseEntry.kt similarity index 93% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseEntry.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/BaseEntry.kt index b737ad8e76..d553eb652d 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseEntry.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BaseEntry.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.graphics.drawable.Drawable diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleData.kt similarity index 84% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleData.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/BubbleData.kt index e43b6197b2..500f599461 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleData.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data -import com.github.mikephil.charting.interfaces.datasets.IBubbleDataSet +import info.appdev.charting.interfaces.datasets.IBubbleDataSet class BubbleData : BarLineScatterCandleBubbleData { constructor() : super() diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleDataSet.kt similarity index 88% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/BubbleDataSet.kt index 778e69ab09..cd872671a4 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleDataSet.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data -import com.github.mikephil.charting.interfaces.datasets.IBubbleDataSet -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.IBubbleDataSet +import info.appdev.charting.utils.convertDpToPixel open class BubbleDataSet(yVals: MutableList?, label: String) : BarLineScatterCandleBubbleDataSet(yVals, label), IBubbleDataSet { protected var mMaxSize: Float = 0f diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleEntry.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleEntry.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleEntry.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/BubbleEntry.kt index e766d790fd..aec75f004d 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleEntry.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleEntry.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.annotation.SuppressLint import android.graphics.drawable.Drawable diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/CandleData.kt similarity index 68% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleData.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/CandleData.kt index 02375528cc..8cc649cff8 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/CandleData.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data -import com.github.mikephil.charting.interfaces.datasets.ICandleDataSet +import info.appdev.charting.interfaces.datasets.ICandleDataSet class CandleData : BarLineScatterCandleBubbleData { constructor() : super() diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/CandleDataSet.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/CandleDataSet.kt index b6615c57fc..e41c653b51 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/CandleDataSet.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.graphics.Paint -import com.github.mikephil.charting.interfaces.datasets.ICandleDataSet -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.ICandleDataSet +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.convertDpToPixel /** * DataSet for the CandleStickChart. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleEntry.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/CandleEntry.kt similarity index 98% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleEntry.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/CandleEntry.kt index 62afbea6d9..64869da68c 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleEntry.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/CandleEntry.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.annotation.SuppressLint import android.graphics.drawable.Drawable diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/ChartData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/ChartData.kt similarity index 98% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/ChartData.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/ChartData.kt index c7783aaed1..56f171451c 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/ChartData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/ChartData.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.graphics.Typeface -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.formatter.IValueFormatter -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IDataSet +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.formatter.IValueFormatter +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IDataSet import timber.log.Timber import java.io.Serializable import java.util.Collections diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/CombinedData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/CombinedData.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/CombinedData.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/CombinedData.kt index 0d0c73e374..7b62595ed6 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/CombinedData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/CombinedData.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.util.Log -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet +import info.appdev.charting.components.YAxis +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet import timber.log.Timber import java.lang.Float import kotlin.Boolean diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/DataSet.kt similarity index 99% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/DataSet.kt index 7cdc117675..72e551e55b 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/DataSet.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import timber.log.Timber import java.io.Serializable diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/Entry.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/Entry.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/Entry.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/Entry.kt index 9da04ec40d..dd33743e20 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/Entry.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/Entry.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.graphics.drawable.Drawable import android.os.Parcel import android.os.ParcelFormatException import android.os.Parcelable -import com.github.mikephil.charting.utils.Utils +import info.appdev.charting.utils.Utils import java.io.Serializable import kotlin.math.abs diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/LineData.kt similarity index 73% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/LineData.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/LineData.kt index 72dc16089b..4736b20213 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/LineData.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.interfaces.datasets.ILineDataSet /** * Data object that encapsulates all data associated with a LineChart. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/LineDataSet.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/LineDataSet.kt index b5a55abc95..f1496d7822 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/LineDataSet.kt @@ -1,13 +1,13 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.content.Context import android.graphics.Color import android.graphics.DashPathEffect -import com.github.mikephil.charting.formatter.DefaultFillFormatter -import com.github.mikephil.charting.formatter.IFillFormatter -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.formatter.DefaultFillFormatter +import info.appdev.charting.formatter.IFillFormatter +import info.appdev.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.convertDpToPixel import timber.log.Timber open class LineDataSet(yVals: MutableList?, label: String = "") : LineRadarDataSet(yVals, label), ILineDataSet { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineRadarDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/LineRadarDataSet.kt similarity index 92% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/LineRadarDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/LineRadarDataSet.kt index 5fbe66c766..b7c8c61adc 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineRadarDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/LineRadarDataSet.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.graphics.Color import android.graphics.drawable.Drawable -import com.github.mikephil.charting.interfaces.datasets.ILineRadarDataSet -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.ILineRadarDataSet +import info.appdev.charting.utils.convertDpToPixel /** * Base dataset for line and radar DataSets. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineScatterCandleRadarDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/LineScatterCandleRadarDataSet.kt similarity index 94% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/LineScatterCandleRadarDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/LineScatterCandleRadarDataSet.kt index 109e908016..57302e1d61 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineScatterCandleRadarDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/LineScatterCandleRadarDataSet.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.graphics.DashPathEffect -import com.github.mikephil.charting.interfaces.datasets.ILineScatterCandleRadarDataSet -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.ILineScatterCandleRadarDataSet +import info.appdev.charting.utils.convertDpToPixel abstract class LineScatterCandleRadarDataSet(yVals: MutableList?, label: String) : BarLineScatterCandleBubbleDataSet(yVals, label), ILineScatterCandleRadarDataSet { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/PieData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/PieData.kt similarity index 93% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/PieData.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/PieData.kt index f5b00841e1..7e9ec67121 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/PieData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/PieData.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IPieDataSet +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IPieDataSet import timber.log.Timber /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/PieDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/PieDataSet.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/PieDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/PieDataSet.kt index c6feffde73..e50d94cda1 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/PieDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/PieDataSet.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data -import com.github.mikephil.charting.interfaces.datasets.IPieDataSet -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.IPieDataSet +import info.appdev.charting.utils.convertDpToPixel open class PieDataSet(yVals: MutableList?, label: String) : DataSet(yVals, label), IPieDataSet { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/PieEntry.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/PieEntry.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/PieEntry.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/PieEntry.kt index 4f4e5f9bf8..b460dddc16 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/PieEntry.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/PieEntry.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.annotation.SuppressLint import android.graphics.drawable.Drawable diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/RadarData.kt similarity index 84% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarData.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/RadarData.kt index e252e3d93a..e6b1fc1d89 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/RadarData.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IRadarDataSet +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IRadarDataSet import java.util.Arrays /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/RadarDataSet.kt similarity index 94% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/RadarDataSet.kt index 92d5dd400c..a195168adf 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/RadarDataSet.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.graphics.Color -import com.github.mikephil.charting.interfaces.datasets.IRadarDataSet -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.interfaces.datasets.IRadarDataSet +import info.appdev.charting.utils.ColorTemplate open class RadarDataSet(yVals: MutableList?, label: String = "") : LineRadarDataSet(yVals, label), IRadarDataSet { /** flag indicating whether highlight circle should be drawn or not */ diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarEntry.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/RadarEntry.kt similarity index 93% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarEntry.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/RadarEntry.kt index 1a3a624b78..0b6e6a3065 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarEntry.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/RadarEntry.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data import android.annotation.SuppressLint diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/ScatterData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/ScatterData.kt similarity index 85% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/ScatterData.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/ScatterData.kt index 00f80971a1..c09890df24 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/ScatterData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/ScatterData.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.interfaces.datasets.IScatterDataSet class ScatterData : BarLineScatterCandleBubbleData { constructor() : super() diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/ScatterDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/ScatterDataSet.kt similarity index 80% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/ScatterDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/ScatterDataSet.kt index b960c50cba..9d9d025a6f 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/ScatterDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/ScatterDataSet.kt @@ -1,16 +1,16 @@ -package com.github.mikephil.charting.data +package info.appdev.charting.data -import com.github.mikephil.charting.charts.ScatterChart.ScatterShape -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.renderer.scatter.ChevronDownShapeRenderer -import com.github.mikephil.charting.renderer.scatter.ChevronUpShapeRenderer -import com.github.mikephil.charting.renderer.scatter.CircleShapeRenderer -import com.github.mikephil.charting.renderer.scatter.CrossShapeRenderer -import com.github.mikephil.charting.renderer.scatter.IShapeRenderer -import com.github.mikephil.charting.renderer.scatter.SquareShapeRenderer -import com.github.mikephil.charting.renderer.scatter.TriangleShapeRenderer -import com.github.mikephil.charting.renderer.scatter.XShapeRenderer -import com.github.mikephil.charting.utils.ColorTemplate +import info.appdev.charting.charts.ScatterChart.ScatterShape +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.renderer.scatter.ChevronDownShapeRenderer +import info.appdev.charting.renderer.scatter.ChevronUpShapeRenderer +import info.appdev.charting.renderer.scatter.CircleShapeRenderer +import info.appdev.charting.renderer.scatter.CrossShapeRenderer +import info.appdev.charting.renderer.scatter.IShapeRenderer +import info.appdev.charting.renderer.scatter.SquareShapeRenderer +import info.appdev.charting.renderer.scatter.TriangleShapeRenderer +import info.appdev.charting.renderer.scatter.XShapeRenderer +import info.appdev.charting.utils.ColorTemplate open class ScatterDataSet(yVals: MutableList?, label: String = "") : LineScatterCandleRadarDataSet(yVals, label), IScatterDataSet { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/filter/Approximator.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/filter/Approximator.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/filter/Approximator.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/filter/Approximator.kt index 32f58bc9bb..a09a239d42 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/filter/Approximator.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/filter/Approximator.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.data.filter +package info.appdev.charting.data.filter import android.annotation.TargetApi import android.os.Build diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/filter/ApproximatorN.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/filter/ApproximatorN.kt similarity index 98% rename from MPChartLib/src/main/java/com/github/mikephil/charting/data/filter/ApproximatorN.kt rename to chartLib/src/main/kotlin/info/appdev/charting/data/filter/ApproximatorN.kt index 41bc83cea4..4f12e27a80 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/filter/ApproximatorN.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/filter/ApproximatorN.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.data.filter +package info.appdev.charting.data.filter import kotlin.math.abs import kotlin.math.sqrt diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/ColorFormatter.kt b/chartLib/src/main/kotlin/info/appdev/charting/formatter/ColorFormatter.kt similarity index 75% rename from MPChartLib/src/main/java/com/github/mikephil/charting/formatter/ColorFormatter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/formatter/ColorFormatter.kt index ce2daf73d9..3293e103c0 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/ColorFormatter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/formatter/ColorFormatter.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.formatter +package info.appdev.charting.formatter -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.interfaces.datasets.IDataSet +import info.appdev.charting.data.Entry +import info.appdev.charting.interfaces.datasets.IDataSet /** * Interface that can be used to return a customized color instead of setting colors via the setColor(...) method of the DataSet. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultAxisValueFormatter.kt b/chartLib/src/main/kotlin/info/appdev/charting/formatter/DefaultAxisValueFormatter.kt similarity index 90% rename from MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultAxisValueFormatter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/formatter/DefaultAxisValueFormatter.kt index 9ad583e3fa..c515349673 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultAxisValueFormatter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/formatter/DefaultAxisValueFormatter.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.formatter +package info.appdev.charting.formatter -import com.github.mikephil.charting.components.AxisBase +import info.appdev.charting.components.AxisBase import java.text.DecimalFormat open class DefaultAxisValueFormatter(digits: Int) : IAxisValueFormatter { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultFillFormatter.kt b/chartLib/src/main/kotlin/info/appdev/charting/formatter/DefaultFillFormatter.kt similarity index 82% rename from MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultFillFormatter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/formatter/DefaultFillFormatter.kt index 52417b18f5..cedd7eed51 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultFillFormatter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/formatter/DefaultFillFormatter.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.formatter +package info.appdev.charting.formatter -import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.interfaces.dataprovider.LineDataProvider +import info.appdev.charting.interfaces.datasets.ILineDataSet /** * Default formatter that calculates the position of the filled line. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultValueFormatter.kt b/chartLib/src/main/kotlin/info/appdev/charting/formatter/DefaultValueFormatter.kt similarity index 89% rename from MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultValueFormatter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/formatter/DefaultValueFormatter.kt index e5eb544861..b722ff0843 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultValueFormatter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/formatter/DefaultValueFormatter.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.formatter +package info.appdev.charting.formatter -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.data.Entry +import info.appdev.charting.utils.ViewPortHandler import java.text.DecimalFormat /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IAxisValueFormatter.kt b/chartLib/src/main/kotlin/info/appdev/charting/formatter/IAxisValueFormatter.kt similarity index 83% rename from MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IAxisValueFormatter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/formatter/IAxisValueFormatter.kt index 36c4e53ddb..760b6a41d5 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IAxisValueFormatter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/formatter/IAxisValueFormatter.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.formatter +package info.appdev.charting.formatter -import com.github.mikephil.charting.components.AxisBase +import info.appdev.charting.components.AxisBase /** * Custom formatter interface that allows formatting of axis labels before they are being drawn. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IFillFormatter.kt b/chartLib/src/main/kotlin/info/appdev/charting/formatter/IFillFormatter.kt similarity index 72% rename from MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IFillFormatter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/formatter/IFillFormatter.kt index f13590d065..cef5444c8e 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IFillFormatter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/formatter/IFillFormatter.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.formatter +package info.appdev.charting.formatter -import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.interfaces.dataprovider.LineDataProvider +import info.appdev.charting.interfaces.datasets.ILineDataSet /** * Interface for providing a custom logic to where the filling line of a LineDataSet should end. This of course only works if setFillEnabled(...) is set to true. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IValueFormatter.kt b/chartLib/src/main/kotlin/info/appdev/charting/formatter/IValueFormatter.kt similarity index 87% rename from MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IValueFormatter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/formatter/IValueFormatter.kt index 0e2ec42c21..8e05dedc0d 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IValueFormatter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/formatter/IValueFormatter.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.formatter +package info.appdev.charting.formatter -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.data.Entry +import info.appdev.charting.utils.ViewPortHandler /** * Interface that allows custom formatting of all values inside the chart before they are diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IndexAxisValueFormatter.kt b/chartLib/src/main/kotlin/info/appdev/charting/formatter/IndexAxisValueFormatter.kt similarity index 90% rename from MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IndexAxisValueFormatter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/formatter/IndexAxisValueFormatter.kt index cc380c1444..2d4b6f0625 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IndexAxisValueFormatter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/formatter/IndexAxisValueFormatter.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.formatter +package info.appdev.charting.formatter -import com.github.mikephil.charting.components.AxisBase +import info.appdev.charting.components.AxisBase import kotlin.math.roundToInt /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/LargeValueFormatter.kt b/chartLib/src/main/kotlin/info/appdev/charting/formatter/LargeValueFormatter.kt similarity index 92% rename from MPChartLib/src/main/java/com/github/mikephil/charting/formatter/LargeValueFormatter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/formatter/LargeValueFormatter.kt index 66a3031905..12692b54ca 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/LargeValueFormatter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/formatter/LargeValueFormatter.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.formatter +package info.appdev.charting.formatter -import com.github.mikephil.charting.components.AxisBase -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.components.AxisBase +import info.appdev.charting.data.Entry +import info.appdev.charting.utils.ViewPortHandler import java.text.DecimalFormat /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/PercentFormatter.kt b/chartLib/src/main/kotlin/info/appdev/charting/formatter/PercentFormatter.kt similarity index 82% rename from MPChartLib/src/main/java/com/github/mikephil/charting/formatter/PercentFormatter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/formatter/PercentFormatter.kt index ca20515a9e..14dd946931 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/PercentFormatter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/formatter/PercentFormatter.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.formatter +package info.appdev.charting.formatter -import com.github.mikephil.charting.components.AxisBase -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.components.AxisBase +import info.appdev.charting.data.Entry +import info.appdev.charting.utils.ViewPortHandler import java.text.DecimalFormat /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/StackedValueFormatter.kt b/chartLib/src/main/kotlin/info/appdev/charting/formatter/StackedValueFormatter.kt similarity index 88% rename from MPChartLib/src/main/java/com/github/mikephil/charting/formatter/StackedValueFormatter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/formatter/StackedValueFormatter.kt index 9e67fb5cfe..957957acd1 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/StackedValueFormatter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/formatter/StackedValueFormatter.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.formatter +package info.appdev.charting.formatter -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry +import info.appdev.charting.utils.ViewPortHandler import java.text.DecimalFormat /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/BarHighlighter.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/BarHighlighter.kt similarity index 92% rename from MPChartLib/src/main/java/com/github/mikephil/charting/highlight/BarHighlighter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/highlight/BarHighlighter.kt index 24e7b385c6..0e19469048 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/BarHighlighter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/BarHighlighter.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.highlight +package info.appdev.charting.highlight -import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.utils.MPPointD +import info.appdev.charting.interfaces.dataprovider.BarDataProvider +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.utils.MPPointD import kotlin.math.abs import kotlin.math.max diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/ChartHighlighter.kt similarity index 92% rename from MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/highlight/ChartHighlighter.kt index 0188901fbf..4df8de7dfa 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/ChartHighlighter.kt @@ -1,12 +1,12 @@ -package com.github.mikephil.charting.highlight - -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.data.ChartData -import com.github.mikephil.charting.data.DataSet -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider -import com.github.mikephil.charting.interfaces.datasets.IDataSet -import com.github.mikephil.charting.utils.MPPointD +package info.appdev.charting.highlight + +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.data.ChartData +import info.appdev.charting.data.DataSet +import info.appdev.charting.data.Entry +import info.appdev.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider +import info.appdev.charting.interfaces.datasets.IDataSet +import info.appdev.charting.utils.MPPointD import kotlin.math.abs import kotlin.math.hypot diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/CombinedHighlighter.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/CombinedHighlighter.kt similarity index 84% rename from MPChartLib/src/main/java/com/github/mikephil/charting/highlight/CombinedHighlighter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/highlight/CombinedHighlighter.kt index ee62fa89e2..e05f25fbee 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/CombinedHighlighter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/CombinedHighlighter.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.highlight +package info.appdev.charting.highlight -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.ChartData -import com.github.mikephil.charting.data.DataSet -import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider -import com.github.mikephil.charting.interfaces.dataprovider.CombinedDataProvider +import info.appdev.charting.data.BarData +import info.appdev.charting.data.ChartData +import info.appdev.charting.data.DataSet +import info.appdev.charting.interfaces.dataprovider.BarDataProvider +import info.appdev.charting.interfaces.dataprovider.CombinedDataProvider open class CombinedHighlighter(dataProvider: CombinedDataProvider, barChart: BarDataProvider) : ChartHighlighter(dataProvider), IHighlighter { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Highlight.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/Highlight.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Highlight.kt rename to chartLib/src/main/kotlin/info/appdev/charting/highlight/Highlight.kt index 57ce6b21d4..8822ab99d0 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Highlight.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/Highlight.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.highlight +package info.appdev.charting.highlight -import com.github.mikephil.charting.components.YAxis.AxisDependency +import info.appdev.charting.components.YAxis.AxisDependency import java.io.Serializable /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/HorizontalBarHighlighter.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/HorizontalBarHighlighter.kt similarity index 85% rename from MPChartLib/src/main/java/com/github/mikephil/charting/highlight/HorizontalBarHighlighter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/highlight/HorizontalBarHighlighter.kt index 680ddbc900..a3964febef 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/HorizontalBarHighlighter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/HorizontalBarHighlighter.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.highlight +package info.appdev.charting.highlight -import com.github.mikephil.charting.data.DataSet -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider -import com.github.mikephil.charting.interfaces.datasets.IDataSet -import com.github.mikephil.charting.utils.MPPointD +import info.appdev.charting.data.DataSet +import info.appdev.charting.data.Entry +import info.appdev.charting.interfaces.dataprovider.BarDataProvider +import info.appdev.charting.interfaces.datasets.IDataSet +import info.appdev.charting.utils.MPPointD import kotlin.math.abs class HorizontalBarHighlighter(dataProvider: BarDataProvider) : BarHighlighter(dataProvider) { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/IHighlighter.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/IHighlighter.kt similarity index 80% rename from MPChartLib/src/main/java/com/github/mikephil/charting/highlight/IHighlighter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/highlight/IHighlighter.kt index 4b06631734..211fb3a6d5 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/IHighlighter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/IHighlighter.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.highlight +package info.appdev.charting.highlight interface IHighlighter { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/PieHighlighter.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/PieHighlighter.kt similarity index 75% rename from MPChartLib/src/main/java/com/github/mikephil/charting/highlight/PieHighlighter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/highlight/PieHighlighter.kt index 7abe47d1e2..a4c590febb 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/PieHighlighter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/PieHighlighter.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.highlight +package info.appdev.charting.highlight -import com.github.mikephil.charting.charts.PieChart -import com.github.mikephil.charting.data.Entry +import info.appdev.charting.charts.PieChart +import info.appdev.charting.data.Entry open class PieHighlighter(chart: PieChart) : PieRadarHighlighter(chart) { override fun getClosestHighlight(index: Int, x: Float, y: Float): Highlight? { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/PieRadarHighlighter.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/PieRadarHighlighter.kt similarity index 92% rename from MPChartLib/src/main/java/com/github/mikephil/charting/highlight/PieRadarHighlighter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/highlight/PieRadarHighlighter.kt index 049dff0b3f..76c5e468b5 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/PieRadarHighlighter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/PieRadarHighlighter.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.highlight +package info.appdev.charting.highlight -import com.github.mikephil.charting.charts.PieRadarChartBase +import info.appdev.charting.charts.PieRadarChartBase abstract class PieRadarHighlighter>(protected var chartPieRadar: T) : IHighlighter { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/RadarHighlighter.kt similarity index 89% rename from MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt rename to chartLib/src/main/kotlin/info/appdev/charting/highlight/RadarHighlighter.kt index 4f6c60b71d..6fff24ffa0 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/RadarHighlighter.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.highlight +package info.appdev.charting.highlight -import com.github.mikephil.charting.charts.RadarChart -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Utils +import info.appdev.charting.charts.RadarChart +import info.appdev.charting.data.Entry +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Utils import kotlin.math.abs open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter(chart) { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Range.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/Range.kt similarity index 92% rename from MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Range.kt rename to chartLib/src/main/kotlin/info/appdev/charting/highlight/Range.kt index cb4933962f..7677355f19 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Range.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/Range.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.highlight +package info.appdev.charting.highlight /** * Class that represents the range of one value in a stacked bar entry. e.g. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BarDataProvider.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/BarDataProvider.kt similarity index 51% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BarDataProvider.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/BarDataProvider.kt index 886f3255e2..503f74af4c 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BarDataProvider.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/BarDataProvider.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.interfaces.dataprovider +package info.appdev.charting.interfaces.dataprovider -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider +import info.appdev.charting.data.BarData +import info.appdev.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider interface BarDataProvider : BarLineScatterCandleBubbleDataProvider { val barData: BarData? diff --git a/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/BubbleDataProvider.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/BubbleDataProvider.kt new file mode 100644 index 0000000000..41db1fa59d --- /dev/null +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/BubbleDataProvider.kt @@ -0,0 +1,8 @@ +package info.appdev.charting.interfaces.dataprovider + +import info.appdev.charting.data.BubbleData +import info.appdev.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider + +interface BubbleDataProvider : BarLineScatterCandleBubbleDataProvider { + val bubbleData: BubbleData? +} diff --git a/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/CandleDataProvider.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/CandleDataProvider.kt new file mode 100644 index 0000000000..0a85926ed6 --- /dev/null +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/CandleDataProvider.kt @@ -0,0 +1,8 @@ +package info.appdev.charting.interfaces.dataprovider + +import info.appdev.charting.data.CandleData +import info.appdev.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider + +interface CandleDataProvider : BarLineScatterCandleBubbleDataProvider { + val candleData: CandleData? +} diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/CombinedDataProvider.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/CombinedDataProvider.kt similarity index 59% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/CombinedDataProvider.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/CombinedDataProvider.kt index f9f00f5950..bceb69e806 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/CombinedDataProvider.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/CombinedDataProvider.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.interfaces.dataprovider +package info.appdev.charting.interfaces.dataprovider -import com.github.mikephil.charting.data.CombinedData +import info.appdev.charting.data.CombinedData interface CombinedDataProvider : LineDataProvider, BarDataProvider, BubbleDataProvider, CandleDataProvider, ScatterDataProvider { val combinedData: CombinedData? diff --git a/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/LineDataProvider.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/LineDataProvider.kt new file mode 100644 index 0000000000..5869a85fb5 --- /dev/null +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/LineDataProvider.kt @@ -0,0 +1,8 @@ +package info.appdev.charting.interfaces.dataprovider + +import info.appdev.charting.data.LineData +import info.appdev.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider + +interface LineDataProvider : BarLineScatterCandleBubbleDataProvider { + val lineData: LineData? +} diff --git a/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/ScatterDataProvider.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/ScatterDataProvider.kt new file mode 100644 index 0000000000..71653e47f8 --- /dev/null +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/ScatterDataProvider.kt @@ -0,0 +1,8 @@ +package info.appdev.charting.interfaces.dataprovider + +import info.appdev.charting.data.ScatterData +import info.appdev.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider + +interface ScatterDataProvider : BarLineScatterCandleBubbleDataProvider { + val scatterData: ScatterData? +} diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/base/BarLineScatterCandleBubbleDataProvider.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/base/BarLineScatterCandleBubbleDataProvider.kt similarity index 59% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/base/BarLineScatterCandleBubbleDataProvider.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/base/BarLineScatterCandleBubbleDataProvider.kt index cd436bffbe..99228121ff 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/base/BarLineScatterCandleBubbleDataProvider.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/base/BarLineScatterCandleBubbleDataProvider.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.interfaces.dataprovider.base +package info.appdev.charting.interfaces.dataprovider.base -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.utils.Transformer +import info.appdev.charting.components.YAxis +import info.appdev.charting.utils.Transformer interface BarLineScatterCandleBubbleDataProvider : IBaseProvider { fun getTransformer(axis: YAxis.AxisDependency?): Transformer? diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/base/IBaseProvider.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/base/IBaseProvider.kt similarity index 82% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/base/IBaseProvider.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/base/IBaseProvider.kt index f321904bfc..8c772a6aab 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/base/IBaseProvider.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/base/IBaseProvider.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.interfaces.dataprovider.base +package info.appdev.charting.interfaces.dataprovider.base import android.graphics.RectF -import com.github.mikephil.charting.data.ChartData -import com.github.mikephil.charting.formatter.IValueFormatter -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.data.ChartData +import info.appdev.charting.formatter.IValueFormatter +import info.appdev.charting.utils.MPPointF /** * Interface that provides everything there is to know about the dimensions, diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IBarDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IBarDataSet.kt similarity index 89% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IBarDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IBarDataSet.kt index f91776bd43..a29dc8da7d 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IBarDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IBarDataSet.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.interfaces.datasets +package info.appdev.charting.interfaces.datasets -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.utils.Fill +import info.appdev.charting.data.BarEntry +import info.appdev.charting.utils.Fill interface IBarDataSet : IBarLineScatterCandleBubbleDataSet { var fills: MutableList diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IBarLineScatterCandleBubbleDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IBarLineScatterCandleBubbleDataSet.kt similarity index 50% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IBarLineScatterCandleBubbleDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IBarLineScatterCandleBubbleDataSet.kt index 75318c3a81..c547744254 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IBarLineScatterCandleBubbleDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IBarLineScatterCandleBubbleDataSet.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.interfaces.datasets +package info.appdev.charting.interfaces.datasets -import com.github.mikephil.charting.data.Entry +import info.appdev.charting.data.Entry interface IBarLineScatterCandleBubbleDataSet : IDataSet { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IBubbleDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IBubbleDataSet.kt similarity index 77% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IBubbleDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IBubbleDataSet.kt index 9d19ebd155..4528ad401c 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IBubbleDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IBubbleDataSet.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.interfaces.datasets +package info.appdev.charting.interfaces.datasets -import com.github.mikephil.charting.data.BubbleEntry +import info.appdev.charting.data.BubbleEntry interface IBubbleDataSet : IBarLineScatterCandleBubbleDataSet { val maxSize: Float diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ICandleDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ICandleDataSet.kt similarity index 91% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ICandleDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ICandleDataSet.kt index e6304556f2..c4cf62b033 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ICandleDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ICandleDataSet.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.interfaces.datasets +package info.appdev.charting.interfaces.datasets import android.graphics.Paint -import com.github.mikephil.charting.data.CandleEntry +import info.appdev.charting.data.CandleEntry interface ICandleDataSet : ILineScatterCandleRadarDataSet { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IDataSet.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IDataSet.kt index 0c753d0098..754b62c3a8 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IDataSet.kt @@ -1,13 +1,13 @@ -package com.github.mikephil.charting.interfaces.datasets +package info.appdev.charting.interfaces.datasets import android.graphics.DashPathEffect import android.graphics.Typeface -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.data.DataSet -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.formatter.IValueFormatter -import com.github.mikephil.charting.utils.MPPointF +import info.appdev.charting.components.Legend +import info.appdev.charting.components.YAxis +import info.appdev.charting.data.DataSet +import info.appdev.charting.data.Entry +import info.appdev.charting.formatter.IValueFormatter +import info.appdev.charting.utils.MPPointF interface IDataSet { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineDataSet.kt similarity index 89% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineDataSet.kt index 70d9f7abd5..a7ef687d44 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineDataSet.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.interfaces.datasets +package info.appdev.charting.interfaces.datasets import android.graphics.DashPathEffect -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.formatter.IFillFormatter +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.formatter.IFillFormatter interface ILineDataSet : ILineRadarDataSet { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineRadarDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineRadarDataSet.kt similarity index 87% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineRadarDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineRadarDataSet.kt index d2d6a6bae7..5557c9fd60 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineRadarDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineRadarDataSet.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.interfaces.datasets +package info.appdev.charting.interfaces.datasets import android.graphics.drawable.Drawable -import com.github.mikephil.charting.data.Entry +import info.appdev.charting.data.Entry interface ILineRadarDataSet : ILineScatterCandleRadarDataSet { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineScatterCandleRadarDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineScatterCandleRadarDataSet.kt similarity index 86% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineScatterCandleRadarDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineScatterCandleRadarDataSet.kt index 3c847bf42e..83ff1115e4 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineScatterCandleRadarDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineScatterCandleRadarDataSet.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.interfaces.datasets +package info.appdev.charting.interfaces.datasets import android.graphics.DashPathEffect -import com.github.mikephil.charting.data.Entry +import info.appdev.charting.data.Entry interface ILineScatterCandleRadarDataSet : IBarLineScatterCandleBubbleDataSet { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IPieDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IPieDataSet.kt similarity index 90% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IPieDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IPieDataSet.kt index c86e654092..05cb075b04 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IPieDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IPieDataSet.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.interfaces.datasets +package info.appdev.charting.interfaces.datasets -import com.github.mikephil.charting.data.PieDataSet.ValuePosition -import com.github.mikephil.charting.data.PieEntry +import info.appdev.charting.data.PieDataSet.ValuePosition +import info.appdev.charting.data.PieEntry interface IPieDataSet : IDataSet { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IRadarDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IRadarDataSet.kt similarity index 84% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IRadarDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IRadarDataSet.kt index c8f174776a..c9e135631d 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IRadarDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IRadarDataSet.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.interfaces.datasets +package info.appdev.charting.interfaces.datasets -import com.github.mikephil.charting.data.RadarEntry +import info.appdev.charting.data.RadarEntry interface IRadarDataSet : ILineRadarDataSet { /** flag indicating whether highlight circle should be drawn or not */ diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IScatterDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IScatterDataSet.kt similarity index 73% rename from MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IScatterDataSet.kt rename to chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IScatterDataSet.kt index 9eb41c2184..9e44a32511 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IScatterDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IScatterDataSet.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.interfaces.datasets +package info.appdev.charting.interfaces.datasets -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.renderer.scatter.IShapeRenderer +import info.appdev.charting.data.Entry +import info.appdev.charting.renderer.scatter.IShapeRenderer interface IScatterDataSet : ILineScatterCandleRadarDataSet { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedMoveViewJob.kt b/chartLib/src/main/kotlin/info/appdev/charting/jobs/AnimatedMoveViewJob.kt similarity index 91% rename from MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedMoveViewJob.kt rename to chartLib/src/main/kotlin/info/appdev/charting/jobs/AnimatedMoveViewJob.kt index e02d341576..38b0042356 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedMoveViewJob.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/jobs/AnimatedMoveViewJob.kt @@ -1,11 +1,11 @@ -package com.github.mikephil.charting.jobs +package info.appdev.charting.jobs import android.animation.ValueAnimator import android.annotation.SuppressLint import android.view.View -import com.github.mikephil.charting.utils.ObjectPool -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.utils.ObjectPool +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.ViewPortHandler @SuppressLint("NewApi") class AnimatedMoveViewJob( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedViewPortJob.kt b/chartLib/src/main/kotlin/info/appdev/charting/jobs/AnimatedViewPortJob.kt similarity index 92% rename from MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedViewPortJob.kt rename to chartLib/src/main/kotlin/info/appdev/charting/jobs/AnimatedViewPortJob.kt index 94c88c469b..ddbaa18e45 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedViewPortJob.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/jobs/AnimatedViewPortJob.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.jobs +package info.appdev.charting.jobs import android.animation.Animator import android.animation.ObjectAnimator @@ -6,8 +6,8 @@ import android.animation.ValueAnimator import android.animation.ValueAnimator.AnimatorUpdateListener import android.annotation.SuppressLint import android.view.View -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.ViewPortHandler @SuppressLint("NewApi") abstract class AnimatedViewPortJob>( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedZoomJob.kt b/chartLib/src/main/kotlin/info/appdev/charting/jobs/AnimatedZoomJob.kt similarity index 92% rename from MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedZoomJob.kt rename to chartLib/src/main/kotlin/info/appdev/charting/jobs/AnimatedZoomJob.kt index 6aa6e11569..8c1ced9f1a 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedZoomJob.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/jobs/AnimatedZoomJob.kt @@ -1,15 +1,15 @@ -package com.github.mikephil.charting.jobs +package info.appdev.charting.jobs import android.animation.Animator import android.animation.ValueAnimator import android.annotation.SuppressLint import android.graphics.Matrix import android.view.View -import com.github.mikephil.charting.charts.BarLineChartBase -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.utils.ObjectPool -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.charts.BarLineChartBase +import info.appdev.charting.components.YAxis +import info.appdev.charting.utils.ObjectPool +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.ViewPortHandler @SuppressLint("NewApi") open class AnimatedZoomJob @SuppressLint("NewApi") constructor( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/MoveViewJob.kt b/chartLib/src/main/kotlin/info/appdev/charting/jobs/MoveViewJob.kt similarity index 87% rename from MPChartLib/src/main/java/com/github/mikephil/charting/jobs/MoveViewJob.kt rename to chartLib/src/main/kotlin/info/appdev/charting/jobs/MoveViewJob.kt index 8501957dbc..df1ca7eac9 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/MoveViewJob.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/jobs/MoveViewJob.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.jobs +package info.appdev.charting.jobs import android.view.View -import com.github.mikephil.charting.utils.ObjectPool -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.utils.ObjectPool +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.ViewPortHandler open class MoveViewJob(viewPortHandler: ViewPortHandler, xValue: Float, yValue: Float, trans: Transformer?, v: View?) : ViewPortJob(viewPortHandler, xValue, yValue, trans, v) { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/ViewPortJob.kt b/chartLib/src/main/kotlin/info/appdev/charting/jobs/ViewPortJob.kt similarity index 82% rename from MPChartLib/src/main/java/com/github/mikephil/charting/jobs/ViewPortJob.kt rename to chartLib/src/main/kotlin/info/appdev/charting/jobs/ViewPortJob.kt index 55de1b21e4..89a191ba26 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/ViewPortJob.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/jobs/ViewPortJob.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.jobs +package info.appdev.charting.jobs import android.view.View -import com.github.mikephil.charting.utils.ObjectPool.Poolable -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.utils.ObjectPool.Poolable +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.ViewPortHandler /** * Runnable that is used for viewport modifications since they cannot be diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/ZoomJob.kt b/chartLib/src/main/kotlin/info/appdev/charting/jobs/ZoomJob.kt similarity index 87% rename from MPChartLib/src/main/java/com/github/mikephil/charting/jobs/ZoomJob.kt rename to chartLib/src/main/kotlin/info/appdev/charting/jobs/ZoomJob.kt index ec9fc45e5d..19f9dba5e1 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/ZoomJob.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/jobs/ZoomJob.kt @@ -1,12 +1,12 @@ -package com.github.mikephil.charting.jobs +package info.appdev.charting.jobs import android.graphics.Matrix import android.view.View -import com.github.mikephil.charting.charts.BarLineChartBase -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.utils.ObjectPool -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.charts.BarLineChartBase +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.utils.ObjectPool +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.ViewPortHandler open class ZoomJob( viewPortHandler: ViewPortHandler, protected var scaleX: Float, protected var scaleY: Float, xValue: Float, yValue: Float, trans: Transformer?, diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.kt b/chartLib/src/main/kotlin/info/appdev/charting/listener/BarLineChartTouchListener.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.kt rename to chartLib/src/main/kotlin/info/appdev/charting/listener/BarLineChartTouchListener.kt index 1364c027ef..927a658cdb 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/listener/BarLineChartTouchListener.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.listener +package info.appdev.charting.listener import android.annotation.SuppressLint import android.graphics.Matrix @@ -6,15 +6,15 @@ import android.view.MotionEvent import android.view.VelocityTracker import android.view.View import android.view.animation.AnimationUtils -import com.github.mikephil.charting.charts.BarLineChartBase -import com.github.mikephil.charting.charts.HorizontalBarChart -import com.github.mikephil.charting.data.BarLineScatterCandleBubbleData -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet -import com.github.mikephil.charting.interfaces.datasets.IDataSet -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.charts.BarLineChartBase +import info.appdev.charting.charts.HorizontalBarChart +import info.appdev.charting.data.BarLineScatterCandleBubbleData +import info.appdev.charting.data.Entry +import info.appdev.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet +import info.appdev.charting.interfaces.datasets.IDataSet +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.convertDpToPixel import timber.log.Timber import kotlin.math.abs import kotlin.math.sqrt diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/ChartTouchListener.kt b/chartLib/src/main/kotlin/info/appdev/charting/listener/ChartTouchListener.kt similarity index 95% rename from MPChartLib/src/main/java/com/github/mikephil/charting/listener/ChartTouchListener.kt rename to chartLib/src/main/kotlin/info/appdev/charting/listener/ChartTouchListener.kt index f90b5e8706..f639f6a242 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/ChartTouchListener.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/listener/ChartTouchListener.kt @@ -1,11 +1,11 @@ -package com.github.mikephil.charting.listener +package info.appdev.charting.listener import android.view.GestureDetector import android.view.GestureDetector.SimpleOnGestureListener import android.view.MotionEvent import android.view.View.OnTouchListener -import com.github.mikephil.charting.charts.Chart -import com.github.mikephil.charting.highlight.Highlight +import info.appdev.charting.charts.Chart +import info.appdev.charting.highlight.Highlight import kotlin.math.sqrt abstract class ChartTouchListener>( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnChartGestureListener.kt b/chartLib/src/main/kotlin/info/appdev/charting/listener/OnChartGestureListener.kt similarity index 93% rename from MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnChartGestureListener.kt rename to chartLib/src/main/kotlin/info/appdev/charting/listener/OnChartGestureListener.kt index 9b25339be4..ed8892aff2 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnChartGestureListener.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/listener/OnChartGestureListener.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.listener +package info.appdev.charting.listener import android.view.MotionEvent -import com.github.mikephil.charting.listener.ChartTouchListener.ChartGesture +import info.appdev.charting.listener.ChartTouchListener.ChartGesture /** * Listener for callbacks when doing gestures on the chart. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnChartValueSelectedListener.kt b/chartLib/src/main/kotlin/info/appdev/charting/listener/OnChartValueSelectedListener.kt similarity index 80% rename from MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnChartValueSelectedListener.kt rename to chartLib/src/main/kotlin/info/appdev/charting/listener/OnChartValueSelectedListener.kt index 48ef465ca8..188ed5ea10 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnChartValueSelectedListener.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/listener/OnChartValueSelectedListener.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.listener +package info.appdev.charting.listener -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.highlight.Highlight +import info.appdev.charting.data.Entry +import info.appdev.charting.highlight.Highlight /** * Listener for callbacks when selecting values inside the chart by diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnDrawLineChartTouchListener.kt b/chartLib/src/main/kotlin/info/appdev/charting/listener/OnDrawLineChartTouchListener.kt similarity index 88% rename from MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnDrawLineChartTouchListener.kt rename to chartLib/src/main/kotlin/info/appdev/charting/listener/OnDrawLineChartTouchListener.kt index 1b1b99e1c6..bf90b24d61 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnDrawLineChartTouchListener.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/listener/OnDrawLineChartTouchListener.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.listener +package info.appdev.charting.listener import android.view.GestureDetector.SimpleOnGestureListener import android.view.MotionEvent diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnDrawListener.kt b/chartLib/src/main/kotlin/info/appdev/charting/listener/OnDrawListener.kt similarity index 82% rename from MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnDrawListener.kt rename to chartLib/src/main/kotlin/info/appdev/charting/listener/OnDrawListener.kt index d1e5a0ea47..6e755a23e1 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnDrawListener.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/listener/OnDrawListener.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.listener +package info.appdev.charting.listener -import com.github.mikephil.charting.data.DataSet -import com.github.mikephil.charting.data.Entry +import info.appdev.charting.data.DataSet +import info.appdev.charting.data.Entry /** * Listener for callbacks when drawing on the chart. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/PieRadarChartTouchListener.kt b/chartLib/src/main/kotlin/info/appdev/charting/listener/PieRadarChartTouchListener.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/listener/PieRadarChartTouchListener.kt rename to chartLib/src/main/kotlin/info/appdev/charting/listener/PieRadarChartTouchListener.kt index 7c3952610e..eeeef61fb9 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/PieRadarChartTouchListener.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/listener/PieRadarChartTouchListener.kt @@ -1,12 +1,12 @@ -package com.github.mikephil.charting.listener +package info.appdev.charting.listener import android.annotation.SuppressLint import android.view.MotionEvent import android.view.View import android.view.animation.AnimationUtils -import com.github.mikephil.charting.charts.PieRadarChartBase -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.charts.PieRadarChartBase +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.convertDpToPixel import kotlin.math.abs class PieRadarChartTouchListener(chart: PieRadarChartBase<*>) : ChartTouchListener>(chart) { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/AxisRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/AxisRenderer.kt similarity index 95% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/AxisRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/AxisRenderer.kt index 4c5e1e8d6d..1f331ce7d5 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/AxisRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/AxisRenderer.kt @@ -1,13 +1,13 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint -import com.github.mikephil.charting.components.AxisBase -import com.github.mikephil.charting.utils.MPPointD -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.roundToNextSignificant +import info.appdev.charting.components.AxisBase +import info.appdev.charting.utils.MPPointD +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.roundToNextSignificant import kotlin.math.abs import kotlin.math.ceil import kotlin.math.floor diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/BarChartRenderer.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/BarChartRenderer.kt index fa00974f68..6c0643695a 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/BarChartRenderer.kt @@ -1,21 +1,21 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint import android.graphics.RectF -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.buffer.BarBuffer -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.utils.Fill -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.calcTextHeight -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.buffer.BarBuffer +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.dataprovider.BarDataProvider +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.utils.Fill +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.calcTextHeight +import info.appdev.charting.utils.convertDpToPixel import kotlin.math.ceil import kotlin.math.min diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/BarLineScatterCandleBubbleRenderer.kt similarity index 81% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/BarLineScatterCandleBubbleRenderer.kt index fd2b96ec6b..9650080824 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/BarLineScatterCandleBubbleRenderer.kt @@ -1,12 +1,12 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.data.DataSet -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider -import com.github.mikephil.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet -import com.github.mikephil.charting.interfaces.datasets.IDataSet -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.data.DataSet +import info.appdev.charting.data.Entry +import info.appdev.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider +import info.appdev.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet +import info.appdev.charting.interfaces.datasets.IDataSet +import info.appdev.charting.utils.ViewPortHandler import kotlin.math.max import kotlin.math.min diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/BubbleChartRenderer.kt similarity index 94% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/BubbleChartRenderer.kt index c8634368b2..65f5ac734c 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/BubbleChartRenderer.kt @@ -1,17 +1,17 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.dataprovider.BubbleDataProvider -import com.github.mikephil.charting.interfaces.datasets.IBubbleDataSet -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.calcTextHeight -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.dataprovider.BubbleDataProvider +import info.appdev.charting.interfaces.datasets.IBubbleDataSet +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.calcTextHeight +import info.appdev.charting.utils.convertDpToPixel import kotlin.math.abs import kotlin.math.max import kotlin.math.min diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/CandleStickChartRenderer.kt similarity index 95% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/CandleStickChartRenderer.kt index 4b781622b9..de02bb5a08 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/CandleStickChartRenderer.kt @@ -1,16 +1,16 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Paint -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.dataprovider.CandleDataProvider -import com.github.mikephil.charting.interfaces.datasets.ICandleDataSet -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.dataprovider.CandleDataProvider +import info.appdev.charting.interfaces.datasets.ICandleDataSet +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel open class CandleStickChartRenderer( @JvmField diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CombinedChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/CombinedChartRenderer.kt similarity index 88% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CombinedChartRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/CombinedChartRenderer.kt index 6ce07e58c8..1d71bf6ab6 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CombinedChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/CombinedChartRenderer.kt @@ -1,14 +1,14 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.charts.Chart -import com.github.mikephil.charting.charts.CombinedChart -import com.github.mikephil.charting.charts.CombinedChart.DrawOrder -import com.github.mikephil.charting.data.ChartData -import com.github.mikephil.charting.data.CombinedData -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.charts.Chart +import info.appdev.charting.charts.CombinedChart +import info.appdev.charting.charts.CombinedChart.DrawOrder +import info.appdev.charting.data.ChartData +import info.appdev.charting.data.CombinedData +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.utils.ViewPortHandler import java.lang.ref.WeakReference /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/DataRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/DataRenderer.kt similarity index 86% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/DataRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/DataRenderer.kt index 66d3b6ea67..874eab2257 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/DataRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/DataRenderer.kt @@ -1,17 +1,17 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint import android.graphics.Paint.Align -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.formatter.IValueFormatter -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.dataprovider.base.IBaseProvider -import com.github.mikephil.charting.interfaces.datasets.IDataSet -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.data.Entry +import info.appdev.charting.formatter.IValueFormatter +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.dataprovider.base.IBaseProvider +import info.appdev.charting.interfaces.datasets.IDataSet +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel /** * Superclass of all render classes for the different data types (line, bar, ...). diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt index eda3636381..fa74372f51 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt @@ -1,21 +1,21 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Paint.Align import android.graphics.RectF -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.buffer.HorizontalBarBuffer -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider -import com.github.mikephil.charting.interfaces.dataprovider.base.IBaseProvider -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.utils.Fill -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.calcTextHeight -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.buffer.HorizontalBarBuffer +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.dataprovider.BarDataProvider +import info.appdev.charting.interfaces.dataprovider.base.IBaseProvider +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.utils.Fill +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.calcTextHeight +import info.appdev.charting.utils.convertDpToPixel import kotlin.math.ceil import kotlin.math.min diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LegendRenderer.kt similarity index 94% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/LegendRenderer.kt index f9df39137c..40e33abd09 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LegendRenderer.kt @@ -1,26 +1,26 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Paint import android.graphics.Paint.Align import android.graphics.Path import androidx.core.graphics.withSave -import com.github.mikephil.charting.components.Legend -import com.github.mikephil.charting.components.Legend.LegendDirection -import com.github.mikephil.charting.components.Legend.LegendForm -import com.github.mikephil.charting.components.Legend.LegendHorizontalAlignment -import com.github.mikephil.charting.components.Legend.LegendOrientation -import com.github.mikephil.charting.components.Legend.LegendVerticalAlignment -import com.github.mikephil.charting.components.LegendEntry -import com.github.mikephil.charting.data.ChartData -import com.github.mikephil.charting.interfaces.datasets.IBarDataSet -import com.github.mikephil.charting.interfaces.datasets.ICandleDataSet -import com.github.mikephil.charting.interfaces.datasets.IPieDataSet -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.calcTextHeight -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.components.Legend +import info.appdev.charting.components.Legend.LegendDirection +import info.appdev.charting.components.Legend.LegendForm +import info.appdev.charting.components.Legend.LegendHorizontalAlignment +import info.appdev.charting.components.Legend.LegendOrientation +import info.appdev.charting.components.Legend.LegendVerticalAlignment +import info.appdev.charting.components.LegendEntry +import info.appdev.charting.data.ChartData +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.interfaces.datasets.ICandleDataSet +import info.appdev.charting.interfaces.datasets.IPieDataSet +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.calcTextHeight +import info.appdev.charting.utils.convertDpToPixel import java.util.Collections import kotlin.math.min diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt index cc935061e8..f8750bd708 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Bitmap import android.graphics.Bitmap.createBitmap @@ -6,19 +6,19 @@ import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint import android.graphics.Path -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider -import com.github.mikephil.charting.interfaces.datasets.IDataSet -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.dataprovider.LineDataProvider +import info.appdev.charting.interfaces.datasets.IDataSet +import info.appdev.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel import java.lang.ref.WeakReference import kotlin.math.max import kotlin.math.min @@ -674,7 +674,7 @@ open class LineChartRenderer( } /** - * Releases the drawing bitmap. This should be called when [com.github.mikephil.charting.charts.LineChart.onDetachedFromWindow]. + * Releases the drawing bitmap. This should be called when [info.appdev.charting.charts.LineChart.onDetachedFromWindow]. */ fun releaseBitmap() { bitmapCanvas?.setBitmap(null) diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineRadarRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineRadarRenderer.kt similarity index 91% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineRadarRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/LineRadarRenderer.kt index b9e3297aa4..c53039cbf4 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineRadarRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineRadarRenderer.kt @@ -1,13 +1,13 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Paint import android.graphics.Path import android.graphics.drawable.Drawable import androidx.core.graphics.withClip -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.getSDKInt +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.getSDKInt abstract class LineRadarRenderer(animator: ChartAnimator, viewPortHandler: ViewPortHandler) : LineScatterCandleRadarRenderer(animator, viewPortHandler) { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineScatterCandleRadarRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineScatterCandleRadarRenderer.kt similarity index 88% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineScatterCandleRadarRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/LineScatterCandleRadarRenderer.kt index 77f95561cd..6040073d79 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineScatterCandleRadarRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineScatterCandleRadarRenderer.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Path -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.interfaces.datasets.ILineScatterCandleRadarDataSet -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.interfaces.datasets.ILineScatterCandleRadarDataSet +import info.appdev.charting.utils.ViewPortHandler abstract class LineScatterCandleRadarRenderer(animator: ChartAnimator, viewPortHandler: ViewPortHandler) : BarLineScatterCandleBubbleRenderer(animator, viewPortHandler) { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/PieChartRenderer.kt similarity index 98% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/PieChartRenderer.kt index 8e0a98fadd..412d8448cc 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/PieChartRenderer.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Bitmap import android.graphics.Canvas @@ -12,17 +12,17 @@ import android.text.StaticLayout import android.text.TextPaint import androidx.core.graphics.createBitmap import androidx.core.graphics.withSave -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.charts.PieChart -import com.github.mikephil.charting.data.PieDataSet.ValuePosition -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IPieDataSet -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.calcTextHeight -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.charts.PieChart +import info.appdev.charting.data.PieDataSet.ValuePosition +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IPieDataSet +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.calcTextHeight +import info.appdev.charting.utils.convertDpToPixel import java.lang.ref.WeakReference import kotlin.math.abs import kotlin.math.ceil diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RadarChartRenderer.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/RadarChartRenderer.kt index e63f21ce6f..1ee3a8c8ef 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RadarChartRenderer.kt @@ -1,19 +1,19 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint import android.graphics.Path import androidx.core.graphics.withSave -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.charts.RadarChart -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.datasets.IRadarDataSet -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.charts.RadarChart +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.datasets.IRadarDataSet +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel open class RadarChartRenderer( protected var chart: RadarChart, animator: ChartAnimator, diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/Renderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/Renderer.kt similarity index 64% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/Renderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/Renderer.kt index 9234eabf18..8108c0a304 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/Renderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/Renderer.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.utils.ViewPortHandler abstract class Renderer( /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedBarChartRenderer.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedBarChartRenderer.kt index ec1b69602a..6c8a9e7b02 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedBarChartRenderer.kt @@ -1,16 +1,16 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.LinearGradient import android.graphics.Path import android.graphics.RectF import android.graphics.Shader -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.highlight.Highlight -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 info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.dataprovider.BarDataProvider +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel import kotlin.math.min @Suppress("unused") diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedHorizontalBarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedHorizontalBarChartRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt index e47087ebc4..f13a5331fb 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedHorizontalBarChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt @@ -1,14 +1,14 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Paint import android.graphics.Path import android.graphics.RectF -import com.github.mikephil.charting.animation.ChartAnimator -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 info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.interfaces.dataprovider.BarDataProvider +import info.appdev.charting.interfaces.datasets.IBarDataSet +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel import kotlin.math.min /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/ScatterChartRenderer.kt similarity index 92% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/ScatterChartRenderer.kt index 570291db94..37e754ef08 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/ScatterChartRenderer.kt @@ -1,14 +1,14 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas -import com.github.mikephil.charting.animation.ChartAnimator -import com.github.mikephil.charting.highlight.Highlight -import com.github.mikephil.charting.interfaces.dataprovider.ScatterDataProvider -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.animation.ChartAnimator +import info.appdev.charting.highlight.Highlight +import info.appdev.charting.interfaces.dataprovider.ScatterDataProvider +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel import timber.log.Timber import kotlin.math.ceil import kotlin.math.min diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt similarity index 95% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt index 350cbe8762..de9b1785c6 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Color @@ -8,19 +8,19 @@ import android.graphics.Path import android.graphics.RectF import androidx.core.graphics.withClip import androidx.core.graphics.withSave -import com.github.mikephil.charting.components.LimitLine -import com.github.mikephil.charting.components.LimitLine.LimitLabelPosition -import com.github.mikephil.charting.components.XAxis -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.utils.FSize -import com.github.mikephil.charting.utils.MPPointD -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.calcTextHeight -import com.github.mikephil.charting.utils.convertDpToPixel -import com.github.mikephil.charting.utils.drawXAxisValue +import info.appdev.charting.components.LimitLine +import info.appdev.charting.components.LimitLine.LimitLabelPosition +import info.appdev.charting.components.XAxis +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.utils.FSize +import info.appdev.charting.utils.MPPointD +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.calcTextHeight +import info.appdev.charting.utils.convertDpToPixel +import info.appdev.charting.utils.drawXAxisValue import kotlin.math.roundToInt open class XAxisRenderer( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRendererHorizontalBarChart.kt similarity index 94% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRendererHorizontalBarChart.kt index 27f925ab3d..bc0e75e9a6 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRendererHorizontalBarChart.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Paint @@ -6,17 +6,17 @@ import android.graphics.Paint.Align import android.graphics.Path import android.graphics.RectF import androidx.core.graphics.withSave -import com.github.mikephil.charting.components.LimitLine.LimitLabelPosition -import com.github.mikephil.charting.components.XAxis -import com.github.mikephil.charting.components.XAxis.XAxisPosition -import com.github.mikephil.charting.utils.FSize -import com.github.mikephil.charting.utils.MPPointD -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.calcTextHeight -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.components.LimitLine.LimitLabelPosition +import info.appdev.charting.components.XAxis +import info.appdev.charting.components.XAxis.XAxisPosition +import info.appdev.charting.utils.FSize +import info.appdev.charting.utils.MPPointD +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.calcTextHeight +import info.appdev.charting.utils.convertDpToPixel import kotlin.math.roundToInt @Suppress("MemberVisibilityCanBePrivate") diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRendererRadarChart.kt similarity index 85% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRendererRadarChart.kt index 2760b91483..f878905bdb 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRendererRadarChart.kt @@ -1,11 +1,11 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas -import com.github.mikephil.charting.charts.RadarChart -import com.github.mikephil.charting.components.XAxis -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.charts.RadarChart +import info.appdev.charting.components.XAxis +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler class XAxisRendererRadarChart(viewPortHandler: ViewPortHandler, xAxis: XAxis, private val chart: RadarChart) : XAxisRenderer(viewPortHandler, xAxis, null) { override fun renderAxisLabels(canvas: Canvas) { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRenderer.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRenderer.kt index 70041fed7d..085b72a354 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRenderer.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Color @@ -6,16 +6,16 @@ import android.graphics.Paint import android.graphics.Paint.Align import android.graphics.Path import android.graphics.RectF -import com.github.mikephil.charting.components.LimitLine.LimitLabelPosition -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.components.YAxis.YAxisLabelPosition -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.components.LimitLine.LimitLabelPosition +import info.appdev.charting.components.YAxis +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.components.YAxis.YAxisLabelPosition +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.ViewPortHandler import androidx.core.graphics.withSave import androidx.core.graphics.withClip -import com.github.mikephil.charting.utils.calcTextHeight -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.utils.calcTextHeight +import info.appdev.charting.utils.convertDpToPixel open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected var yAxis: YAxis, trans: Transformer?) : AxisRenderer(viewPortHandler, trans, yAxis) { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRendererHorizontalBarChart.kt similarity index 94% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRendererHorizontalBarChart.kt index 1f0465664a..79a7794a00 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRendererHorizontalBarChart.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Paint @@ -6,15 +6,15 @@ import android.graphics.Paint.Align import android.graphics.Path import android.graphics.RectF import androidx.core.graphics.withSave -import com.github.mikephil.charting.components.LimitLine.LimitLabelPosition -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.components.YAxis.AxisDependency -import com.github.mikephil.charting.components.YAxis.YAxisLabelPosition -import com.github.mikephil.charting.utils.MPPointD -import com.github.mikephil.charting.utils.Transformer -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.calcTextHeight -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.components.LimitLine.LimitLabelPosition +import info.appdev.charting.components.YAxis +import info.appdev.charting.components.YAxis.AxisDependency +import info.appdev.charting.components.YAxis.YAxisLabelPosition +import info.appdev.charting.utils.MPPointD +import info.appdev.charting.utils.Transformer +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.calcTextHeight +import info.appdev.charting.utils.convertDpToPixel @Suppress("MemberVisibilityCanBePrivate") open class YAxisRendererHorizontalBarChart( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRendererRadarChart.kt similarity index 94% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRendererRadarChart.kt index 886d8a6ff6..3972e62637 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRendererRadarChart.kt @@ -1,13 +1,13 @@ -package com.github.mikephil.charting.renderer +package info.appdev.charting.renderer import android.graphics.Canvas import android.graphics.Path -import com.github.mikephil.charting.charts.RadarChart -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.utils.MPPointF -import com.github.mikephil.charting.utils.Utils -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.roundToNextSignificant +import info.appdev.charting.charts.RadarChart +import info.appdev.charting.components.YAxis +import info.appdev.charting.utils.MPPointF +import info.appdev.charting.utils.Utils +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.roundToNextSignificant import kotlin.math.abs import kotlin.math.ceil import kotlin.math.floor diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronDownShapeRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/ChevronDownShapeRenderer.kt similarity index 76% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronDownShapeRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/ChevronDownShapeRenderer.kt index 7231808dbc..ab23c7e930 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronDownShapeRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/ChevronDownShapeRenderer.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.renderer.scatter +package info.appdev.charting.renderer.scatter import android.graphics.Canvas import android.graphics.Paint -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel class ChevronDownShapeRenderer : IShapeRenderer { override fun renderShape( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronUpShapeRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/ChevronUpShapeRenderer.kt similarity index 76% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronUpShapeRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/ChevronUpShapeRenderer.kt index 64b671d82e..f38505ceb2 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronUpShapeRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/ChevronUpShapeRenderer.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.renderer.scatter +package info.appdev.charting.renderer.scatter import android.graphics.Canvas import android.graphics.Paint -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel class ChevronUpShapeRenderer : IShapeRenderer { override fun renderShape( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CircleShapeRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/CircleShapeRenderer.kt similarity index 84% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CircleShapeRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/CircleShapeRenderer.kt index 4055fd3a7d..639670b562 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CircleShapeRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/CircleShapeRenderer.kt @@ -1,11 +1,11 @@ -package com.github.mikephil.charting.renderer.scatter +package info.appdev.charting.renderer.scatter import android.graphics.Canvas import android.graphics.Paint -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel class CircleShapeRenderer : IShapeRenderer { override fun renderShape( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CrossShapeRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/CrossShapeRenderer.kt similarity index 76% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CrossShapeRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/CrossShapeRenderer.kt index 29cbd37afa..c4cda2568a 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CrossShapeRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/CrossShapeRenderer.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.renderer.scatter +package info.appdev.charting.renderer.scatter import android.graphics.Canvas import android.graphics.Paint -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel class CrossShapeRenderer : IShapeRenderer { override fun renderShape( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/IShapeRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/IShapeRenderer.kt similarity index 80% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/IShapeRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/IShapeRenderer.kt index 4315b59890..5f4c8256cd 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/IShapeRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/IShapeRenderer.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.renderer.scatter +package info.appdev.charting.renderer.scatter import android.graphics.Canvas import android.graphics.Paint -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.utils.ViewPortHandler interface IShapeRenderer { /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/SquareShapeRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/SquareShapeRenderer.kt similarity index 86% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/SquareShapeRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/SquareShapeRenderer.kt index 5310c621f1..bb5606882f 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/SquareShapeRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/SquareShapeRenderer.kt @@ -1,11 +1,11 @@ -package com.github.mikephil.charting.renderer.scatter +package info.appdev.charting.renderer.scatter import android.graphics.Canvas import android.graphics.Paint -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel class SquareShapeRenderer : IShapeRenderer { override fun renderShape( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/TriangleShapeRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/TriangleShapeRenderer.kt similarity index 88% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/TriangleShapeRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/TriangleShapeRenderer.kt index 564ed73dd3..1886c24005 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/TriangleShapeRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/TriangleShapeRenderer.kt @@ -1,12 +1,12 @@ -package com.github.mikephil.charting.renderer.scatter +package info.appdev.charting.renderer.scatter import android.graphics.Canvas import android.graphics.Paint import android.graphics.Path -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.utils.ColorTemplate -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.utils.ColorTemplate +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel open class TriangleShapeRenderer : IShapeRenderer { protected var trianglePathBuffer: Path = Path() diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/XShapeRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/XShapeRenderer.kt similarity index 77% rename from MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/XShapeRenderer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/XShapeRenderer.kt index f7005bbecd..72c2a80caa 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/XShapeRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/scatter/XShapeRenderer.kt @@ -1,10 +1,10 @@ -package com.github.mikephil.charting.renderer.scatter +package info.appdev.charting.renderer.scatter import android.graphics.Canvas import android.graphics.Paint -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.utils.ViewPortHandler -import com.github.mikephil.charting.utils.convertDpToPixel +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.utils.ViewPortHandler +import info.appdev.charting.utils.convertDpToPixel class XShapeRenderer : IShapeRenderer { override fun renderShape( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/AssetManagerUtils.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/AssetManagerUtils.kt similarity index 94% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/AssetManagerUtils.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/AssetManagerUtils.kt index ec5c17d50e..1e19fa79f0 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/AssetManagerUtils.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/AssetManagerUtils.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils import android.content.res.AssetManager import android.webkit.ConsoleMessage -import com.github.mikephil.charting.data.BarEntry -import com.github.mikephil.charting.data.Entry +import info.appdev.charting.data.BarEntry +import info.appdev.charting.data.Entry import timber.log.Timber import java.io.BufferedReader import java.io.IOException diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/CanvasUtils.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/CanvasUtils.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/CanvasUtils.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/CanvasUtils.kt index b8d9c05eec..a20452956d 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/CanvasUtils.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/CanvasUtils.kt @@ -1,11 +1,11 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils import android.graphics.Canvas import android.graphics.Paint import android.graphics.Paint.Align import android.graphics.Rect import android.graphics.drawable.Drawable -import com.github.mikephil.charting.utils.Utils.FDEG2RAD +import info.appdev.charting.utils.Utils.FDEG2RAD import kotlin.math.abs import kotlin.math.cos import kotlin.math.sin diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ColorTemplate.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/ColorTemplate.kt similarity index 98% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/ColorTemplate.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/ColorTemplate.kt index f2c60a521c..1027faff21 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ColorTemplate.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/ColorTemplate.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils import android.graphics.Color diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/EntryXComparator.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/EntryXComparator.kt similarity index 77% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/EntryXComparator.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/EntryXComparator.kt index b717c26be9..d5bb3a2f77 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/EntryXComparator.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/EntryXComparator.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils -import com.github.mikephil.charting.data.Entry +import info.appdev.charting.data.Entry import kotlin.Comparator import kotlin.Int diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/FSize.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/FSize.kt similarity index 94% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/FSize.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/FSize.kt index 1cfb52c626..6259435442 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/FSize.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/FSize.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils -import com.github.mikephil.charting.utils.ObjectPool.Poolable +import info.appdev.charting.utils.ObjectPool.Poolable import kotlin.Any import kotlin.Boolean import kotlin.Int diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/Fill.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/Fill.kt similarity index 99% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/Fill.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/Fill.kt index 83c20c1e31..8dd49a4a1e 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/Fill.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/Fill.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils import android.graphics.Canvas import android.graphics.LinearGradient diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/HorizontalViewPortHandler.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/HorizontalViewPortHandler.kt similarity index 55% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/HorizontalViewPortHandler.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/HorizontalViewPortHandler.kt index 172e4655e0..a4f8648c14 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/HorizontalViewPortHandler.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/HorizontalViewPortHandler.kt @@ -1,3 +1,3 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils class HorizontalViewPortHandler : ViewPortHandler() diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/MPPointD.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/MPPointD.kt similarity index 90% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/MPPointD.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/MPPointD.kt index 9b55cf42ba..5e10c81103 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/MPPointD.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/MPPointD.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils -import com.github.mikephil.charting.utils.ObjectPool.Poolable +import info.appdev.charting.utils.ObjectPool.Poolable /** * Point encapsulating two double values. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/MPPointF.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/MPPointF.kt similarity index 95% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/MPPointF.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/MPPointF.kt index 562e1d9cdd..bef01b2352 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/MPPointF.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/MPPointF.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils import android.os.Parcel import android.os.Parcelable -import com.github.mikephil.charting.utils.ObjectPool.Poolable +import info.appdev.charting.utils.ObjectPool.Poolable class MPPointF : Poolable { var x: Float = 0f diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ObjectPool.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/ObjectPool.kt similarity index 98% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/ObjectPool.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/ObjectPool.kt index 0be86bac64..4386d78db0 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ObjectPool.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/ObjectPool.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils -import com.github.mikephil.charting.utils.ObjectPool.Poolable +import info.appdev.charting.utils.ObjectPool.Poolable /** * An object pool for recycling of object instances extending Poolable. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/SaveUtils.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/SaveUtils.kt similarity index 99% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/SaveUtils.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/SaveUtils.kt index e8ce18097a..bd6560e78c 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/SaveUtils.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/SaveUtils.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils import android.content.ContentValues import android.content.Context diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/Transformer.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/Transformer.kt similarity index 96% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/Transformer.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/Transformer.kt index 09c428bf4c..3e1c8f66e6 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/Transformer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/Transformer.kt @@ -1,14 +1,14 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils import android.graphics.Matrix import android.graphics.Path import android.graphics.RectF -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.interfaces.datasets.IBubbleDataSet -import com.github.mikephil.charting.interfaces.datasets.ICandleDataSet -import com.github.mikephil.charting.interfaces.datasets.ILineDataSet -import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet -import com.github.mikephil.charting.utils.MPPointD.Companion.getInstance +import info.appdev.charting.data.Entry +import info.appdev.charting.interfaces.datasets.IBubbleDataSet +import info.appdev.charting.interfaces.datasets.ICandleDataSet +import info.appdev.charting.interfaces.datasets.ILineDataSet +import info.appdev.charting.interfaces.datasets.IScatterDataSet +import info.appdev.charting.utils.MPPointD.Companion.getInstance import kotlin.Boolean import kotlin.FloatArray import kotlin.Int diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/TransformerHorizontalBarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/TransformerHorizontalBarChart.kt similarity index 94% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/TransformerHorizontalBarChart.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/TransformerHorizontalBarChart.kt index 741ab11a81..4c8ebd3173 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/TransformerHorizontalBarChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/TransformerHorizontalBarChart.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils /** * Transformer class for the HorizontalBarChart. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/Utils.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/Utils.kt similarity index 97% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/Utils.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/Utils.kt index 07b2118718..5d00ff550b 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/Utils.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/Utils.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils import android.content.Context import android.graphics.Canvas @@ -8,9 +8,9 @@ import android.graphics.drawable.Drawable import android.view.MotionEvent import android.view.VelocityTracker import android.view.ViewConfiguration -import com.github.mikephil.charting.formatter.DefaultValueFormatter -import com.github.mikephil.charting.formatter.IValueFormatter -import com.github.mikephil.charting.utils.MPPointF.Companion.instance +import info.appdev.charting.formatter.DefaultValueFormatter +import info.appdev.charting.formatter.IValueFormatter +import info.appdev.charting.utils.MPPointF.Companion.instance import java.lang.Float import kotlin.Int import kotlin.IntArray diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/UtilsKt.kt similarity index 99% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/UtilsKt.kt index 494c403d55..b7f14fb6b2 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/UtilsKt.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils import android.content.Context import android.graphics.Paint diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ViewPortHandler.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/ViewPortHandler.kt similarity index 99% rename from MPChartLib/src/main/java/com/github/mikephil/charting/utils/ViewPortHandler.kt rename to chartLib/src/main/kotlin/info/appdev/charting/utils/ViewPortHandler.kt index c8de631dd6..edc7773db8 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ViewPortHandler.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/ViewPortHandler.kt @@ -1,4 +1,4 @@ -package com.github.mikephil.charting.utils +package info.appdev.charting.utils import android.graphics.Matrix import android.graphics.RectF diff --git a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/ApproximationTest.kt b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/ApproximationTest.kt similarity index 81% rename from MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/ApproximationTest.kt rename to chartLib/src/test/kotlin/com/github/mikephil/charting/test/ApproximationTest.kt index 5c21429f42..93f310540d 100644 --- a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/ApproximationTest.kt +++ b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/ApproximationTest.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.test +package info.appdev.charting.test -import com.github.mikephil.charting.data.filter.Approximator +import info.appdev.charting.data.filter.Approximator import org.junit.Assert import org.junit.Test diff --git a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/AxisRendererTest.kt b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/AxisRendererTest.kt similarity index 92% rename from MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/AxisRendererTest.kt rename to chartLib/src/test/kotlin/com/github/mikephil/charting/test/AxisRendererTest.kt index c961ab4b36..00cd20c749 100644 --- a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/AxisRendererTest.kt +++ b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/AxisRendererTest.kt @@ -1,9 +1,9 @@ -package com.github.mikephil.charting.test +package info.appdev.charting.test -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.renderer.AxisRenderer -import com.github.mikephil.charting.renderer.YAxisRenderer -import com.github.mikephil.charting.utils.ViewPortHandler +import info.appdev.charting.components.YAxis +import info.appdev.charting.renderer.AxisRenderer +import info.appdev.charting.renderer.YAxisRenderer +import info.appdev.charting.utils.ViewPortHandler import org.junit.Assert import org.junit.Test diff --git a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/BarDataTest.kt b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/BarDataTest.kt similarity index 90% rename from MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/BarDataTest.kt rename to chartLib/src/test/kotlin/com/github/mikephil/charting/test/BarDataTest.kt index 67d2194dbc..0869e638d6 100644 --- a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/BarDataTest.kt +++ b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/BarDataTest.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.test +package info.appdev.charting.test -import com.github.mikephil.charting.data.BarData -import com.github.mikephil.charting.data.BarDataSet -import com.github.mikephil.charting.data.BarEntry +import info.appdev.charting.data.BarData +import info.appdev.charting.data.BarDataSet +import info.appdev.charting.data.BarEntry import org.junit.Assert import org.junit.Test diff --git a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/ChartDataTest.kt b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/ChartDataTest.kt similarity index 95% rename from MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/ChartDataTest.kt rename to chartLib/src/test/kotlin/com/github/mikephil/charting/test/ChartDataTest.kt index 2686be28c2..468aaf40b2 100644 --- a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/ChartDataTest.kt +++ b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/ChartDataTest.kt @@ -1,11 +1,11 @@ -package com.github.mikephil.charting.test - -import com.github.mikephil.charting.components.YAxis -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet -import com.github.mikephil.charting.data.ScatterData -import com.github.mikephil.charting.data.ScatterDataSet +package info.appdev.charting.test + +import info.appdev.charting.components.YAxis +import info.appdev.charting.data.Entry +import info.appdev.charting.data.LineData +import info.appdev.charting.data.LineDataSet +import info.appdev.charting.data.ScatterData +import info.appdev.charting.data.ScatterDataSet import org.junit.Assert import org.junit.Test diff --git a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/DataSetTest.kt b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/DataSetTest.kt similarity index 97% rename from MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/DataSetTest.kt rename to chartLib/src/test/kotlin/com/github/mikephil/charting/test/DataSetTest.kt index d620105e61..62b0b0efb9 100644 --- a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/DataSetTest.kt +++ b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/DataSetTest.kt @@ -1,8 +1,8 @@ -package com.github.mikephil.charting.test +package info.appdev.charting.test -import com.github.mikephil.charting.data.DataSet -import com.github.mikephil.charting.data.Entry -import com.github.mikephil.charting.data.ScatterDataSet +import info.appdev.charting.data.DataSet +import info.appdev.charting.data.Entry +import info.appdev.charting.data.ScatterDataSet import org.junit.Assert import org.junit.Test diff --git a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/LargeValueFormatterTest.kt b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/LargeValueFormatterTest.kt similarity index 96% rename from MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/LargeValueFormatterTest.kt rename to chartLib/src/test/kotlin/com/github/mikephil/charting/test/LargeValueFormatterTest.kt index 7628b7e2c7..48fd5dc438 100644 --- a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/LargeValueFormatterTest.kt +++ b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/LargeValueFormatterTest.kt @@ -1,6 +1,6 @@ -package com.github.mikephil.charting.test +package info.appdev.charting.test -import com.github.mikephil.charting.formatter.LargeValueFormatter +import info.appdev.charting.formatter.LargeValueFormatter import org.junit.Assert import org.junit.Test diff --git a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/ObjectPoolTest.kt b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/ObjectPoolTest.kt similarity index 98% rename from MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/ObjectPoolTest.kt rename to chartLib/src/test/kotlin/com/github/mikephil/charting/test/ObjectPoolTest.kt index 31eef103be..6e16a06d61 100644 --- a/MPChartLib/src/test/kotlin/com/github/mikephil/charting/test/ObjectPoolTest.kt +++ b/chartLib/src/test/kotlin/com/github/mikephil/charting/test/ObjectPoolTest.kt @@ -1,7 +1,7 @@ -package com.github.mikephil.charting.test +package info.appdev.charting.test -import com.github.mikephil.charting.utils.ObjectPool -import com.github.mikephil.charting.utils.ObjectPool.Poolable +import info.appdev.charting.utils.ObjectPool +import info.appdev.charting.utils.ObjectPool.Poolable import org.junit.Assert import org.junit.Test diff --git a/settings.gradle.kts b/settings.gradle.kts index 062df08df2..186ce51d72 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,2 +1,2 @@ -include("MPChartLib") +include("chartLib") include("app") From d857cf7cdac149d8ad836b0c3c27e0590c0cc496 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Fri, 26 Dec 2025 23:31:27 +0100 Subject: [PATCH 2/2] Cosmetic --- .github/workflows/Android-CI-release.yml | 4 ++-- .github/workflows/Android-CI.yml | 2 +- .../src/main/kotlin/info/appdev/charting/components/Legend.kt | 3 +-- jitpack.yml | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/Android-CI-release.yml b/.github/workflows/Android-CI-release.yml index b09172b005..c4822d24e7 100644 --- a/.github/workflows/Android-CI-release.yml +++ b/.github/workflows/Android-CI-release.yml @@ -47,7 +47,7 @@ jobs: # run: | # signing/decrypt.sh # cat signing/gradle_secure.properties >> gradle.properties -# ./gradlew MPChartLib:publishMavenPublicationToMavenCentralRepository +# ./gradlew chartLib:publishMavenPublicationToMavenCentralRepository # env: # CRYPT_PASS: ${{ secrets.CRYPT_PASS }} @@ -58,6 +58,6 @@ jobs: name: ${{steps.tagger.outputs.tag}} generate_release_notes: true body: ${{steps.github_release.outputs.changelog}} - files: MPChartLib/build/outputs/aar/MPChartLib-release.aar + files: chartLib/build/outputs/aar/chartLib-release.aar env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml index cb6707b7d0..65c61e12fd 100644 --- a/.github/workflows/Android-CI.yml +++ b/.github/workflows/Android-CI.yml @@ -117,7 +117,7 @@ jobs: - name: Run tests run: ./gradlew test - name: Test jitpack publish command - run: ./gradlew :MPChartLib:publishToMavenLocal + run: ./gradlew :chartLib:publishToMavenLocal - name: Code checks run: ./gradlew check - name: Archive Lint report diff --git a/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt index fc61df686d..a2af9adab6 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt @@ -202,8 +202,7 @@ class Legend() : ComponentBase() { entry.formSize).convertDpToPixel() if (formSize > maxFormSize) maxFormSize = formSize - val label = entry.label - if (label == null) continue + val label = entry.label ?: continue val length = Utils.calcTextWidth(p, label).toFloat() diff --git a/jitpack.yml b/jitpack.yml index 63e497b945..18789d592e 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,5 +1,5 @@ jdk: - openjdk17 install: - - ./gradlew :MPChartLib:build :MPChartLib:publishToMavenLocal -x :MPChartLib:test + - ./gradlew :chartLib:build :chartLib:publishToMavenLocal -x :chartLib:test - find . -name "*.aar"