Skip to content

Commit ad15379

Browse files
authored
Merge pull request #218 from AppDevNext/RenameLayout
Rename
2 parents f7ba7bb + 2f1b5a5 commit ad15379

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class StartTest {
5353
Log.d(nameRule.methodName, "Intended ${index}-${it.simpleName}")
5454

5555
onData(anything())
56-
.inAdapterView(allOf(withId(R.id.listView1), isCompletelyDisplayed()))
56+
.inAdapterView(allOf(withId(R.id.listViewMain), isCompletelyDisplayed()))
5757
.atPosition(index).perform(click())
5858

5959
Espresso.onView(ViewMatchers.isRoot())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected void onCreate(Bundle savedInstanceState) {
4848

4949
setTitle("ListViewBarChartActivity");
5050

51-
ListView lv = findViewById(R.id.listView1);
51+
ListView lv = findViewById(R.id.listViewMain);
5252

5353
ArrayList<BarData> list = new ArrayList<>();
5454

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
5252

5353
setTitle("ListViewMultiChartActivity");
5454

55-
ListView lv = findViewById(R.id.listView1);
55+
ListView lv = findViewById(R.id.listViewMain);
5656

5757
ArrayList<ChartItem> list = new ArrayList<>();
5858

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/notimportant/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class MainActivity : AppCompatActivity(), OnItemClickListener {
2525
// initialize the utilities
2626
Utils.init(this)
2727
val adapter = MyAdapter(this, menuItems)
28-
val lv = findViewById<ListView>(R.id.listView1)
28+
val lv = findViewById<ListView>(R.id.listViewMain)
2929
lv.adapter = adapter
3030
lv.onItemClickListener = this
3131
}

MPChartExample/src/main/res/layout/activity_listview_chart.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:orientation="vertical">
66

77
<ListView
8-
android:id="@+id/listView1"
8+
android:id="@+id/listViewMain"
99
android:layout_width="match_parent"
1010
android:layout_height="match_parent" >
1111
</ListView>

MPChartExample/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:id="@+id/listView1"
3+
android:id="@+id/listViewMain"
44
android:layout_width="fill_parent"
55
android:layout_height="fill_parent"
66
android:scrollbarFadeDuration="0">

0 commit comments

Comments
 (0)