Skip to content

Cosmetic in activities #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hannesa2 merged 1 commit into from
Dec 22, 2025
Merged

Cosmetic in activities #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {
val set1: BarDataSet

if (binding.chart1.data != null &&
binding.chart1.data!!.getDataSetCount() > 0
binding.chart1.data!!.dataSetCount > 0
) {
set1 = binding.chart1.data!!.getDataSetByIndex(0) as BarDataSet
set1.entries = values
Expand Down Expand Up @@ -111,18 +111,17 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {
}

R.id.actionToggleValues -> {
binding.chart1.data!!.dataSets.forEach {
it?.isDrawValues = !it.isDrawValues
binding.chart1.data?.dataSets?.forEach {
it.isDrawValues = !it.isDrawValues
}

binding.chart1.invalidate()
}

R.id.actionToggleHighlight -> {
if (binding.chart1.data != null) {
binding.chart1.data!!.isHighlightEnabled = !binding.chart1.data!!.isHighlightEnabled()
binding.chart1.invalidate()
binding.chart1.data?.let {
it.isHighlightEnabled = !it.isHighlightEnabled
}
binding.chart1.invalidate()
}

R.id.actionTogglePinch -> {
Expand All @@ -140,9 +139,12 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {
}

R.id.actionToggleBarBorders -> {
for (set in binding.chart1.data!!.dataSets)
(set as BarDataSet).barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f

binding.chart1.data?.dataSets?.forEach { set ->
(set as BarDataSet).barBorderWidth = if (set.barBorderWidth == 1f)
0f
else
1f
}
binding.chart1.invalidate()
}

Expand Down
28 changes: 12 additions & 16 deletions app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
val set1: BarDataSet

if (binding.chart1.data != null &&
binding.chart1.data!!.getDataSetCount() > 0
binding.chart1.data!!.dataSetCount > 0
) {
set1 = binding.chart1.data!!.getDataSetByIndex(0) as BarDataSet
set1.entries = values
Expand Down Expand Up @@ -192,25 +192,24 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
}

R.id.actionToggleValues -> {
binding.chart1.data!!.dataSets.forEach {
it?.isDrawValues = !it.isDrawValues
binding.chart1.data?.dataSets?.forEach {
it.isDrawValues = !it.isDrawValues
}

binding.chart1.invalidate()
}

R.id.actionToggleIcons -> {
for (set in binding.chart1.data!!.dataSets)
set?.isDrawIcons = !set.isDrawIcons

binding.chart1.data?.dataSets?.forEach { set ->
set.isDrawIcons = !set.isDrawIcons
}
binding.chart1.invalidate()
}

R.id.actionToggleHighlight -> {
if (binding.chart1.data != null) {
binding.chart1.data!!.isHighlightEnabled = !binding.chart1.data!!.isHighlightEnabled()
binding.chart1.invalidate()
binding.chart1.data?.let {
it.isHighlightEnabled = !it.isHighlightEnabled
}
binding.chart1.invalidate()
}

R.id.actionTogglePinch -> {
Expand All @@ -226,12 +225,9 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
}

R.id.actionToggleBarBorders -> {
for (set in binding.chart1.data!!.dataSets)
(set as BarDataSet).barBorderWidth = if (set.barBorderWidth == 1f)
0f
else
1f

binding.chart1.data?.dataSets?.forEach { set ->
(set as BarDataSet).barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
}
binding.chart1.invalidate()
}

Expand Down
18 changes: 9 additions & 9 deletions app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar
val set3: BarDataSet
val set4: BarDataSet

if (binding.chart1.data != null && binding.chart1.data!!.getDataSetCount() > 0) {
if (binding.chart1.data != null && binding.chart1.data!!.dataSetCount > 0) {
set1 = binding.chart1.data!!.getDataSetByIndex(0) as BarDataSet
set2 = binding.chart1.data!!.getDataSetByIndex(1) as BarDataSet
set3 = binding.chart1.data!!.getDataSetByIndex(2) as BarDataSet
Expand Down Expand Up @@ -185,10 +185,9 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar
}

R.id.actionToggleValues -> {
binding.chart1.data!!.dataSets.forEach {
it?.isDrawValues = !it.isDrawValues
binding.chart1.data?.dataSets?.forEach {
it.isDrawValues = !it.isDrawValues
}

binding.chart1.invalidate()
}

Expand All @@ -205,16 +204,17 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar
}

R.id.actionToggleBarBorders -> {
for (set in binding.chart1.data!!.dataSets) (set as BarDataSet).barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f

binding.chart1.data?.dataSets?.forEach { set ->
(set as BarDataSet).barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
}
binding.chart1.invalidate()
}

R.id.actionToggleHighlight -> {
if (binding.chart1.data != null) {
binding.chart1.data!!.isHighlightEnabled = !binding.chart1.data!!.isHighlightEnabled()
binding.chart1.invalidate()
binding.chart1.data?.let {
it.isHighlightEnabled = !it.isHighlightEnabled
}
binding.chart1.invalidate()
}

R.id.actionSave -> {
Expand Down
18 changes: 9 additions & 9 deletions app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
val set: BarDataSet

if (binding.chart1.data != null &&
binding.chart1.data!!.getDataSetCount() > 0
binding.chart1.data!!.dataSetCount > 0
) {
set = binding.chart1.data!!.getDataSetByIndex(0) as BarDataSet
set.entries = entries
Expand Down Expand Up @@ -130,18 +130,17 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
}

R.id.actionToggleValues -> {
binding.chart1.data!!.dataSets.forEach {
it?.isDrawValues = !it.isDrawValues
binding.chart1.data?.dataSets?.forEach {
it.isDrawValues = !it.isDrawValues
}

binding.chart1.invalidate()
}

R.id.actionToggleHighlight -> {
if (binding.chart1.data != null) {
binding.chart1.data!!.isHighlightEnabled = !binding.chart1.data!!.isHighlightEnabled()
binding.chart1.invalidate()
binding.chart1.data?.let {
it.isHighlightEnabled = !it.isHighlightEnabled
}
binding.chart1.invalidate()
}

R.id.actionTogglePinch -> {
Expand All @@ -158,8 +157,9 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
}

R.id.actionToggleBarBorders -> {
for (set in binding.chart1.data!!.dataSets) (set as BarDataSet).barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f

binding.chart1.data?.dataSets?.forEach { set ->
(set as BarDataSet).barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
}
binding.chart1.invalidate()
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class BarChartPositiveNegative : DemoBase() {
val set: BarDataSet

if (binding.chart1.data != null &&
binding.chart1.data!!.getDataSetCount() > 0
binding.chart1.data!!.dataSetCount > 0
) {
set = binding.chart1.data!!.getDataSetByIndex(0) as BarDataSet
set.entries = values
Expand Down
Loading