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 33a5504..b9c4959 100644 --- a/Listify/app/src/main/java/com/example/listify/ListPickerDialogFragment.java +++ b/Listify/app/src/main/java/com/example/listify/ListPickerDialogFragment.java @@ -2,7 +2,6 @@ package com.example.listify; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import android.graphics.Color; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; @@ -14,9 +13,9 @@ import android.widget.ListView; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; -import com.example.listify.adapter.DisplayShoppingListsAdapter; +import com.example.listify.adapter.ShoppingListsAdapter; import com.example.listify.data.List; -import com.example.listify.model.ShoppingList; + import java.util.ArrayList; @@ -29,7 +28,7 @@ public class ListPickerDialogFragment extends DialogFragment { public OnListPickListener onListPickListener; ListView userListsView; - DisplayShoppingListsAdapter displayShoppingListsAdapter; + ShoppingListsAdapter shoppingListsAdapter; Button btnMinus; Button btnPlus; EditText etQuantity; @@ -67,8 +66,8 @@ public class ListPickerDialogFragment extends DialogFragment { // Display user's shopping lists userListsView = (ListView) root.findViewById(R.id.user_lists); - displayShoppingListsAdapter = new DisplayShoppingListsAdapter(getActivity(), userLists); - userListsView.setAdapter(displayShoppingListsAdapter); + shoppingListsAdapter = new ShoppingListsAdapter(getActivity(), userLists); + userListsView.setAdapter(shoppingListsAdapter); // TODO: fix highlighting error userListsView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsAdapter.java b/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsAdapter.java new file mode 100644 index 0000000..0f928f1 --- /dev/null +++ b/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsAdapter.java @@ -0,0 +1,55 @@ +package com.example.listify.adapter; + +import android.app.Activity; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.TextView; +import com.example.listify.R; +import com.example.listify.data.List; +import java.util.ArrayList; + +public class ShoppingListsAdapter extends BaseAdapter { + private Activity activity; + private ArrayList lists; + private LayoutInflater inflater; + + public ShoppingListsAdapter(Activity activity, ArrayList lists){ + this.activity = activity; + this.lists = lists; + } + + @Override + public int getCount() { + return lists.size(); + } + + @Override + public Object getItem(int position) { + return lists.get(position); + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + if (inflater == null) { + inflater = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + } + if (convertView == null) { + convertView = inflater.inflate(R.layout.shopping_lists_name_item, null); + } + + List curList = lists.get(position); + + TextView tvListName = (TextView) convertView.findViewById(R.id.shopping_list_name); + tvListName.setText(curList.getName()); + + return convertView; + } +} \ No newline at end of file diff --git a/Listify/app/src/main/java/com/example/listify/adapter/DisplayShoppingListsAdapter.java b/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java similarity index 93% rename from Listify/app/src/main/java/com/example/listify/adapter/DisplayShoppingListsAdapter.java rename to Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java index f2f5398..763159b 100644 --- a/Listify/app/src/main/java/com/example/listify/adapter/DisplayShoppingListsAdapter.java +++ b/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java @@ -18,13 +18,13 @@ import com.example.listify.data.List; import java.util.ArrayList; -public class DisplayShoppingListsAdapter extends BaseAdapter { +public class ShoppingListsSwipeableAdapter extends BaseAdapter { private Activity activity; private ArrayList lists; private LayoutInflater inflater; private final ViewBinderHelper binderHelper; - public DisplayShoppingListsAdapter(Activity activity, ArrayList lists){ + public ShoppingListsSwipeableAdapter(Activity activity, ArrayList lists){ binderHelper = new ViewBinderHelper(); this.activity = activity; this.lists = lists; @@ -53,7 +53,7 @@ public class DisplayShoppingListsAdapter extends BaseAdapter { inflater = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); } if (convertView == null) { - convertView = inflater.inflate(R.layout.display_shopping_lists_item, null); + convertView = inflater.inflate(R.layout.shopping_lists_swipeable_name_item, null); holder = new ViewHolder(); holder.swipeLayout = (SwipeRevealLayout)convertView.findViewById(R.id.swipe_layout); 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 45ded70..ce8411f 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 @@ -1,35 +1,22 @@ package com.example.listify.ui.lists; -import android.app.Dialog; -import android.content.Intent; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.View; import android.view.ViewGroup; import android.view.LayoutInflater; -import android.view.Window; -import android.view.WindowManager; -import android.widget.AdapterView; import android.widget.ListView; import android.widget.ProgressBar; import android.widget.Toast; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import androidx.fragment.app.ListFragment; -import com.amplifyframework.auth.AuthException; import com.example.listify.AuthManager; -import com.example.listify.CreateListAddDialogFragment; import com.example.listify.CreateListDialogFragment; -import com.example.listify.ItemDetails; -import com.example.listify.ListPage; import com.example.listify.LoadingCircleDialog; import com.example.listify.R; import com.example.listify.Requestor; -import com.example.listify.SearchResults; import com.example.listify.SynchronousReceiver; -import com.example.listify.adapter.DisplayShoppingListsAdapter; +import com.example.listify.adapter.ShoppingListsSwipeableAdapter; import com.example.listify.data.List; import com.google.android.material.floatingactionbutton.FloatingActionButton; @@ -44,7 +31,7 @@ import static com.example.listify.MainActivity.am; public class ListsFragment extends Fragment implements CreateListDialogFragment.OnNewListListener, Requestor.Receiver { ArrayList shoppingLists = new ArrayList<>(); - DisplayShoppingListsAdapter displayShoppingListsAdapter; + ShoppingListsSwipeableAdapter shoppingListsSwipeableAdapter; Requestor requestor; ListView shoppingListsView; ProgressBar loadingLists; @@ -127,7 +114,7 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment. getActivity().runOnUiThread(new Runnable() { @Override public void run() { - displayShoppingListsAdapter.notifyDataSetChanged(); + shoppingListsSwipeableAdapter.notifyDataSetChanged(); loadingDialog.cancel(); Toast.makeText(getContext(), String.format("%s created", name), Toast.LENGTH_LONG).show(); } @@ -172,12 +159,12 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment. } // Set adapter and display this users lists - displayShoppingListsAdapter = new DisplayShoppingListsAdapter(getActivity(), shoppingLists); + shoppingListsSwipeableAdapter = new ShoppingListsSwipeableAdapter(getActivity(), shoppingLists); getActivity().runOnUiThread(new Runnable() { @Override public void run() { - shoppingListsView.setAdapter(displayShoppingListsAdapter); + shoppingListsView.setAdapter(shoppingListsSwipeableAdapter); // shoppingListsView.setOnItemClickListener(new AdapterView.OnItemClickListener() { // @Override // public void onItemClick(AdapterView parent, View view, int position, long id) { diff --git a/Listify/app/src/main/res/layout/shopping_lists_name_item.xml b/Listify/app/src/main/res/layout/shopping_lists_name_item.xml new file mode 100644 index 0000000..5419294 --- /dev/null +++ b/Listify/app/src/main/res/layout/shopping_lists_name_item.xml @@ -0,0 +1,20 @@ + + + + \ No newline at end of file diff --git a/Listify/app/src/main/res/layout/display_shopping_lists_item.xml b/Listify/app/src/main/res/layout/shopping_lists_swipeable_name_item.xml similarity index 100% rename from Listify/app/src/main/res/layout/display_shopping_lists_item.xml rename to Listify/app/src/main/res/layout/shopping_lists_swipeable_name_item.xml