Optional use own rounded BarRenderer 4.x

app/src/main/AndroidManifest.xml

@@ -23,7 +23,9 @@
         <activity android:name="info.appdev.chartexample.LineChartDualAxisActivity" />
         <activity android:name="info.appdev.chartexample.LineChartTimeActivity" />
         <activity android:name="info.appdev.chartexample.BarChartActivity" />
+        <activity android:name="info.appdev.chartexample.BarRoundedChartActivity" />
         <activity android:name="info.appdev.chartexample.HorizontalBarChartActivity" />
+        <activity android:name="info.appdev.chartexample.HorizontalBarRoundedChartActivity" />
         <activity android:name="info.appdev.chartexample.compose.HorizontalBarComposeActivity" />
         <activity android:name="info.appdev.chartexample.HorizontalBarNegativeChartActivity" />
         <activity android:name="info.appdev.chartexample.PieChartActivity" />
@@ -38,7 +40,7 @@
         <activity android:name="info.appdev.chartexample.ListViewBarChartActivity" />
         <activity android:name="info.appdev.chartexample.ListViewMultiChartActivity" />
         <activity android:name="info.appdev.chartexample.StackedBarActivity" />
-        <activity android:name="AnotherBarActivity" />
+        <activity android:name=".AnotherBarActivity" />
         <activity android:name="info.appdev.chartexample.InvertedLineChartActivity" />
         <activity android:name="info.appdev.chartexample.CandleStickChartActivity" />
         <activity android:name="info.appdev.chartexample.CubicLineChartActivity" />

app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt

@@ -35,9 +35,9 @@ import info.appdev.chartexample.formatter.MyAxisValueFormatter
 import info.appdev.chartexample.notimportant.DemoBase
 import timber.log.Timber
 
-class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {
+open class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {
 
-    private lateinit var binding: ActivityBarchartBinding
+    lateinit var binding: ActivityBarchartBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/kotlin/info/appdev/chartexample/BarRoundedChartActivity.kt

@@ -0,0 +1,12 @@
+package info.appdev.chartexample
+
+import android.os.Bundle
+import info.appdev.chartexample.databinding.ActivityBarchartBinding
+
+class BarRoundedChartActivity : BarChartActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding.chart1.isOwnRoundedRendererUsed = true
+    }
+}

app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt

@@ -27,9 +27,9 @@ import info.appdev.chartexample.databinding.ActivityHorizontalbarchartBinding
 import info.appdev.chartexample.notimportant.DemoBase
 import timber.log.Timber
 
-class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {
+open class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {
 
-    private lateinit var binding: ActivityHorizontalbarchartBinding
+    lateinit var binding: ActivityHorizontalbarchartBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/kotlin/info/appdev/chartexample/HorizontalBarRoundedChartActivity.kt

@@ -0,0 +1,12 @@
+package info.appdev.chartexample
+
+import android.os.Bundle
+
+class HorizontalBarRoundedChartActivity : HorizontalBarChartActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding.chart1.isOwnRoundedRendererUsed = true
+    }
+}

app/src/main/kotlin/info/appdev/chartexample/notimportant/MainActivity.kt

@@ -48,6 +48,7 @@ import info.appdev.chartexample.BarChartActivity
 import info.appdev.chartexample.BarChartActivityMultiDataset
 import info.appdev.chartexample.BarChartActivitySinus
 import info.appdev.chartexample.BarChartPositiveNegative
+import info.appdev.chartexample.BarRoundedChartActivity
 import info.appdev.chartexample.BubbleChartActivity
 import info.appdev.chartexample.CandleStickChartActivity
 import info.appdev.chartexample.CombinedChartActivity
@@ -57,6 +58,7 @@ import info.appdev.chartexample.FilledLineActivity
 import info.appdev.chartexample.GradientActivity
 import info.appdev.chartexample.HalfPieChartActivity
 import info.appdev.chartexample.HorizontalBarChartActivity
+import info.appdev.chartexample.HorizontalBarRoundedChartActivity
 import info.appdev.chartexample.InvertedLineChartActivity
 import info.appdev.chartexample.LineChartActivity
 import info.appdev.chartexample.LineChartActivityColored
