Skip to content

Commit d205e8e

Browse files
committed
Add rounded sample, currently with normal renderer
1 parent 75596a2 commit d205e8e

File tree

6 files changed

+35
-5
lines changed

6 files changed

+35
-5
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
<activity android:name="info.appdev.chartexample.LineChartDualAxisActivity" />
2424
<activity android:name="info.appdev.chartexample.LineChartTimeActivity" />
2525
<activity android:name="info.appdev.chartexample.BarChartActivity" />
26+
<activity android:name="info.appdev.chartexample.BarRoundedChartActivity" />
2627
<activity android:name="info.appdev.chartexample.HorizontalBarChartActivity" />
28+
<activity android:name="info.appdev.chartexample.HorizontalBarRoundedChartActivity" />
2729
<activity android:name="info.appdev.chartexample.compose.HorizontalBarComposeActivity" />
2830
<activity android:name="info.appdev.chartexample.HorizontalBarNegativeChartActivity" />
2931
<activity android:name="info.appdev.chartexample.PieChartActivity" />
@@ -38,7 +40,7 @@
3840
<activity android:name="info.appdev.chartexample.ListViewBarChartActivity" />
3941
<activity android:name="info.appdev.chartexample.ListViewMultiChartActivity" />
4042
<activity android:name="info.appdev.chartexample.StackedBarActivity" />
41-
<activity android:name="AnotherBarActivity" />
43+
<activity android:name=".AnotherBarActivity" />
4244
<activity android:name="info.appdev.chartexample.InvertedLineChartActivity" />
4345
<activity android:name="info.appdev.chartexample.CandleStickChartActivity" />
4446
<activity android:name="info.appdev.chartexample.CubicLineChartActivity" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ import info.appdev.chartexample.formatter.MyAxisValueFormatter
3535
import info.appdev.chartexample.notimportant.DemoBase
3636
import timber.log.Timber
3737

38-
class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {
38+
open class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {
3939

40-
private lateinit var binding: ActivityBarchartBinding
40+
lateinit var binding: ActivityBarchartBinding
4141

4242
override fun onCreate(savedInstanceState: Bundle?) {
4343
super.onCreate(savedInstanceState)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package info.appdev.chartexample
2+
3+
import android.os.Bundle
4+
import info.appdev.chartexample.databinding.ActivityBarchartBinding
5+
6+
class BarRoundedChartActivity : BarChartActivity() {
7+
8+
override fun onCreate(savedInstanceState: Bundle?) {
9+
super.onCreate(savedInstanceState)
10+
binding.chart1.isOwnRoundedRendererUsed = false
11+
}
12+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import info.appdev.chartexample.databinding.ActivityHorizontalbarchartBinding
2727
import info.appdev.chartexample.notimportant.DemoBase
2828
import timber.log.Timber
2929

30-
class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {
30+
open class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {
3131

32-
private lateinit var binding: ActivityHorizontalbarchartBinding
32+
lateinit var binding: ActivityHorizontalbarchartBinding
3333

3434
override fun onCreate(savedInstanceState: Bundle?) {
3535
super.onCreate(savedInstanceState)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package info.appdev.chartexample
2+
3+
import android.os.Bundle
4+
5+
class HorizontalBarRoundedChartActivity : HorizontalBarChartActivity() {
6+
7+
override fun onCreate(savedInstanceState: Bundle?) {
8+
super.onCreate(savedInstanceState)
9+
10+
binding.chart1.isOwnRoundedRendererUsed = false
11+
}
12+
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import info.appdev.chartexample.BarChartActivity
4848
import info.appdev.chartexample.BarChartActivityMultiDataset
4949
import info.appdev.chartexample.BarChartActivitySinus
5050
import info.appdev.chartexample.BarChartPositiveNegative
51+
import info.appdev.chartexample.BarRoundedChartActivity
5152
import info.appdev.chartexample.BubbleChartActivity
5253
import info.appdev.chartexample.CandleStickChartActivity
5354
import info.appdev.chartexample.CombinedChartActivity
@@ -57,6 +58,7 @@ import info.appdev.chartexample.FilledLineActivity
5758
import info.appdev.chartexample.GradientActivity
5859
import info.appdev.chartexample.HalfPieChartActivity
5960
import info.appdev.chartexample.HorizontalBarChartActivity
61+
import info.appdev.chartexample.HorizontalBarRoundedChartActivity
6062
import info.appdev.chartexample.InvertedLineChartActivity
6163
import info.appdev.chartexample.LineChartActivity
6264
import info.appdev.chartexample.LineChartActivityColored
@@ -167,9 +169,11 @@ class MainActivity : ComponentActivity() {
167169

168170
add(ContentItem("Bar Charts"))
169171
add(ContentItem("Basic", "Simple bar chart.", BarChartActivity::class.java))
172+
add(ContentItem("Basic with own rounded renderer", "Simple rounded bar chart.", BarRoundedChartActivity::class.java))
170173
add(ContentItem("Basic 2", "Variation of the simple bar chart.", AnotherBarActivity::class.java))
171174
add(ContentItem("Multiple", "Show multiple data sets.", BarChartActivityMultiDataset::class.java))
172175
add(ContentItem("Horizontal", "Render bar chart horizontally.", HorizontalBarChartActivity::class.java))
176+
add(ContentItem("Horizontal with own rounded renderer", "Render bar rounded chart horizontally.", HorizontalBarRoundedChartActivity::class.java))
173177
add(ContentItem("Stacked", "Stacked bar chart.", StackedBarActivity::class.java))
174178
add(ContentItem("Negative", "Positive and negative values with unique colors.", BarChartPositiveNegative::class.java))
175179
//objects.add(ContentItem("Negative Horizontal", "demonstrates how to create a HorizontalBarChart with positive and negative values."))

0 commit comments

Comments
 (0)