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 83c4ee2..b9c4959 100644 --- a/Listify/app/src/main/java/com/example/listify/ListPickerDialogFragment.java +++ b/Listify/app/src/main/java/com/example/listify/ListPickerDialogFragment.java @@ -13,7 +13,7 @@ import android.widget.ListView; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; -import com.example.listify.adapter.ShoppingListsSwipeableAdapter; +import com.example.listify.adapter.ShoppingListsAdapter; import com.example.listify.data.List; import java.util.ArrayList; @@ -28,7 +28,7 @@ public class ListPickerDialogFragment extends DialogFragment { public OnListPickListener onListPickListener; ListView userListsView; - ShoppingListsSwipeableAdapter shoppingListsSwipeableAdapter; + ShoppingListsAdapter shoppingListsAdapter; Button btnMinus; Button btnPlus; EditText etQuantity; @@ -66,8 +66,8 @@ public class ListPickerDialogFragment extends DialogFragment { // Display user's shopping lists userListsView = (ListView) root.findViewById(R.id.user_lists); - shoppingListsSwipeableAdapter = new ShoppingListsSwipeableAdapter(getActivity(), userLists); - userListsView.setAdapter(shoppingListsSwipeableAdapter); + 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/ShoppingListsSwipeableAdapter.java b/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java index ee9faae..763159b 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 @@ -53,7 +53,7 @@ public class ShoppingListsSwipeableAdapter 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/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