Show subtasks on details view. #442

Author: Gabor Keszthelyi

.idea/dictionaries/dictionary.xml

@@ -8,3 +8,4 @@ CONTENTPAL_VERSION=fc8cca91
 ROBOLECTRIC_VERSION=3.1.4
 JEMS_VERSION=1.13
 ANDROID_TEST_RUNNER_VERSION=0.5
+BOLTS_VERSION=a43822b

.idea/inspectionProfiles/Project_Default.xml

@@ -38,7 +38,7 @@ dependencies {
     }
     compile 'org.dmfs:jems:' + JEMS_VERSION
     androidTestCompile 'com.android.support:support-annotations:' + SUPPORT_LIBRARY_VERSION
-    androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support.test:rules:0.5'
+    androidTestCompile 'com.android.support.test:runner:' + ANDROID_TEST_RUNNER_VERSION
+    androidTestCompile 'com.android.support.test:rules:' + ANDROID_TEST_RUNNER_VERSION
     androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
 }

gradle.properties

@@ -42,6 +42,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
+    dataBinding {
+        enabled = true
+    }
 }
 
 dependencies {
@@ -52,6 +55,7 @@ dependencies {
         exclude group: 'xmlpull', module: 'xmlpull'
     }
     compile project(':opentasks-provider')
+    compile project(':opentaskspal')
     compile 'com.google.android.apps.dashclock:dashclock-api:2.0.0'
     compile 'com.github.dmfs:color-picker:1.0'
     compile ('au.com.codeka:carrot:2.4.0'){
@@ -64,6 +68,9 @@ dependencies {
         exclude module: 'jems'
     }
     compile 'org.dmfs:jems:' + JEMS_VERSION
+    compile 'io.reactivex.rxjava2:rxjava:2.1.5'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    compile 'com.github.dmfs.bolts:color-bolts:' + BOLTS_VERSION
 
     testCompile 'junit:junit:4.12'
 

opentasks-provider/build.gradle

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

opentasks/build.gradle

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         package="org.dmfs.tasks">
 
     <uses-permission android:name="org.dmfs.permission.READ_TASKS"/>
@@ -11,12 +12,16 @@
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 
+    <!--TODO Remove after https://github.com/dmfs/opentasks/issues/392-->
+    <uses-sdk tools:overrideLibrary="org.dmfs.android.bolts"/>
+
     <application
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
             android:name=".TasksApplication"
             android:taskAffinity="org.dmfs.tasks.TaskListActivity"
-            android:theme="@style/OpenTasksAppTheme">
+            android:theme="@style/OpenTasksAppTheme"
+            android:supportsRtl="false">
 
         <!-- TaskListActivity listens for MAIN intents -->
         <activity

opentasks/proguard.cfg

@@ -60,6 +60,7 @@
 import org.dmfs.tasks.model.OnContentChangeListener;
 import org.dmfs.tasks.model.Sources;
 import org.dmfs.tasks.model.TaskFieldAdapters;
+import org.dmfs.tasks.utils.BasicTaskDetailsUi;
 import org.dmfs.tasks.utils.ContentValueMapper;
 import org.dmfs.tasks.utils.OnModelLoadedListener;
 import org.dmfs.tasks.utils.RecentlyUsedLists;
@@ -809,7 +810,7 @@ public void saveAndExit()
                 activity.finish();
                 if (isNewTask)
                 {
-                    activity.startActivity(new Intent("android.intent.action.VIEW", mTaskUri));
+                    new BasicTaskDetailsUi(mTaskUri).show(activity);
                 }
             }
             else

opentasks/src/main/AndroidManifest.xml

@@ -18,7 +18,6 @@
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build.VERSION;
 import android.os.Bundle;
@@ -30,6 +29,7 @@
 
 import org.dmfs.tasks.model.ContentSet;
 import org.dmfs.tasks.utils.BaseActivity;
+import org.dmfs.tasks.utils.Darkened;
 
 
 /**
@@ -132,16 +132,6 @@ public void onDelete(Uri taskUri)
     }
 
 
-    private int darkenColor(int color)
-    {
-        float[] hsv = new float[3];
-        Color.colorToHSV(color, hsv);
-        hsv[2] = hsv[2] * 0.75f;
-        color = Color.HSVToColor(hsv);
-        return color;
-    }
-
-
     @SuppressLint("NewApi")
     @Override
     public void updateColor(int color)
@@ -151,7 +141,7 @@ public void updateColor(int color)
         {
             Window window = getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(darkenColor(color));
+            window.setStatusBarColor(new Darkened(color).argb());
         }
     }
 

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

@@ -52,10 +52,13 @@
 import android.view.animation.AlphaAnimation;
 import android.widget.TextView;
 
+import org.dmfs.android.contentpal.RowDataSnapshot;
 import org.dmfs.android.retentionmagic.SupportFragment;
 import org.dmfs.android.retentionmagic.annotations.Parameter;
 import org.dmfs.android.retentionmagic.annotations.Retain;
+import org.dmfs.tasks.contract.TaskContract;
 import org.dmfs.tasks.contract.TaskContract.Tasks;
+import org.dmfs.tasks.data.SubtasksSource;
 import org.dmfs.tasks.model.ContentSet;
 import org.dmfs.tasks.model.Model;
 import org.dmfs.tasks.model.OnContentChangeListener;
@@ -64,13 +67,18 @@
 import org.dmfs.tasks.notification.TaskNotificationHandler;
 import org.dmfs.tasks.share.ShareIntentFactory;
 import org.dmfs.tasks.utils.ContentValueMapper;
+import org.dmfs.tasks.utils.Darkened;
 import org.dmfs.tasks.utils.OnModelLoadedListener;
+import org.dmfs.tasks.widget.SubtasksView;
 import org.dmfs.tasks.widget.TaskView;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.functions.Consumer;
+
 
 /**
  * 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
@@ -131,6 +139,8 @@ public class ViewTaskFragment extends SupportFragment
      */
     private TaskView mDetailView;
 
+    private CompositeDisposable mDisposables;
+
     private int mListColor;
     private int mOldStatus = -1;
     private boolean mPinned = false;
@@ -208,14 +218,6 @@ public static ViewTaskFragment newInstance(Uri uri)
     }
 
 
