Skip to content

Add Categories #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add Categories #65

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e82d2c
Add Categories
tobiasKaminsky May 17, 2020
60c384f
wip
tobiasKaminsky May 23, 2020
9476352
wip
tobiasKaminsky May 23, 2020
8ca9101
correct category order
tobiasKaminsky May 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ dependencies {
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:preference-v7:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'com.afollestad:sectioned-recyclerview:0.5.0'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not too happy about this dependency, since it seems to be pretty much dead. The author even removed it from his GitHub profile

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know, this is totally outdated, but also used in NC Files App…
If you find a proper replace, I am more than happy to change it.
(also the other way around, if I find one for NC Files App).
But for now it "just works" (for >500k users…)

}
37 changes: 27 additions & 10 deletions app/src/main/java/com/woefe/shoppinglist/activity/EditBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@
import android.view.View;
import android.view.ViewConfiguration;
import android.view.inputmethod.InputMethodManager;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.RelativeLayout;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;

Expand All @@ -46,26 +48,33 @@
public class EditBar implements ShoppingList.ShoppingListListener {
private static final String KEY_SAVED_DESCRIPTION = "SAVED_DESCRIPTION";
private static final String KEY_SAVED_QUANTITY = "SAVED_QUANTITY";
private static final String KEY_SAVED_CATEGORY = "SAVED_CATEGORY";
private static final String KEY_SAVED_MODE = "SAVED_MODE";
private static final String KEY_SAVE_IS_VISIBLE = "SAVE_IS_VISIBLE";
private final Context ctx;
private final RelativeLayout layout;
private final EditText descriptionText;
private final EditText quantityText;
private final Spinner categorySpinner;
private final TextView duplicateWarnText;
private Mode mode;
private EditBarListener listener;
private final FloatingActionButton fab;
private int position;
private final Set<String> descriptionIndex = new HashSet<>();
private ShoppingList shoppingList;
private ArrayAdapter<String> categoryAdapter;

public EditBar(View boundView, final Context ctx) {
this.ctx = ctx;
this.layout = boundView.findViewById(R.id.layout_add_item);
final ImageButton button = boundView.findViewById(R.id.button_add_new_item);
this.descriptionText = boundView.findViewById(R.id.new_item_description);
this.quantityText = boundView.findViewById(R.id.new_item_quantity);
this.categorySpinner = boundView.findViewById(R.id.category_description);
categoryAdapter = new ArrayAdapter<>(ctx, android.R.layout.simple_spinner_item);
categoryAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
categorySpinner.setAdapter(categoryAdapter);
this.duplicateWarnText = boundView.findViewById(R.id.text_warn);
this.mode = Mode.ADD;

Expand Down Expand Up @@ -141,39 +150,43 @@ private void setButtonEnabled(ImageButton button, boolean enabled) {
private void onConfirm() {
String desc = descriptionText.getText().toString();
String qty = quantityText.getText().toString();
String category = categorySpinner.getSelectedItem().toString();

if (desc.equals("")) {
Toast.makeText(ctx, R.string.error_description_empty, Toast.LENGTH_SHORT).show();
return;
}

if (mode == Mode.ADD) {
listener.onNewItem(desc, qty);
listener.onNewItem(desc, qty, category);
descriptionText.requestFocus();
} else if (mode == Mode.EDIT) {
listener.onEditSave(position, desc, qty);
listener.onEditSave(position, desc, qty, category);
}

descriptionText.setText("");
quantityText.setText("");
//categorySpinner.setText("");
}

public void showEdit(int position, String description, String quantity) {
this.position = position;
prepare(Mode.EDIT, description, quantity);
public void showEdit(String description, String quantity, String category) {
// this.position = position;
prepare(Mode.EDIT, description, quantity, category);
show();
}

public void showAdd() {
prepare(Mode.ADD, "", "");
prepare(Mode.ADD, "", "", "");
show();
}

private void prepare(Mode mode, String description, String quantity) {
private void prepare(Mode mode, String description, String quantity, String category) {
this.mode = mode;
quantityText.setText(quantity);
descriptionText.setText("");
descriptionText.append(description);
int position = shoppingList.getCategories().indexOf(category);
categorySpinner.setSelection(position);
}

public void enableAutoHideFAB(RecyclerView view) {
Expand Down Expand Up @@ -269,16 +282,18 @@ public void removeEditBarListener(EditBarListener l) {
public void saveState(Bundle state) {
state.putString(KEY_SAVED_DESCRIPTION, descriptionText.getText().toString());
state.putString(KEY_SAVED_QUANTITY, quantityText.getText().toString());
state.putInt(KEY_SAVED_CATEGORY, categorySpinner.getSelectedItemPosition());
state.putBoolean(KEY_SAVE_IS_VISIBLE, isVisible());
state.putSerializable(KEY_SAVED_MODE, mode);
}

public void restoreState(Bundle state) {
String description = state.getString(KEY_SAVED_DESCRIPTION);
String quantity = state.getString(KEY_SAVED_QUANTITY);
categorySpinner.setSelection(state.getInt(KEY_SAVED_CATEGORY));
Mode mode = (Mode) state.getSerializable(KEY_SAVED_MODE);
if (state.getBoolean(KEY_SAVE_IS_VISIBLE)) {
prepare(mode, description, quantity);
prepare(mode, description, quantity, categorySpinner.getSelectedItem().toString());
layout.setVisibility(View.VISIBLE);
fab.hide();
}
Expand All @@ -305,13 +320,15 @@ public void onShoppingListUpdate(ShoppingList list, ShoppingList.Event e) {
}
descriptionIndex.clear();
descriptionIndex.addAll(list.createDescriptionIndex());
categoryAdapter.clear();
categoryAdapter.addAll(shoppingList.getCategories());
checkDuplicate(descriptionText.getText().toString());
}

public interface EditBarListener {
void onEditSave(int position, String description, String quantity);
void onEditSave(int position, String description, String quantity, String category);

void onNewItem(String description, String quantity);
void onNewItem(String description, String quantity, String category);
}

private enum Mode {
Expand Down
139 changes: 98 additions & 41 deletions app/src/main/java/com/woefe/shoppinglist/activity/RecyclerListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@
import android.widget.ImageView;
import android.widget.TextView;

import com.afollestad.sectionedrecyclerview.SectionedRecyclerViewAdapter;
import com.afollestad.sectionedrecyclerview.SectionedViewHolder;
import com.woefe.shoppinglist.R;
import com.woefe.shoppinglist.shoppinglist.ListItem;
import com.woefe.shoppinglist.shoppinglist.ShoppingList;

/**
* @author Wolfgang Popp
*/
public class RecyclerListAdapter extends RecyclerView.Adapter<RecyclerListAdapter.ViewHolder> {
public class RecyclerListAdapter extends SectionedRecyclerViewAdapter<SectionedViewHolder> {
private final int colorChecked;
private final int colorDefault;
private final int colorBackground;
Expand All @@ -40,9 +42,6 @@ public void onShoppingListUpdate(ShoppingList list, ShoppingList.Event e) {
case ShoppingList.Event.ITEM_INSERTED:
notifyItemInserted(e.getIndex());
break;
case ShoppingList.Event.ITEM_MOVED:
notifyItemMoved(e.getOldIndex(), e.getNewIndex());
break;
case ShoppingList.Event.ITEM_REMOVED:
notifyItemRemoved(e.getIndex());
break;
Expand Down Expand Up @@ -72,8 +71,8 @@ public void disconnectShoppingList() {
}
}

public void move(int fromPos, int toPos) {
shoppingList.move(fromPos, toPos);
public void move(ListItem from, ListItem to) {
shoppingList.move(from, to);
}

public void remove(int pos) {
Expand All @@ -90,76 +89,119 @@ public void setOnItemLongClickListener(ItemLongClickListener listener) {

@NonNull
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View v = LayoutInflater.from(parent.getContext())
.inflate(R.layout.list_item, parent, false);
return new ViewHolder(v);
public SectionedViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
if (viewType == VIEW_TYPE_HEADER) {
View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_category, parent, false);
return new CategoryViewHolder(v);
} else {
View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item, parent, false);
return new ItemViewHolder(v);
}
}

@Override
public int getSectionCount() {
return shoppingList.getCategories().size();
}

@Override
public int getItemCount(int section) {
String category = shoppingList.getCategories().get(section);
int count = 0;

for (int i = 0; i < shoppingList.size(); i++) {
if (shoppingList.get(i).getCategory().equals(category)) {
count++;
}
}

return count;
}

@Override
public void onBindHeaderViewHolder(SectionedViewHolder sectionedViewHolder, int section, boolean expanded) {
CategoryViewHolder categoryViewHolder = (CategoryViewHolder) sectionedViewHolder;
categoryViewHolder.category.setText(shoppingList.getCategories().get(section));
}

@Override
public void onBindFooterViewHolder(SectionedViewHolder sectionedViewHolder, int i) {
// not needed
}

@Override
public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
ListItem listItem = shoppingList.get(position);
holder.description.setText(listItem.getDescription());
holder.quantity.setText(listItem.getQuantity());
public void onBindViewHolder(SectionedViewHolder sectionedViewHolder,
int section,
int relativePosition,
final int absolutePosition) {

final ItemViewHolder itemViewHolder = (ItemViewHolder) sectionedViewHolder;
String category = shoppingList.getCategories().get(section);
final ListItem listItem = shoppingList.getListItemByCategory(category).get(relativePosition);

itemViewHolder.description.setText(listItem.getDescription());
itemViewHolder.quantity.setText(listItem.getQuantity());
itemViewHolder.listItem = listItem;

if (listItem.isChecked()) {
holder.description.setTextColor(colorChecked);
holder.quantity.setTextColor(colorChecked);
itemViewHolder.description.setTextColor(colorChecked);
itemViewHolder.quantity.setTextColor(colorChecked);
} else {
holder.description.setTextColor(colorDefault);
holder.quantity.setTextColor(colorDefault);
itemViewHolder.description.setTextColor(colorDefault);
itemViewHolder.quantity.setTextColor(colorDefault);
}

holder.itemView.setBackgroundColor(colorBackground);
itemViewHolder.itemView.setBackgroundColor(colorBackground);

holder.view.setOnClickListener(new View.OnClickListener() {
itemViewHolder.view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
shoppingList.toggleChecked(holder.getAdapterPosition());
shoppingList.toggleChecked(listItem, absolutePosition);
}
});


holder.view.setOnLongClickListener(new View.OnLongClickListener() {
itemViewHolder.view.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
return longClickListener != null
&& longClickListener.onLongClick(holder.getAdapterPosition());
&& longClickListener.onLongClick(listItem);
}
});

holder.dragHandler.setOnTouchListener(new View.OnTouchListener() {
itemViewHolder.dragHandler.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
if (event.getAction() == MotionEvent.ACTION_DOWN) {
touchHelper.startDrag(holder);
touchHelper.startDrag(itemViewHolder);
return true;
}
return false;
}
});

}

@Override
public int getItemCount() {
if (shoppingList != null) {
return shoppingList.size();
}
return 0;
public interface ItemLongClickListener {
boolean onLongClick(ListItem item);
}

public interface ItemLongClickListener {
boolean onLongClick(int position);
static class CategoryViewHolder extends SectionedViewHolder {
TextView category;

CategoryViewHolder(View itemView) {
super(itemView);

category = itemView.findViewById(R.id.category);
}
}

public static class ViewHolder extends RecyclerView.ViewHolder {
static class ItemViewHolder extends SectionedViewHolder {
TextView description;
TextView quantity;
ImageView dragHandler;
View view;
ListItem listItem;

public ViewHolder(View itemView) {
public ItemViewHolder(View itemView) {
super(itemView);
view = itemView;
description = itemView.findViewById(R.id.text_description);
Expand Down Expand Up @@ -190,19 +232,28 @@ public boolean isLongPressDragEnabled() {
}

@Override
public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
public int getMovementFlags(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
final int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
final int swipeFlags = ItemTouchHelper.START;
return makeMovementFlags(dragFlags, swipeFlags);
}

@Override
public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
public boolean onMove(@NonNull RecyclerView recyclerView,
RecyclerView.ViewHolder viewHolder,
RecyclerView.ViewHolder target) {
if (viewHolder.getItemViewType() != target.getItemViewType()) {
return false;
}

RecyclerListAdapter.this.move(viewHolder.getAdapterPosition(), target.getAdapterPosition());
if (!(viewHolder instanceof ItemViewHolder) || !(target instanceof ItemViewHolder)) {
return false;
}

ItemViewHolder sourceViewHolder = (ItemViewHolder) viewHolder;
ItemViewHolder targetViewHolder = (ItemViewHolder) target;

RecyclerListAdapter.this.move(sourceViewHolder.listItem, targetViewHolder.listItem);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not entirely sure where it was introduced, but when moving items, it only swaps with the neighbor item.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will have a look 👍

return true;
}

Expand All @@ -212,7 +263,13 @@ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
}

@Override
public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
public void onChildDraw(@NonNull Canvas c,
@NonNull RecyclerView recyclerView,
@NonNull RecyclerView.ViewHolder viewHolder,
float dX,
float dY,
int actionState,
boolean isCurrentlyActive) {

if (actionState != ItemTouchHelper.ACTION_STATE_SWIPE) {
super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
Expand Down
Loading