From c04c074d03ae3c71bde75ccfe7a4089ed79fc7e7 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 29 Mar 2016 12:37:40 +0200 Subject: [PATCH] Move files to new path --- .../ui/adapter/ItemsRecyclerViewAdapter.java | 92 ----------------- .../habitica/ui/fragments/ItemsFragment.java | 98 ------------------- .../ui/fragments/ItemsRecyclerFragment.java | 98 ------------------- .../habitica/ui/fragments/StableFragment.java | 4 - .../habitrpgwrapper/lib/models/BaseItem.java | 58 ----------- .../habitrpgwrapper/lib/models/Egg.java | 28 ------ .../habitrpgwrapper/lib/models/Food.java | 36 ------- .../lib/models/HatchingPotion.java | 28 ------ .../habitrpgwrapper/lib/models/QuestItem.java | 8 -- .../lib/models/responses/BuyResponse.java | 0 10 files changed, 450 deletions(-) delete mode 100644 Habitica/src/com/habitrpg/android/habitica/ui/adapter/ItemsRecyclerViewAdapter.java delete mode 100644 Habitica/src/com/habitrpg/android/habitica/ui/fragments/ItemsFragment.java delete mode 100644 Habitica/src/com/habitrpg/android/habitica/ui/fragments/ItemsRecyclerFragment.java delete mode 100644 Habitica/src/com/habitrpg/android/habitica/ui/fragments/StableFragment.java delete mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/BaseItem.java delete mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Egg.java delete mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Food.java delete mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/HatchingPotion.java delete mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/QuestItem.java rename Habitica/src/{ => main/java}/com/magicmicky/habitrpgwrapper/lib/models/responses/BuyResponse.java (100%) diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/ItemsRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/ItemsRecyclerViewAdapter.java deleted file mode 100644 index 021895542..000000000 --- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/ItemsRecyclerViewAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.habitrpg.android.habitica.ui.adapter; - -import android.media.Image; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.TextView; - -import com.habitrpg.android.habitica.R; -import com.habitrpg.android.habitica.events.DisplayFragmentEvent; -import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment; -import com.magicmicky.habitrpgwrapper.lib.models.BaseItem; -import com.magicmicky.habitrpgwrapper.lib.models.Group; -import com.magicmicky.habitrpgwrapper.lib.models.Items; -import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData; -import com.squareup.picasso.Picasso; - -import org.greenrobot.eventbus.EventBus; - -import java.util.ArrayList; -import java.util.List; - -import butterknife.Bind; -import butterknife.ButterKnife; -import retrofit.Callback; -import retrofit.RetrofitError; -import retrofit.client.Response; - -public class ItemsRecyclerViewAdapter extends RecyclerView.Adapter { - - private List itemsArrayList; - - public void setItemsArrayList(List itemsArrayList) { - this.itemsArrayList = itemsArrayList; - this.notifyDataSetChanged(); - } - - @Override - public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - - View view = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.item_item, parent, false); - - return new ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(ItemViewHolder holder, int position) { - holder.bind(itemsArrayList.get(position)); - } - - @Override - public int getItemCount() { - return this.itemsArrayList == null ? 0 : this.itemsArrayList.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener { - - @Bind(R.id.titleTextView) - TextView textView; - - @Bind(R.id.imageView) - ImageView imageView; - - BaseItem item; - - public ItemViewHolder(View itemView) { - super(itemView); - - ButterKnife.bind(this, itemView); - itemView.setOnClickListener(this); - } - - public void bind(BaseItem item) { - this.item = item; - this.textView.setText(this.item.getText()); - String imageUrl = "https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_" + item.getKey() + ".png"; - - Picasso.with(imageView.getContext()) - .load(imageUrl) - .into(imageView); - } - - @Override - public void onClick(View v) { - - } - } -} diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/ItemsFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/ItemsFragment.java deleted file mode 100644 index b9ee94f67..000000000 --- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/ItemsFragment.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.habitrpg.android.habitica.ui.fragments; - -import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.habitrpg.android.habitica.R; -import com.habitrpg.android.habitica.ui.DividerItemDecoration; -import com.habitrpg.android.habitica.ui.adapter.social.PublicGuildsRecyclerViewAdapter; -import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment; -import com.habitrpg.android.habitica.ui.fragments.social.GroupInformationFragment; -import com.magicmicky.habitrpgwrapper.lib.models.UserParty; - -import butterknife.Bind; -import butterknife.ButterKnife; - -public class ItemsFragment extends BaseMainFragment { - - @Bind(R.id.view_pager) - public ViewPager viewPager; - - private View view; - @Nullable - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - this.usesTabLayout = true; - super.onCreateView(inflater, container, savedInstanceState); - if (view == null) { - view = inflater.inflate(R.layout.fragment_viewpager, container, false); - - ButterKnife.bind(this, view); - - viewPager.setCurrentItem(0); - - setViewPagerAdapter(); - } - return view; - } - - public void setViewPagerAdapter() { - android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager(); - - UserParty party = user.getParty(); - - if (party == null) { - return; - } - - viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) { - - @Override - public Fragment getItem(int position) { - - ItemsRecyclerFragment fragment = new ItemsRecyclerFragment(); - switch (position) { - case 0: - fragment.itemType = "eggs"; - case 1: - fragment.itemType = "hatchingpotions"; - case 2: - fragment.itemType = "food"; - case 3: - fragment.itemType = "quests"; - } - return fragment; - } - - @Override - public int getCount() { - return 4; - } - - @Override - public CharSequence getPageTitle(int position) { - switch (position) { - case 0: - return activity.getString(R.string.eggs); - case 1: - return activity.getString(R.string.hatching_potions); - case 2: - return activity.getString(R.string.food); - case 3: - return activity.getString(R.string.quests); - } - return ""; - } - }); - - tabLayout.setupWithViewPager(viewPager); - } -} diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/ItemsRecyclerFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/ItemsRecyclerFragment.java deleted file mode 100644 index 2e5ed1851..000000000 --- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/ItemsRecyclerFragment.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.habitrpg.android.habitica.ui.fragments; - -import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.habitrpg.android.habitica.R; -import com.habitrpg.android.habitica.ui.DividerItemDecoration; -import com.habitrpg.android.habitica.ui.adapter.ItemsRecyclerViewAdapter; -import com.habitrpg.android.habitica.ui.adapter.social.PublicGuildsRecyclerViewAdapter; -import com.magicmicky.habitrpgwrapper.lib.models.BaseItem; -import com.magicmicky.habitrpgwrapper.lib.models.Egg; -import com.magicmicky.habitrpgwrapper.lib.models.Food; -import com.magicmicky.habitrpgwrapper.lib.models.HatchingPotion; -import com.magicmicky.habitrpgwrapper.lib.models.QuestItem; -import com.magicmicky.habitrpgwrapper.lib.models.Skill; -import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction; -import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener; -import com.raizlabs.android.dbflow.sql.builder.Condition; -import com.raizlabs.android.dbflow.sql.language.From; -import com.raizlabs.android.dbflow.sql.language.Select; - -import java.util.List; - -import butterknife.Bind; -import butterknife.ButterKnife; - -public class ItemsRecyclerFragment extends BaseFragment implements TransactionListener> { - - public String itemType; - - @Bind(R.id.recyclerView) - RecyclerView recyclerView; - - private View view; - private ItemsRecyclerViewAdapter viewAdapter; - - @Nullable - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - super.onCreateView(inflater, container, savedInstanceState); - if (view == null) { - view = inflater.inflate(R.layout.fragment_recyclerview, container, false); - android.support.v4.app.FragmentActivity context = getActivity(); - - ButterKnife.bind(this, view); - recyclerView.setLayoutManager(new LinearLayoutManager(context)); - recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST)); - viewAdapter = new ItemsRecyclerViewAdapter(); - recyclerView.setAdapter(viewAdapter); - - this.loadItems(); - } - return view; - } - - private void loadItems() { - Select select = new Select(); - From from = null; - switch (this.itemType) { - case "eggs": - from = select.from(Egg.class); - break; - case "hatchingpotions": - from = select.from(HatchingPotion.class); - break; - case "food": - from = select.from(Food.class); - break; - case "quests": - from = select.from(QuestItem.class); - break; - } - if (from != null) { - from.async().queryList(this); - } - } - - @Override - public void onResultReceived(List result) { - this.viewAdapter.setItemsArrayList(result); - } - - @Override - public boolean onReady(BaseTransaction> transaction) { - return false; - } - - @Override - public boolean hasResult(BaseTransaction> transaction, List result) { - return false; - } -} diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/StableFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/StableFragment.java deleted file mode 100644 index 7ddcb1fea..000000000 --- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/StableFragment.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.habitrpg.android.habitica.ui.fragments; - -public class StableFragment extends BaseMainFragment { -} diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/BaseItem.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/BaseItem.java deleted file mode 100644 index 56b03de83..000000000 --- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/BaseItem.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.magicmicky.habitrpgwrapper.lib.models; - -import com.raizlabs.android.dbflow.annotation.Column; -import com.raizlabs.android.dbflow.annotation.PrimaryKey; -import com.raizlabs.android.dbflow.structure.BaseModel; - -public class BaseItem extends BaseModel { - - @Column - @PrimaryKey - String key; - - @Column - String text, notes; - - @Column - Integer value, numberOwned; - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getText() { - return text; - } - - public void setText(String text) { - this.text = text; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public Integer getValue() { - return value; - } - - public void setValue(Integer value) { - this.value = value; - } - - public Integer getNumberOwned() { - return numberOwned; - } - - public void setNumberOwned(Integer numberOwned) { - this.numberOwned = numberOwned; - } -} diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Egg.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Egg.java deleted file mode 100644 index 2f428433e..000000000 --- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Egg.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.magicmicky.habitrpgwrapper.lib.models; - -import com.habitrpg.android.habitica.HabitDatabase; -import com.raizlabs.android.dbflow.annotation.Column; -import com.raizlabs.android.dbflow.annotation.Table; - -@Table(databaseName = HabitDatabase.NAME) -public class Egg extends BaseItem { - - @Column - String adjective, mountText; - - public String getAdjective() { - return adjective; - } - - public void setAdjective(String adjective) { - this.adjective = adjective; - } - - public String getMountText() { - return mountText; - } - - public void setMountText(String mountText) { - this.mountText = mountText; - } -} diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Food.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Food.java deleted file mode 100644 index 1fe5b3475..000000000 --- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Food.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.magicmicky.habitrpgwrapper.lib.models; - -import com.raizlabs.android.dbflow.annotation.Column; - -public class Food extends BaseItem { - - @Column - String target, article; - - @Column - Boolean canDrop; - - public String getTarget() { - return target; - } - - public void setTarget(String target) { - this.target = target; - } - - public String getArticle() { - return article; - } - - public void setArticle(String article) { - this.article = article; - } - - public Boolean getCanDrop() { - return canDrop; - } - - public void setCanDrop(Boolean canDrop) { - this.canDrop = canDrop; - } -} diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/HatchingPotion.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/HatchingPotion.java deleted file mode 100644 index b499bf3fd..000000000 --- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/HatchingPotion.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.magicmicky.habitrpgwrapper.lib.models; - -import com.habitrpg.android.habitica.HabitDatabase; -import com.raizlabs.android.dbflow.annotation.Column; -import com.raizlabs.android.dbflow.annotation.Table; - -@Table(databaseName = HabitDatabase.NAME) -public class HatchingPotion extends BaseItem { - - @Column - Boolean premium, limited; - - public Boolean getPremium() { - return premium; - } - - public void setPremium(Boolean premium) { - this.premium = premium; - } - - public Boolean getLimited() { - return limited; - } - - public void setLimited(Boolean limited) { - this.limited = limited; - } -} diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/QuestItem.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/QuestItem.java deleted file mode 100644 index a6eef303a..000000000 --- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/QuestItem.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.magicmicky.habitrpgwrapper.lib.models; - -import com.habitrpg.android.habitica.HabitDatabase; -import com.raizlabs.android.dbflow.annotation.Table; - -@Table(databaseName = HabitDatabase.NAME) -public class QuestItem extends BaseItem { -} diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/responses/BuyResponse.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/BuyResponse.java similarity index 100% rename from Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/responses/BuyResponse.java rename to Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/BuyResponse.java