-    /**
-     * Mandatory empty constructor for the fragment manager to instantiate the fragment (e.g. upon screen orientation changes).
-     */
-    public ViewTaskFragment()
-    {
-    }
-
-
     @Override
     public void onCreate(Bundle savedInstanceState)
     {
@@ -266,6 +268,7 @@ public void onDestroyView()
             mDetailView.setValues(null);
         }
 
+        mDisposables.dispose();
     }
 
 
@@ -320,6 +323,8 @@ else if (mTaskUri != null)
             loadUri(uri);
         }
 
+        mDisposables = new CompositeDisposable();
+
         return mRootView;
     }
 
@@ -401,7 +406,11 @@ public void loadUri(Uri uri)
         if ((oldUri == null) != (uri == null))
         {
             /*
+<<<<<<< HEAD
 			 * getActivity().invalidateOptionsMenu() doesn't work in Android 2.x so use the compat lib
+=======
+             * getActivity().invalidateOptionsMenu() doesn't work in Android 2.x so use the compat lib
+>>>>>>> bb000fc... Show subtasks on details view. #442
 			 */
             ActivityCompat.invalidateOptionsMenu(getActivity());
         }
@@ -492,7 +501,11 @@ public void onModelLoaded(Model model)
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
     {
         /*
+<<<<<<< HEAD
 		 * Don't show any options if we don't have a task to show.
+=======
+         * Don't show any options if we don't have a task to show.
+>>>>>>> bb000fc... Show subtasks on details view. #442
 		 */
         if (mTaskUri != null)
         {
@@ -717,6 +730,23 @@ public void onContentLoaded(ContentSet contentSet)
                 postUpdateView();
             }
         }
+
+        mDisposables.add(
+                new SubtasksSource(mAppContext, mTaskUri)
+                        .subscribe(new Consumer<Iterable<RowDataSnapshot<TaskContract.Tasks>>>()
+                        {
+                            @Override
+                            public void accept(Iterable<RowDataSnapshot<TaskContract.Tasks>> subTasks)
+                            {
+                                if (subTasks.iterator().hasNext())
+                                {
+                                    new SubtasksView(mContent).update(subTasks);
+                                    ((TextView) mContent.findViewById(R.id.opentasks_view_item_task_details_subtitles_section_header))
+                                            .setTextColor(new Darkened(mListColor).argb());
+                                    mContent.requestLayout();
+                                }
+                            }
+                        }));
     }