sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-25 07:06:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix various crashes

Browse source
This commit is contained in:
Phillip Thelen 2016-06-14 16:45:08 +02:00
parent c43297200c
commit 3e022de5bf
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
View file

@ -116,7 +116,7 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
}
binding.setImageNamed("Pet_"+type+"_"+item.getKey());
if (isHatching) {
if (isHatching != null && isHatching) {
this.binding.setDisabled(this.isPetOwned());
}
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
View file

@ -113,6 +113,9 @@ public class AvatarSetupFragment extends BaseFragment {
float itemWidth = getContext().getResources().getDimension(R.dimen.customization_width);
int spanCount = (int) (width / itemWidth);
if (spanCount == 0) {
spanCount = 1;
}
this.layoutManager.setSpanCount(spanCount);
}

9
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
View file

@ -306,14 +306,19 @@ public class PartyFragment extends BaseMainFragment {
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
if (position == 1 && group != null) {
chatListFragment.setNavigatedToFragment(group.id);
if (chatListFragment != null) {
chatListFragment.setNavigatedToFragment(group.id);
}
}
}
@Override
public void onPageSelected(int position) {
if (position == 1 && group != null) {
chatListFragment.setNavigatedToFragment(group.id);
if (chatListFragment != null) {
chatListFragment.setNavigatedToFragment(group.id);
}
}
}