Skip to content

Commit 37df181

Browse files
authored
Merge pull request #675 from AppDevNext/GradientId
Gradient
2 parents 79242d8 + ee2d0c3 commit 37df181

4 files changed

Lines changed: 11 additions & 12 deletions

File tree

app/src/androidTest/kotlin/info/appdev/chartexample/StartTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ class StartTest {
213213
composeTestRule.waitForIdle()
214214
Thread.sleep(200) // Small delay for back navigation
215215
} catch (e: Exception) {
216-
Timber.e("#$index/'${contentClass.simpleName}': '$optionMenu' ${e.message}", e)
216+
Timber.e("#$index/'${contentClass.simpleName}'->'$optionMenu' ${e.message}", e)
217217
onView(ViewMatchers.isRoot())
218218
.perform(captureToBitmap { bitmap: Bitmap ->
219219
bitmap.writeToTestStorage(

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ class GradientActivity : DemoBase() {
3232
Utils.init(this)
3333

3434
// Minimal chart setup
35-
binding.chart.description.isEnabled = false
36-
binding.chart.legend.isEnabled = false
37-
binding.chart.axisRight.isEnabled = false
38-
binding.chart.setDrawGridBackground(false)
35+
binding.chart1.description.isEnabled = false
36+
binding.chart1.legend.isEnabled = false
37+
binding.chart1.axisRight.isEnabled = false
38+
binding.chart1.setDrawGridBackground(false)
3939

4040
// -----------------------------
4141
// Linear function
@@ -64,13 +64,13 @@ class GradientActivity : DemoBase() {
6464
override fun getFillLinePosition(
6565
dataSet: ILineDataSet?,
6666
dataProvider: LineDataProvider
67-
): Float = binding.chart.axisLeft.axisMinimum
67+
): Float = binding.chart1.axisLeft.axisMinimum
6868
}
6969
}
7070

71-
binding.chart.axisLeft.axisMinimum = 0f
72-
binding.chart.data = LineData(dataSet)
73-
binding.chart.invalidate()
71+
binding.chart1.axisLeft.axisMinimum = 0f
72+
binding.chart1.data = LineData(dataSet)
73+
binding.chart1.invalidate()
7474
}
7575

7676
override fun saveToGallery() = Unit

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class ListViewBarChartActivity : DemoBase() {
6868

6969
data?.setValueTypeface(tfLight)
7070
data?.setValueTextColor(Color.BLACK)
71-
holder.chart!!.description.isEnabled = false
71+
holder.chart?.description?.isEnabled = false
7272
holder.chart?.setDrawGridBackground(false)
7373

7474

app/src/main/res/layout/activity_gradient.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
android:layout_height="match_parent"
88
tools:context=".GradientActivity">
99

10-
1110
<info.appdev.charting.charts.LineChart
12-
android:id="@+id/chart"
11+
android:id="@+id/chart1"
1312
android:layout_width="0dp"
1413
android:layout_height="0dp"
1514
android:layout_margin="16dp"

0 commit comments

Comments
 (0)