From a05f88354279ed93dc88858f60b5484c41131170 Mon Sep 17 00:00:00 2001 From: Shobhit Agarwal Date: Sun, 21 May 2017 03:08:34 +0530 Subject: [PATCH 1/6] Adds separate activities --- collect_app/src/main/AndroidManifest.xml | 5 ++++- .../activities/EditFormHierarchyActivity.java | 20 +++++++++++++++++++ .../activities/ReadFormHeirarchyActivity.java | 19 ++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java create mode 100644 collect_app/src/main/java/org/odk/collect/android/activities/ReadFormHeirarchyActivity.java diff --git a/collect_app/src/main/AndroidManifest.xml b/collect_app/src/main/AndroidManifest.xml index a6e36797da7..da97c627ba2 100644 --- a/collect_app/src/main/AndroidManifest.xml +++ b/collect_app/src/main/AndroidManifest.xml @@ -199,7 +199,10 @@ the specific language governing permissions and limitations under the License. android:theme="@style/AppTheme.SettingsTheme" android:label="@string/app_name" /> + Date: Sun, 21 May 2017 03:39:34 +0530 Subject: [PATCH 2/6] Refactors code --- collect_app/src/main/AndroidManifest.xml | 2 +- .../activities/EditFormHierarchyActivity.java | 87 ++++++++++++ .../android/activities/FormEntryActivity.java | 11 +- .../activities/FormHierarchyActivity.java | 108 ++------------- .../activities/ReadFormHeirarchyActivity.java | 19 --- .../activities/ViewFormHierarchyActivity.java | 126 ++++++++++++++++++ 6 files changed, 228 insertions(+), 125 deletions(-) delete mode 100644 collect_app/src/main/java/org/odk/collect/android/activities/ReadFormHeirarchyActivity.java create mode 100644 collect_app/src/main/java/org/odk/collect/android/activities/ViewFormHierarchyActivity.java diff --git a/collect_app/src/main/AndroidManifest.xml b/collect_app/src/main/AndroidManifest.xml index da97c627ba2..18851606035 100644 --- a/collect_app/src/main/AndroidManifest.xml +++ b/collect_app/src/main/AndroidManifest.xml @@ -199,7 +199,7 @@ the specific language governing permissions and limitations under the License. android:theme="@style/AppTheme.SettingsTheme" android:label="@string/app_name" /> children = h.getChildren(); + for (int i = 0; i < children.size(); i++) { + formList.remove(position + 1); + } + h.setIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.expander_ic_minimized)); + break; + case COLLAPSED: + Collect.getInstance().getActivityLogger().logInstanceAction(this, "onListItemClick", + "EXPANDED", h.getFormIndex()); + h.setType(EXPANDED); + ArrayList children1 = h.getChildren(); + for (int i = 0; i < children1.size(); i++) { + Timber.i("adding child: %s", children1.get(i).getFormIndex()); + formList.add(position + 1 + i, children1.get(i)); + + } + h.setIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.expander_ic_maximized)); + break; + case QUESTION: + Collect.getInstance().getActivityLogger().logInstanceAction(this, "onListItemClick", + "QUESTION-JUMP", index); + Collect.getInstance().getFormController().jumpToIndex(index); + if (Collect.getInstance().getFormController().indexIsInFieldList()) { + try { + Collect.getInstance().getFormController().stepToPreviousScreenEvent(); + } catch (JavaRosaException e) { + Timber.e(e); + createErrorDialog(e.getCause().getMessage()); + return; + } + } + setResult(RESULT_OK); + finish(); + return; + case CHILD: + Collect.getInstance().getActivityLogger().logInstanceAction(this, "onListItemClick", + "REPEAT-JUMP", h.getFormIndex()); + Collect.getInstance().getFormController().jumpToIndex(h.getFormIndex()); + setResult(RESULT_OK); + refreshView(); + return; + } + + // Should only get here if we've expanded or collapsed a group + HierarchyListAdapter itla = new HierarchyListAdapter(this); + itla.setListItems(formList); + setListAdapter(itla); + getListView().setSelection(position); + } } diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java index a04df4d8271..521393d2cbd 100644 --- a/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java +++ b/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java @@ -935,8 +935,7 @@ public boolean onOptionsItemSelected(MenuItem item) { timerLogger.logTimerEvent(TimerLogger.EventTypes.HIERARCHY, 0, null, false, true); - Intent i = new Intent(this, FormHierarchyActivity.class); - i.putExtra(ApplicationConstants.BundleKeys.FORM_MODE, ApplicationConstants.FormModes.EDIT_SAVED); + Intent i = new Intent(this, EditFormHierarchyActivity.class); startActivityForResult(i, HIERARCHY_ACTIVITY); return true; case R.id.menu_preferences: @@ -2587,17 +2586,13 @@ public void run() { if (!showFirst) { // we've just loaded a saved form, so start in the hierarchy view - - Intent i = new Intent(this, FormHierarchyActivity.class); String formMode = reqIntent.getStringExtra(ApplicationConstants.BundleKeys.FORM_MODE); if (formMode == null || ApplicationConstants.FormModes.EDIT_SAVED.equalsIgnoreCase(formMode)) { - i.putExtra(ApplicationConstants.BundleKeys.FORM_MODE, ApplicationConstants.FormModes.EDIT_SAVED); - startActivity(i); + startActivity(new Intent(this, EditFormHierarchyActivity.class)); return; // so we don't show the intro screen before jumping to the hierarchy } else { if (ApplicationConstants.FormModes.VIEW_SENT.equalsIgnoreCase(formMode)) { - i.putExtra(ApplicationConstants.BundleKeys.FORM_MODE, ApplicationConstants.FormModes.VIEW_SENT); - startActivity(i); + startActivity(new Intent(this, ViewFormHierarchyActivity.class)); } finish(); } diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java index 8c2dbdac31d..ab0c835e26c 100644 --- a/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java +++ b/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java @@ -37,10 +37,8 @@ import org.odk.collect.android.R; import org.odk.collect.android.adapters.HierarchyListAdapter; import org.odk.collect.android.application.Collect; -import org.odk.collect.android.exception.JavaRosaException; import org.odk.collect.android.logic.FormController; import org.odk.collect.android.logic.HierarchyElement; -import org.odk.collect.android.utilities.ApplicationConstants; import org.odk.collect.android.utilities.FormEntryPromptUtils; import java.util.ArrayList; @@ -50,20 +48,21 @@ public class FormHierarchyActivity extends AppCompatActivity implements AdapterView.OnItemClickListener { - private static final int CHILD = 1; - private static final int EXPANDED = 2; - private static final int COLLAPSED = 3; - private static final int QUESTION = 4; + protected static final int CHILD = 1; + protected static final int EXPANDED = 2; + protected static final int COLLAPSED = 3; + protected static final int QUESTION = 4; private static final String mIndent = " "; - private Button jumpPreviousButton; - List formList; TextView path; FormIndex startIndex; private FormIndex currentIndex; + public Button jumpPreviousButton; + protected Button jumpBeginningButton; + protected Button jumpEndButton; private ListView listView; private TextView emptyView; @@ -103,7 +102,7 @@ public void onClick(View v) { } }); - Button jumpBeginningButton = (Button) findViewById(R.id.jumpBeginningButton); + jumpBeginningButton = (Button) findViewById(R.id.jumpBeginningButton); jumpBeginningButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { @@ -116,7 +115,7 @@ public void onClick(View v) { } }); - Button jumpEndButton = (Button) findViewById(R.id.jumpEndButton); + jumpEndButton = (Button) findViewById(R.id.jumpEndButton); jumpEndButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { @@ -129,25 +128,6 @@ public void onClick(View v) { } }); - String formMode = getIntent().getStringExtra(ApplicationConstants.BundleKeys.FORM_MODE); - if (ApplicationConstants.FormModes.VIEW_SENT.equalsIgnoreCase(formMode)) { - Collect.getInstance().getFormController().stepToOuterScreenEvent(); - - Button exitButton = (Button) findViewById(R.id.exitButton); - exitButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - Collect.getInstance().getActivityLogger().logInstanceAction(this, "exit", - "click"); - setResult(RESULT_OK); - finish(); - } - }); - - exitButton.setVisibility(View.VISIBLE); - jumpBeginningButton.setVisibility(View.GONE); - jumpEndButton.setVisibility(View.GONE); - } refreshView(); @@ -188,7 +168,7 @@ protected void onStop() { super.onStop(); } - private void goUpLevel() { + protected void goUpLevel() { Collect.getInstance().getFormController().stepToOuterScreenEvent(); refreshView(); @@ -390,7 +370,7 @@ public void refreshView() { /** * Creates and displays dialog with the given errorMsg. */ - private void createErrorDialog(String errorMsg) { + protected void createErrorDialog(String errorMsg) { Collect.getInstance() .getActivityLogger() .logInstanceAction(this, "createErrorDialog", "show."); @@ -418,72 +398,6 @@ public void onClick(DialogInterface dialog, int i) { alertDialog.show(); } - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - HierarchyElement h = (HierarchyElement) listView.getItemAtPosition(position); - FormIndex index = h.getFormIndex(); - if (index == null) { - goUpLevel(); - return; - } - - switch (h.getType()) { - case EXPANDED: - Collect.getInstance().getActivityLogger().logInstanceAction(this, "onListItemClick", - "COLLAPSED", h.getFormIndex()); - h.setType(COLLAPSED); - ArrayList children = h.getChildren(); - for (int i = 0; i < children.size(); i++) { - formList.remove(position + 1); - } - h.setIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.expander_ic_minimized)); - break; - case COLLAPSED: - Collect.getInstance().getActivityLogger().logInstanceAction(this, "onListItemClick", - "EXPANDED", h.getFormIndex()); - h.setType(EXPANDED); - ArrayList children1 = h.getChildren(); - for (int i = 0; i < children1.size(); i++) { - Timber.i("adding child: %s", children1.get(i).getFormIndex()); - formList.add(position + 1 + i, children1.get(i)); - - } - h.setIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.expander_ic_maximized)); - break; - case QUESTION: - Collect.getInstance().getActivityLogger().logInstanceAction(this, "onListItemClick", - "QUESTION-JUMP", index); - Collect.getInstance().getFormController().jumpToIndex(index); - if (Collect.getInstance().getFormController().indexIsInFieldList()) { - try { - Collect.getInstance().getFormController().stepToPreviousScreenEvent(); - } catch (JavaRosaException e) { - Timber.e(e); - createErrorDialog(e.getCause().getMessage()); - return; - } - } - setResult(RESULT_OK); - String formMode = getIntent().getStringExtra(ApplicationConstants.BundleKeys.FORM_MODE); - if (formMode == null || ApplicationConstants.FormModes.EDIT_SAVED.equalsIgnoreCase(formMode)) { - finish(); - } - return; - case CHILD: - Collect.getInstance().getActivityLogger().logInstanceAction(this, "onListItemClick", - "REPEAT-JUMP", h.getFormIndex()); - Collect.getInstance().getFormController().jumpToIndex(h.getFormIndex()); - setResult(RESULT_OK); - refreshView(); - return; - } - - // Should only get here if we've expanded or collapsed a group - HierarchyListAdapter itla = new HierarchyListAdapter(this); - itla.setListItems(formList); - listView.setAdapter(itla); - listView.setSelection(position); - } @Override diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/ReadFormHeirarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/ReadFormHeirarchyActivity.java deleted file mode 100644 index 7d6e1a701f7..00000000000 --- a/collect_app/src/main/java/org/odk/collect/android/activities/ReadFormHeirarchyActivity.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 Shobhit - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package org.odk.collect.android.activities; - - -public class ReadFormHeirarchyActivity extends FormHierarchyActivity { -} diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/ViewFormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/ViewFormHierarchyActivity.java new file mode 100644 index 00000000000..fead63a8dcf --- /dev/null +++ b/collect_app/src/main/java/org/odk/collect/android/activities/ViewFormHierarchyActivity.java @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2017 Shobhit + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.odk.collect.android.activities; + + +import android.os.Bundle; +import android.support.v4.content.ContextCompat; +import android.view.View; +import android.widget.Button; +import android.widget.ListView; + +import org.javarosa.core.model.FormIndex; +import org.odk.collect.android.R; +import org.odk.collect.android.adapters.HierarchyListAdapter; +import org.odk.collect.android.application.Collect; +import org.odk.collect.android.exception.JavaRosaException; +import org.odk.collect.android.logic.HierarchyElement; + +import java.util.ArrayList; + +import timber.log.Timber; + + +public class ViewFormHierarchyActivity extends FormHierarchyActivity { + + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + Collect.getInstance().getFormController().stepToOuterScreenEvent(); + + Button exitButton = (Button) findViewById(R.id.exitButton); + exitButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Collect.getInstance().getActivityLogger().logInstanceAction(this, "exit", + "click"); + setResult(RESULT_OK); + finish(); + } + }); + + exitButton.setVisibility(View.VISIBLE); + + jumpBeginningButton.setVisibility(View.GONE); + jumpEndButton.setVisibility(View.GONE); + + } + + + @Override + protected void onListItemClick(ListView l, View v, int position, long id) { + HierarchyElement h = (HierarchyElement) l.getItemAtPosition(position); + FormIndex index = h.getFormIndex(); + if (index == null) { + goUpLevel(); + return; + } + + switch (h.getType()) { + case EXPANDED: + Collect.getInstance().getActivityLogger().logInstanceAction(this, "onListItemClick", + "COLLAPSED", h.getFormIndex()); + h.setType(COLLAPSED); + ArrayList children = h.getChildren(); + for (int i = 0; i < children.size(); i++) { + formList.remove(position + 1); + } + h.setIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.expander_ic_minimized)); + break; + case COLLAPSED: + Collect.getInstance().getActivityLogger().logInstanceAction(this, "onListItemClick", + "EXPANDED", h.getFormIndex()); + h.setType(EXPANDED); + ArrayList children1 = h.getChildren(); + for (int i = 0; i < children1.size(); i++) { + Timber.i("adding child: %s", children1.get(i).getFormIndex()); + formList.add(position + 1 + i, children1.get(i)); + + } + h.setIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.expander_ic_maximized)); + break; + case QUESTION: + Collect.getInstance().getActivityLogger().logInstanceAction(this, "onListItemClick", + "QUESTION-JUMP", index); + Collect.getInstance().getFormController().jumpToIndex(index); + if (Collect.getInstance().getFormController().indexIsInFieldList()) { + try { + Collect.getInstance().getFormController().stepToPreviousScreenEvent(); + } catch (JavaRosaException e) { + Timber.e(e); + createErrorDialog(e.getCause().getMessage()); + return; + } + } + setResult(RESULT_OK); + return; + case CHILD: + Collect.getInstance().getActivityLogger().logInstanceAction(this, "onListItemClick", + "REPEAT-JUMP", h.getFormIndex()); + Collect.getInstance().getFormController().jumpToIndex(h.getFormIndex()); + setResult(RESULT_OK); + refreshView(); + return; + } + + // Should only get here if we've expanded or collapsed a group + HierarchyListAdapter itla = new HierarchyListAdapter(this); + itla.setListItems(formList); + setListAdapter(itla); + getListView().setSelection(position); + } +} From 8af5bbaa33b6d5839fa4c8fc0e4838504d26b4ac Mon Sep 17 00:00:00 2001 From: Shobhit Agarwal Date: Sun, 21 May 2017 03:42:41 +0530 Subject: [PATCH 3/6] Removes blank newlines --- .../collect/android/activities/EditFormHierarchyActivity.java | 2 -- .../collect/android/activities/ViewFormHierarchyActivity.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java index 6b676b90ca7..509ffe6998f 100644 --- a/collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java +++ b/collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java @@ -37,10 +37,8 @@ public class EditFormHierarchyActivity extends FormHierarchyActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - } - @Override protected void onListItemClick(ListView l, View v, int position, long id) { HierarchyElement h = (HierarchyElement) l.getItemAtPosition(position); diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/ViewFormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/ViewFormHierarchyActivity.java index fead63a8dcf..72dbd36c2f7 100644 --- a/collect_app/src/main/java/org/odk/collect/android/activities/ViewFormHierarchyActivity.java +++ b/collect_app/src/main/java/org/odk/collect/android/activities/ViewFormHierarchyActivity.java @@ -57,10 +57,8 @@ public void onClick(View v) { jumpBeginningButton.setVisibility(View.GONE); jumpEndButton.setVisibility(View.GONE); - } - @Override protected void onListItemClick(ListView l, View v, int position, long id) { HierarchyElement h = (HierarchyElement) l.getItemAtPosition(position); From 168cdf683435f675f892924549dd4004bfee3790 Mon Sep 17 00:00:00 2001 From: Shobhit Agarwal Date: Tue, 23 May 2017 00:24:46 +0530 Subject: [PATCH 4/6] changes access specifier --- .../odk/collect/android/activities/FormHierarchyActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java index ab0c835e26c..18015be9157 100644 --- a/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java +++ b/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java @@ -60,7 +60,7 @@ public class FormHierarchyActivity extends AppCompatActivity implements AdapterV FormIndex startIndex; private FormIndex currentIndex; - public Button jumpPreviousButton; + protected Button jumpPreviousButton; protected Button jumpBeginningButton; protected Button jumpEndButton; private ListView listView; From 7ee7e7df5a06e4f0e73903a59b68dff30220baa4 Mon Sep 17 00:00:00 2001 From: Shobhit Agarwal Date: Tue, 6 Jun 2017 18:45:13 +0530 Subject: [PATCH 5/6] Makes formHierrarchyActivity abstract Replaces ListView click listener --- .../android/activities/EditFormHierarchyActivity.java | 11 ++++++----- .../android/activities/FormHierarchyActivity.java | 7 +++---- .../android/activities/ViewFormHierarchyActivity.java | 11 ++++++----- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java index 509ffe6998f..3a348c2294a 100644 --- a/collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java +++ b/collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java @@ -19,7 +19,7 @@ import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.view.View; -import android.widget.ListView; +import android.widget.AdapterView; import org.javarosa.core.model.FormIndex; import org.odk.collect.android.R; @@ -39,9 +39,10 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); } + @Override - protected void onListItemClick(ListView l, View v, int position, long id) { - HierarchyElement h = (HierarchyElement) l.getItemAtPosition(position); + public void onItemClick(AdapterView parent, View v, int position, long id) { + HierarchyElement h = (HierarchyElement) listView.getItemAtPosition(position); FormIndex index = h.getFormIndex(); if (index == null) { goUpLevel(); @@ -99,7 +100,7 @@ protected void onListItemClick(ListView l, View v, int position, long id) { // Should only get here if we've expanded or collapsed a group HierarchyListAdapter itla = new HierarchyListAdapter(this); itla.setListItems(formList); - setListAdapter(itla); - getListView().setSelection(position); + listView.setAdapter(itla); + listView.setSelection(position); } } diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java index 18015be9157..48c9f9ef65e 100644 --- a/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java +++ b/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java @@ -46,7 +46,7 @@ import timber.log.Timber; -public class FormHierarchyActivity extends AppCompatActivity implements AdapterView.OnItemClickListener { +public abstract class FormHierarchyActivity extends AppCompatActivity implements AdapterView.OnItemClickListener { protected static final int CHILD = 1; protected static final int EXPANDED = 2; @@ -63,8 +63,7 @@ public class FormHierarchyActivity extends AppCompatActivity implements AdapterV protected Button jumpPreviousButton; protected Button jumpBeginningButton; protected Button jumpEndButton; - private ListView listView; - private TextView emptyView; + protected ListView listView; @Override @@ -74,7 +73,7 @@ public void onCreate(Bundle savedInstanceState) { listView = (ListView) findViewById(android.R.id.list); listView.setOnItemClickListener(this); - emptyView = (TextView) findViewById(android.R.id.empty); + TextView emptyView = (TextView) findViewById(android.R.id.empty); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/ViewFormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/ViewFormHierarchyActivity.java index 72dbd36c2f7..f2c68967a6b 100644 --- a/collect_app/src/main/java/org/odk/collect/android/activities/ViewFormHierarchyActivity.java +++ b/collect_app/src/main/java/org/odk/collect/android/activities/ViewFormHierarchyActivity.java @@ -18,8 +18,8 @@ import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.view.View; +import android.widget.AdapterView; import android.widget.Button; -import android.widget.ListView; import org.javarosa.core.model.FormIndex; import org.odk.collect.android.R; @@ -59,9 +59,10 @@ public void onClick(View v) { jumpEndButton.setVisibility(View.GONE); } + @Override - protected void onListItemClick(ListView l, View v, int position, long id) { - HierarchyElement h = (HierarchyElement) l.getItemAtPosition(position); + public void onItemClick(AdapterView parent, View v, int position, long id) { + HierarchyElement h = (HierarchyElement) listView.getItemAtPosition(position); FormIndex index = h.getFormIndex(); if (index == null) { goUpLevel(); @@ -118,7 +119,7 @@ protected void onListItemClick(ListView l, View v, int position, long id) { // Should only get here if we've expanded or collapsed a group HierarchyListAdapter itla = new HierarchyListAdapter(this); itla.setListItems(formList); - setListAdapter(itla); - getListView().setSelection(position); + listView.setAdapter(itla); + listView.setSelection(position); } } From b3a1cceedb5fe1d77242d5c68af893a89f401c24 Mon Sep 17 00:00:00 2001 From: Shobhit Agarwal Date: Sun, 17 Dec 2017 15:29:46 +0530 Subject: [PATCH 6/6] Removes unused overriden method --- .../android/activities/EditFormHierarchyActivity.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java index 3a348c2294a..a728c144d09 100644 --- a/collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java +++ b/collect_app/src/main/java/org/odk/collect/android/activities/EditFormHierarchyActivity.java @@ -16,7 +16,6 @@ package org.odk.collect.android.activities; -import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.view.View; import android.widget.AdapterView; @@ -34,12 +33,6 @@ public class EditFormHierarchyActivity extends FormHierarchyActivity { - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - - @Override public void onItemClick(AdapterView parent, View v, int position, long id) { HierarchyElement h = (HierarchyElement) listView.getItemAtPosition(position);