From 6dc5399b8ce284e8b99f5c58f47752c3ae8b2d4a Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 7 Apr 2016 20:31:10 +0200 Subject: [PATCH] fix equipping pets and mounts --- .../inventory/MountDetailRecyclerAdapter.java | 14 +++++------ .../inventory/PetDetailRecyclerAdapter.java | 24 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java index eb11b95df..4eb66fffe 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java @@ -120,14 +120,12 @@ public class MountDetailRecyclerAdapter extends RecyclerView.Adapter { + if (index == 0) { + EquipCommand event = new EquipCommand(); + event.type = "mount"; + event.key = animal.getKey(); + EventBus.getDefault().post(event); } }); menu.show(); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java index 56f643844..75b0b236a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.res.Resources; import android.support.v7.widget.CardView; import android.support.v7.widget.RecyclerView; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -148,18 +149,17 @@ public class PetDetailRecyclerAdapter extends RecyclerView.Adapter { + Log.e("EEEEEEE", index.toString()); + if (index == 0) { + EquipCommand event = new EquipCommand(); + event.type = "pet"; + event.key = animal.getKey(); + EventBus.getDefault().post(event); + } else if (index == 1) { + FeedCommand event = new FeedCommand(); + event.usingPet = animal; + EventBus.getDefault().post(event); } }); menu.show();