diff --git a/Lambdas/Lists/User/src/UserDeleter.java b/Lambdas/Lists/User/src/UserDeleter.java index 347d341..b440d9e 100644 --- a/Lambdas/Lists/User/src/UserDeleter.java +++ b/Lambdas/Lists/User/src/UserDeleter.java @@ -46,28 +46,26 @@ public class UserDeleter implements CallHandler { awsCognitoIdentityProvider.adminDeleteUser(adminDeleteUserRequest); - try { - PreparedStatement statement = connection.prepareStatement(GET_LISTS); - statement.setString(1, cognitoID); - System.out.println(statement); - ResultSet userLists = statement.executeQuery(); - while (userLists.next()) { - int listID = userLists.getInt("listID"); - statement = connection.prepareStatement(DELETE_LIST_PRODUCT); - statement.setInt(1, listID); - System.out.println(statement); - statement.executeQuery(); - } + PreparedStatement statement = connection.prepareStatement(GET_LISTS); + statement.setString(1, cognitoID); + System.out.println(statement); + ResultSet userLists = statement.executeQuery(); + while (userLists.next()) { + int listID = userLists.getInt("listID"); - statement = connection.prepareStatement(DELETE_LISTS); - statement.setString(1, cognitoID); + statement = connection.prepareStatement(DELETE_LIST_PRODUCT); + statement.setInt(1, listID); System.out.println(statement); statement.executeQuery(); - connection.commit(); - } finally { - connection.close(); } + + statement = connection.prepareStatement(DELETE_LISTS); + statement.setString(1, cognitoID); + System.out.println(statement); + statement.executeQuery(); + connection.commit(); + return null; } } diff --git a/Listify/app/src/main/java/com/example/listify/CreateListDialogFragment.java b/Listify/app/src/main/java/com/example/listify/CreateListDialogFragment.java index 36e1402..56e0473 100644 --- a/Listify/app/src/main/java/com/example/listify/CreateListDialogFragment.java +++ b/Listify/app/src/main/java/com/example/listify/CreateListDialogFragment.java @@ -29,6 +29,7 @@ public class CreateListDialogFragment extends DialogFragment { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + // Get the layout inflater LayoutInflater inflater = requireActivity().getLayoutInflater(); @@ -59,7 +60,7 @@ public class CreateListDialogFragment extends DialogFragment { public void onAttach(@NonNull Context context) { super.onAttach(context); try { - onNewListListener = (OnNewListListener) getActivity(); + onNewListListener = (OnNewListListener) getTargetFragment(); } catch (ClassCastException e) { Log.e("CreateListDialogFragment", "onAttach: ClassCastException: " + e.getMessage()); } diff --git a/Listify/app/src/main/java/com/example/listify/ListPickerDialogFragment.java b/Listify/app/src/main/java/com/example/listify/ListPickerDialogFragment.java index 0351bd0..33a5504 100644 --- a/Listify/app/src/main/java/com/example/listify/ListPickerDialogFragment.java +++ b/Listify/app/src/main/java/com/example/listify/ListPickerDialogFragment.java @@ -74,11 +74,11 @@ public class ListPickerDialogFragment extends DialogFragment { userListsView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - for (int i = 0; i < parent.getChildCount(); i++) { - parent.getChildAt(i).setBackgroundColor(Color.TRANSPARENT); - } +// for (int i = 0; i < parent.getChildCount(); i++) { +// parent.getChildAt(i).setBackgroundColor(Color.TRANSPARENT); +// } - parent.getChildAt(position).setBackgroundColor(Color.GREEN); +// parent.getChildAt(position).setBackgroundColor(Color.GREEN); // view.setBackgroundColor(Color.GREEN); selectedListIndex = position; } diff --git a/Listify/app/src/main/java/com/example/listify/MainActivity.java b/Listify/app/src/main/java/com/example/listify/MainActivity.java index 6c5b237..e6f3708 100644 --- a/Listify/app/src/main/java/com/example/listify/MainActivity.java +++ b/Listify/app/src/main/java/com/example/listify/MainActivity.java @@ -132,7 +132,7 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF NavigationView navigationView = findViewById(R.id.nav_view); // Passing each menu ID as a set of Ids because each menu should be considered as top level destinations. mAppBarConfiguration = new AppBarConfiguration.Builder( - R.id.nav_home, R.id.nav_gallery, R.id.nav_slideshow, R.id.nav_lists) + R.id.nav_home, R.id.nav_lists) .setDrawerLayout(drawer) .build(); NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment); diff --git a/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java b/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java index 0d70572..c7029ba 100644 --- a/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java +++ b/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java @@ -36,6 +36,7 @@ import static com.example.listify.MainActivity.am; public class ListsFragment extends Fragment implements CreateListDialogFragment.OnNewListListener { ArrayList shoppingLists = new ArrayList<>(); + DisplayShoppingListsAdapter displayShoppingListsAdapter; ListView shoppingListsView; public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -67,7 +68,7 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment. // Set adapter and display this users lists - DisplayShoppingListsAdapter displayShoppingListsAdapter = new DisplayShoppingListsAdapter(getActivity(), shoppingLists); + displayShoppingListsAdapter = new DisplayShoppingListsAdapter(getActivity(), shoppingLists); shoppingListsView.setAdapter(displayShoppingListsAdapter); shoppingListsView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override @@ -81,11 +82,13 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment. }); FloatingActionButton fab = (FloatingActionButton) root.findViewById(R.id.new_list_fab); + Fragment thisFragment = this; fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { CreateListDialogFragment createListDialogFragment = new CreateListDialogFragment(); - createListDialogFragment.show(getActivity().getSupportFragmentManager(), "Create New List"); + createListDialogFragment.show(getFragmentManager(), "Create New List"); + createListDialogFragment.setTargetFragment(thisFragment, 0); } }); @@ -108,7 +111,9 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment. try { requestor.postObject(newList, idReceiver, idReceiver); - System.out.println(idReceiver.await()); + newList.setItemID(idReceiver.await()); + shoppingLists.add(newList); + displayShoppingListsAdapter.notifyDataSetChanged(); Toast.makeText(getContext(), String.format("%s created", name), Toast.LENGTH_LONG).show(); } catch (Exception e) { Toast.makeText(getContext(), "An error occurred", Toast.LENGTH_LONG).show(); diff --git a/Listify/app/src/main/res/layout/dialog_add_to_list.xml b/Listify/app/src/main/res/layout/dialog_add_to_list.xml index 8325780..5e255f9 100644 --- a/Listify/app/src/main/res/layout/dialog_add_to_list.xml +++ b/Listify/app/src/main/res/layout/dialog_add_to_list.xml @@ -18,7 +18,9 @@ android:layout_height="300dp" android:divider="@color/list_divider" android:dividerHeight="1dp" - android:choiceMode="multipleChoiceModal"/> + android:layout_marginHorizontal="50dp" + android:choiceMode="singleChoice" + android:listSelector="@color/colorAccent"/> - + + + + + + + - + + + + + + - + + + + + \ No newline at end of file diff --git a/Listify/app/src/main/res/menu/activity_main_drawer.xml b/Listify/app/src/main/res/menu/activity_main_drawer.xml index b9f5501..93efe47 100644 --- a/Listify/app/src/main/res/menu/activity_main_drawer.xml +++ b/Listify/app/src/main/res/menu/activity_main_drawer.xml @@ -8,14 +8,14 @@ android:id="@+id/nav_home" android:icon="@drawable/ic_menu_camera" android:title="@string/menu_home" /> - - + + + + + + + +