diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 955f301b4..c8dcff643 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index e4b17aa50..7b0bf5c99 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -571,7 +571,7 @@ Weak Strong Grey - Dated + Scheduled Completed Other Clear diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java index 7d2881715..66794663a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java @@ -137,7 +137,7 @@ public class TaskFilterHelper { query = query.greaterThanOrEqualTo("value", 0.0d); break; case Task.FILTER_DATED: - query = query.isNotNull("duedate"); + query = query.isNotNull("dueDate"); break; case Task.FILTER_COMPLETED: query = query.equalTo("completed", true); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt index cec6c99ba..103744e41 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt @@ -129,7 +129,10 @@ abstract class BaseFragment : DialogFragment() { } override fun onDestroy() { - tutorialRepository.close() + try { + tutorialRepository.close() + } catch (exception: UninitializedPropertyAccessException) { + } super.onDestroy() } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt index 5ee3463f4..66875caa5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt @@ -31,7 +31,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() { (layoutManager as GridLayoutManager).spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { override fun getSpanSize(position: Int): Int { return if (recyclerAdapter?.getItemViewType(position) ?: 0 < 2) { - (getLayoutManager(context) as GridLayoutManager).spanCount + (layoutManager as GridLayoutManager).spanCount } else { 1 }