Show subtasks on details view. #442

opentasks/build.gradle

@@ -63,11 +63,15 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    dataBinding {
+        enabled = true
+    }
 }
 
 dependencies {
     implementation project(':opentasks-theme')
     implementation project(':opentasks-provider')
+    implementation project(':opentaskspal')
     implementation deps.support_appcompat
     implementation deps.support_design
     implementation(deps.xml_magic) {
@@ -88,6 +92,9 @@ dependencies {
     implementation deps.datetime
     implementation deps.bolts_color
     implementation deps.retention_magic
+    implementation deps.contentpal
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.5'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
 
     testImplementation deps.junit
     testImplementation deps.robolectric

opentasks/proguard.cfg

@@ -80,4 +80,7 @@
     java.lang.String TAG;
     @org.dmfs.android.retentionmagic.annotations.* <fields>;
     private long mId;
-}
+}
+
+-dontwarn android.databinding.**
+-keep class android.databinding.** { *; }

opentasks/src/main/java/org/dmfs/tasks/ViewTaskFragment.java

@@ -57,6 +57,10 @@
 import org.dmfs.android.retentionmagic.annotations.Parameter;
 import org.dmfs.android.retentionmagic.annotations.Retain;
 import org.dmfs.tasks.contract.TaskContract.Tasks;
+import org.dmfs.tasks.detailsscreen.RowDataSubtaskViewParams;
+import org.dmfs.tasks.detailsscreen.RowDataSubtasksViewParams;
+import org.dmfs.tasks.detailsscreen.SubtasksSource;
+import org.dmfs.tasks.detailsscreen.SubtasksView;
 import org.dmfs.tasks.model.ContentSet;
 import org.dmfs.tasks.model.Model;
 import org.dmfs.tasks.model.OnContentChangeListener;
@@ -74,6 +78,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import io.reactivex.disposables.CompositeDisposable;
+
 
 /**
  * A fragment representing a single Task detail screen. This fragment is either contained in a {@link TaskListActivity} in two-pane mode (on tablets) or in a
@@ -135,6 +141,8 @@ public class ViewTaskFragment extends SupportFragment
      */
     private TaskView mDetailView;
 
+    private CompositeDisposable mDisposables;
+
     private int mListColor;
     private int mOldStatus = -1;
     private boolean mPinned = false;
@@ -252,12 +260,14 @@ public void onDestroyView()
             mDetailView.setValues(null);
         }
 
+        mDisposables.dispose();
     }
 
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
     {
+        mDisposables = new CompositeDisposable();
         mShowFloatingActionButton = !getResources().getBoolean(R.bool.has_two_panes);
 
         mRootView = inflater.inflate(R.layout.fragment_task_view_detail, container, false);
@@ -442,6 +452,12 @@ private void updateView()
                 ((TextView) mToolBar.findViewById(R.id.toolbar_title)).setText(TaskFieldAdapters.TITLE.get(mContentSet));
             }
         }
+
+        mDisposables.add(new SubtasksSource(mAppContext, mTaskUri, RowDataSubtaskViewParams.SUBTASK_PROJECTION)
+                .subscribe(subtasks ->
+                {
+                    new SubtasksView(mContent).update(new RowDataSubtasksViewParams(new ValueColor(mListColor), subtasks));
+                }));
     }
 
 

opentasks/src/main/java/org/dmfs/tasks/detailsscreen/RowDataSubtaskViewParams.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright 2018 dmfs GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.dmfs.tasks.detailsscreen;
+
+import org.dmfs.android.bolts.color.Color;
+import org.dmfs.android.contentpal.Projection;
+import org.dmfs.android.contentpal.RowDataSnapshot;
+import org.dmfs.android.contentpal.projections.Composite;
+import org.dmfs.jems.optional.Optional;
+import org.dmfs.opentaskspal.readdata.EffectiveDueDate;
+import org.dmfs.opentaskspal.readdata.EffectiveTaskColor;
+import org.dmfs.opentaskspal.readdata.Id;
+import org.dmfs.opentaskspal.readdata.PercentComplete;
+import org.dmfs.opentaskspal.readdata.TaskTitle;
+import org.dmfs.rfc5545.DateTime;
+import org.dmfs.tasks.contract.TaskContract;
+
+
+/**
+ * {@link SubtasksView.Params} that reads the data from the given {@link RowDataSnapshot}.
+ *
+ * @author Gabor Keszthelyi
+ */
+public final class RowDataSubtaskViewParams implements SubtaskView.Params
+{
+
+    /**
+     * The projection required for this adapter to work.
+     */
+    public static final Projection<TaskContract.Tasks> SUBTASK_PROJECTION = new Composite<>(
+            Id.PROJECTION,
+            TaskTitle.PROJECTION,
+            EffectiveDueDate.PROJECTION,
+            EffectiveTaskColor.PROJECTION,
+            PercentComplete.PROJECTION
+    );
+
+    private final RowDataSnapshot<TaskContract.Tasks> mRowDataSnapshot;
+
+
+    public RowDataSubtaskViewParams(RowDataSnapshot<TaskContract.Tasks> rowDataSnapshot)
+    {
+        mRowDataSnapshot = rowDataSnapshot;
+    }
+
+
+    @Override
+    public Long id()
+    {
+        return new Id(mRowDataSnapshot).value();
+    }
+
+
+    @Override
+    public Optional<CharSequence> title()
+    {
+        return new TaskTitle(mRowDataSnapshot);
+    }
+
+
+    @Override
+    public Optional<DateTime> due()
+    {
+        return new EffectiveDueDate(mRowDataSnapshot);
+    }
+
+
+    @Override
+    public Color color()
+    {
+        return new EffectiveTaskColor(mRowDataSnapshot);
+    }
+
+
+    @Override
+    public Optional<Integer> percentComplete()
+    {
+        return new PercentComplete(mRowDataSnapshot);
+    }
+}

opentasks/src/main/java/org/dmfs/tasks/detailsscreen/RowDataSubtasksViewParams.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2018 dmfs GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.dmfs.tasks.detailsscreen;
+
+import org.dmfs.android.bolts.color.Color;
+import org.dmfs.android.contentpal.RowDataSnapshot;
+import org.dmfs.jems.iterable.decorators.Mapped;
+import org.dmfs.tasks.contract.TaskContract;
+
+
+/**
+ * {@link SubtasksView.Params} that adapts the given {@link RowDataSnapshot}s (and takes the list color).
+ *
+ * @author Gabor Keszthelyi
+ */
+public final class RowDataSubtasksViewParams implements SubtasksView.Params
+{
+    private final Color mTaskListColor;
+    private final Iterable<RowDataSnapshot<TaskContract.Tasks>> mSubtaskRows;
+
+
+    public RowDataSubtasksViewParams(Color taskListColor, Iterable<RowDataSnapshot<TaskContract.Tasks>> subtaskRows)
+    {
+        mTaskListColor = taskListColor;
+        mSubtaskRows = subtaskRows;
+    }
+
+
+    @Override
+    public Color taskListColor()
+    {
+        return mTaskListColor;
+    }
+
+
+    @Override
+    public Iterable<SubtaskView.Params> subtasks()
+    {
+        return new Mapped<>(RowDataSubtaskViewParams::new, mSubtaskRows);
+    }
+}