sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-14 10:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix various crashes

Browse source
This commit is contained in:
Phillip Thelen 2016-04-19 13:26:03 +02:00
parent 8654e038f6
commit 8d4f51e0a3
7 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
View file

@ -577,7 +577,8 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
}
IDrawerItem item = drawer.getDrawerItem(MainDrawerBuilder.SIDEBAR_SKILLS);
if (user.getPreferences().getDisableClasses() || !user.getFlags().getClassSelected()) {
if ((user.getPreferences() != null && user.getPreferences().getDisableClasses())
|| (user.getFlags() != null && !user.getFlags().getClassSelected())) {
if (item != null) {
drawer.removeItem(MainDrawerBuilder.SIDEBAR_SKILLS);
}

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

@ -109,7 +109,7 @@ public class MountDetailRecyclerAdapter extends RecyclerView.Adapter<MountDetail
DataBindingUtils.loadImage(this.imageView, "Mount_Icon_" + itemType + "-" + item.getColor());
} else {
DataBindingUtils.loadImage(this.imageView, "PixelPaw");
this.imageView.setAlpha(0.4f);
this.imageView.setAlpha(0.3f);
}
}

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

@ -143,7 +143,7 @@ public class PetDetailRecyclerAdapter extends RecyclerView.Adapter<PetDetailRecy
} else {
DataBindingUtils.loadImage(this.imageView, "Pet-" + itemType + "-" + item.getColor());
}
this.imageView.setAlpha(0.4f);
this.imageView.setAlpha(0.3f);
}
}

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java
View file

@ -79,8 +79,6 @@ public class StableRecyclerFragment extends BaseFragment {
adapter.activity = (MainActivity)this.getActivity();
adapter.itemType = this.itemType;
recyclerView.setAdapter(adapter);
this.loadItems();
}
}
@ -94,6 +92,7 @@ public class StableRecyclerFragment extends BaseFragment {
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
this.loadItems();
final View finalView = view;
finalView.post(() -> setGridSpanCount(finalView.getWidth()));
}
@ -119,6 +118,9 @@ public class StableRecyclerFragment extends BaseFragment {
private void loadItems() {
Runnable itemsRunnable = () -> {
if (itemType == null) {
return;
}
List<Object> items = new ArrayList<>();
Where<? extends Animal> query = null;

11
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
View file

@ -96,8 +96,6 @@ public class ItemRecyclerFragment extends BaseFragment {
adapter.feedingPet = this.feedingPet;
}
recyclerView.setAdapter(adapter);
this.loadItems();
}
recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
}
@ -121,6 +119,12 @@ public class ItemRecyclerFragment extends BaseFragment {
return view;
}
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
this.loadItems();
}
@Override
public void onResume() {
if (this.isHatching) {
@ -146,6 +150,9 @@ public class ItemRecyclerFragment extends BaseFragment {
private void loadItems() {
From from = null;
if (this.itemType == null) {
return;
}
switch (this.itemType) {
case "eggs":
from = new Select().from(Egg.class);

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
View file

@ -106,9 +106,11 @@ public class GroupInformationFragment extends Fragment {
updateQuestMember(group);
}
updateQuestProgress(group, quest);
this.group = group;
if (isAdded()) {
updateQuestProgress(group, quest);
}
}
public void setQuestContent(QuestContent quest) {

8
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
View file

@ -54,10 +54,12 @@ public class TavernFragment extends BaseMainFragment implements Callback<Group>
@Override
public void success(Group group, Response response) {
this.tavern = group;
if (group.quest != null) {
if (group.quest != null && this.isAdded()) {
this.viewPager.getAdapter().notifyDataSetChanged();
this.tabLayout.setVisibility(View.VISIBLE);
this.tabLayout.setupWithViewPager(this.viewPager);
if (this.tabLayout != null) {
this.tabLayout.setVisibility(View.VISIBLE);
this.tabLayout.setupWithViewPager(this.viewPager);
}
ContentCache contentCache = new ContentCache(mAPIHelper.apiService);