mirror of
https://github.com/ClaytonWWilson/Listify.git
synced 2025-12-15 18:28:47 +00:00
Moved share option into shopping list menu
This commit is contained in:
parent
9a025c99ca
commit
81a69291fe
@ -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.
|
//Inflate the menu; this adds items to the action bar if it is present.
|
||||||
getMenuInflater().inflate(R.menu.list, menu);
|
getMenuInflater().inflate(R.menu.list, menu);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
MenuItem renameItem = menu.findItem(R.id.action_rename_list);
|
MenuItem renameItem = menu.findItem(R.id.action_rename_list);
|
||||||
renameItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
|
renameItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
|
||||||
@Override
|
@Override
|
||||||
@ -186,7 +184,9 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver, R
|
|||||||
shareItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
|
shareItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public boolean onMenuItemClick(MenuItem item) {
|
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;
|
return false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -195,7 +195,6 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver, R
|
|||||||
duplicateItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
|
duplicateItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public boolean onMenuItemClick(MenuItem item) {
|
public boolean onMenuItemClick(MenuItem item) {
|
||||||
|
|
||||||
ListDuplicate duplicate = new ListDuplicate(selectedList.getListID(), String.format("%s copy", selectedList.getName()));
|
ListDuplicate duplicate = new ListDuplicate(selectedList.getListID(), String.format("%s copy", selectedList.getName()));
|
||||||
|
|
||||||
Properties configs = new Properties();
|
Properties configs = new Properties();
|
||||||
|
|||||||
@ -97,7 +97,7 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter implements Reques
|
|||||||
holder.swipeLayout = (SwipeRevealLayout)convertView.findViewById(R.id.swipe_layout);
|
holder.swipeLayout = (SwipeRevealLayout)convertView.findViewById(R.id.swipe_layout);
|
||||||
holder.frontView = convertView.findViewById(R.id.front_layout);
|
holder.frontView = convertView.findViewById(R.id.front_layout);
|
||||||
holder.deleteList = convertView.findViewById(R.id.delete_list);
|
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.listName = (TextView) convertView.findViewById(R.id.shopping_list_name);
|
||||||
holder.itemCount = (TextView) convertView.findViewById(R.id.shopping_list_item_count);
|
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
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
Intent listSharees = new Intent(activity, ListSharees.class);
|
Intent listSharees = new Intent(activity, ListSharees.class);
|
||||||
listSharees.putExtra("listID", curList.getListID());
|
listSharees.putExtra("listID", curList.getListID());
|
||||||
activity.startActivity(listSharees);
|
activity.startActivity(listSharees);
|
||||||
}
|
}
|
||||||
});
|
});*/
|
||||||
|
|
||||||
holder.frontView.setOnClickListener(new View.OnClickListener() {
|
holder.frontView.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
@ -172,7 +172,7 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter implements Reques
|
|||||||
SwipeRevealLayout swipeLayout;
|
SwipeRevealLayout swipeLayout;
|
||||||
View frontView;
|
View frontView;
|
||||||
View deleteList;
|
View deleteList;
|
||||||
View shareList;
|
//View shareList;
|
||||||
TextView listName;
|
TextView listName;
|
||||||
TextView itemCount;
|
TextView itemCount;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,12 +17,12 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<ImageView
|
<!--<ImageView
|
||||||
android:id="@+id/share_list"
|
android:id="@+id/share_list"
|
||||||
android:src="@drawable/ic_baseline_share_24"
|
android:src="@drawable/ic_baseline_share_24"
|
||||||
android:layout_width="50dp"
|
android:layout_width="50dp"
|
||||||
android:layout_height="50dp"
|
android:layout_height="50dp"
|
||||||
android:background="@color/colorAccent"/>
|
android:background="@color/colorAccent"/>-->
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/delete_list"
|
android:id="@+id/delete_list"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user