Skip to content

Commit 89bff46

Browse files
committed
reenable onRowClick lisenter
1 parent 2b6cc53 commit 89bff46

2 files changed

Lines changed: 20 additions & 13 deletions

File tree

DataTable/src/main/java/com/isolpro/library/datatable/DataTable.java

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,16 @@ private void populateTopHeader() {
157157
TableRow thTr = ((TableRow) tlTopHeader.getChildAt(0));
158158

159159
for (int i = 0; i < itemsCount; i++) {
160-
if (thTr.getChildCount() > i) {
161-
TopHeaderTextView currentView = (TopHeaderTextView) thTr.getChildAt(i);
160+
TopHeaderTextView currentView = thTr.getChildCount() > i ? (TopHeaderTextView) thTr.getChildAt(i) : null;
162161

162+
TopHeaderTextView topHeaderTextView = dataTableAdapter.getTopHeaderView(i, currentView);
163+
164+
if (currentView == null)
165+
thTr.addView(topHeaderTextView);
166+
else {
163167
thTr.removeViewAt(i);
164-
thTr.addView(dataTableAdapter.getTopHeaderView(i, currentView), i);
165-
} else
166-
thTr.addView(dataTableAdapter.getTopHeaderView(i, null));
168+
thTr.addView(topHeaderTextView, i);
169+
}
167170
}
168171

169172
Utils.removeChildFromIndex(thTr, itemsCount);
@@ -195,13 +198,17 @@ private void populateBody() {
195198
int itemsCount = dataTableAdapter.getBodyCount();
196199

197200
for (int i = 0; i < itemsCount; i++) {
198-
if (tlBody.getChildCount() > i) {
199-
BodyTableRow currentView = (BodyTableRow) tlBody.getChildAt(i);
201+
BodyTableRow currentView = tlBody.getChildCount() > i ? (BodyTableRow) tlBody.getChildAt(i) : null;
200202

203+
BodyTableRow row = dataTableAdapter.getBodyView(i, currentView);
204+
row.setOnClickListener(this::handleOnBodyRowClicked);
205+
206+
if (currentView == null)
207+
tlBody.addView(row);
208+
else {
201209
tlBody.removeViewAt(i);
202-
tlBody.addView(dataTableAdapter.getBodyView(i, currentView), i);
203-
} else
204-
tlBody.addView(dataTableAdapter.getBodyView(i, null));
210+
tlBody.addView(row, i);
211+
}
205212
}
206213

207214
Utils.removeChildFromIndex(tlBody, itemsCount);

app/src/main/java/com/isolpro/datatablelibrary/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ protected void onCreate(Bundle savedInstanceState) {
3838
List<String> topHeaderItems = new ArrayList<>();
3939
topHeaderItems.add("Names");
4040
topHeaderItems.add("Classes");
41-
// topHeaderItems.add("Sections");
41+
topHeaderItems.add("Sections");
4242
topHeaderItems.add("Rolls");
43-
// topHeaderItems.add("Emails");
43+
topHeaderItems.add("Emails");
4444
topHeaderItems.add("Mobiles");
4545
topHeaderItems.add("Websites");
4646
topHeaderItems.add("Subjects");
@@ -76,7 +76,7 @@ protected void onCreate(Bundle savedInstanceState) {
7676

7777
adapter.setBodyItems(bodyItems);
7878

79-
adapter.notifyDatasetChanged();
79+
// adapter.notifyDatasetChanged();
8080
}
8181

8282
}

0 commit comments

Comments
 (0)