@@ -167,9 +169,11 @@ class MainActivity : ComponentActivity() {
 
             add(ContentItem("Bar Charts"))
             add(ContentItem("Basic", "Simple bar chart.", BarChartActivity::class.java))
+            add(ContentItem("Basic with own rounded renderer", "Simple rounded bar chart.", BarRoundedChartActivity::class.java))
             add(ContentItem("Basic 2", "Variation of the simple bar chart.", AnotherBarActivity::class.java))
             add(ContentItem("Multiple", "Show multiple data sets.", BarChartActivityMultiDataset::class.java))
             add(ContentItem("Horizontal", "Render bar chart horizontally.", HorizontalBarChartActivity::class.java))
+            add(ContentItem("Horizontal with own rounded renderer", "Render bar rounded chart horizontally.", HorizontalBarRoundedChartActivity::class.java))
             add(ContentItem("Stacked", "Stacked bar chart.", StackedBarActivity::class.java))
             add(ContentItem("Negative", "Positive and negative values with unique colors.", BarChartPositiveNegative::class.java))
             //objects.add(ContentItem("Negative Horizontal", "demonstrates how to create a HorizontalBarChart with positive and negative values."))

chartLib/src/main/kotlin/info/appdev/charting/charts/BarChart.kt

@@ -10,6 +10,7 @@ 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 info.appdev.charting.renderer.RoundedBarChartRenderer
 import timber.log.Timber
 import java.util.Locale
 
@@ -26,6 +27,12 @@ open class BarChart : BarLineChartBase<BarData>, BarDataProvider {
      */
     override var isHighlightFullBarEnabled: Boolean = false
 
+    override var isOwnRoundedRendererUsed: Boolean = false
+        set(value) {
+            field = value
+            init()
+        }
+
     /**
      * if set to true, all values are drawn above their bars, instead of below their top
      */
@@ -54,10 +61,17 @@ open class BarChart : BarLineChartBase<BarData>, BarDataProvider {
 
     constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
 
+    protected open fun setRenderer() {
+        mRenderer = if (isOwnRoundedRendererUsed)
+            RoundedBarChartRenderer(this, mAnimator, viewPortHandler)
+        else
+            BarChartRenderer(this, mAnimator, viewPortHandler, mDrawRoundedBars, mRoundedBarRadius)
+    }
+
     override fun init() {
         super.init()
 
-        mRenderer = BarChartRenderer(this, mAnimator, viewPortHandler, mDrawRoundedBars, mRoundedBarRadius)
+        setRenderer()
 
         setHighlighter(BarHighlighter(this))
 

chartLib/src/main/kotlin/info/appdev/charting/charts/CombinedChart.kt

@@ -33,6 +33,12 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
      * false to make it highlight single values (relevant only for stacked).
      */
     override var isHighlightFullBarEnabled: Boolean = false
+    override var isOwnRoundedRendererUsed: Boolean = false
+        set(value) {
+            if (value) {
+                Timber.e("CombinedChart does not support Rounded Renderer")
+            }
+        }
 
     /**
      * if set to true, a grey area is drawn behind each bar that indicates the maximum value

chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt

@@ -13,6 +13,7 @@ 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.RoundedHorizontalBarChartRenderer
 import info.appdev.charting.renderer.XAxisRendererHorizontalBarChart
 import info.appdev.charting.renderer.YAxisRendererHorizontalBarChart
 import info.appdev.charting.utils.HorizontalViewPortHandler
@@ -35,6 +36,13 @@ open class HorizontalBarChart : BarChart {
 
     constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
 
+    override fun setRenderer() {
+        mRenderer = if (isOwnRoundedRendererUsed)
+            RoundedHorizontalBarChartRenderer(this, mAnimator, viewPortHandler)
+        else
+            HorizontalBarChartRenderer(this, mAnimator, viewPortHandler)
+    }
+
     init {
         viewPortHandler = HorizontalViewPortHandler()
 
@@ -43,7 +51,6 @@ open class HorizontalBarChart : BarChart {
         mLeftAxisTransformer = TransformerHorizontalBarChart(viewPortHandler)
         mRightAxisTransformer = TransformerHorizontalBarChart(viewPortHandler)
 
-        mRenderer = HorizontalBarChartRenderer(this, mAnimator, viewPortHandler)
         setHighlighter(HorizontalBarHighlighter(this))
 
         axisRendererLeft = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisLeft, mLeftAxisTransformer)

chartLib/src/main/kotlin/info/appdev/charting/interfaces/dataprovider/BarDataProvider.kt

@@ -8,4 +8,5 @@ interface BarDataProvider : BarLineScatterCandleBubbleDataProvider {
     var isDrawBarShadowEnabled: Boolean
     var isDrawValueAboveBarEnabled: Boolean
     var isHighlightFullBarEnabled: Boolean
+    var isOwnRoundedRendererUsed : Boolean
 }