ClaytonWWilson/Listify
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/Listify.git synced 2025-12-16 10:48:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #127 from ClaytonWWilson/aaron-branch-2

Browse Source 
Aaron branch 2
This commit is contained in:
Aaron Sun 2020-11-24 10:58:30 -08:00 committed by GitHub
commit 2e515e687f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Listify/app/src/main/java/com/example/listify/ListPage.java
View File

@ -122,7 +122,7 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
EditText sharedEmailText = (EditText) codeView.findViewById(R.id.editTextTextSharedEmail); EditText sharedEmailText = (EditText) codeView.findViewById(R.id.editTextTextSharedEmail);
String sharedEmail = sharedEmailText.getText().toString(); String sharedEmail = sharedEmailText.getText().toString();
ListShare listShare = new ListShare(LIST_ID, sharedEmail, "Read, Write, Delete, Share"); ListShare listShare = new ListShare(LIST_ID, sharedEmail, "Read, Write, Delete, Share", null);
try { try {
requestor.putObject(listShare); requestor.putObject(listShare);
} }

4
Listify/app/src/main/java/com/example/listify/MainActivity.java
View File

@ -105,7 +105,7 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF
e.printStackTrace(); e.printStackTrace();
} }
Requestor requestor = new Requestor(authManager, configs.getProperty("apiKey")); /*Requestor requestor = new Requestor(authManager, configs.getProperty("apiKey"));
SynchronousReceiver<SearchHistory> historyReceiver = new SynchronousReceiver<>(); SynchronousReceiver<SearchHistory> historyReceiver = new SynchronousReceiver<>();
requestor.getObject("N/A", SearchHistory.class, historyReceiver, historyReceiver); requestor.getObject("N/A", SearchHistory.class, historyReceiver, historyReceiver);
try { try {
@ -116,7 +116,7 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
/*
List testList = new List(-1, "New List", "user filled by lambda", Instant.now().toEpochMilli()); List testList = new List(-1, "New List", "user filled by lambda", Instant.now().toEpochMilli());
ListEntry entry = new ListEntry(1, 4, Math.abs(new Random().nextInt()), Instant.now().toEpochMilli(),false); ListEntry entry = new ListEntry(1, 4, Math.abs(new Random().nextInt()), Instant.now().toEpochMilli(),false);

2
Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java
View File

@ -133,7 +133,7 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
EditText sharedEmailText = (EditText) codeView.findViewById(R.id.editTextTextSharedEmail); EditText sharedEmailText = (EditText) codeView.findViewById(R.id.editTextTextSharedEmail);
String sharedEmail = sharedEmailText.getText().toString(); String sharedEmail = sharedEmailText.getText().toString();
ListShare listShare = new ListShare(curList.getListID(), sharedEmail, "Read, Write, Delete, Share"); ListShare listShare = new ListShare(curList.getListID(), sharedEmail, "Read, Write, Delete, Share", null);
try { try {
requestor.putObject(listShare); requestor.putObject(listShare);
} }

1
Listify/app/src/main/java/com/example/listify/data/List.java
View File

@ -84,6 +84,7 @@ public class List {
public void setUiPosition(Integer uiPosition) { public void setUiPosition(Integer uiPosition) {
this.uiPosition = uiPosition; this.uiPosition = uiPosition;
}
public ListEntry[] getEntries() { public ListEntry[] getEntries() {
return entries; return entries;