From 78186ffbc4d212530d31e27eecc7a523bf71efba Mon Sep 17 00:00:00 2001 From: Aaron Sun Date: Sun, 29 Nov 2020 16:04:27 -0800 Subject: [PATCH 1/2] Can now view sharee IDs in Sharee page (need to change to email) --- .../main/java/com/example/listify/ListSharees.java | 2 +- .../adapter/ShoppingListsSwipeableAdapter.java | 5 ++--- .../layout/shopping_lists_swipeable_name_item.xml | 13 +++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Listify/app/src/main/java/com/example/listify/ListSharees.java b/Listify/app/src/main/java/com/example/listify/ListSharees.java index 6d497b2..f267c9c 100644 --- a/Listify/app/src/main/java/com/example/listify/ListSharees.java +++ b/Listify/app/src/main/java/com/example/listify/ListSharees.java @@ -75,7 +75,7 @@ public class ListSharees extends AppCompatActivity implements Requestor.Receiver ListShare sharee = (ListShare) delivered; if(sharee != null) { - lShareeEmails.add("sharee.getShareWithEmail()"); + lShareeEmails.add(sharee.getShareWithEmail()); if(sharee.getEntries() != null) { for(ListShare ls : sharee.getEntries()) { diff --git a/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java b/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java index 1ecf2b6..1ad6d5e 100644 --- a/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java +++ b/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java @@ -80,7 +80,7 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter { holder.swipeLayout = (SwipeRevealLayout)convertView.findViewById(R.id.swipe_layout); holder.frontView = convertView.findViewById(R.id.front_layout); holder.deleteList = convertView.findViewById(R.id.delete_list); -// holder.shareList = convertView.findViewById(R.id.share_list); + holder.shareList = convertView.findViewById(R.id.share_list); holder.listName = (TextView) convertView.findViewById(R.id.shopping_list_name); holder.itemCount = (TextView) convertView.findViewById(R.id.shopping_list_item_count); @@ -132,7 +132,6 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter { // Send the list ID and list name listSharees.putExtra("listID", curList.getListID()); - //listPage.putExtra("listName", curList.getName()); activity.startActivity(listSharees); } @@ -157,7 +156,7 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter { SwipeRevealLayout swipeLayout; View frontView; View deleteList; -// View shareList; + View shareList; TextView listName; TextView itemCount; } diff --git a/Listify/app/src/main/res/layout/shopping_lists_swipeable_name_item.xml b/Listify/app/src/main/res/layout/shopping_lists_swipeable_name_item.xml index df2c9e7..bc19afa 100644 --- a/Listify/app/src/main/res/layout/shopping_lists_swipeable_name_item.xml +++ b/Listify/app/src/main/res/layout/shopping_lists_swipeable_name_item.xml @@ -17,12 +17,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - - - - - - + + From 5cb920f494d833295bc90fc5d6561b05130d4f74 Mon Sep 17 00:00:00 2001 From: Aaron Sun Date: Sun, 29 Nov 2020 16:46:25 -0800 Subject: [PATCH 2/2] Can now share list in Sharee page --- .../java/com/example/listify/ListSharees.java | 24 +++++++++++++++++++ .../res/layout/activity_listofsharees.xml | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/Listify/app/src/main/java/com/example/listify/ListSharees.java b/Listify/app/src/main/java/com/example/listify/ListSharees.java index f267c9c..c86524d 100644 --- a/Listify/app/src/main/java/com/example/listify/ListSharees.java +++ b/Listify/app/src/main/java/com/example/listify/ListSharees.java @@ -45,6 +45,7 @@ public class ListSharees extends AppCompatActivity implements Requestor.Receiver MyAdapter myAdapter; Requestor requestor; + Button shareList; Button removeSharee; ArrayList lShareeEmails = new ArrayList<>(); @@ -68,6 +69,23 @@ public class ListSharees extends AppCompatActivity implements Requestor.Receiver listView = findViewById(R.id.listOfSharees); myAdapter = new MyAdapter(this, lShareeEmails); listView.setAdapter(myAdapter); + + shareList = (Button) findViewById(R.id.buttonShare); + shareList.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + EditText sharedEmailText = (EditText) findViewById(R.id.editTextShareeEmail); + String sharedEmail = sharedEmailText.getText().toString(); + + ListShare listShare = new ListShare(listID, sharedEmail, "Read, Write, Delete, Share", null); + try { + requestor.putObject(listShare); + } + catch(Exception e) { + e.printStackTrace(); + } + } + }); } @Override @@ -122,6 +140,12 @@ public class ListSharees extends AppCompatActivity implements Requestor.Receiver } }); + //No need to show owner + if(position == 0) { + shareeEmail.setVisibility(View.GONE); + removeSharee.setVisibility(View.GONE); + } + return listproduct; } } diff --git a/Listify/app/src/main/res/layout/activity_listofsharees.xml b/Listify/app/src/main/res/layout/activity_listofsharees.xml index add74b0..53fd6c3 100644 --- a/Listify/app/src/main/res/layout/activity_listofsharees.xml +++ b/Listify/app/src/main/res/layout/activity_listofsharees.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:ems="17" android:inputType="textPersonName" - android:hint="Sharee's email" + android:hint="Share with" android:layout_marginTop="30dp" android:layout_marginLeft="10dp"/>