From ce947a908c4259bb6350b6f7a6c2d0144ab81af1 Mon Sep 17 00:00:00 2001 From: Tariel Hlontsi Date: Mon, 16 May 2016 12:43:50 +0300 Subject: [PATCH] Package renaming --- .../hikapro}/backpack/ApplicationTest.java | 2 +- app/src/main/AndroidManifest.xml | 6 ++-- .../com => com/hikapro}/backpack/App.java | 2 +- .../hikapro}/backpack/MainActivity.java | 34 +++++++++---------- .../hikapro}/backpack/StateMaintainer.java | 2 +- .../hikapro}/backpack/model/Api.java | 12 +++---- .../hikapro}/backpack/model/DetailModel.java | 15 ++++---- .../hikapro}/backpack/model/ItemModel.java | 15 ++++---- .../hikapro}/backpack/model/Model.java | 31 ++++++++--------- .../hikapro}/backpack/model/PackedModel.java | 14 +++----- .../hikapro}/backpack/model/RestClient.java | 4 +-- .../hikapro}/backpack/model/SetModel.java | 20 +++++------ .../hikapro}/backpack/model/dao/Command.java | 2 +- .../hikapro}/backpack/model/dao/DAO.java | 24 ++++++------- .../hikapro}/backpack/model/dao/Db.java | 12 +++---- .../hikapro}/backpack/model/dao/DbHelper.java | 2 +- .../hikapro}/backpack/model/dao/Event.java | 2 +- .../model/dao/ImageDownloadHelper.java | 4 +-- .../hikapro}/backpack/model/dao/Test.java | 2 +- .../backpack/model/entities/Category.java | 2 +- .../backpack/model/entities/Item.java | 2 +- .../hikapro}/backpack/model/entities/Set.java | 2 +- .../backpack/model/entities/Timestamp.java | 2 +- .../backpack/model/entities/UpdateLog.java | 2 +- .../backpack/model/entities/Updates.java | 2 +- .../presenter/ItemDetailPresenter.java | 13 ++++--- .../backpack/presenter/ItemListPresenter.java | 20 +++++------ .../presenter/PackedListPresenter.java | 15 ++++---- .../backpack/presenter/Presenter.java | 17 ++++------ .../backpack/presenter/SetListPresenter.java | 18 +++++----- .../presenter/adapters/ItemDetailAdapter.java | 11 +++--- .../presenter/adapters/ItemListAdapter.java | 16 ++++----- .../presenter/adapters/PackedListAdapter.java | 5 ++- .../presenter/adapters/SetListAdapter.java | 12 +++---- .../helper/items/DimensionCalculator.java | 2 +- .../helper/items/DividerDecoration.java | 2 +- .../items/HeaderPositionCalculator.java | 2 +- .../adapters/helper/items/HeaderProvider.java | 2 +- .../adapters/helper/items/HeaderRenderer.java | 2 +- .../helper/items/HeaderViewCache.java | 2 +- .../helper/items/ItemSwipeCallback.java | 6 ++-- .../helper/items/ItemSwipeDecoration.java | 2 +- .../helper/items/ItemVisibilityAdapter.java | 2 +- .../helper/items/StickyHeaderAdapter.java | 2 +- .../helper/items/StickyHeaderDecoration.java | 2 +- .../helper/sets/ItemTouchHelperAdapter.java | 2 +- .../sets/ItemTouchHelperViewHolder.java | 2 +- .../helper/sets/OnStartDragListener.java | 2 +- .../sets/SimpleItemTouchHelperCallback.java | 2 +- .../hikapro}/backpack/view/View.java | 10 +++--- .../view/fragments/ItemDetailFragment.java | 14 ++++---- .../view/fragments/ItemListFragment.java | 19 +++++------ .../view/fragments/PackedListFragment.java | 4 +-- .../view/fragments/SetListFragment.java | 16 ++++----- .../view/recycler/DetailViewHolder.java | 4 +-- .../view/recycler/HeaderViewHolder.java | 4 +-- .../view/recycler/ItemViewHolder.java | 5 ++- .../backpack/view/recycler/SetViewHolder.java | 6 ++-- app/src/main/res/layout/activity_main.xml | 2 +- .../main/res/layout/fragment_item_detail.xml | 2 +- .../main/res/layout/fragment_item_list.xml | 2 +- .../hikapro}/backpack/ExampleUnitTest.java | 2 +- 62 files changed, 224 insertions(+), 244 deletions(-) rename app/src/androidTest/java/{hikapro/com => com/hikapro}/backpack/ApplicationTest.java (91%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/App.java (92%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/MainActivity.java (90%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/StateMaintainer.java (98%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/Api.java (66%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/DetailModel.java (85%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/ItemModel.java (96%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/Model.java (58%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/PackedModel.java (89%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/RestClient.java (85%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/SetModel.java (84%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/dao/Command.java (95%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/dao/DAO.java (97%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/dao/Db.java (97%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/dao/DbHelper.java (96%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/dao/Event.java (97%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/dao/ImageDownloadHelper.java (98%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/dao/Test.java (84%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/entities/Category.java (95%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/entities/Item.java (98%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/entities/Set.java (98%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/entities/Timestamp.java (85%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/entities/UpdateLog.java (92%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/model/entities/Updates.java (95%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/ItemDetailPresenter.java (90%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/ItemListPresenter.java (93%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/PackedListPresenter.java (91%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/Presenter.java (80%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/SetListPresenter.java (91%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/ItemDetailAdapter.java (83%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/ItemListAdapter.java (94%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/PackedListAdapter.java (54%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/SetListAdapter.java (88%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/items/DimensionCalculator.java (95%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/items/DividerDecoration.java (98%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/items/HeaderPositionCalculator.java (99%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/items/HeaderProvider.java (90%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/items/HeaderRenderer.java (97%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/items/HeaderViewCache.java (97%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/items/ItemSwipeCallback.java (95%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/items/ItemSwipeDecoration.java (98%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/items/ItemVisibilityAdapter.java (88%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/items/StickyHeaderAdapter.java (85%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/items/StickyHeaderDecoration.java (99%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/sets/ItemTouchHelperAdapter.java (77%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/sets/ItemTouchHelperViewHolder.java (73%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/sets/OnStartDragListener.java (78%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/presenter/adapters/helper/sets/SimpleItemTouchHelperCallback.java (98%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/view/View.java (80%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/view/fragments/ItemDetailFragment.java (89%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/view/fragments/ItemListFragment.java (90%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/view/fragments/PackedListFragment.java (85%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/view/fragments/SetListFragment.java (88%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/view/recycler/DetailViewHolder.java (90%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/view/recycler/HeaderViewHolder.java (85%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/view/recycler/ItemViewHolder.java (87%) rename app/src/main/java/{hikapro/com => com/hikapro}/backpack/view/recycler/SetViewHolder.java (89%) rename app/src/test/java/{hikapro/com => com/hikapro}/backpack/ExampleUnitTest.java (90%) diff --git a/app/src/androidTest/java/hikapro/com/backpack/ApplicationTest.java b/app/src/androidTest/java/com/hikapro/backpack/ApplicationTest.java similarity index 91% rename from app/src/androidTest/java/hikapro/com/backpack/ApplicationTest.java rename to app/src/androidTest/java/com/hikapro/backpack/ApplicationTest.java index 50b1479..ee17456 100644 --- a/app/src/androidTest/java/hikapro/com/backpack/ApplicationTest.java +++ b/app/src/androidTest/java/com/hikapro/backpack/ApplicationTest.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack; +package com.hikapro.backpack; import android.app.Application; import android.test.ApplicationTestCase; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df33a52..64e5780 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,17 +1,17 @@ + package="com.hikapro.backpack"> - + diff --git a/app/src/main/java/hikapro/com/backpack/App.java b/app/src/main/java/com/hikapro/backpack/App.java similarity index 92% rename from app/src/main/java/hikapro/com/backpack/App.java rename to app/src/main/java/com/hikapro/backpack/App.java index 701539b..c2fd994 100644 --- a/app/src/main/java/hikapro/com/backpack/App.java +++ b/app/src/main/java/com/hikapro/backpack/App.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack; +package com.hikapro.backpack; import android.app.Application; import android.content.Context; diff --git a/app/src/main/java/hikapro/com/backpack/MainActivity.java b/app/src/main/java/com/hikapro/backpack/MainActivity.java similarity index 90% rename from app/src/main/java/hikapro/com/backpack/MainActivity.java rename to app/src/main/java/com/hikapro/backpack/MainActivity.java index 135c449..f22a430 100644 --- a/app/src/main/java/hikapro/com/backpack/MainActivity.java +++ b/app/src/main/java/com/hikapro/backpack/MainActivity.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack; +package com.hikapro.backpack; import android.app.Activity; import android.app.Fragment; @@ -7,22 +7,22 @@ import android.app.FragmentTransaction; import android.os.Bundle; 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; +import com.hikapro.backpack.model.DetailModel; +import com.hikapro.backpack.model.ItemModel; +import com.hikapro.backpack.model.PackedModel; +import com.hikapro.backpack.model.SetModel; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.model.entities.Set; +import com.hikapro.backpack.presenter.ItemDetailPresenter; +import com.hikapro.backpack.presenter.ItemListPresenter; +import com.hikapro.backpack.presenter.PackedListPresenter; +import com.hikapro.backpack.presenter.Presenter; +import com.hikapro.backpack.presenter.SetListPresenter; +import com.hikapro.backpack.view.View; +import com.hikapro.backpack.view.fragments.ItemDetailFragment; +import com.hikapro.backpack.view.fragments.ItemListFragment; +import com.hikapro.backpack.view.fragments.PackedListFragment; +import com.hikapro.backpack.view.fragments.SetListFragment; public class MainActivity extends Activity implements View.ActivityCallback { diff --git a/app/src/main/java/hikapro/com/backpack/StateMaintainer.java b/app/src/main/java/com/hikapro/backpack/StateMaintainer.java similarity index 98% rename from app/src/main/java/hikapro/com/backpack/StateMaintainer.java rename to app/src/main/java/com/hikapro/backpack/StateMaintainer.java index 7e21532..0680e97 100644 --- a/app/src/main/java/hikapro/com/backpack/StateMaintainer.java +++ b/app/src/main/java/com/hikapro/backpack/StateMaintainer.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack; +package com.hikapro.backpack; import android.app.Fragment; import android.app.FragmentManager; diff --git a/app/src/main/java/hikapro/com/backpack/model/Api.java b/app/src/main/java/com/hikapro/backpack/model/Api.java similarity index 66% rename from app/src/main/java/hikapro/com/backpack/model/Api.java rename to app/src/main/java/com/hikapro/backpack/model/Api.java index d8fe92d..2cd2d68 100644 --- a/app/src/main/java/hikapro/com/backpack/model/Api.java +++ b/app/src/main/java/com/hikapro/backpack/model/Api.java @@ -1,13 +1,13 @@ -package hikapro.com.backpack.model; +package com.hikapro.backpack.model; import java.util.List; -import hikapro.com.backpack.model.entities.Category; -import hikapro.com.backpack.model.entities.Item; -import hikapro.com.backpack.model.entities.Set; +import com.hikapro.backpack.model.entities.Category; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.model.entities.Set; -import hikapro.com.backpack.model.entities.Timestamp; -import hikapro.com.backpack.model.entities.Updates; +import com.hikapro.backpack.model.entities.Timestamp; +import com.hikapro.backpack.model.entities.Updates; import retrofit2.Call; import retrofit2.http.GET; import retrofit2.http.Query; diff --git a/app/src/main/java/hikapro/com/backpack/model/DetailModel.java b/app/src/main/java/com/hikapro/backpack/model/DetailModel.java similarity index 85% rename from app/src/main/java/hikapro/com/backpack/model/DetailModel.java rename to app/src/main/java/com/hikapro/backpack/model/DetailModel.java index b3f09cb..57f2d30 100644 --- a/app/src/main/java/hikapro/com/backpack/model/DetailModel.java +++ b/app/src/main/java/com/hikapro/backpack/model/DetailModel.java @@ -1,16 +1,13 @@ -package hikapro.com.backpack.model; +package com.hikapro.backpack.model; import android.graphics.Bitmap; import android.os.Message; -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.Item; -import hikapro.com.backpack.model.entities.Set; -import hikapro.com.backpack.presenter.Presenter; +import com.hikapro.backpack.model.dao.Command; +import com.hikapro.backpack.model.dao.DAO; +import com.hikapro.backpack.model.dao.Event; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.presenter.Presenter; /** * Created by tariel on 23/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/model/ItemModel.java b/app/src/main/java/com/hikapro/backpack/model/ItemModel.java similarity index 96% rename from app/src/main/java/hikapro/com/backpack/model/ItemModel.java rename to app/src/main/java/com/hikapro/backpack/model/ItemModel.java index 3d94c9e..c6e6c3b 100644 --- a/app/src/main/java/hikapro/com/backpack/model/ItemModel.java +++ b/app/src/main/java/com/hikapro/backpack/model/ItemModel.java @@ -1,20 +1,19 @@ -package hikapro.com.backpack.model; +package com.hikapro.backpack.model; import android.os.Message; import java.util.ArrayList; -import java.util.Arrays; 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; +import com.hikapro.backpack.model.dao.Command; +import com.hikapro.backpack.model.dao.DAO; +import com.hikapro.backpack.model.dao.Event; +import com.hikapro.backpack.model.entities.Category; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.presenter.Presenter; /** * Created by tariel on 22/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/model/Model.java b/app/src/main/java/com/hikapro/backpack/model/Model.java similarity index 58% rename from app/src/main/java/hikapro/com/backpack/model/Model.java rename to app/src/main/java/com/hikapro/backpack/model/Model.java index 0cca863..277a77f 100644 --- a/app/src/main/java/hikapro/com/backpack/model/Model.java +++ b/app/src/main/java/com/hikapro/backpack/model/Model.java @@ -1,14 +1,11 @@ -package hikapro.com.backpack.model; +package com.hikapro.backpack.model; import android.graphics.Bitmap; import android.os.Message; import java.util.List; -import hikapro.com.backpack.model.entities.Category; -import hikapro.com.backpack.model.entities.Item; -import hikapro.com.backpack.model.entities.Set; -import hikapro.com.backpack.presenter.Presenter; +import com.hikapro.backpack.presenter.Presenter; /** * Created by tariel on 19/04/16. @@ -23,34 +20,34 @@ public interface Model { } interface Set extends Base { - hikapro.com.backpack.model.entities.Set getSetByPosition(int position); - hikapro.com.backpack.model.entities.Set findSet(int id); + com.hikapro.backpack.model.entities.Set getSetByPosition(int position); + com.hikapro.backpack.model.entities.Set findSet(int id); int getSetsCount(); void setPresenter(Presenter.SetList presenter); Presenter.SetList getPresenter(); //GLM - List getSets(); // tag renamed + List getSets(); // tag renamed void setsReorderNotify(); } interface Item extends Base { - int insertItem(hikapro.com.backpack.model.entities.Item item); - boolean deleteItem(hikapro.com.backpack.model.entities.Item item); + int insertItem(com.hikapro.backpack.model.entities.Item item); + boolean deleteItem(com.hikapro.backpack.model.entities.Item item); void filter(String query); int getHeaderId(int position);//TODO review int getItemId(int position);//TODO review void clear(); - boolean isPendingRemoval(hikapro.com.backpack.model.entities.Item item); - void pendingRemove(hikapro.com.backpack.model.entities.Item item); - void pendingRemoveCancel(hikapro.com.backpack.model.entities.Item item); + boolean isPendingRemoval(com.hikapro.backpack.model.entities.Item item); + void pendingRemove(com.hikapro.backpack.model.entities.Item item); + void pendingRemoveCancel(com.hikapro.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); + com.hikapro.backpack.model.entities.Item findItem(int id); + com.hikapro.backpack.model.entities.Item getItemByPosition(int position); - hikapro.com.backpack.model.entities.Category getCategoryByPosition(int position); + com.hikapro.backpack.model.entities.Category getCategoryByPosition(int position); void setPresenter(Presenter.ItemList presenter); Presenter.ItemList getPresenter(); @@ -61,7 +58,7 @@ public interface Model { interface Detail extends Base { int getCount(); - hikapro.com.backpack.model.entities.Item findItem(int id); + com.hikapro.backpack.model.entities.Item findItem(int id); Bitmap getPicture(); void setPresenter(Presenter.ItemDetail presenter); Presenter.ItemDetail getPresenter(); diff --git a/app/src/main/java/hikapro/com/backpack/model/PackedModel.java b/app/src/main/java/com/hikapro/backpack/model/PackedModel.java similarity index 89% rename from app/src/main/java/hikapro/com/backpack/model/PackedModel.java rename to app/src/main/java/com/hikapro/backpack/model/PackedModel.java index 6d18301..e3b7128 100644 --- a/app/src/main/java/hikapro/com/backpack/model/PackedModel.java +++ b/app/src/main/java/com/hikapro/backpack/model/PackedModel.java @@ -1,18 +1,14 @@ -package hikapro.com.backpack.model; +package com.hikapro.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; +import com.hikapro.backpack.model.dao.Command; +import com.hikapro.backpack.model.dao.Event; +import com.hikapro.backpack.model.entities.Category; +import com.hikapro.backpack.model.entities.Item; /** * Created by tariel on 12/05/16. diff --git a/app/src/main/java/hikapro/com/backpack/model/RestClient.java b/app/src/main/java/com/hikapro/backpack/model/RestClient.java similarity index 85% rename from app/src/main/java/hikapro/com/backpack/model/RestClient.java rename to app/src/main/java/com/hikapro/backpack/model/RestClient.java index 6ae2133..83c0466 100644 --- a/app/src/main/java/hikapro/com/backpack/model/RestClient.java +++ b/app/src/main/java/com/hikapro/backpack/model/RestClient.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model; +package com.hikapro.backpack.model; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -11,7 +11,7 @@ import retrofit2.converter.gson.GsonConverterFactory; */ public class RestClient { - public static final String BASE_URL = "http://hikapro.com/"; + public static final String BASE_URL = "http://hikapro.hikapro/"; public static Api getApi() { diff --git a/app/src/main/java/hikapro/com/backpack/model/SetModel.java b/app/src/main/java/com/hikapro/backpack/model/SetModel.java similarity index 84% rename from app/src/main/java/hikapro/com/backpack/model/SetModel.java rename to app/src/main/java/com/hikapro/backpack/model/SetModel.java index cea372c..000681f 100644 --- a/app/src/main/java/hikapro/com/backpack/model/SetModel.java +++ b/app/src/main/java/com/hikapro/backpack/model/SetModel.java @@ -1,15 +1,15 @@ -package hikapro.com.backpack.model; +package com.hikapro.backpack.model; import android.os.Message; import java.util.ArrayList; 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.Set; -import hikapro.com.backpack.presenter.Presenter; +import com.hikapro.backpack.model.dao.Command; +import com.hikapro.backpack.model.dao.DAO; +import com.hikapro.backpack.model.dao.Event; +import com.hikapro.backpack.model.entities.Set; +import com.hikapro.backpack.presenter.Presenter; /** @@ -17,7 +17,7 @@ import hikapro.com.backpack.presenter.Presenter; */ public class SetModel implements Model.Set { - private List cache; + private List cache; private Presenter.SetList presenter; private DAO dao; @@ -31,11 +31,11 @@ public class SetModel implements Model.Set { //region sets @Override - public hikapro.com.backpack.model.entities.Set getSetByPosition(int position) { + public com.hikapro.backpack.model.entities.Set getSetByPosition(int position) { return cache.get(position); } @Override - public hikapro.com.backpack.model.entities.Set findSet(int id) { + public com.hikapro.backpack.model.entities.Set findSet(int id) { Set ret = null; for (Set s : cache) { if (s.getId() == id) { @@ -135,7 +135,7 @@ public class SetModel implements Model.Set { //GLM @Override - public List getSets() + public List getSets() { return cache; } diff --git a/app/src/main/java/hikapro/com/backpack/model/dao/Command.java b/app/src/main/java/com/hikapro/backpack/model/dao/Command.java similarity index 95% rename from app/src/main/java/hikapro/com/backpack/model/dao/Command.java rename to app/src/main/java/com/hikapro/backpack/model/dao/Command.java index 204c349..baaa42a 100644 --- a/app/src/main/java/hikapro/com/backpack/model/dao/Command.java +++ b/app/src/main/java/com/hikapro/backpack/model/dao/Command.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.dao; +package com.hikapro.backpack.model.dao; /** * Created by tariel on 27/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/model/dao/DAO.java b/app/src/main/java/com/hikapro/backpack/model/dao/DAO.java similarity index 97% rename from app/src/main/java/hikapro/com/backpack/model/dao/DAO.java rename to app/src/main/java/com/hikapro/backpack/model/dao/DAO.java index 6c7c003..b3dab3f 100644 --- a/app/src/main/java/hikapro/com/backpack/model/dao/DAO.java +++ b/app/src/main/java/com/hikapro/backpack/model/dao/DAO.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.dao; +package com.hikapro.backpack.model.dao; import android.content.ContentValues; import android.content.Context; @@ -24,15 +24,15 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import hikapro.com.backpack.App; -import hikapro.com.backpack.model.Api; -import hikapro.com.backpack.model.Model; -import hikapro.com.backpack.model.RestClient; -import hikapro.com.backpack.model.SetModel; -import hikapro.com.backpack.model.entities.Category; -import hikapro.com.backpack.model.entities.Item; -import hikapro.com.backpack.model.entities.Set; -import hikapro.com.backpack.model.entities.Timestamp; +import com.hikapro.backpack.App; +import com.hikapro.backpack.model.Api; +import com.hikapro.backpack.model.Model; +import com.hikapro.backpack.model.RestClient; +import com.hikapro.backpack.model.SetModel; +import com.hikapro.backpack.model.entities.Category; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.model.entities.Set; +import com.hikapro.backpack.model.entities.Timestamp; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -847,7 +847,7 @@ public class DAO { Call> call = api.getSets(); call.enqueue(new Callback>() { @Override - public void onResponse(Call> call, Response> response) { + public void onResponse(Call> call, Response> response) { statusCode = response.code(); // TODO // check if first time @@ -856,7 +856,7 @@ public class DAO { insertSets(response.body()); } @Override - public void onFailure(Call> call, Throwable t) { + public void onFailure(Call> call, Throwable t) { } }); message.what = Event.SYNC_COMPLETED; diff --git a/app/src/main/java/hikapro/com/backpack/model/dao/Db.java b/app/src/main/java/com/hikapro/backpack/model/dao/Db.java similarity index 97% rename from app/src/main/java/hikapro/com/backpack/model/dao/Db.java rename to app/src/main/java/com/hikapro/backpack/model/dao/Db.java index 702c3c8..44d583a 100644 --- a/app/src/main/java/hikapro/com/backpack/model/dao/Db.java +++ b/app/src/main/java/com/hikapro/backpack/model/dao/Db.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.dao; +package com.hikapro.backpack.model.dao; import android.content.ContentValues; import android.database.Cursor; @@ -9,11 +9,11 @@ import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.List; -import hikapro.com.backpack.model.entities.Category; -import hikapro.com.backpack.model.entities.Item; -import hikapro.com.backpack.model.entities.Set; -import hikapro.com.backpack.model.entities.Timestamp; -import hikapro.com.backpack.model.entities.UpdateLog; +import com.hikapro.backpack.model.entities.Category; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.model.entities.Set; +import com.hikapro.backpack.model.entities.Timestamp; +import com.hikapro.backpack.model.entities.UpdateLog; /** * Created by tariel on 20/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/model/dao/DbHelper.java b/app/src/main/java/com/hikapro/backpack/model/dao/DbHelper.java similarity index 96% rename from app/src/main/java/hikapro/com/backpack/model/dao/DbHelper.java rename to app/src/main/java/com/hikapro/backpack/model/dao/DbHelper.java index e4e6a03..0eb60f8 100644 --- a/app/src/main/java/hikapro/com/backpack/model/dao/DbHelper.java +++ b/app/src/main/java/com/hikapro/backpack/model/dao/DbHelper.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.dao; +package com.hikapro.backpack.model.dao; import android.content.Context; import android.database.sqlite.SQLiteDatabase; diff --git a/app/src/main/java/hikapro/com/backpack/model/dao/Event.java b/app/src/main/java/com/hikapro/backpack/model/dao/Event.java similarity index 97% rename from app/src/main/java/hikapro/com/backpack/model/dao/Event.java rename to app/src/main/java/com/hikapro/backpack/model/dao/Event.java index b120747..ffd4a74 100644 --- a/app/src/main/java/hikapro/com/backpack/model/dao/Event.java +++ b/app/src/main/java/com/hikapro/backpack/model/dao/Event.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.dao; +package com.hikapro.backpack.model.dao; /** * Created by tariel on 27/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/model/dao/ImageDownloadHelper.java b/app/src/main/java/com/hikapro/backpack/model/dao/ImageDownloadHelper.java similarity index 98% rename from app/src/main/java/hikapro/com/backpack/model/dao/ImageDownloadHelper.java rename to app/src/main/java/com/hikapro/backpack/model/dao/ImageDownloadHelper.java index ebc2660..8b18706 100644 --- a/app/src/main/java/hikapro/com/backpack/model/dao/ImageDownloadHelper.java +++ b/app/src/main/java/com/hikapro/backpack/model/dao/ImageDownloadHelper.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.dao; +package com.hikapro.backpack.model.dao; import android.content.Context; import android.graphics.Bitmap; @@ -13,7 +13,7 @@ import java.io.IOException; import java.net.URL; import java.net.URLConnection; -import hikapro.com.backpack.App; +import com.hikapro.backpack.App; /** * Created by tariel on 04/05/16. diff --git a/app/src/main/java/hikapro/com/backpack/model/dao/Test.java b/app/src/main/java/com/hikapro/backpack/model/dao/Test.java similarity index 84% rename from app/src/main/java/hikapro/com/backpack/model/dao/Test.java rename to app/src/main/java/com/hikapro/backpack/model/dao/Test.java index f1464cf..e9e5484 100644 --- a/app/src/main/java/hikapro/com/backpack/model/dao/Test.java +++ b/app/src/main/java/com/hikapro/backpack/model/dao/Test.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.dao; +package com.hikapro.backpack.model.dao; /** * Created by tariel on 27/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/model/entities/Category.java b/app/src/main/java/com/hikapro/backpack/model/entities/Category.java similarity index 95% rename from app/src/main/java/hikapro/com/backpack/model/entities/Category.java rename to app/src/main/java/com/hikapro/backpack/model/entities/Category.java index d4187b5..6655b82 100644 --- a/app/src/main/java/hikapro/com/backpack/model/entities/Category.java +++ b/app/src/main/java/com/hikapro/backpack/model/entities/Category.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.entities; +package com.hikapro.backpack.model.entities; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/hikapro/com/backpack/model/entities/Item.java b/app/src/main/java/com/hikapro/backpack/model/entities/Item.java similarity index 98% rename from app/src/main/java/hikapro/com/backpack/model/entities/Item.java rename to app/src/main/java/com/hikapro/backpack/model/entities/Item.java index dfe6d59..7293ab6 100644 --- a/app/src/main/java/hikapro/com/backpack/model/entities/Item.java +++ b/app/src/main/java/com/hikapro/backpack/model/entities/Item.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.entities; +package com.hikapro.backpack.model.entities; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/hikapro/com/backpack/model/entities/Set.java b/app/src/main/java/com/hikapro/backpack/model/entities/Set.java similarity index 98% rename from app/src/main/java/hikapro/com/backpack/model/entities/Set.java rename to app/src/main/java/com/hikapro/backpack/model/entities/Set.java index b1a4abd..1ecb529 100644 --- a/app/src/main/java/hikapro/com/backpack/model/entities/Set.java +++ b/app/src/main/java/com/hikapro/backpack/model/entities/Set.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.entities; +package com.hikapro.backpack.model.entities; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/hikapro/com/backpack/model/entities/Timestamp.java b/app/src/main/java/com/hikapro/backpack/model/entities/Timestamp.java similarity index 85% rename from app/src/main/java/hikapro/com/backpack/model/entities/Timestamp.java rename to app/src/main/java/com/hikapro/backpack/model/entities/Timestamp.java index 01f5e90..a958966 100644 --- a/app/src/main/java/hikapro/com/backpack/model/entities/Timestamp.java +++ b/app/src/main/java/com/hikapro/backpack/model/entities/Timestamp.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.entities; +package com.hikapro.backpack.model.entities; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/hikapro/com/backpack/model/entities/UpdateLog.java b/app/src/main/java/com/hikapro/backpack/model/entities/UpdateLog.java similarity index 92% rename from app/src/main/java/hikapro/com/backpack/model/entities/UpdateLog.java rename to app/src/main/java/com/hikapro/backpack/model/entities/UpdateLog.java index b314744..5507436 100644 --- a/app/src/main/java/hikapro/com/backpack/model/entities/UpdateLog.java +++ b/app/src/main/java/com/hikapro/backpack/model/entities/UpdateLog.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.entities; +package com.hikapro.backpack.model.entities; /** * Created by tariel on 27/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/model/entities/Updates.java b/app/src/main/java/com/hikapro/backpack/model/entities/Updates.java similarity index 95% rename from app/src/main/java/hikapro/com/backpack/model/entities/Updates.java rename to app/src/main/java/com/hikapro/backpack/model/entities/Updates.java index 00d2689..022a9c6 100644 --- a/app/src/main/java/hikapro/com/backpack/model/entities/Updates.java +++ b/app/src/main/java/com/hikapro/backpack/model/entities/Updates.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.model.entities; +package com.hikapro.backpack.model.entities; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/hikapro/com/backpack/presenter/ItemDetailPresenter.java b/app/src/main/java/com/hikapro/backpack/presenter/ItemDetailPresenter.java similarity index 90% rename from app/src/main/java/hikapro/com/backpack/presenter/ItemDetailPresenter.java rename to app/src/main/java/com/hikapro/backpack/presenter/ItemDetailPresenter.java index 8fe9a0a..99aa89c 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/ItemDetailPresenter.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/ItemDetailPresenter.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter; +package com.hikapro.backpack.presenter; import android.content.Context; import android.graphics.Bitmap; @@ -12,12 +12,11 @@ import android.widget.Toast; import java.lang.ref.WeakReference; -import hikapro.com.backpack.R; -import hikapro.com.backpack.model.Model; -import hikapro.com.backpack.model.entities.Item; -import hikapro.com.backpack.presenter.adapters.ItemDetailAdapter; -import hikapro.com.backpack.view.View; -import hikapro.com.backpack.view.recycler.DetailViewHolder; +import com.hikapro.backpack.R; +import com.hikapro.backpack.model.Model; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.presenter.adapters.ItemDetailAdapter; +import com.hikapro.backpack.view.View; /** * Created by tariel on 23/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/presenter/ItemListPresenter.java b/app/src/main/java/com/hikapro/backpack/presenter/ItemListPresenter.java similarity index 93% rename from app/src/main/java/hikapro/com/backpack/presenter/ItemListPresenter.java rename to app/src/main/java/com/hikapro/backpack/presenter/ItemListPresenter.java index 77b98fe..f190732 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/ItemListPresenter.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/ItemListPresenter.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter; +package com.hikapro.backpack.presenter; import android.app.ActionBar; import android.app.Activity; @@ -15,15 +15,15 @@ import android.widget.Toast; import java.lang.ref.WeakReference; -import hikapro.com.backpack.R; -import hikapro.com.backpack.model.Model; -import hikapro.com.backpack.model.entities.Item; -import hikapro.com.backpack.model.entities.Set; -import hikapro.com.backpack.presenter.adapters.helper.items.DividerDecoration; -import hikapro.com.backpack.presenter.adapters.ItemListAdapter; -import hikapro.com.backpack.presenter.adapters.helper.items.ItemSwipeCallback; -import hikapro.com.backpack.presenter.adapters.helper.items.StickyHeaderDecoration; -import hikapro.com.backpack.view.View; +import com.hikapro.backpack.R; +import com.hikapro.backpack.model.Model; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.model.entities.Set; +import com.hikapro.backpack.presenter.adapters.helper.items.DividerDecoration; +import com.hikapro.backpack.presenter.adapters.ItemListAdapter; +import com.hikapro.backpack.presenter.adapters.helper.items.ItemSwipeCallback; +import com.hikapro.backpack.presenter.adapters.helper.items.StickyHeaderDecoration; +import com.hikapro.backpack.view.View; /** * Created by tariel on 20/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/presenter/PackedListPresenter.java b/app/src/main/java/com/hikapro/backpack/presenter/PackedListPresenter.java similarity index 91% rename from app/src/main/java/hikapro/com/backpack/presenter/PackedListPresenter.java rename to app/src/main/java/com/hikapro/backpack/presenter/PackedListPresenter.java index 258c321..04942f7 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/PackedListPresenter.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/PackedListPresenter.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter; +package com.hikapro.backpack.presenter; import android.app.Fragment; import android.os.Bundle; @@ -9,15 +9,14 @@ 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; +import com.hikapro.backpack.R; +import com.hikapro.backpack.model.entities.Set; +import com.hikapro.backpack.presenter.adapters.PackedListAdapter; +import com.hikapro.backpack.presenter.adapters.helper.items.DividerDecoration; +import com.hikapro.backpack.presenter.adapters.helper.items.ItemSwipeCallback; +import com.hikapro.backpack.presenter.adapters.helper.items.StickyHeaderDecoration; /** * Created by tariel on 13/05/16. diff --git a/app/src/main/java/hikapro/com/backpack/presenter/Presenter.java b/app/src/main/java/com/hikapro/backpack/presenter/Presenter.java similarity index 80% rename from app/src/main/java/hikapro/com/backpack/presenter/Presenter.java rename to app/src/main/java/com/hikapro/backpack/presenter/Presenter.java index fee3285..ad7e968 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/Presenter.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/Presenter.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter; +package com.hikapro.backpack.presenter; import android.content.Context; import android.graphics.Bitmap; @@ -7,12 +7,9 @@ import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; -import hikapro.com.backpack.model.Model; -import hikapro.com.backpack.model.entities.Item; -import hikapro.com.backpack.model.entities.Set; -import hikapro.com.backpack.view.recycler.DetailViewHolder; -import hikapro.com.backpack.view.recycler.ItemViewHolder; -import hikapro.com.backpack.view.recycler.SetViewHolder; +import com.hikapro.backpack.model.Model; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.model.entities.Set; /** * Created by tariel on 19/04/16. @@ -32,7 +29,7 @@ public interface Presenter { 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 setView(com.hikapro.backpack.view.View.SetList view); void setModel(Model.Set model); Model.Set getModel(); void notifyDataSetChanged(); @@ -48,7 +45,7 @@ public interface Presenter { void onDestroy(boolean isChangingConfiguration); android.view.View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState); - void setView(hikapro.com.backpack.view.View.ItemList view); + void setView(com.hikapro.backpack.view.View.ItemList view); void setModel(Model.Item model); Model.Item getModel(); void notifyDataSetChanged(); @@ -62,7 +59,7 @@ public interface Presenter { } interface ItemDetail extends Base { - void setView(hikapro.com.backpack.view.View.ItemDetail view); + void setView(com.hikapro.backpack.view.View.ItemDetail view); void setModel(Model.Detail model); Model.Detail getModel(); void notifyDataSetChanged(); diff --git a/app/src/main/java/hikapro/com/backpack/presenter/SetListPresenter.java b/app/src/main/java/com/hikapro/backpack/presenter/SetListPresenter.java similarity index 91% rename from app/src/main/java/hikapro/com/backpack/presenter/SetListPresenter.java rename to app/src/main/java/com/hikapro/backpack/presenter/SetListPresenter.java index f355b35..23a3d80 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/SetListPresenter.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/SetListPresenter.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter; +package com.hikapro.backpack.presenter; import android.app.Activity; import android.content.Context; @@ -14,14 +14,14 @@ import android.widget.Toast; import java.lang.ref.WeakReference; import java.util.Collections; -import hikapro.com.backpack.R; -import hikapro.com.backpack.model.Model; -import hikapro.com.backpack.model.entities.Set; -import hikapro.com.backpack.presenter.adapters.SetListAdapter; -import hikapro.com.backpack.presenter.adapters.helper.sets.OnStartDragListener; -import hikapro.com.backpack.presenter.adapters.helper.sets.SimpleItemTouchHelperCallback; -import hikapro.com.backpack.view.View; -import hikapro.com.backpack.view.recycler.SetViewHolder; +import com.hikapro.backpack.R; +import com.hikapro.backpack.model.Model; +import com.hikapro.backpack.model.entities.Set; +import com.hikapro.backpack.presenter.adapters.SetListAdapter; +import com.hikapro.backpack.presenter.adapters.helper.sets.OnStartDragListener; +import com.hikapro.backpack.presenter.adapters.helper.sets.SimpleItemTouchHelperCallback; +import com.hikapro.backpack.view.View; +import com.hikapro.backpack.view.recycler.SetViewHolder; /** * Created by tariel on 20/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/ItemDetailAdapter.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemDetailAdapter.java similarity index 83% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/ItemDetailAdapter.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemDetailAdapter.java index 2a44c6e..d4db0e5 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/ItemDetailAdapter.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemDetailAdapter.java @@ -1,14 +1,13 @@ -package hikapro.com.backpack.presenter.adapters; +package com.hikapro.backpack.presenter.adapters; import android.graphics.Bitmap; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; -import hikapro.com.backpack.R; -import hikapro.com.backpack.model.Model; -import hikapro.com.backpack.presenter.Presenter; -import hikapro.com.backpack.view.recycler.DetailViewHolder; +import com.hikapro.backpack.R; +import com.hikapro.backpack.presenter.Presenter; +import com.hikapro.backpack.view.recycler.DetailViewHolder; /** * Created by tariel on 23/04/16. @@ -28,7 +27,7 @@ public class ItemDetailAdapter extends RecyclerView.Adapter { @Override public void onBindViewHolder(DetailViewHolder holder, int position) { - hikapro.com.backpack.model.entities.Item item = presenter.getModel().findItem(position); + com.hikapro.backpack.model.entities.Item item = presenter.getModel().findItem(position); holder.title.setText(item.getName()); holder.description.setText(item.getDescription()); Bitmap bitmap = presenter.getModel().getPicture(); diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/ItemListAdapter.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemListAdapter.java similarity index 94% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/ItemListAdapter.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemListAdapter.java index 0842b44..83289ee 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/ItemListAdapter.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemListAdapter.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters; +package com.hikapro.backpack.presenter.adapters; import android.graphics.Color; import android.os.Handler; @@ -9,13 +9,13 @@ import android.view.ViewGroup; import java.util.HashMap; -import hikapro.com.backpack.R; -import hikapro.com.backpack.model.entities.Category; -import hikapro.com.backpack.model.entities.Item; -import hikapro.com.backpack.presenter.Presenter; -import hikapro.com.backpack.presenter.adapters.helper.items.StickyHeaderAdapter; -import hikapro.com.backpack.view.recycler.HeaderViewHolder; -import hikapro.com.backpack.view.recycler.ItemViewHolder; +import com.hikapro.backpack.R; +import com.hikapro.backpack.model.entities.Category; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.presenter.Presenter; +import com.hikapro.backpack.presenter.adapters.helper.items.StickyHeaderAdapter; +import com.hikapro.backpack.view.recycler.HeaderViewHolder; +import com.hikapro.backpack.view.recycler.ItemViewHolder; /** * Created by tariel on 01/05/16. diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/PackedListAdapter.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/PackedListAdapter.java similarity index 54% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/PackedListAdapter.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/PackedListAdapter.java index 2d862b0..4568d29 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/PackedListAdapter.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/PackedListAdapter.java @@ -1,7 +1,6 @@ -package hikapro.com.backpack.presenter.adapters; +package com.hikapro.backpack.presenter.adapters; -import hikapro.com.backpack.presenter.Presenter; -import hikapro.com.backpack.presenter.adapters.ItemListAdapter; +import com.hikapro.backpack.presenter.Presenter; /** * Created by tariel on 12/05/16. diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/SetListAdapter.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/SetListAdapter.java similarity index 88% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/SetListAdapter.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/SetListAdapter.java index aa78956..5a3ef18 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/SetListAdapter.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/SetListAdapter.java @@ -1,14 +1,14 @@ -package hikapro.com.backpack.presenter.adapters; +package com.hikapro.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; +import com.hikapro.backpack.R; +import com.hikapro.backpack.presenter.SetListPresenter; +import com.hikapro.backpack.presenter.adapters.helper.sets.ItemTouchHelperAdapter; +import com.hikapro.backpack.view.recycler.SetViewHolder; /** * Created by tariel on 20/04/16. @@ -25,7 +25,7 @@ public class SetListAdapter extends RecyclerView.Adapter impleme @Override public void onBindViewHolder(final SetViewHolder holder, int position) { - final hikapro.com.backpack.model.entities.Set set = presenter.getModel().getSetByPosition(position); + final com.hikapro.backpack.model.entities.Set set = presenter.getModel().getSetByPosition(position); if (rightBracket == null || rightBracket.isEmpty()) { diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/DimensionCalculator.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/DimensionCalculator.java similarity index 95% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/DimensionCalculator.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/DimensionCalculator.java index cf459ed..2bce3ed 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/DimensionCalculator.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/DimensionCalculator.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.items; +package com.hikapro.backpack.presenter.adapters.helper.items; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/DividerDecoration.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/DividerDecoration.java similarity index 98% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/DividerDecoration.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/DividerDecoration.java index 7076da7..4f66cf5 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/DividerDecoration.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/DividerDecoration.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.items; +package com.hikapro.backpack.presenter.adapters.helper.items; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/HeaderPositionCalculator.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderPositionCalculator.java similarity index 99% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/HeaderPositionCalculator.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderPositionCalculator.java index 2eab5be..b41707c 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/HeaderPositionCalculator.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderPositionCalculator.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.items; +package com.hikapro.backpack.presenter.adapters.helper.items; import android.graphics.Rect; import android.support.v7.widget.LinearLayoutManager; diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/HeaderProvider.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderProvider.java similarity index 90% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/HeaderProvider.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderProvider.java index d760882..fca986d 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/HeaderProvider.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderProvider.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.items; +package com.hikapro.backpack.presenter.adapters.helper.items; import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/HeaderRenderer.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderRenderer.java similarity index 97% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/HeaderRenderer.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderRenderer.java index 6bde81a..3ee9adc 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/HeaderRenderer.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderRenderer.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.items; +package com.hikapro.backpack.presenter.adapters.helper.items; import android.graphics.Canvas; import android.graphics.Rect; diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/HeaderViewCache.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderViewCache.java similarity index 97% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/HeaderViewCache.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderViewCache.java index 118aeb3..de5f7dd 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/HeaderViewCache.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderViewCache.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.items; +package com.hikapro.backpack.presenter.adapters.helper.items; import android.support.v4.util.LongSparseArray; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/ItemSwipeCallback.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemSwipeCallback.java similarity index 95% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/ItemSwipeCallback.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemSwipeCallback.java index 13bc750..21aa37d 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/ItemSwipeCallback.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemSwipeCallback.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.items; +package com.hikapro.backpack.presenter.adapters.helper.items; import android.content.Context; import android.graphics.Canvas; @@ -11,8 +11,8 @@ import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; import android.view.View; -import hikapro.com.backpack.R; -import hikapro.com.backpack.presenter.adapters.ItemListAdapter; +import com.hikapro.backpack.R; +import com.hikapro.backpack.presenter.adapters.ItemListAdapter; /** * Created by tariel on 02/05/16. diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/ItemSwipeDecoration.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemSwipeDecoration.java similarity index 98% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/ItemSwipeDecoration.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemSwipeDecoration.java index 784595e..33f5d27 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/ItemSwipeDecoration.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemSwipeDecoration.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.items; +package com.hikapro.backpack.presenter.adapters.helper.items; import android.graphics.Canvas; import android.graphics.Color; diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/ItemVisibilityAdapter.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemVisibilityAdapter.java similarity index 88% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/ItemVisibilityAdapter.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemVisibilityAdapter.java index 2d6547d..ebbe047 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/ItemVisibilityAdapter.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemVisibilityAdapter.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.items; +package com.hikapro.backpack.presenter.adapters.helper.items; /** * Created by tariel on 30/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/StickyHeaderAdapter.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/StickyHeaderAdapter.java similarity index 85% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/StickyHeaderAdapter.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/StickyHeaderAdapter.java index f21ef78..58409dd 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/StickyHeaderAdapter.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/StickyHeaderAdapter.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.items; +package com.hikapro.backpack.presenter.adapters.helper.items; import android.support.v7.widget.RecyclerView; import android.view.ViewGroup; diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/StickyHeaderDecoration.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/StickyHeaderDecoration.java similarity index 99% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/StickyHeaderDecoration.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/StickyHeaderDecoration.java index 074b954..883257a 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/items/StickyHeaderDecoration.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/StickyHeaderDecoration.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.items; +package com.hikapro.backpack.presenter.adapters.helper.items; import android.graphics.Canvas; import android.graphics.Rect; diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/sets/ItemTouchHelperAdapter.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/ItemTouchHelperAdapter.java similarity index 77% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/sets/ItemTouchHelperAdapter.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/ItemTouchHelperAdapter.java index a1377aa..480a00a 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/sets/ItemTouchHelperAdapter.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/ItemTouchHelperAdapter.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.sets; +package com.hikapro.backpack.presenter.adapters.helper.sets; /** * Created by N551 on 25.04.2016. diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/sets/ItemTouchHelperViewHolder.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/ItemTouchHelperViewHolder.java similarity index 73% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/sets/ItemTouchHelperViewHolder.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/ItemTouchHelperViewHolder.java index 96085d0..2ffe2a9 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/sets/ItemTouchHelperViewHolder.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/ItemTouchHelperViewHolder.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.sets; +package com.hikapro.backpack.presenter.adapters.helper.sets; /** * Created by N551 on 25.04.2016. diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/sets/OnStartDragListener.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/OnStartDragListener.java similarity index 78% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/sets/OnStartDragListener.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/OnStartDragListener.java index 02770ec..a6d9725 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/sets/OnStartDragListener.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/OnStartDragListener.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.sets; +package com.hikapro.backpack.presenter.adapters.helper.sets; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/sets/SimpleItemTouchHelperCallback.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/SimpleItemTouchHelperCallback.java similarity index 98% rename from app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/sets/SimpleItemTouchHelperCallback.java rename to app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/SimpleItemTouchHelperCallback.java index 0e70a70..6afddfb 100644 --- a/app/src/main/java/hikapro/com/backpack/presenter/adapters/helper/sets/SimpleItemTouchHelperCallback.java +++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/SimpleItemTouchHelperCallback.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.presenter.adapters.helper.sets; +package com.hikapro.backpack.presenter.adapters.helper.sets; import android.graphics.Canvas; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/hikapro/com/backpack/view/View.java b/app/src/main/java/com/hikapro/backpack/view/View.java similarity index 80% rename from app/src/main/java/hikapro/com/backpack/view/View.java rename to app/src/main/java/com/hikapro/backpack/view/View.java index 5d51876..fae4e55 100644 --- a/app/src/main/java/hikapro/com/backpack/view/View.java +++ b/app/src/main/java/com/hikapro/backpack/view/View.java @@ -1,11 +1,11 @@ -package hikapro.com.backpack.view; +package com.hikapro.backpack.view; import android.content.Context; -import hikapro.com.backpack.model.entities.Item; -import hikapro.com.backpack.model.entities.Set; -import hikapro.com.backpack.presenter.Presenter; -import hikapro.com.backpack.presenter.adapters.helper.sets.OnStartDragListener; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.model.entities.Set; +import com.hikapro.backpack.presenter.Presenter; +import com.hikapro.backpack.presenter.adapters.helper.sets.OnStartDragListener; /** * Created by tariel on 19/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/view/fragments/ItemDetailFragment.java b/app/src/main/java/com/hikapro/backpack/view/fragments/ItemDetailFragment.java similarity index 89% rename from app/src/main/java/hikapro/com/backpack/view/fragments/ItemDetailFragment.java rename to app/src/main/java/com/hikapro/backpack/view/fragments/ItemDetailFragment.java index b7c3de9..94249e0 100644 --- a/app/src/main/java/hikapro/com/backpack/view/fragments/ItemDetailFragment.java +++ b/app/src/main/java/com/hikapro/backpack/view/fragments/ItemDetailFragment.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.view.fragments; +package com.hikapro.backpack.view.fragments; import android.app.Activity; @@ -10,18 +10,18 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import hikapro.com.backpack.model.entities.Item; -import hikapro.com.backpack.presenter.Presenter; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.presenter.Presenter; /** * A simple {@link Fragment} subclass. */ -public class ItemDetailFragment extends Fragment implements hikapro.com.backpack.view.View.ItemDetail { +public class ItemDetailFragment extends Fragment implements com.hikapro.backpack.view.View.ItemDetail { private static final String BUNDLE_ITEM_KEY = "BUNDLE_ITEM_KEY"; private Presenter.ItemDetail presenter; - private hikapro.com.backpack.view.View.ActivityCallback activityCallback; + private com.hikapro.backpack.view.View.ActivityCallback activityCallback; public ItemDetailFragment() { @@ -45,7 +45,7 @@ public class ItemDetailFragment extends Fragment implements hikapro.com.backpack public void onAttach(Context context) { super.onAttach(context); try { - activityCallback = (hikapro.com.backpack.view.View.ActivityCallback) context; + activityCallback = (com.hikapro.backpack.view.View.ActivityCallback) context; } catch (ClassCastException e) { throw new ClassCastException(context.toString() + " must implement activityCallback"); @@ -55,7 +55,7 @@ public class ItemDetailFragment extends Fragment implements hikapro.com.backpack public void onAttach(Activity activity) { super.onAttach(activity); try { - activityCallback = (hikapro.com.backpack.view.View.ActivityCallback) activity; + activityCallback = (com.hikapro.backpack.view.View.ActivityCallback) activity; } catch (ClassCastException e) { throw new ClassCastException(activity.toString() + " must implement activityCallback"); diff --git a/app/src/main/java/hikapro/com/backpack/view/fragments/ItemListFragment.java b/app/src/main/java/com/hikapro/backpack/view/fragments/ItemListFragment.java similarity index 90% rename from app/src/main/java/hikapro/com/backpack/view/fragments/ItemListFragment.java rename to app/src/main/java/com/hikapro/backpack/view/fragments/ItemListFragment.java index ae1900d..1ebd3f4 100644 --- a/app/src/main/java/hikapro/com/backpack/view/fragments/ItemListFragment.java +++ b/app/src/main/java/com/hikapro/backpack/view/fragments/ItemListFragment.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.view.fragments; +package com.hikapro.backpack.view.fragments; import android.app.Activity; @@ -15,18 +15,17 @@ import android.view.ViewGroup; import android.widget.SearchView; import android.widget.Toast; -import hikapro.com.backpack.R; -import hikapro.com.backpack.model.entities.Item; -import hikapro.com.backpack.model.entities.Set; -import hikapro.com.backpack.presenter.ItemListPresenter; -import hikapro.com.backpack.presenter.Presenter; +import com.hikapro.backpack.R; +import com.hikapro.backpack.model.entities.Item; +import com.hikapro.backpack.model.entities.Set; +import com.hikapro.backpack.presenter.Presenter; -public class ItemListFragment extends Fragment implements hikapro.com.backpack.view.View.ItemList, +public class ItemListFragment extends Fragment implements com.hikapro.backpack.view.View.ItemList, SearchView.OnQueryTextListener { protected static final String BUNDLE_SET_KEY = "BUNDLE_SET_KEY"; - private hikapro.com.backpack.view.View.ActivityCallback activityCallback; + private com.hikapro.backpack.view.View.ActivityCallback activityCallback; private Presenter.ItemList presenter; public ItemListFragment() { @@ -95,7 +94,7 @@ public class ItemListFragment extends Fragment implements hikapro.com.backpack.v public void onAttach(Context context) { super.onAttach(context); try { - activityCallback = (hikapro.com.backpack.view.View.ActivityCallback) context; + activityCallback = (com.hikapro.backpack.view.View.ActivityCallback) context; } catch (ClassCastException e) { throw new ClassCastException(context.toString() + " must implement activityCallback"); @@ -105,7 +104,7 @@ public class ItemListFragment extends Fragment implements hikapro.com.backpack.v public void onAttach(Activity activity) { super.onAttach(activity); try { - activityCallback = (hikapro.com.backpack.view.View.ActivityCallback) activity; + activityCallback = (com.hikapro.backpack.view.View.ActivityCallback) activity; } catch (ClassCastException e) { throw new ClassCastException(activity.toString() + " must implement activityCallback"); diff --git a/app/src/main/java/hikapro/com/backpack/view/fragments/PackedListFragment.java b/app/src/main/java/com/hikapro/backpack/view/fragments/PackedListFragment.java similarity index 85% rename from app/src/main/java/hikapro/com/backpack/view/fragments/PackedListFragment.java rename to app/src/main/java/com/hikapro/backpack/view/fragments/PackedListFragment.java index 69e4d18..79edefa 100644 --- a/app/src/main/java/hikapro/com/backpack/view/fragments/PackedListFragment.java +++ b/app/src/main/java/com/hikapro/backpack/view/fragments/PackedListFragment.java @@ -1,8 +1,8 @@ -package hikapro.com.backpack.view.fragments; +package com.hikapro.backpack.view.fragments; import android.os.Bundle; -import hikapro.com.backpack.model.entities.Set; +import com.hikapro.backpack.model.entities.Set; /** * Created by tariel on 12/05/16. diff --git a/app/src/main/java/hikapro/com/backpack/view/fragments/SetListFragment.java b/app/src/main/java/com/hikapro/backpack/view/fragments/SetListFragment.java similarity index 88% rename from app/src/main/java/hikapro/com/backpack/view/fragments/SetListFragment.java rename to app/src/main/java/com/hikapro/backpack/view/fragments/SetListFragment.java index 4feaf63..55bbdce 100644 --- a/app/src/main/java/hikapro/com/backpack/view/fragments/SetListFragment.java +++ b/app/src/main/java/com/hikapro/backpack/view/fragments/SetListFragment.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.view.fragments; +package com.hikapro.backpack.view.fragments; import android.app.Activity; import android.app.Fragment; @@ -10,15 +10,15 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import hikapro.com.backpack.model.entities.Set; -import hikapro.com.backpack.presenter.Presenter; -import hikapro.com.backpack.presenter.adapters.helper.sets.OnStartDragListener; +import com.hikapro.backpack.model.entities.Set; +import com.hikapro.backpack.presenter.Presenter; +import com.hikapro.backpack.presenter.adapters.helper.sets.OnStartDragListener; -public class SetListFragment extends Fragment implements hikapro.com.backpack.view.View.SetList, +public class SetListFragment extends Fragment implements com.hikapro.backpack.view.View.SetList, OnStartDragListener { private Presenter.SetList presenter; - private hikapro.com.backpack.view.View.ActivityCallback activityCallback; + private com.hikapro.backpack.view.View.ActivityCallback activityCallback; public SetListFragment() { @@ -34,7 +34,7 @@ public class SetListFragment extends Fragment implements hikapro.com.backpack.vi public void onAttach(Context context) { super.onAttach(context); try { - activityCallback = (hikapro.com.backpack.view.View.ActivityCallback) context; + activityCallback = (com.hikapro.backpack.view.View.ActivityCallback) context; } catch (ClassCastException e) { throw new ClassCastException(context.toString() + " must implement activityCallback"); @@ -44,7 +44,7 @@ public class SetListFragment extends Fragment implements hikapro.com.backpack.vi public void onAttach(Activity activity) { super.onAttach(activity); try { - activityCallback = (hikapro.com.backpack.view.View.ActivityCallback) activity; + activityCallback = (com.hikapro.backpack.view.View.ActivityCallback) activity; } catch (ClassCastException e) { throw new ClassCastException(activity.toString() + " must implement activityCallback"); diff --git a/app/src/main/java/hikapro/com/backpack/view/recycler/DetailViewHolder.java b/app/src/main/java/com/hikapro/backpack/view/recycler/DetailViewHolder.java similarity index 90% rename from app/src/main/java/hikapro/com/backpack/view/recycler/DetailViewHolder.java rename to app/src/main/java/com/hikapro/backpack/view/recycler/DetailViewHolder.java index ed2e380..ca6d2a5 100644 --- a/app/src/main/java/hikapro/com/backpack/view/recycler/DetailViewHolder.java +++ b/app/src/main/java/com/hikapro/backpack/view/recycler/DetailViewHolder.java @@ -1,11 +1,11 @@ -package hikapro.com.backpack.view.recycler; +package com.hikapro.backpack.view.recycler; import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import hikapro.com.backpack.R; +import com.hikapro.backpack.R; /** * Created by tariel on 23/04/16. diff --git a/app/src/main/java/hikapro/com/backpack/view/recycler/HeaderViewHolder.java b/app/src/main/java/com/hikapro/backpack/view/recycler/HeaderViewHolder.java similarity index 85% rename from app/src/main/java/hikapro/com/backpack/view/recycler/HeaderViewHolder.java rename to app/src/main/java/com/hikapro/backpack/view/recycler/HeaderViewHolder.java index 95de0c9..9a12bf5 100644 --- a/app/src/main/java/hikapro/com/backpack/view/recycler/HeaderViewHolder.java +++ b/app/src/main/java/com/hikapro/backpack/view/recycler/HeaderViewHolder.java @@ -1,10 +1,10 @@ -package hikapro.com.backpack.view.recycler; +package com.hikapro.backpack.view.recycler; import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; -import hikapro.com.backpack.R; +import com.hikapro.backpack.R; /** * Created by tariel on 01/05/16. diff --git a/app/src/main/java/hikapro/com/backpack/view/recycler/ItemViewHolder.java b/app/src/main/java/com/hikapro/backpack/view/recycler/ItemViewHolder.java similarity index 87% rename from app/src/main/java/hikapro/com/backpack/view/recycler/ItemViewHolder.java rename to app/src/main/java/com/hikapro/backpack/view/recycler/ItemViewHolder.java index 618f83a..3b1cb90 100644 --- a/app/src/main/java/hikapro/com/backpack/view/recycler/ItemViewHolder.java +++ b/app/src/main/java/com/hikapro/backpack/view/recycler/ItemViewHolder.java @@ -1,13 +1,12 @@ -package hikapro.com.backpack.view.recycler; +package com.hikapro.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; +import com.hikapro.backpack.R; /** diff --git a/app/src/main/java/hikapro/com/backpack/view/recycler/SetViewHolder.java b/app/src/main/java/com/hikapro/backpack/view/recycler/SetViewHolder.java similarity index 89% rename from app/src/main/java/hikapro/com/backpack/view/recycler/SetViewHolder.java rename to app/src/main/java/com/hikapro/backpack/view/recycler/SetViewHolder.java index c54d2cd..e0bce7b 100644 --- a/app/src/main/java/hikapro/com/backpack/view/recycler/SetViewHolder.java +++ b/app/src/main/java/com/hikapro/backpack/view/recycler/SetViewHolder.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack.view.recycler; +package com.hikapro.backpack.view.recycler; import android.graphics.Color; import android.graphics.drawable.Drawable; @@ -7,8 +7,8 @@ import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; -import hikapro.com.backpack.R; -import hikapro.com.backpack.presenter.adapters.helper.sets.ItemTouchHelperViewHolder; +import com.hikapro.backpack.R; +import com.hikapro.backpack.presenter.adapters.helper.sets.ItemTouchHelperViewHolder; /** * Created by tariel on 20/04/16. diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2a8e37d..de4e2f0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="horizontal" android:fitsSystemWindows="true" - tools:context="hikapro.com.backpack.MainActivity"> + tools:context="com.hikapro.backpack.MainActivity"> + tools:context="com.hikapro.backpack.view.fragments.ItemDetailFragment"> diff --git a/app/src/test/java/hikapro/com/backpack/ExampleUnitTest.java b/app/src/test/java/com/hikapro/backpack/ExampleUnitTest.java similarity index 90% rename from app/src/test/java/hikapro/com/backpack/ExampleUnitTest.java rename to app/src/test/java/com/hikapro/backpack/ExampleUnitTest.java index bed9698..cc852d2 100644 --- a/app/src/test/java/hikapro/com/backpack/ExampleUnitTest.java +++ b/app/src/test/java/com/hikapro/backpack/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package hikapro.com.backpack; +package com.hikapro.backpack; import org.junit.Test;