diff --git a/Listify/app/src/main/java/com/example/listify/ListPage.java b/Listify/app/src/main/java/com/example/listify/ListPage.java index 2d658a3..6f05132 100644 --- a/Listify/app/src/main/java/com/example/listify/ListPage.java +++ b/Listify/app/src/main/java/com/example/listify/ListPage.java @@ -170,8 +170,6 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver, R //Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.list, menu); - - MenuItem renameItem = menu.findItem(R.id.action_rename_list); renameItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override @@ -186,7 +184,9 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver, R shareItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { - Toast.makeText(ListPage.this, "Share List", Toast.LENGTH_SHORT).show(); + Intent listSharees = new Intent(ListPage.this, ListSharees.class); + listSharees.putExtra("listID", selectedList.getListID()); + ListPage.this.startActivity(listSharees); return false; } }); @@ -195,7 +195,6 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver, R duplicateItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { - ListDuplicate duplicate = new ListDuplicate(selectedList.getListID(), String.format("%s copy", selectedList.getName())); Properties configs = new Properties(); 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 18d86a2..f88e3ef 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 @@ -97,7 +97,7 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter implements Reques 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); @@ -147,14 +147,14 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter implements Reques } }); - holder.shareList.setOnClickListener(new View.OnClickListener() { + /*holder.shareList.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Intent listSharees = new Intent(activity, ListSharees.class); listSharees.putExtra("listID", curList.getListID()); activity.startActivity(listSharees); } - }); + });*/ holder.frontView.setOnClickListener(new View.OnClickListener() { @Override @@ -172,7 +172,7 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter implements Reques 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 bc19afa..fa1fc66 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"> - + android:background="@color/colorAccent"/>-->