e-corp
/
backpack-hikapro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mend

This commit is contained in:
Tariel Hlontsi 2016-05-15 16:53:02 +03:00
parent ee32f8471c
commit ce72c4aab1
43 changed files with 974 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
app/src/main/java/hikapro/com/backpack/MainActivity.java
View File

@ -9,15 +9,19 @@ import android.util.Log;
import hikapro.com.backpack.model.DetailModel;
import hikapro.com.backpack.model.ItemModel;
import hikapro.com.backpack.model.PackedModel;
import hikapro.com.backpack.model.SetModel;
import hikapro.com.backpack.model.entities.Item;
import hikapro.com.backpack.model.entities.Set;
import hikapro.com.backpack.presenter.ItemDetailPresenter;
import hikapro.com.backpack.presenter.ItemListPresenter;
import hikapro.com.backpack.presenter.PackedListPresenter;
import hikapro.com.backpack.presenter.Presenter;
import hikapro.com.backpack.presenter.SetListPresenter;
import hikapro.com.backpack.view.View;
import hikapro.com.backpack.view.fragments.ItemDetailFragment;
import hikapro.com.backpack.view.fragments.ItemListFragment;
import hikapro.com.backpack.view.fragments.PackedListFragment;
import hikapro.com.backpack.view.fragments.SetListFragment;
public class MainActivity extends Activity implements View.ActivityCallback {
@ -73,6 +77,17 @@ public class MainActivity extends Activity implements View.ActivityCallback {
ItemDetailPresenter presenter = stateMaintainer.get(ItemDetailPresenter.class.getName());
DetailModel model = stateMaintainer.get(DetailModel.class.getName());
view.setPresenter(presenter);
presenter.setView(view);
presenter.setModel(model);
model.setPresenter(presenter);
}
fragment = fragmentManager.findFragmentByTag(PackedListFragment.class.getName());
if (fragment != null) {
PackedListFragment view = (PackedListFragment) fragment;
PackedListPresenter presenter = stateMaintainer.get(PackedListPresenter.class.getName());
PackedModel model = stateMaintainer.get(PackedModel.class.getName());
view.setPresenter(presenter);
presenter.setView(view);
presenter.setModel(model);
@ -132,7 +147,8 @@ public class MainActivity extends Activity implements View.ActivityCallback {
presenter.setModel(model);
model.setPresenter(presenter);
replaceFragment(view, false, SetListFragment.class.getName(), false, false);
//replaceFragment(view, false, SetListFragment.class.getName(), false, false);
replaceFragment(view, SetListFragment.class.getName(), 0);
stateMaintainer.put(presenter);
stateMaintainer.put(model);
@ -150,12 +166,40 @@ public class MainActivity extends Activity implements View.ActivityCallback {
presenter.setModel(model);
model.setPresenter(presenter);
replaceFragment(view, true, ItemListFragment.class.getName(), true, true);
//replaceFragment(view, true, ItemListFragment.class.getName(), true, true);
replaceFragment(view, ItemListFragment.class.getName(),
Presenter.ADD_TO_BACKSTACK | Presenter.TRANSITION_X);
stateMaintainer.put(presenter);
stateMaintainer.put(model);
}
@Override
public void startPackedListFragment(Set set) {
PackedListFragment view = PackedListFragment.newFromSet(set);
PackedListPresenter presenter = new PackedListPresenter();
PackedModel model;
if (stateMaintainer.hasKey(PackedModel.class.getName())) {
model = stateMaintainer.get(PackedModel.class.getName());
} else {
model = new PackedModel();
}
view.setPresenter(presenter);
presenter.setView(view);
presenter.setModel(model);
model.setPresenter(presenter);
//replaceFragment(view, true, ItemListFragment.class.getName(), true, true);
replaceFragment(view, PackedListFragment.class.getName(),
Presenter.ADD_TO_BACKSTACK | Presenter.TRANSITION_Y);
stateMaintainer.put(presenter);
stateMaintainer.put(model);
}
@Override
public void startItemDetailFragment(Item item) {
@ -168,7 +212,9 @@ public class MainActivity extends Activity implements View.ActivityCallback {
presenter.setModel(model);
model.setPresenter(presenter);
replaceFragment(view, true, ItemDetailFragment.class.getName(), true, true);
//replaceFragment(view, true, ItemDetailFragment.class.getName(), true, true);
replaceFragment(view, ItemDetailFragment.class.getName(),
Presenter.ADD_TO_BACKSTACK | Presenter.TRANSITION_X);
stateMaintainer.put(presenter);
stateMaintainer.put(model);
@ -179,8 +225,8 @@ public class MainActivity extends Activity implements View.ActivityCallback {
FragmentTransaction transaction = fragmentManager.beginTransaction();
if (transition) {
if (x)
transaction.setCustomAnimations(R.animator.slide_in_left, R.animator.slide_out_right,
R.animator.slide_in_right, R.animator.slide_out_left);
transaction.setCustomAnimations(R.animator.slide_in_left_x, R.animator.slide_out_right_x,
R.animator.slide_in_right_x, R.animator.slide_out_left_x);
}
transaction.replace(R.id.container, fragment, tag);
@ -189,4 +235,26 @@ public class MainActivity extends Activity implements View.ActivityCallback {
transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
transaction.commit();
}
private void replaceFragment(Fragment fragment, String tag, int flags) {
FragmentTransaction transaction = fragmentManager.beginTransaction();
if ((flags & Presenter.TRANSITION_X) == Presenter.TRANSITION_X) {
transaction.setCustomAnimations(R.animator.slide_in_left_x, R.animator.slide_out_right_x,
R.animator.slide_in_right_x, R.animator.slide_out_left_x);
}
if ((flags & Presenter.TRANSITION_Y) == Presenter.TRANSITION_Y) {
transaction.setCustomAnimations(R.animator.slide_in_top_y, R.animator.slide_out_bottom_y,
R.animator.slide_in_bottom_y, R.animator.slide_out_top_y);
}
transaction.replace(R.id.container, fragment, tag);
if ((flags & Presenter.ADD_TO_BACKSTACK) == Presenter.ADD_TO_BACKSTACK) {
transaction.addToBackStack(null);
}
//transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
transaction.commit();
}
}

108
app/src/main/java/hikapro/com/backpack/model/BagModel.java
View File

@ -1,108 +0,0 @@
package hikapro.com.backpack.model;
import android.os.Message;
import hikapro.com.backpack.model.entities.Category;
import hikapro.com.backpack.model.entities.Item;
import hikapro.com.backpack.presenter.Presenter;
/**
* Created by tariel on 12/05/16.
*/
public class BagModel implements Model.Bag {
@Override
public int insertItem(Item item) {
return 0;
}
@Override
public boolean deleteItem(Item item) {
return false;
}
@Override
public void filter(String query) {
}
@Override
public int getHeaderId(int position) {
return 0;
}
@Override
public int getItemId(int position) {
return 0;
}
@Override
public void clear() {
}
@Override
public boolean isPendingRemoval(Item item) {
return false;
}
@Override
public void pendingRemove(Item item) {
}
@Override
public void pendingRemoveCancel(Item item) {
}
@Override
public int getItemsCount() {
return 0;
}
@Override
public Item findItem(int id) {
return null;
}
@Override
public Item getItemByPosition(int position) {
return null;
}
@Override
public Category getCategoryByPosition(int position) {
return null;
}
@Override
public void setPresenter(Presenter.ItemList presenter) {
}
@Override
public Presenter.ItemList getPresenter() {
return null;
}
@Override
public void onDestroy(boolean isConfigurationChanging) {
}
@Override
public void executeQuery() {
}
@Override
public void notifyDataSetChanged() {
}
@Override
public void onEvent(Message event) {
}
}

118
app/src/main/java/hikapro/com/backpack/model/ItemModel.java
View File

@ -21,19 +21,21 @@ import hikapro.com.backpack.presenter.Presenter;
*/
public class ItemModel implements Model.Item {
private Presenter.ItemList presenter;
protected Presenter.ItemList presenter;
private List<Category> rawCategories;
private List<Category> sortedCategories;
private List<Item> rawItems;
private DAO dao;
private int currentSet;
private Hashtable<Integer, Category> categoriesCache;
protected DAO dao;
protected int currentSet;
protected int currentSetActiveItemsQty;
protected int packedQty;
protected Hashtable<Integer, Category> categoriesCache;
private List<Item> itemsCache;
private List<Item> itemsDiscardCache;
private Hashtable<Category, List<Item>> items;
private Hashtable<Integer, List<Item>> cache;
protected Hashtable<Integer, List<Item>> cache;
public ItemModel() {
this.rawCategories = new ArrayList<>();
@ -42,6 +44,8 @@ public class ItemModel implements Model.Item {
this.categoriesCache = new Hashtable<>(20, 0.9f);
this.packedQty = -1;
this.itemsCache = new ArrayList<>();
this.itemsDiscardCache = new ArrayList<>();
this.cache = new Hashtable<>(12, 0.9f);
@ -59,7 +63,6 @@ public class ItemModel implements Model.Item {
return ret;
}
// categories <--
// items -->
@ -70,6 +73,7 @@ public class ItemModel implements Model.Item {
iList.add(item);
Collections.sort(iList);
cache.put(currentSet, iList);
++currentSetActiveItemsQty;
// TODO write to database
return 0;
}
@ -78,6 +82,7 @@ public class ItemModel implements Model.Item {
if (isPendingRemoval(item))
itemsDiscardCache.remove(item);
cache.get(currentSet).remove(item);
--currentSetActiveItemsQty;
//TODO write to ds
return false;
@ -168,6 +173,15 @@ public class ItemModel implements Model.Item {
return is ? cache.get(currentSet).size() : 0;
}
@Override
public int getActiveItemsCount() {
return currentSetActiveItemsQty;
}
@Override
public int getPackedQty() {
return packedQty;
}
// items <--
// events -->
@ -192,6 +206,29 @@ public class ItemModel implements Model.Item {
// process -->
@Override
public void packItem(int itemId) {
Item item = findItem(itemId);
if (item != null)
cache.get(currentSet).remove(item);
Message command = Message.obtain();
command.what = Command.ITEM_PACK;
command.arg1 = currentSet;
command.arg2 = itemId;
dao.executeCommand(command);
}
@Override
public void unpackItem(int itemId) {
// nothing
}
@Override
public void unpackSet(int setId) {
// nothing
}
@Override
public void executeQuery() {
Message command;
@ -214,7 +251,14 @@ public class ItemModel implements Model.Item {
public void onEvent(Message event) {
switch (event.what) {
case Event.SET_ITEMS_LOAD_ERROR :
case Event.SET_ITEMS_LOAD_ERROR : // TODO check
if (presenter != null) {
if (packedQty == -1)
packedQty = presenter.getCurrentSet().getPackedQty();
presenter.notifyItemPackStatusChanged();
}
break;
case Event.SET_UNPACK_ERROR :
break;
case Event.ITEM_FROM_SET_ERROR :
break;
@ -232,6 +276,17 @@ public class ItemModel implements Model.Item {
List<Item> res = (List<Item>) event.obj;
cache.put(event.arg1, res);
notifyDataSetChanged();
if (presenter != null) {
if (packedQty == -1)
packedQty = presenter.getCurrentSet().getPackedQty();
presenter.notifyItemPackStatusChanged();
}
break;
case Event.SET_UNPACK_COMPLETED :
packedQty = 0;
if (presenter != null) {
presenter.notifyItemPackStatusChanged();
}
break;
case Event.ITEM_CATEGORY_LOAD_COMPLETED :
categoriesCache = (Hashtable<Integer, Category>)event.obj;
@ -241,8 +296,17 @@ public class ItemModel implements Model.Item {
case Event.ITEM_DELETED :
break;
case Event.ITEM_PACKED :
//TODO something
++packedQty;
if (presenter != null) {
presenter.notifyItemPackStatusChanged();
}
break;
case Event.ITEM_UNPACKED :
--packedQty;
if (presenter != null) {
presenter.notifyItemPackStatusChanged();
}
break;
case Event.ITEM_INSERTED :
break;
@ -258,6 +322,7 @@ public class ItemModel implements Model.Item {
public void setPresenter(Presenter.ItemList presenter) {
this.presenter = presenter;
this.currentSet = presenter.getCurrentSet().getId();
this.currentSetActiveItemsQty = presenter.getCurrentSet().getActiveQty();
}
@Override
@ -265,45 +330,6 @@ public class ItemModel implements Model.Item {
return presenter;
}
private void initData() {
List<Integer> ids = presenter.getCurrentSet().getItems();
List<Item> sortedItems = new ArrayList<>(ids.size());
Category category;
for (Item item : rawItems) {
if (ids.contains(item.getId())) {
sortedItems.add(item);
}
}
Collections.sort(sortedItems);
items = new Hashtable<>(sortedItems.size());
for (Item item : sortedItems) {
category = findCategory(item.getCategory());
if (category != null) {
if (items.containsKey(category)) {
items.get(category).add(item);
} else {
List<Item> innerList = new ArrayList<>(20);
innerList.add(item);
items.put(category, innerList);
}
}
}
Category[] array = items.keySet().toArray(new Category[items.size()]);
sortedCategories = Arrays.asList(array);
notifyDataSetChanged();
}
private Category findSortedCategory(int categoryId) {
Category category = null;
for (Category c : sortedCategories) {
if (c.getId() == categoryId) {
category = c;
break;
}
}
return category;
}
private Category findCategory(int categoryId) {
Category category = null;

9
app/src/main/java/hikapro/com/backpack/model/Model.java
View File

@ -44,6 +44,8 @@ public interface Model {
void pendingRemove(hikapro.com.backpack.model.entities.Item item);
void pendingRemoveCancel(hikapro.com.backpack.model.entities.Item item);
int getItemsCount();
int getActiveItemsCount();
int getPackedQty();
hikapro.com.backpack.model.entities.Item findItem(int id);
hikapro.com.backpack.model.entities.Item getItemByPosition(int position);
@ -51,7 +53,12 @@ public interface Model {
hikapro.com.backpack.model.entities.Category getCategoryByPosition(int position);
void setPresenter(Presenter.ItemList presenter);
Presenter.ItemList getPresenter();
void packItem(int itemId);
void unpackItem(int itemId);
void unpackSet(int setId);
}
interface Detail extends Base {
int getCount();
hikapro.com.backpack.model.entities.Item findItem(int id);
@ -60,8 +67,6 @@ public interface Model {
Presenter.ItemDetail getPresenter();
}
interface Bag extends Item {
}
}

121
app/src/main/java/hikapro/com/backpack/model/PackedModel.java Normal file
View File

@ -0,0 +1,121 @@
package hikapro.com.backpack.model;
import android.os.Message;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Hashtable;
import java.util.List;
import hikapro.com.backpack.model.dao.Command;
import hikapro.com.backpack.model.dao.DAO;
import hikapro.com.backpack.model.dao.Event;
import hikapro.com.backpack.model.entities.Category;
import hikapro.com.backpack.model.entities.Item;
import hikapro.com.backpack.presenter.Presenter;
/**
* Created by tariel on 12/05/16.
*/
public class PackedModel extends ItemModel {
public PackedModel() {
super();
}
@Override
public void executeQuery() {
Message command;
if (cache.contains(currentSet)) {
notifyDataSetChanged();
} else {
if (categoriesCache.isEmpty()) {
command = Message.obtain();
command.what = Command.ITEM_GET_CATEGORIES;
dao.executeCommand(command);
}
command = Message.obtain();
command.what = Command.SET_GET_PACKED_ITEMS;
command.arg1 = presenter.getCurrentSet().getId();
dao.executeCommand(command);
}
}
@Override
public void onEvent(Message event) {
switch (event.what) {
case Event.SET_PACKED_LOAD_ERROR :
break;
case Event.SET_UNPACK_ERROR :
break;
case Event.ITEM_CATEGORY_LOAD_ERROR :
break;
case Event.ITEM_PACK_ERROR :
break;
case Event.ITEM_UNPACK_ERROR :
break;
case Event.SET_PACKED_LOAD_COMPLETED :
List<Item> res = (List<Item>) event.obj;
cache.put(event.arg1, res);
notifyDataSetChanged();
packedQty = res.size();
if (presenter != null) {
presenter.notifyItemPackStatusChanged();
}
break;
case Event.SET_UNPACK_COMPLETED :
packedQty = 0;
cache.get(event.arg2).clear();
if (presenter != null) {
presenter.notifyItemPackStatusChanged();
}
break;
case Event.ITEM_CATEGORY_LOAD_COMPLETED :
categoriesCache = (Hashtable<Integer, Category>)event.obj;
break;
case Event.ITEM_PACKED :
//TODO something
++packedQty;
if (presenter != null) {
presenter.notifyItemPackStatusChanged();
}
break;
case Event.ITEM_UNPACKED :
--packedQty;
if (presenter != null) {
presenter.notifyItemPackStatusChanged();
}
break;
}
}
@Override
public void unpackItem(int itemId) {
Message command;
command = Message.obtain();
command.what = Command.ITEM_UNPACK;
command.arg1 = currentSet;
command.arg2 = itemId;
dao.executeCommand(command);
Item item = findItem(itemId);
if (item != null)
cache.get(currentSet).remove(item);
}
@Override
public void packItem(int itemId) {
// nothing
}
@Override
public void unpackSet(int setId) {
Message command;
command = Message.obtain();
command.what = Command.SET_UNPACK_ITEMS;
command.arg1 = setId;
dao.executeCommand(command);
}
}

2
app/src/main/java/hikapro/com/backpack/model/dao/Command.java
View File

@ -13,6 +13,8 @@ public interface Command {
int SET_GET_ALL = 0x64;
int SET_REORDER = 0x65;
int SET_GET_ITEMS = 0x66;
int SET_GET_PACKED_ITEMS = 0x67;
int SET_UNPACK_ITEMS = 0x68;
int ITEM_DELETE_FROM_SET = 0x78;
int ITEM_INSERT = 0x79;

136
app/src/main/java/hikapro/com/backpack/model/dao/DAO.java
View File

@ -135,6 +135,19 @@ public class DAO {
threadPool.execute(setTask);
break;
case Command.SET_GET_PACKED_ITEMS :
setTask = new SetTask(Command.SET_GET_PACKED_ITEMS,
Process.THREAD_PRIORITY_MORE_FAVORABLE);
setTask.setId = command.arg1;
threadPool.execute(setTask);
break;
case Command.SET_UNPACK_ITEMS :
setTask = new SetTask(Command.SET_UNPACK_ITEMS,
Process.THREAD_PRIORITY_DEFAULT);
setTask.setId = command.arg1;
threadPool.execute(setTask);
case Command.ITEM_GET_CATEGORIES :
itemTask = new ItemTask(Command.ITEM_GET_CATEGORIES,
Process.THREAD_PRIORITY_MORE_FAVORABLE);
@ -357,13 +370,13 @@ public class DAO {
return ret;
}
private List<Item> readItems(int setId) {
private List<Item> readItems(int setId, boolean packed) {
List<Item> ret = new ArrayList<>(256);
Cursor cursor = null;
SQLiteDatabase db = null;
Item item;
String query = String.format(
"SELECT a.%s, a.%s, a.%s, a.%s, a.%s, a.%s, a.%s, a.%s, a.%s FROM %s a INNER JOIN %s b ON a.%s = b.%s WHERE b.%s = ? AND b.%s <> 1 AND b.%s <> 1",
"SELECT a.%s, a.%s, a.%s, a.%s, a.%s, a.%s, a.%s, a.%s, a.%s FROM %s a INNER JOIN %s b ON a.%s = b.%s WHERE b.%s = ? AND b.%s <> 1 AND b.%s %s 1",
Db.ItemsTable.COLUMN_ID,
Db.ItemsTable.COLUMN_NAME,
@ -381,7 +394,8 @@ public class DAO {
Db.SetItemsTable.COLUMN_ITEM,
Db.SetItemsTable.COLUMN_SET,
Db.SetItemsTable.COLUMN_DELETED,
Db.SetItemsTable.COLUMN_PACKED);
Db.SetItemsTable.COLUMN_PACKED,
packed ? "=" : "<>");
try {
db = getReadDB();
cursor = db.rawQuery(query, new String[]{String.valueOf(setId)});
@ -430,6 +444,20 @@ public class DAO {
}
return ret;
}
private Set readSet(SQLiteDatabase db, int setId) {
Set ret = null;
Cursor cursor;
String query = String.format("SELECT * FROM %s a WHERE a.%s = %d LIMIT 1",
Db.SetsTable.TABLE_NAME, Db.SetsTable.COLUMN_ID, setId);
cursor = db.rawQuery(query, null);
if (cursor.moveToNext())
ret = Db.SetsTable.parseCursor(cursor);
if (cursor != null)
cursor.close();
return ret;
}
private List<Set> readSets() {
List<Set> ret = new ArrayList<>(12);
Cursor cursor = null;
@ -437,19 +465,8 @@ public class DAO {
Set set;
try {
db = getReadDB();
cursor = db.query(Db.SetsTable.TABLE_NAME,
new String[]{Db.SetsTable.COLUMN_ID,
Db.SetsTable.COLUMN_ITEMS,
Db.SetsTable.COLUMN_LINE_NUMBER,
Db.SetsTable.COLUMN_NAME,
Db.SetsTable.COLUMN_PHOTO_LOCAL,
Db.SetsTable.COLUMN_PHOTO_THUMB_LOCAL,
Db.SetsTable.COLUMN_PHOTO_THUMB_URL,
Db.SetsTable.COLUMN_PHOTO_THUMBNAIL_LOCAL,
Db.SetsTable.COLUMN_PHOTO_THUMBNAIL_URL,
Db.SetsTable.COLUMN_PHOTO_URL},
null,null,null,null,
Db.SetsTable.COLUMN_LINE_NUMBER);
String query = String.format("SELECT * FROM %s", Db.SetsTable.TABLE_NAME);
cursor = db.rawQuery(query, null);
while (cursor.moveToNext()) {
set = Db.SetsTable.parseCursor(cursor);
ret.add(set);
@ -549,10 +566,59 @@ public class DAO {
}
return ret;
}
private int updateSetItemsPacked(int setId, boolean pack) {
int ret = 0;
SQLiteDatabase db = null;
ContentValues values;
Set set;
try {
db = getWriteDB();
db.beginTransaction();
/*
String query = String.format("UPDATE %s SET %s = %d where %s = %d",
Db.SetItemsTable.TABLE_NAME,
Db.SetItemsTable.COLUMN_PACKED,
pack,
Db.SetItemsTable.COLUMN_SET,
setId);
Cursor cursor = db.rawQuery(query, null);*/
values = new ContentValues();
values.put(Db.SetItemsTable.COLUMN_PACKED, pack);
ret = db.update(Db.SetItemsTable.TABLE_NAME, values, String.format("%s = ?",
Db.SetItemsTable.COLUMN_SET),
new String[]{String.valueOf(setId)});
set = readSet(db, setId);
if (set != null) {
values = new ContentValues();
values.put(Db.SetsTable.COLUMN_PACKED_QTY, pack ? set.getActiveQty() : 0);
ret += db.update(Db.SetsTable.TABLE_NAME, values, String.format("%s = ?",
Db.SetsTable.COLUMN_ID),
new String[]{String.valueOf(setId)});
}
db.setTransactionSuccessful();
} catch (SQLiteException e) {
//TODO write to log here
} catch (Exception e) {
//TODO write to log here
} finally {
if (db != null) {
db.endTransaction();
db.close();
}
}
return ret;
}
private int updateSetItemPacked(int setId, int itemId, boolean pack) {
int ret = 0;
SQLiteDatabase db = null;
ContentValues values;
Set set;
try {
db = getWriteDB();
db.beginTransaction();
@ -563,13 +629,13 @@ public class DAO {
Db.SetItemsTable.COLUMN_SET, Db.SetItemsTable.COLUMN_ITEM ),
new String[]{String.valueOf(setId), String.valueOf(itemId)});
if (pack) {
values = Db.SetItemsTable.toContentValues(MY_LIST_ID, itemId);
db.insert(Db.SetItemsTable.TABLE_NAME, null, values);
} else {
db.delete(Db.SetItemsTable.TABLE_NAME, String.format("%s = ? AND %s = ?",
Db.SetItemsTable.COLUMN_SET, Db.SetItemsTable.COLUMN_ITEM ),
new String[]{String.valueOf(MY_LIST_ID), String.valueOf(itemId) });
set = readSet(db, setId);
if (set != null) {
values = new ContentValues();
values.put(Db.SetsTable.COLUMN_PACKED_QTY, pack ? set.getPackedQty() + 1 : set.getPackedQty() - 1);
ret += db.update(Db.SetsTable.TABLE_NAME, values, String.format("%s = ?",
Db.SetsTable.COLUMN_ID),
new String[]{String.valueOf(setId)});
}
db.setTransactionSuccessful();
} catch (SQLiteException e) {
@ -690,6 +756,7 @@ public class DAO {
int priority;
int setId;
List<Set> setsToUpdate;
List<Item> items;
public SetTask(int command, int priority) {
this.currentCommand = command;
@ -715,7 +782,7 @@ public class DAO {
break;
case Command.SET_GET_ITEMS :
List<Item> items = readItems(setId);
items = readItems(setId, false);
if (items.isEmpty())
message.what = Event.SET_ITEMS_LOAD_ERROR;
else {
@ -733,6 +800,27 @@ public class DAO {
else
message.what = Event.SET_REORDER_ERROR;
break;
case Command.SET_GET_PACKED_ITEMS :
items = readItems(setId, true);
if (items.isEmpty())
message.what = Event.SET_PACKED_LOAD_ERROR;
else {
Collections.sort(items);
message.what = Event.SET_PACKED_LOAD_COMPLETED;
message.obj = items;
message.arg1 = setId;
}
break;
case Command.SET_UNPACK_ITEMS :
message.arg1 = updateSetItemsPacked(setId, false);
message.arg2 = setId;
if (message.arg1 > 0)
message.what = Event.SET_UNPACK_COMPLETED;
else
message.what = Event.SET_UNPACK_ERROR;
break;
}
handler.sendMessage(message);
}

7
app/src/main/java/hikapro/com/backpack/model/dao/Db.java
View File

@ -140,6 +140,8 @@ public class Db {
public static final String COLUMN_PHOTO_THUMBNAIL_URL = "photo_thumbnail_url";
public static final String COLUMN_PHOTO_THUMBNAIL_LOCAL = "photo_thumbnail_local";
public static final String COLUMN_LINE_NUMBER = "line_num";
public static final String COLUMN_PACKED_QTY = "packed_qty";
public static final String COLUMN_ACTIVE_QTY = "active_qty";
public static final String CREATE =
@ -153,6 +155,8 @@ public class Db {
COLUMN_PHOTO_THUMB_LOCAL + " TEXT, " +
COLUMN_PHOTO_THUMBNAIL_URL + " TEXT, " +
COLUMN_LINE_NUMBER + " INTEGER, " +
COLUMN_PACKED_QTY + " INTEGER, " +
COLUMN_ACTIVE_QTY + " INTEGER, " +
COLUMN_PHOTO_THUMBNAIL_LOCAL + " TEXT" +
" ); ";
@ -172,6 +176,7 @@ public class Db {
values.put(COLUMN_PHOTO_THUMB_URL, set.getPhotoThumb());
values.put(COLUMN_PHOTO_THUMBNAIL_URL, set.getPhotoThumbnail());
values.put(COLUMN_LINE_NUMBER, lineNumber);
values.put(COLUMN_ACTIVE_QTY, items.size());
/*
values.put(COLUMN_PHOTO_LOCAL, "");
values.put(COLUMN_PHOTO_THUMB_LOCAL, "");
@ -196,6 +201,8 @@ public class Db {
set.setPhotoThumb(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_PHOTO_THUMB_URL)));
set.setPhotoThumbnail(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_PHOTO_THUMBNAIL_URL)));
set.setLineNumber(cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_LINE_NUMBER)));
set.setPackedQty(cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_PACKED_QTY)));
set.setActiveQty(cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_ACTIVE_QTY)));
return set;
}

4
app/src/main/java/hikapro/com/backpack/model/dao/Event.java
View File

@ -12,11 +12,15 @@ public interface Event {
int SET_LOAD_ERROR = -0x1;
int SET_REORDER_ERROR = -0x2;
int SET_ITEMS_LOAD_ERROR = -0x3;
int SET_PACKED_LOAD_ERROR = -0x4;
int SET_UNPACK_ERROR = -0x5;
int SET_LOAD_COMPLETED = 0x1;
int SET_REORDER_COMPLETED = 0x2;
int SET_ITEMS_LOAD_COMPLETED = 0x3;
int SET_PACKED_LOAD_COMPLETED = 0x4;
int SET_UNPACK_COMPLETED = 0x5;
int ITEM_FROM_SET_ERROR = -0x14;

18
app/src/main/java/hikapro/com/backpack/model/entities/Set.java
View File

@ -32,6 +32,8 @@ public class Set implements Comparable<Set>, Serializable {
private String photoThumbnail;
private int lineNumber;
private int packedQty;
private int activeQty;
public Set() {
}
@ -101,6 +103,22 @@ public class Set implements Comparable<Set>, Serializable {
this.lineNumber = lineNumber;
}
public int getPackedQty() {
return packedQty;
}
public void setPackedQty(int packedQty) {
this.packedQty = packedQty;
}
public int getActiveQty() {
return activeQty;
}
public void setActiveQty(int activeQty) {
this.activeQty = activeQty;
}
@Override
public int hashCode() {
int result = name != null ? name.hashCode() : 0;

91
app/src/main/java/hikapro/com/backpack/presenter/ItemListPresenter.java
View File

@ -1,6 +1,7 @@
package hikapro.com.backpack.presenter;
import android.app.Fragment;
import android.app.ActionBar;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
@ -9,6 +10,7 @@ import android.support.v7.widget.helper.ItemTouchHelper;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import java.lang.ref.WeakReference;
@ -28,13 +30,17 @@ import hikapro.com.backpack.view.View;
*/
public class ItemListPresenter implements Presenter.ItemList {
private static final String BUNDLE_SET_LIST_KEY = "BUNDLE_SET_LIST_KEY";
protected static final String BUNDLE_SET_LIST_KEY = "BUNDLE_SET_LIST_KEY";
private WeakReference<View.ItemList> view;
private Model.Item model;
private Set set;
private ItemListAdapter adapter;
RecyclerView recycler;
protected WeakReference<View.ItemList> view;
protected Model.Item model;
protected Set set;
protected ItemListAdapter adapter;
protected RecyclerView recycler;
private LinearLayout footer;
private TextView showPacked;
protected TextView packedCount;
public ItemListPresenter() {
this.adapter = new ItemListAdapter(this);
@ -80,6 +86,32 @@ public class ItemListPresenter implements Presenter.ItemList {
adapter.setUndoOn(true);
model.executeQuery();
footer = (LinearLayout) view.findViewById(R.id.item_list_footer);
packedCount = (TextView) footer.findViewById(R.id.footer_packed_count);
showPacked = (TextView) footer.findViewById(R.id.open_packed);
showPacked.setOnClickListener(new android.view.View.OnClickListener() {
@Override
public void onClick(android.view.View v) {
showPackedItems();
}
});
Activity activity = (Activity) getActivityContext();
if (activity != null) {
ActionBar actionBar = activity.getActionBar();
if (actionBar != null) {
actionBar.show();
actionBar.setTitle(set.getName());
}
}
/*
if ( model.getPackedQty() > 0) {
footer.setVisibility(android.view.View.VISIBLE);
String str = String.format("%s %d / %d",
getActivityContext().getResources().getString(R.string.packed), model.getPackedQty(),
model.getActiveItemsCount());
packedCount.setText(str);
}
*/
return view;
}
@Override
@ -98,20 +130,45 @@ public class ItemListPresenter implements Presenter.ItemList {
}
@Override
public void clickItem(int itemId) {
/*
public void notifyItemPackStatusChanged() {
setVisibility();
Context context = getActivityContext();
if (context != null) {
String str = String.format("%s %d / %d",
context.getResources().getString(R.string.packed),
model.getPackedQty(),
model.getActiveItemsCount());
packedCount.setText(str);
}
}
@Override
public void setVisibility() {
if (model.getPackedQty() == model.getActiveItemsCount()) {
footer.setVisibility(android.view.View.VISIBLE);
} else if ( model.getPackedQty() > 0) {
footer.setVisibility(android.view.View.VISIBLE);
} else {
footer.setVisibility(android.view.View.GONE);
}
}
private void showPackedItems () {
getView().showPackedItems(set);
}
@Override
public void showDetails(int itemId) {
Item item = model.findItem(itemId);
if (item != null)
getView().showItemDetail(item);
else
showMessage(String.format("Item with Id %d is not found.", itemId));
*/
Fragment fragment = (Fragment)getView();
LinearLayout ll = (LinearLayout)fragment.getView().findViewById(R.id.item_list_footer);
ll.setVisibility(android.view.View.VISIBLE);
/*
ll.setAlpha(0.0f);
ll.animate().translationY(ll.getHeight()).alpha(1.0f);*/
}
// process <--
@ -155,7 +212,7 @@ public class ItemListPresenter implements Presenter.ItemList {
// other impl <--
private View.ItemList getView() throws NullPointerException {
protected View.ItemList getView() throws NullPointerException {
if ( view != null )
return view.get();
else

123
app/src/main/java/hikapro/com/backpack/presenter/PackedListPresenter.java Normal file
View File

@ -0,0 +1,123 @@
package hikapro.com.backpack.presenter;
import android.app.Fragment;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView;
import hikapro.com.backpack.R;
import hikapro.com.backpack.model.entities.Set;
import hikapro.com.backpack.presenter.adapters.PackedListAdapter;
import hikapro.com.backpack.presenter.adapters.helper.items.DividerDecoration;
import hikapro.com.backpack.presenter.adapters.helper.items.ItemSwipeCallback;
import hikapro.com.backpack.presenter.adapters.helper.items.StickyHeaderDecoration;
/**
* Created by tariel on 13/05/16.
*/
public class PackedListPresenter extends ItemListPresenter {
private TextView backToList;
private Button unpackButton;
public PackedListPresenter() {
this.adapter = new PackedListAdapter(this);
adapter.setHasStableIds(true);
adapter.setCheckAll(true);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
if (savedInstanceState != null)
set = (Set) savedInstanceState.getSerializable(BUNDLE_SET_LIST_KEY);
else
set = getView().getSet();
android.view.View view = inflater.inflate(R.layout.fragment_packed_list, container, false);
LinearLayoutManager llm = new LinearLayoutManager(getActivityContext());
recycler = (RecyclerView) view.findViewById(R.id.items_recycler);
recycler.setLayoutManager(llm);
recycler.setAdapter(adapter);
final StickyHeaderDecoration decoration = new StickyHeaderDecoration(adapter);
recycler.addItemDecoration(decoration);
recycler.addItemDecoration(new DividerDecoration(getActivityContext()));
adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
@Override
public void onChanged() {
decoration.invalidateHeaders();
}
});
ItemSwipeCallback itemSwipeCallback = new ItemSwipeCallback(0, ItemTouchHelper.LEFT, adapter, getActivityContext());
ItemTouchHelper itemTouchHelper = new ItemTouchHelper(itemSwipeCallback);
itemTouchHelper.attachToRecyclerView(recycler);
adapter.setUndoOn(true);
model.executeQuery();
backToList = (TextView) view.findViewById(R.id.back_to_list);
packedCount = (TextView) view.findViewById(R.id.header_packed_count);
unpackButton = (Button) view.findViewById(R.id.unpack_button);
if (model.getPackedQty() == model.getActiveItemsCount()) {
backToList.setVisibility(View.INVISIBLE);
packedCount.setVisibility(View.INVISIBLE);
unpackButton.setVisibility(View.VISIBLE);
} else {
backToList.setVisibility(View.VISIBLE);
packedCount.setVisibility(View.VISIBLE);
unpackButton.setVisibility(View.INVISIBLE);
}
unpackButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
model.unpackSet(set.getId());
}
});
backToList.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Fragment fragment = (Fragment) getView();
if (fragment != null)
fragment.getFragmentManager().popBackStack();
}
});
/*
String str = String.format("%s %d / %d",
getActivityContext().getResources().getString(R.string.packed),
model.getPackedQty(), model.getActiveItemsCount());
packedCount.setText(str);
*/
return view;
}
@Override
public void setVisibility() {
if (model.getPackedQty() == 0) {
packedCount.setVisibility(View.GONE);
unpackButton.setVisibility(View.GONE);
backToList.setVisibility(View.VISIBLE);
} else if (model.getPackedQty() == model.getActiveItemsCount()) {
packedCount.setVisibility(View.GONE);
unpackButton.setVisibility(View.VISIBLE);
backToList.setVisibility(View.GONE);
} else {
packedCount.setVisibility(View.VISIBLE);
unpackButton.setVisibility(View.GONE);
backToList.setVisibility(View.VISIBLE);
}
}
}

18
app/src/main/java/hikapro/com/backpack/presenter/Presenter.java
View File

@ -19,20 +19,22 @@ import hikapro.com.backpack.view.recycler.SetViewHolder;
*/
public interface Presenter {
int ADD_TO_BACKSTACK = 0b0001;
int TRANSITION_X = 0b0010;
int TRANSITION_Y = 0b0100;
interface Base {
Context getAppContext();
Context getActivityContext();
}
interface SetList extends Base {
SetViewHolder createViewHolder(ViewGroup parent, int viewType);
void bindViewHolder(SetViewHolder holder, int position);
int getSetsCount();
void clickSet(int setId);
void showItemList(Set set);
void onDestroy(boolean isChangingConfiguration);
android.view.View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState);
void setView(hikapro.com.backpack.view.View.SetList view);
void setModel(Model.Set model);
Model.Set getModel();
void notifyDataSetChanged();
void showMessage(String message);
@ -50,10 +52,12 @@ public interface Presenter {
void setModel(Model.Item model);
Model.Item getModel();
void notifyDataSetChanged();
void notifyItemPackStatusChanged();
void setVisibility();
Set getCurrentSet();
void showMessage(String message);
void onSaveInstanceState(Bundle outState);
void clickItem(int itemId);
void showDetails(int itemId);
void filter(String query);
}
@ -70,10 +74,6 @@ public interface Presenter {
void displayPicture(Bitmap bitmap);
}
interface Bag extends ItemList {
}
}

73
app/src/main/java/hikapro/com/backpack/presenter/SetListPresenter.java
View File

@ -1,5 +1,6 @@
package hikapro.com.backpack.presenter;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.support.v7.widget.DefaultItemAnimator;
@ -82,66 +83,17 @@ public class SetListPresenter implements Presenter.SetList {
ItemTouchHelper.Callback callback = new SimpleItemTouchHelperCallback(adapter);
mItemTouchHelper = new ItemTouchHelper(callback);
mItemTouchHelper.attachToRecyclerView(setRecycler);
Activity activity = (Activity) getActivityContext();
if (activity != null)
activity.getActionBar().hide();
return view;
}
// life cycle <--
// recycler -->
@Override
public SetViewHolder createViewHolder(ViewGroup parent, int viewType) {
SetViewHolder viewHolder;
android.view.View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.set_card,
parent, false);
viewHolder = new SetViewHolder(v);
return viewHolder;
}
@Override
public void bindViewHolder(final SetViewHolder holder, int position) {
final hikapro.com.backpack.model.entities.Set set = model.getSetByPosition(position);
holder.textView.setText(set.getName());
holder.cardView.setOnClickListener(new android.view.View.OnClickListener() {
@Override
public void onClick(android.view.View v) {
if (getView() != null)
getView().showItemList(set);
else
showMessage("There is no view in presenter");
}
});
//GLM_add_resources_SetList
holder.cardView.setOnLongClickListener(new android.view.View.OnLongClickListener() {
@Override
public boolean onLongClick(android.view.View v) {
mDragStartListener.onStartDrag(holder);
return false;
}
});
}
@Override
public int getSetsCount() {
return model.getSetsCount();
}
// recycler <--
// process -->
@Override
public void clickSet(int setId) {
Set set = model.findSet(setId);
if (set != null) {
getView().showItemList(set);
} else {
showMessage("Set not found!");
}
}
@Override
public void notifyDataSetChanged() {
adapter.notifyDataSetChanged();
@ -176,6 +128,12 @@ public class SetListPresenter implements Presenter.SetList {
public void setModel(Model.Set model) {
this.model = model;
}
@Override
public Model.Set getModel() {
return model;
}
@Override
public void showMessage(String message) {
Toast.makeText(getView().getAppContext(), message, Toast.LENGTH_SHORT).show();
@ -195,4 +153,15 @@ public class SetListPresenter implements Presenter.SetList {
public void onStartDrag(RecyclerView.ViewHolder viewHolder) {
mItemTouchHelper.startDrag(viewHolder);
}
public void showItemList(Set set) {
if (getView() != null)
getView().showItemList(set);
else
showMessage("There is no view in presenter");
}
public void onLongClick(SetViewHolder holder) {
mDragStartListener.onStartDrag(holder);
}
}

57
app/src/main/java/hikapro/com/backpack/presenter/adapters/ItemListAdapter.java
View File

@ -10,10 +10,8 @@ import android.view.ViewGroup;
import java.util.HashMap;
import hikapro.com.backpack.R;
import hikapro.com.backpack.model.Model;
import hikapro.com.backpack.model.entities.Category;
import hikapro.com.backpack.model.entities.Item;
import hikapro.com.backpack.presenter.ItemListPresenter;
import hikapro.com.backpack.presenter.Presenter;
import hikapro.com.backpack.presenter.adapters.helper.items.StickyHeaderAdapter;
import hikapro.com.backpack.view.recycler.HeaderViewHolder;
@ -30,6 +28,7 @@ public class ItemListAdapter extends RecyclerView.Adapter<ItemViewHolder> implem
private Handler handler = new Handler(); // hanlder for running delayed runnables
HashMap<Item, Runnable> pendingRunables = new HashMap<>(); // map of items to pending runnables, so we can cancel a removal if need be
private Presenter.ItemList presenter;
private boolean checkAll;
public ItemListAdapter(Presenter.ItemList presenter) {
this.presenter = presenter;
@ -43,7 +42,8 @@ public class ItemListAdapter extends RecyclerView.Adapter<ItemViewHolder> implem
@Override
public long getItemId(int position) {
return presenter.getModel().getItemByPosition(position).getId();
long ret = presenter.getModel().getItemId(position);
return ret;
}
@Override
@ -53,7 +53,7 @@ public class ItemListAdapter extends RecyclerView.Adapter<ItemViewHolder> implem
if (presenter.getModel().isPendingRemoval(item)) {
// we need to show the "undo" state of the row
holder.itemView.setBackgroundColor(Color.RED);
holder.title.setVisibility(View.GONE);
holder.checkBox.setVisibility(View.GONE);
holder.undoButton.setVisibility(View.VISIBLE);
holder.undoButton.setOnClickListener(new View.OnClickListener() {
@Override
@ -68,16 +68,28 @@ public class ItemListAdapter extends RecyclerView.Adapter<ItemViewHolder> implem
}
});
} else {
holder.title.setVisibility(View.VISIBLE);
holder.title.setText(item.getName());
holder.checkBox.setVisibility(View.VISIBLE);
holder.checkBox.setChecked(checkAll);
holder.checkBox.setText(item.getName() + " " + item.getId() + " pos " + position);//TODO del
holder.id = item.getId();
holder.title.setOnClickListener(new android.view.View.OnClickListener() {
holder.checkBox.setOnClickListener(new android.view.View.OnClickListener() {
@Override
public void onClick(View v) {
presenter.clickItem(holder.id);
if (holder.checkBox.isChecked()) {
pack(holder.id, position);
// presenter.packItem(); TODO wtf
} else {
unpack(holder.id, position);
// presenter.unpackItem(); TODO wtf
}
}
});
holder.infoButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
presenter.showDetails(holder.id);
}
});
holder.categoryId = item.getCategory();
holder.itemView.setBackgroundColor(0x33FF99);
holder.undoButton.setVisibility(View.GONE);
holder.undoButton.setOnClickListener(null);
@ -118,11 +130,6 @@ public class ItemListAdapter extends RecyclerView.Adapter<ItemViewHolder> implem
notifyDataSetChanged();
}
@Override
public void setHasStableIds(boolean hasStableIds) {
super.setHasStableIds(hasStableIds);
}
@Override
public long getHeaderId(int position) {
/*if (position == 0) {
@ -184,4 +191,26 @@ public class ItemListAdapter extends RecyclerView.Adapter<ItemViewHolder> implem
return presenter.getModel().isPendingRemoval(item);
}
public void pack(int itemId, int position) {
presenter.getModel().packItem(itemId);
notifyDataSetChanged();
/*
notifyItemRemoved(position);
notifyItemRangeRemoved(position, getItemCount());
*/
}
public void unpack(int itemId, int position) {
presenter.getModel().unpackItem(itemId);
//notifyItemRemoved(position);
notifyDataSetChanged();
}
public void unpackAll() {
}
public void setCheckAll(boolean checkAll) {
this.checkAll = checkAll;
}
}

4
app/src/main/java/hikapro/com/backpack/presenter/adapters/BagAdapter.java → app/src/main/java/hikapro/com/backpack/presenter/adapters/PackedListAdapter.java
View File

@ -6,9 +6,9 @@ import hikapro.com.backpack.presenter.adapters.ItemListAdapter;
/**
* Created by tariel on 12/05/16.
*/
public class BagAdapter extends ItemListAdapter {
public class PackedListAdapter extends ItemListAdapter {
public BagAdapter(Presenter.ItemList presenter) {
public PackedListAdapter(Presenter.ItemList presenter) {
super(presenter);
}
}

46
app/src/main/java/hikapro/com/backpack/presenter/adapters/SetListAdapter.java
View File

@ -1,8 +1,11 @@
package hikapro.com.backpack.presenter.adapters;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import hikapro.com.backpack.R;
import hikapro.com.backpack.presenter.SetListPresenter;
import hikapro.com.backpack.presenter.adapters.helper.sets.ItemTouchHelperAdapter;
import hikapro.com.backpack.view.recycler.SetViewHolder;
@ -13,24 +16,59 @@ import hikapro.com.backpack.view.recycler.SetViewHolder;
public class SetListAdapter extends RecyclerView.Adapter<SetViewHolder> implements ItemTouchHelperAdapter{
private SetListPresenter presenter;
private String rightBracket;
public SetListAdapter(SetListPresenter presenter) {
this.presenter = presenter;
}
@Override
public void onBindViewHolder(SetViewHolder holder, int position) {
presenter.bindViewHolder(holder, position);
public void onBindViewHolder(final SetViewHolder holder, int position) {
final hikapro.com.backpack.model.entities.Set set = presenter.getModel().getSetByPosition(position);
if (rightBracket == null || rightBracket.isEmpty()) {
if (presenter.getActivityContext() != null)
this.rightBracket = presenter.getActivityContext().getResources().
getString(R.string.right_angle_bracket);
else
this.rightBracket = "";
}
holder.textView.setText(set.getName() + " " + rightBracket);
String info = String.format("%s %d / %d",
presenter.getActivityContext().getResources().getString(R.string.packed),
set.getPackedQty(),
set.getActiveQty());
holder.setInfo.setText(info);
holder.cardView.setOnClickListener(new android.view.View.OnClickListener() {
@Override
public void onClick(android.view.View v) {
presenter.showItemList(set);
}
});
holder.cardView.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
presenter.onLongClick(holder);
return false;
}
});
}
@Override
public SetViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
return presenter.createViewHolder(parent, viewType);
SetViewHolder viewHolder;
android.view.View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.set_card,
parent, false);
viewHolder = new SetViewHolder(v);
return viewHolder;
}
@Override
public int getItemCount() {
return presenter.getSetsCount();
return presenter.getModel().getSetsCount();
}
//GLM_add_resources_SetList

5
app/src/main/java/hikapro/com/backpack/view/View.java
View File

@ -26,6 +26,7 @@ public interface View {
interface ItemList extends Base {
void showItemDetail(Item item);
void showPackedItems(Set set);
void setPresenter(Presenter.ItemList presenter);
Set getSet();
}
@ -33,13 +34,11 @@ public interface View {
void setPresenter(Presenter.ItemDetail presenter);
Item getItem();
}
interface Bag extends Base {
void setPresenter(Presenter.Bag presenter);
}
interface ActivityCallback {
void startSetListFragment();
void startItemListFragment(Set set);
void startPackedListFragment(Set set);
void startItemDetailFragment(Item item);
}

46
app/src/main/java/hikapro/com/backpack/view/fragments/ItemListFragment.java
View File

@ -70,7 +70,24 @@ public class ItemListFragment extends Fragment implements hikapro.com.backpack.v
@Override
public boolean onOptionsItemSelected(MenuItem item) {
return super.onOptionsItemSelected(item);
boolean ret;
switch (item.getItemId()) {
case R.id.action_share :
Toast.makeText(getActivityContext(), "Share", Toast.LENGTH_SHORT).show();
ret = true;
break;
case R.id.action_unpack_my_bag :
Toast.makeText(getActivityContext(), "Unpack my bag", Toast.LENGTH_SHORT).show();
ret = true;
break;
case R.id.action_restore_to_default :
Toast.makeText(getActivityContext(), "Restore to default", Toast.LENGTH_SHORT).show();
ret = true;
break;
default:
ret = super.onOptionsItemSelected(item);
}
return ret;
}
// life cycle -->
@ -93,13 +110,13 @@ public class ItemListFragment extends Fragment implements hikapro.com.backpack.v
throw new ClassCastException(activity.toString()
+ " must implement activityCallback");
}
Log.i(this.toString(), "onAttach");
Log.i(this.toString(), " onAttach");
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
Log.i(this.toString(), "onCreate");
Log.i(this.toString(), " onCreate");
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
@ -107,51 +124,51 @@ public class ItemListFragment extends Fragment implements hikapro.com.backpack.v
// Inflate the layout for this fragment
presenter.setView(this);
View view = presenter.onCreateView(inflater, container, savedInstanceState);
Log.i(this.toString(), "onCreateView");
Log.i(this.toString(), " onCreateView");
return view;
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
Log.i(this.toString(), "onActivityCreated");
Log.i(this.toString(), " onActivityCreated");
}
@Override
public void onStart() {
super.onStart();
Log.i(this.toString(), "onStart");
Log.i(this.toString(), " onStart");
}
@Override
public void onResume() {
super.onResume();
Log.i(this.toString(), "onResume");
Log.i(this.toString(), " onResume");
}
@Override
public void onStop() {
super.onStop();
Log.i(this.toString(), "onStop");
Log.i(this.toString(), " onStop");
}
@Override
public void onDestroyView() {
super.onDestroyView();
presenter.onDestroy(true); // TODO isChangingConfigurations
Log.i(this.toString(), "onDestroyView");
Log.i(this.toString(), " onDestroyView");
}
@Override
public void onDestroy() {
super.onDestroy();
presenter.onDestroy(false); // TODO isChangingConfigurations
Log.i(this.toString(), "onDestroy");
Log.i(this.toString(), " onDestroy");
}
@Override
public void onDetach() {
super.onDetach();
Log.i(this.toString(), "onDetach");
Log.i(this.toString(), " onDetach");
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
presenter.onSaveInstanceState(outState);
Log.i(this.toString(), "onSaveInstanceState");
Log.i(this.toString(), " onSaveInstanceState");
}
// life cycle <--
@ -161,6 +178,11 @@ public class ItemListFragment extends Fragment implements hikapro.com.backpack.v
activityCallback.startItemDetailFragment(item);
}
@Override
public void showPackedItems(Set set) {
activityCallback.startPackedListFragment(set);
}
@Override
public void setPresenter(Presenter.ItemList presenter) {
this.presenter = presenter;

12
app/src/main/java/hikapro/com/backpack/view/fragments/BagFragment.java → app/src/main/java/hikapro/com/backpack/view/fragments/PackedListFragment.java
View File

@ -7,17 +7,17 @@ import hikapro.com.backpack.model.entities.Set;
/**
* Created by tariel on 12/05/16.
*/
public class BagFragment extends ItemListFragment {
public class PackedListFragment extends ItemListFragment {
public BagFragment() {
public PackedListFragment() {
}
private static BagFragment construct() {
return new BagFragment();
private static PackedListFragment construct() {
return new PackedListFragment();
}
public static BagFragment newFromSet(Set set) {
BagFragment ret = BagFragment.construct();
public static PackedListFragment newFromSet(Set set) {
PackedListFragment ret = PackedListFragment.construct();
Bundle args = new Bundle();
args.putSerializable(BUNDLE_SET_KEY, set);
ret.setArguments(args);

10
app/src/main/java/hikapro/com/backpack/view/recycler/ItemViewHolder.java
View File

@ -3,6 +3,8 @@ package hikapro.com.backpack.view.recycler;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.ImageButton;
import android.widget.TextView;
import hikapro.com.backpack.R;
@ -14,9 +16,9 @@ import hikapro.com.backpack.R;
public class ItemViewHolder extends RecyclerView.ViewHolder {
public int id;
public int categoryId;
public TextView title;
public CheckBox checkBox;
public Button undoButton;
public ImageButton infoButton;
public ItemViewHolder(View v) {
super(v);
@ -24,7 +26,9 @@ public class ItemViewHolder extends RecyclerView.ViewHolder {
}
private void setupViews(View view) {
title = (TextView) view.findViewById(R.id.item_txt);
infoButton = (ImageButton) view.findViewById(R.id.info_button);
checkBox = (CheckBox) view.findViewById(R.id.item_checkbox);
undoButton = (Button) view.findViewById(R.id.undo_button);
}
}

6
app/src/main/java/hikapro/com/backpack/view/recycler/SetViewHolder.java
View File

@ -17,6 +17,7 @@ public class SetViewHolder extends RecyclerView.ViewHolder implements ItemTouchH
public CardView cardView;
public TextView textView;
public TextView setInfo;
//GLM_add_resources_SetList
private View view;
@ -24,16 +25,13 @@ public class SetViewHolder extends RecyclerView.ViewHolder implements ItemTouchH
public SetViewHolder(View v) {
super(v);
//
this.view = v;
//
setupViews(v);
}
private void setupViews(View view) {
cardView = (CardView) view.findViewById(R.id.card_view_set);
textView = (TextView) view.findViewById(R.id.set_text);
setInfo = (TextView) view.findViewById(R.id.set_info);
this.view = view;
drawable = view.getBackground();

12
app/src/main/res/animator/slide_in_bottom_y.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="500"
android:propertyName="y"
android:valueFrom="-1000"
android:valueTo="0"
android:valueType="floatType" />
</set>

0
app/src/main/res/animator/slide_in_left.xml → app/src/main/res/animator/slide_in_left_x.xml
View File

0
app/src/main/res/animator/slide_in_right.xml → app/src/main/res/animator/slide_in_right_x.xml
View File

12
app/src/main/res/animator/slide_in_top_y.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="500"
android:propertyName="y"
android:valueFrom="1000"
android:valueTo="0"
android:valueType="floatType" />
</set>

12
app/src/main/res/animator/slide_out_bottom_y.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="500"
android:propertyName="y"
android:valueFrom="0"
android:valueTo="-1000"
android:valueType="floatType" />
</set>

0
app/src/main/res/animator/slide_out_left.xml → app/src/main/res/animator/slide_out_left_x.xml
View File

0
app/src/main/res/animator/slide_out_right.xml → app/src/main/res/animator/slide_out_right_x.xml
View File

12
app/src/main/res/animator/slide_out_top_y.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="500"
android:propertyName="y"
android:valueFrom="0"
android:valueTo="1000"
android:valueType="floatType" />
</set>

BIN
app/src/main/res/drawable-hdpi/ic_add_white_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 144 B

BIN
app/src/main/res/drawable-hdpi/ic_info_black_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 321 B

BIN
app/src/main/res/drawable-xhdpi/ic_add_white_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 97 B

BIN
app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 412 B

BIN
app/src/main/res/drawable/ic_add_white_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 127 B

BIN
app/src/main/res/drawable/ic_info_black_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 321 B

13
app/src/main/res/layout/fragment_item_list.xml
View File

@ -5,7 +5,7 @@
android:layout_height="fill_parent"
android:animateLayoutChanges="true">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@ -24,21 +24,24 @@
android:orientation="vertical"
android:id="@+id/item_list_footer"
android:layout_gravity="bottom"
android:visibility="gone">
android:visibility="gone"
android:background="#80968AA7">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
android:text="Packed 8/106"
android:text="Packed"
android:textSize="16sp"
android:textColor="#000000"
android:textStyle="bold"
android:textColor="#00FF7F"
android:id="@+id/footer_packed_count"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textSize="16sp"
android:textColor="#000000"
android:textStyle="bold"
android:textColor="#00FF7F"
android:text="Show what's in my bag &#x2193;"
android:id="@+id/open_packed"/>
</LinearLayout>

66
app/src/main/res/layout/fragment_packed_list.xml Normal file
View File

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_height="match_parent"
android:animateLayoutChanges="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/item_list_header"
android:layout_gravity="top"
android:gravity="center"
android:visibility="visible"
android:layout_alignParentTop="true"
android:animateLayoutChanges="true"
android:background="#80968AA7">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
android:text="Packed"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="#00FF7F"
android:id="@+id/header_packed_count"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="#00FF7F"
android:text="Continue with my packing &#x2191;"
android:id="@+id/back_to_list"/>
<Button
android:id="@+id/unpack_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="UNPACK MY BAG"
android:textSize="18sp"
android:textAlignment="center"
android:background="#76EE00"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:visibility="invisible"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_alignParentBottom="true"
android:layout_below="@id/item_list_header">
<android.support.v7.widget.RecyclerView
android:id="@+id/items_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="vertical"
/>
</LinearLayout>
</RelativeLayout>

7
app/src/main/res/layout/item_detail.xml
View File

@ -13,9 +13,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:text="@string/hello_blank_fragment" />
android:layout_centerHorizontal="true"/>
<ImageView
android:id="@+id/item_photo"
@ -32,7 +30,6 @@
android:layout_height="wrap_content"
android:layout_below="@id/item_photo"
android:layout_centerHorizontal="true"
android:layout_marginTop="25dp"
android:text="@string/hello_blank_fragment" />
android:layout_marginTop="25dp" />
</RelativeLayout>

11
app/src/main/res/layout/set_card.xml
View File

@ -18,7 +18,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginBottom="5dp"/>
android:layout_marginBottom="5dp"
android:textSize="26sp"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
android:typeface="serif"/>
<TextView
android:id="@+id/set_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"/>
</LinearLayout>

29
app/src/main/res/layout/view_item.xml
View File

@ -2,22 +2,37 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="56dp"
>
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:clickable="true"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:textSize="14sp"
tools:text="Aardvark"
android:id="@+id/item_txt"
android:id="@+id/item_checkbox"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dp"
tools:context=".MainActivity"/>
<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/info_button"
android:src="@drawable/ic_info_black_24dp"
android:background="@null"
android:layout_alignParentRight="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
/>
</RelativeLayout>
<Button
android:id="@+id/undo_button"
android:layout_width="wrap_content"

28
app/src/main/res/menu/menu_main.xml
View File

@ -2,11 +2,26 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".MainActivity">
<item
android:id="@+id/action_settings"
android:id="@+id/action_share"
android:orderInCategory="1"
android:title="Settings"
android:showAsAction="never" />
android:title="Share"
android:showAsAction="never"
app:showAsAction="never" />
<item
android:id="@+id/action_unpack_my_bag"
android:orderInCategory="2"
android:title="Unpack my bag"
android:showAsAction="never"
app:showAsAction="never" />
<item
android:id="@+id/action_restore_to_default"
android:orderInCategory="3"
android:title="Restore to default"
android:showAsAction="never"
app:showAsAction="never" />
<item
android:id="@+id/action_search"
@ -16,5 +31,12 @@
android:actionViewClass="android.widget.SearchView"
android:visible="true"
android:title="Search"/>
<item
android:id="@+id/action_add"
android:icon="@drawable/ic_add_white_36dp"
android:showAsAction="always|collapseActionView"
app:showAsAction="always|collapseActionView"
android:visible="true"
android:title="Add"/>
</menu>

7
app/src/main/res/values/strings.xml
View File

@ -1,6 +1,5 @@
<resources>
<string name="app_name">BackPack</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="app_name">Back Pack</string>
<string name="packed">Packed</string>
<string name="right_angle_bracket">&#x276D;</string>
</resources>