ClaytonWWilson/Listify
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/Listify.git synced 2025-12-15 18:28:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into lambda-robustness

Browse Source
This commit is contained in:
Nathan Merz 2020-11-30 12:17:35 -05:00 committed by GitHub
commit 4e90bce03e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,6 @@ public class ListSharees extends AppCompatActivity implements Requestor.Receiver
ListShare sharee = (ListShare) delivered; ListShare sharee = (ListShare) delivered;
if(sharee != null) { if(sharee != null) {
lShareeEntries.add(sharee);
lShareeEmails.add(sharee.getShareWithEmail()); lShareeEmails.add(sharee.getShareWithEmail());
if(sharee.getEntries() != null) { if(sharee.getEntries() != null) {

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

@ -80,7 +80,7 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter {
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);
@ -132,7 +132,6 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter {
// Send the list ID and list name // Send the list ID and list name
listSharees.putExtra("listID", curList.getListID()); listSharees.putExtra("listID", curList.getListID());
//listPage.putExtra("listName", curList.getName());
activity.startActivity(listSharees); activity.startActivity(listSharees);
} }
@ -157,7 +156,7 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter {
SwipeRevealLayout swipeLayout; SwipeRevealLayout swipeLayout;
View frontView; View frontView;
View deleteList; View deleteList;
// View shareList; View shareList;
TextView listName; TextView listName;
TextView itemCount; TextView itemCount;
} }

2
Listify/app/src/main/res/layout/activity_listofsharees.xml
View File

@ -17,7 +17,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="17" android:ems="17"
android:inputType="textPersonName" android:inputType="textPersonName"
android:hint="Sharee's email" android:hint="Share with"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:layout_marginLeft="10dp"/> android:layout_marginLeft="10dp"/>

13
Listify/app/src/main/res/layout/shopping_lists_swipeable_name_item.xml
View File

@ -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"
@ -30,6 +30,7 @@
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@android:color/holo_red_dark"/> android:background="@android:color/holo_red_dark"/>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>