From cab560ee886f82518fdb83b5ec48da2d96e0fa9e Mon Sep 17 00:00:00 2001 From: Negue Date: Tue, 24 Nov 2015 23:34:18 +0100 Subject: [PATCH] minor fix --- .../habitica/ui/adapter/HabitItemRecyclerViewAdapter.java | 2 +- .../android/habitica/ui/fragments/GemsPurchaseFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java index 280036b22..2c4e25ba3 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java @@ -269,7 +269,7 @@ public class HabitItemRecyclerViewAdapter public void bindHolder(THabitItem habitItem, int position) { double itemvalue = habitItem.getValue(); Item = habitItem; - if (habitItem.notes.length() == 0) { + if (habitItem.notes == null || habitItem.notes.length() == 0) { notesTextView.setHeight(0); } else { notesTextView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)); diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java index 04e74139c..262b711e6 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java @@ -36,7 +36,7 @@ public class GemsPurchaseFragment extends BaseFragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - this.usesTabLayout = true; + super.onCreateView(inflater, container, savedInstanceState); View v = inflater.inflate(R.layout.fragment_gem_purchase, container, false);