Merge pull request #56 from ClaytonWWilson/aaron-branch

Aaron branch
This commit is contained in:
DreamCoder23 2020-10-08 20:14:56 -07:00 committed by GitHub
commit 09735f5ce3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions

View File

@ -91,6 +91,7 @@ public class ListPage extends AppCompatActivity {
pPrices.add(item.getPrice().toString()); pPrices.add(item.getPrice().toString());
pQuantity.add("1"); pQuantity.add("1");
pImages.add(R.drawable.placeholder); pImages.add(R.drawable.placeholder);
pListItemPair.add(entry);
} }
} }
} }
@ -189,7 +190,7 @@ public class ListPage extends AppCompatActivity {
pQuantity.remove(position); pQuantity.remove(position);
pImages.remove(position); pImages.remove(position);
//requestor.deleteObject("39", ListEntry.class); requestor.deleteObject(pListItemPair.remove(position));
listView.setAdapter(myAdapter); listView.setAdapter(myAdapter);
} }

View File

@ -2,6 +2,7 @@ package com.example.listify.ui.home;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
@ -43,10 +44,10 @@ public class HomeFragment extends Fragment {
toListPage.setOnClickListener(new View.OnClickListener() { toListPage.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
//Intent intent = new Intent(HomeFragment.this.getActivity(), com.example.listify.ListPage.class); Intent intent = new Intent(HomeFragment.this.getActivity(), com.example.listify.ListPage.class);
//startActivity(intent); startActivity(intent);
try { /*try {
Properties configs = new Properties(); Properties configs = new Properties();
try { try {
configs = AuthManager.loadProperties(getContext(), "android.resource://" + getActivity().getPackageName() + "/raw/auths.json"); configs = AuthManager.loadProperties(getContext(), "android.resource://" + getActivity().getPackageName() + "/raw/auths.json");
@ -56,7 +57,9 @@ public class HomeFragment extends Fragment {
Requestor requestor = new Requestor(am, configs.getProperty("apiKey")); Requestor requestor = new Requestor(am, configs.getProperty("apiKey"));
am.deleteUser(requestor); am.deleteUser(requestor);
} }
catch(Exception ex) {} catch (Exception e) {
Log.i("Authentication", e.toString());
}*/
} }
}); });