Merge pull request #112 from ClaytonWWilson/master

Merge from master
This commit is contained in:
Aaron Sun 2020-11-12 14:49:04 -08:00 committed by GitHub
commit 36ef81ce16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 8 deletions

View File

@ -147,7 +147,6 @@ public class SearchResults extends AppCompatActivity implements FilterDialogFrag
} }
}); });
// TODO: Reset upper and lower limits on price filter when a new search is made
filterItem = menu.findItem(R.id.action_filter); filterItem = menu.findItem(R.id.action_filter);
filterItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { filterItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override @Override

View File

@ -101,11 +101,9 @@ public class SortDialogFragment extends DialogFragment {
} }
}); });
// TODO: set onclick listener for descending switch
llDescendingContainer.setOnClickListener(new View.OnClickListener() { llDescendingContainer.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
System.out.println("linear");
swDescending.performClick(); swDescending.performClick();
// handleClicked(sortMode, swDescending.isChecked()); // handleClicked(sortMode, swDescending.isChecked());
} }
@ -114,7 +112,6 @@ public class SortDialogFragment extends DialogFragment {
swDescending.setOnClickListener(new View.OnClickListener() { swDescending.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
System.out.println("switch");
descending = swDescending.isChecked(); descending = swDescending.isChecked();
onSortListener.sendSort(sortMode, swDescending.isChecked()); onSortListener.sendSort(sortMode, swDescending.isChecked());
} }

View File

@ -101,8 +101,6 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter {
holder.deleteList.setOnClickListener(new View.OnClickListener() { holder.deleteList.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
// TODO: Add database call to delete the list on the server
try { try {
requestor.deleteObject(Integer.toString(curList.getItemID()), List.class); requestor.deleteObject(Integer.toString(curList.getItemID()), List.class);
} }
@ -121,8 +119,6 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter {
holder.shareList.setOnClickListener(new View.OnClickListener() { holder.shareList.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
// TODO: Add database call to share list
View codeView = inflater.inflate(R.layout.activity_sharedemail, null); View codeView = inflater.inflate(R.layout.activity_sharedemail, null);
AlertDialog.Builder builder = new AlertDialog.Builder(activity); AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setView(codeView); builder.setView(codeView);