diff --git a/Habitica/res/layout/empty_view_seasonal_shop.xml b/Habitica/res/layout/empty_view_seasonal_shop.xml
new file mode 100644
index 000000000..9a1df1d65
--- /dev/null
+++ b/Habitica/res/layout/empty_view_seasonal_shop.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/layout/empty_view_timetravelers.xml b/Habitica/res/layout/empty_view_timetravelers.xml
new file mode 100644
index 000000000..d8b011541
--- /dev/null
+++ b/Habitica/res/layout/empty_view_timetravelers.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_shop.xml b/Habitica/res/layout/fragment_shop.xml
new file mode 100644
index 000000000..ae605b2db
--- /dev/null
+++ b/Habitica/res/layout/fragment_shop.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 6904992d0..3924dfa79 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -660,4 +660,9 @@
Purchase gems
You\'ll need more Mystic Hourglasses to buy this item!
Get hourglasses
+ Subscribe for Hourglasses
+ Earn one Mystic Hourglass for every three months of consecutive subscription, then use them to unlock limited edition items, pets, and mounts from the past… and future!
+ I want to Subscribe
+ The Grand Galas happen close to the solstices and equinoxes, so check back then to find a fun assortment of special seasonal items!
+ Come back soon!
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java
index db09292e1..9f76495b0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java
@@ -12,6 +12,7 @@ import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
@@ -26,6 +27,7 @@ import com.facebook.imagepipeline.image.CloseableImage;
import com.facebook.imagepipeline.request.ImageRequest;
import com.facebook.imagepipeline.request.ImageRequestBuilder;
import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
import com.habitrpg.android.habitica.helpers.RxErrorHandler;
import com.habitrpg.android.habitica.models.inventory.Item;
import com.habitrpg.android.habitica.models.shops.Shop;
@@ -36,6 +38,8 @@ import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder;
import com.habitrpg.android.habitica.ui.viewHolders.ShopItemViewHolder;
+import org.greenrobot.eventbus.EventBus;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -85,6 +89,10 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter (this.items.size()-1)) {
+ return;
+ }
Object obj = this.items.get(position);
if (obj.getClass().equals(Shop.class)) {
((ShopHeaderViewHolder) holder).bind((Shop) obj, shopSpriteSuffix);
} else if (obj.getClass().equals(ShopCategory.class)) {
((SectionViewHolder) holder).bind(((ShopCategory) obj).getText());
- } else {
+ } else if (obj.getClass().equals(ShopItem.class)) {
ShopItem item = (ShopItem) items.get(position);
((ShopItemViewHolder) holder).bind(item, item.canBuy(user));
if (ownedItems.containsKey(item.getKey())) {
@@ -113,18 +133,24 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter (this.items.size()-1)) {
+ return 2;
+ } else if (this.items.get(position).getClass().equals(Shop.class)) {
return 0;
} else if (this.items.get(position).getClass().equals(ShopCategory.class)) {
return 1;
} else {
- return 2;
+ return 3;
}
}
@Override
public int getItemCount() {
- return items != null ? items.size() : 0;
+ int size = items != null ? items.size() : 0;
+ if (size == 1) {
+ return 2;
+ }
+ return size;
}
public void setOwnedItems(Map ownedItems) {
@@ -208,4 +234,19 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter EventBus.getDefault().post(new OpenGemPurchaseFragmentCommand()));
+ }
+ }
+ }
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java
index 12fa47d55..90c47eb70 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java
@@ -6,6 +6,7 @@ import android.support.v7.widget.GridLayoutManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.FrameLayout;
import android.widget.TextView;
import com.habitrpg.android.habitica.R;
@@ -74,7 +75,7 @@ public class ShopFragment extends BaseFragment {
layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
@Override
public int getSpanSize(int position) {
- if (adapter.getItemViewType(position) < 2) {
+ if (adapter.getItemViewType(position) < 3) {
return layoutManager.getSpanCount();
} else {
return 1;