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 613c78c..0393b0d 100644 --- a/Listify/app/src/main/java/com/example/listify/ListSharees.java +++ b/Listify/app/src/main/java/com/example/listify/ListSharees.java @@ -72,7 +72,6 @@ public class ListSharees extends AppCompatActivity implements Requestor.Receiver ListShare sharee = (ListShare) delivered; if(sharee != null) { - lShareeEntries.add(sharee); lShareeEmails.add(sharee.getShareWithEmail()); if(sharee.getEntries() != null) { 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/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"/> 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"> - - - - - - + +