included suggestions and rebased

dmfs · Apr 12, 2020 · 9c029fc · 9c029fc
1 parent 8099bc6
commit 9c029fc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 196 deletions.
diff --git a/opentasks/src/main/java/org/dmfs/tasks/QuickAddDialogFragment.java b/opentasks/src/main/java/org/dmfs/tasks/QuickAddDialogFragment.java
@@ -79,7 +79,7 @@ public class QuickAddDialogFragment extends SupportDialogFragment
     /**
      * The maximum time to add for the first time the "Task completed" info is shown.
      */
-    private final static int COMPLETION_DELAY_MAX = 1000; // ms
+    private final static int COMPLETION_DELAY_MAX = 1500; // ms
 
     private final static String ARG_LIST_ID = "list_id";
     private final static String ARG_PARENT_ID = "parent_id";

diff --git a/opentaskspal/src/main/java/org/dmfs/opentaskspal/rowsets/QueryRowSetSorting.java b/opentaskspal/src/main/java/org/dmfs/opentaskspal/rowsets/QueryRowSetSorting.java
diff --git a/opentaskspal/src/main/java/org/dmfs/opentaskspal/rowsets/Subtasks.java b/opentaskspal/src/main/java/org/dmfs/opentaskspal/rowsets/Subtasks.java
@@ -23,6 +23,7 @@
 import org.dmfs.android.contentpal.predicates.ReferringTo;
 import org.dmfs.android.contentpal.rowsets.DelegatingRowSet;
 import org.dmfs.android.contentpal.rowsets.QueryRowSet;
+import org.dmfs.android.contentpal.views.Sorted;
 import org.dmfs.jems.optional.Optional;
 import org.dmfs.jems.optional.elementary.Present;
 import org.dmfs.tasks.contract.TaskContract.Tasks;
@@ -38,12 +39,15 @@
 public final class Subtasks extends DelegatingRowSet<Tasks>
 {
 
-    @SuppressWarnings("unchecked")
     public Subtasks(@NonNull View<Tasks> view,
                     @NonNull Projection<? super Tasks> projection,
                     @NonNull RowReference<Tasks> parentTask)
     {
-        super(new QueryRowSetSorting<>(view, projection, new ReferringTo<>(Tasks.PARENT_ID, parentTask), new Present(Tasks.STATUS + ", " + Tasks.TITLE)));
+        super(
+                new QueryRowSet<>(
+                        new Sorted<>(Tasks.PERCENT_COMPLETE + ", " + Tasks.TITLE, view),
+                        projection,
+                        new ReferringTo<>(Tasks.PARENT_ID, parentTask)));
     }
 
 }