From 66f20faeb7930d4956187a24f79194a95873c66d Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Sat, 10 Mar 2018 14:04:41 +0100 Subject: [PATCH] Fix minor issues --- .../RealmUserLocalRepository.kt | 2 +- .../ui/fragments/NavigationDrawerFragment.kt | 10 +++--- .../inventory/items/ItemRecyclerFragment.java | 4 +-- .../stable/MountDetailRecyclerFragment.java | 34 +++++++++---------- .../ui/fragments/setup/TaskSetupFragment.java | 3 +- .../SkillTasksRecyclerViewFragment.java | 6 +--- 6 files changed, 26 insertions(+), 33 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt index a414f0958..0907f503e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt @@ -57,7 +57,7 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), } private fun removeOldChallenges(userId: String, onlineChallenges: List) { - val challenges = realm.where(Challenge::class.java).equalTo("userId", userId).findAll().createSnapshot() + val challenges = realm.where(Challenge::class.java).equalTo("isParticipating", true).findAll().createSnapshot() val challengesToDelete = challenges.filterNot { onlineChallenges.contains(it) } realm.executeTransaction { for (challenge in challengesToDelete) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt index b11d0705a..a029777c7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt @@ -349,10 +349,12 @@ class NavigationDrawerFragment : DialogFragment() { } fun setUsername(name: String?) { - if (name != null && name.isNotEmpty()) { - toolbarTitle.text = name - } else { - toolbarTitle.text = "Habitica" + if (toolbarTitle != null) { + if (name != null && name.isNotEmpty()) { + toolbarTitle.text = name + } else { + toolbarTitle.text = "Habitica" + } } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java index cc1191232..1883d158a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java @@ -73,9 +73,7 @@ public class ItemRecyclerFragment extends BaseFragment { @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState); - if (view == null) { - view = inflater.inflate(R.layout.fragment_items, container, false); - } + view = inflater.inflate(R.layout.fragment_items, container, false); setUnbinder(ButterKnife.bind(this, view)); recyclerView.setEmptyView(emptyView); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java index 4e4a1038b..3428ea740 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java @@ -37,28 +37,26 @@ public class MountDetailRecyclerFragment extends BaseMainFragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { this.usesTabLayout = false; super.onCreateView(inflater, container, savedInstanceState); - if (view == null) { - view = inflater.inflate(R.layout.fragment_recyclerview, container, false); + view = inflater.inflate(R.layout.fragment_recyclerview, container, false); - recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView); + recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView); - layoutManager = new GridLayoutManager(getActivity(), 2); - recyclerView.setLayoutManager(layoutManager); - recyclerView.addItemDecoration(new MarginDecoration(getActivity())); + layoutManager = new GridLayoutManager(getActivity(), 2); + recyclerView.setLayoutManager(layoutManager); + recyclerView.addItemDecoration(new MarginDecoration(getActivity())); - adapter = (MountDetailRecyclerAdapter) recyclerView.getAdapter(); - if (adapter == null) { - adapter = new MountDetailRecyclerAdapter(null, true); - adapter.context = this.getActivity(); - adapter.itemType = this.animalType; - recyclerView.setAdapter(adapter); - recyclerView.setItemAnimator(new SafeDefaultItemAnimator()); - this.loadItems(); + adapter = (MountDetailRecyclerAdapter) recyclerView.getAdapter(); + if (adapter == null) { + adapter = new MountDetailRecyclerAdapter(null, true); + adapter.context = this.getActivity(); + adapter.itemType = this.animalType; + recyclerView.setAdapter(adapter); + recyclerView.setItemAnimator(new SafeDefaultItemAnimator()); + this.loadItems(); - getCompositeSubscription().add(adapter.getEquipEvents() - .flatMap(key -> inventoryRepository.equip(user, "mount", key)) - .subscribe(items -> {}, RxErrorHandler.handleEmptyError())); - } + getCompositeSubscription().add(adapter.getEquipEvents() + .flatMap(key -> inventoryRepository.equip(user, "mount", key)) + .subscribe(items -> {}, RxErrorHandler.handleEmptyError())); } if (savedInstanceState != null) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java index 1a5ff6708..1792a02bf 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java @@ -47,8 +47,7 @@ public class TaskSetupFragment extends BaseFragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState); - if (view == null) - view = inflater.inflate(R.layout.fragment_setup_tasks, container, false); + view = inflater.inflate(R.layout.fragment_setup_tasks, container, false); this.setTasks(); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java index 600838e42..fab7e0174 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java @@ -45,11 +45,7 @@ public class SkillTasksRecyclerViewFragment extends BaseFragment { @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - if (view == null) { - view = inflater.inflate(R.layout.fragment_recyclerview, container, false); - } - - return view; + return inflater.inflate(R.layout.fragment_recyclerview, container, false); } @Override