Skip to content

Commit 0ac4f59

Browse files
authored
Merge pull request #140 from AppDevNext/RenameView
Rename view
2 parents eeb1a59 + 0c2545b commit 0ac4f59

27 files changed

+133
-135
lines changed

MPChartExample/src/androidTest/java/com/xxmassdeveloper/mpchartexample/PieTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ class PieTest {
3434
.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}")
3535

3636
for(x in 10..50 step 10) {
37-
onView(withId(R.id.seekBar1)).perform(setProgress(x))
37+
onView(withId(R.id.seekBarX)).perform(setProgress(x))
3838
onView(ViewMatchers.isRoot())
3939
.captureToBitmap()
4040
.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}1-${x}")
4141
}
4242

4343
for(x in 50..200 step 50) {
44-
onView(withId(R.id.seekBar2)).perform(setProgress(x))
44+
onView(withId(R.id.seekBarY)).perform(setProgress(x))
4545
onView(ViewMatchers.isRoot())
4646
.captureToBitmap()
4747
.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}2-${x}")

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/AnotherBarActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ protected void onCreate(Bundle savedInstanceState) {
4545
tvX = findViewById(R.id.tvXMax);
4646
tvY = findViewById(R.id.tvYMax);
4747

48-
seekBarX = findViewById(R.id.seekBar1);
48+
seekBarX = findViewById(R.id.seekBarX);
4949
seekBarX.setOnSeekBarChangeListener(this);
5050

51-
seekBarY = findViewById(R.id.seekBar2);
51+
seekBarY = findViewById(R.id.seekBarY);
5252
seekBarY.setOnSeekBarChangeListener(this);
5353

5454
chart = findViewById(R.id.chart1);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/BarChartActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ protected void onCreate(Bundle savedInstanceState) {
6262
tvX = findViewById(R.id.tvXMax);
6363
tvY = findViewById(R.id.tvYMax);
6464

65-
seekBarX = findViewById(R.id.seekBar1);
66-
seekBarY = findViewById(R.id.seekBar2);
65+
seekBarX = findViewById(R.id.seekBarX);
66+
seekBarY = findViewById(R.id.seekBarY);
6767

6868
seekBarY.setOnSeekBarChangeListener(this);
6969
seekBarX.setOnSeekBarChangeListener(this);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/BarChartActivityMultiDataset.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ protected void onCreate(Bundle savedInstanceState) {
5656
tvX.setTextSize(10);
5757
tvY = findViewById(R.id.tvYMax);
5858

59-
seekBarX = findViewById(R.id.seekBar1);
59+
seekBarX = findViewById(R.id.seekBarX);
6060
seekBarX.setMax(50);
6161
seekBarX.setOnSeekBarChangeListener(this);
6262

63-
seekBarY = findViewById(R.id.seekBar2);
63+
seekBarY = findViewById(R.id.seekBarY);
6464
seekBarY.setOnSeekBarChangeListener(this);
6565

6666
chart = findViewById(R.id.chart1);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/BubbleChartActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ protected void onCreate(Bundle savedInstanceState) {
5353
tvX = findViewById(R.id.tvXMax);
5454
tvY = findViewById(R.id.tvYMax);
5555

56-
seekBarX = findViewById(R.id.seekBar1);
56+
seekBarX = findViewById(R.id.seekBarX);
5757
seekBarX.setOnSeekBarChangeListener(this);
5858

59-
seekBarY = findViewById(R.id.seekBar2);
59+
seekBarY = findViewById(R.id.seekBarY);
6060
seekBarY.setOnSeekBarChangeListener(this);
6161

6262
chart = findViewById(R.id.chart1);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/CandleStickChartActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ protected void onCreate(Bundle savedInstanceState) {
4848
tvX = findViewById(R.id.tvXMax);
4949
tvY = findViewById(R.id.tvYMax);
5050

51-
seekBarX = findViewById(R.id.seekBar1);
51+
seekBarX = findViewById(R.id.seekBarX);
5252
seekBarX.setOnSeekBarChangeListener(this);
5353

54-
seekBarY = findViewById(R.id.seekBar2);
54+
seekBarY = findViewById(R.id.seekBarY);
5555
seekBarY.setOnSeekBarChangeListener(this);
5656

5757
chart = findViewById(R.id.chart1);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/CubicLineChartActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ protected void onCreate(Bundle savedInstanceState) {
4848
tvX = findViewById(R.id.tvXMax);
4949
tvY = findViewById(R.id.tvYMax);
5050

51-
seekBarX = findViewById(R.id.seekBar1);
52-
seekBarY = findViewById(R.id.seekBar2);
51+
seekBarX = findViewById(R.id.seekBarX);
52+
seekBarY = findViewById(R.id.seekBarY);
5353

5454
chart = findViewById(R.id.chart1);
5555
chart.setViewPortOffsets(0, 0, 0, 0);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/HorizontalBarChartActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ protected void onCreate(Bundle savedInstanceState) {
5353
tvX = findViewById(R.id.tvXMax);
5454
tvY = findViewById(R.id.tvYMax);
5555

56-
seekBarX = findViewById(R.id.seekBar1);
57-
seekBarY = findViewById(R.id.seekBar2);
56+
seekBarX = findViewById(R.id.seekBarX);
57+
seekBarY = findViewById(R.id.seekBarY);
5858

5959
seekBarY.setOnSeekBarChangeListener(this);
6060
seekBarX.setOnSeekBarChangeListener(this);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/HorizontalBarNegativeChartActivity.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
package com.xxmassdeveloper.mpchartexample;
33

44
import android.Manifest;
5-
import android.annotation.SuppressLint;
65
import android.content.Intent;
76
import android.content.pm.PackageManager;
87
import android.graphics.RectF;
@@ -15,7 +14,6 @@
1514
import android.widget.SeekBar;
1615
import android.widget.SeekBar.OnSeekBarChangeListener;
1716
import android.widget.TextView;
18-
import android.widget.Toast;
1917

2018
import androidx.core.content.ContextCompat;
2119

@@ -56,8 +54,8 @@ protected void onCreate(Bundle savedInstanceState) {
5654
tvX = findViewById(R.id.tvXMax);
5755
tvY = findViewById(R.id.tvYMax);
5856

59-
seekBarX = findViewById(R.id.seekBar1);
60-
seekBarY = findViewById(R.id.seekBar2);
57+
seekBarX = findViewById(R.id.seekBarX);
58+
seekBarY = findViewById(R.id.seekBarY);
6159

6260
seekBarY.setOnSeekBarChangeListener(this);
6361
seekBarX.setOnSeekBarChangeListener(this);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/InvertedLineChartActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ protected void onCreate(Bundle savedInstanceState) {
5353
tvX = findViewById(R.id.tvXMax);
5454
tvY = findViewById(R.id.tvYMax);
5555

56-
seekBarX = findViewById(R.id.seekBar1);
57-
seekBarY = findViewById(R.id.seekBar2);
56+
seekBarX = findViewById(R.id.seekBarX);
57+
seekBarY = findViewById(R.id.seekBarY);
5858

5959
seekBarY.setOnSeekBarChangeListener(this);
6060
seekBarX.setOnSeekBarChangeListener(this);

0 commit comments

Comments
 (0)