Replace classes with Single. #436 (#439)

opentasks/build.gradle

@@ -58,6 +58,7 @@ dependencies {
         exclude module: 'carrot'
         exclude group: 'com.android.support'
     }
+    compile 'org.dmfs:essentials:1.9'
 
     testCompile 'junit:junit:4.12'
 }

opentasks/src/main/java/org/dmfs/tasks/share/ShareIntentFactory.java

@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 
+import org.dmfs.jems.single.Single;
 import org.dmfs.tasks.model.ContentSet;
 import org.dmfs.tasks.model.Model;
 import org.dmfs.tasks.utils.TaskIntentFactory;
@@ -46,13 +47,13 @@ public final class ShareIntentFactory implements TaskIntentFactory
     @Override
     public Intent create(ContentSet contentSet, Model model, Context context)
     {
-        CharSequence title = new TitleText(contentSet);
-        CharSequence body = new ShareTaskText(contentSet, model, context);
+        Single<CharSequence> title = new TaskShareTitle(contentSet);
+        Single<CharSequence> body = new TaskShareDetails(contentSet, model, context);
 
         Intent sendIntent = new Intent();
         sendIntent.setAction(Intent.ACTION_SEND);
-        sendIntent.putExtra(Intent.EXTRA_SUBJECT, title.toString());
-        sendIntent.putExtra(Intent.EXTRA_TEXT, body.toString());
+        sendIntent.putExtra(Intent.EXTRA_SUBJECT, title.value().toString());
+        sendIntent.putExtra(Intent.EXTRA_TEXT, body.value().toString());
         sendIntent.setType("text/plain");
 
         return sendIntent;

opentasks/src/main/java/org/dmfs/tasks/share/ShareTaskText.java → opentasks/src/main/java/org/dmfs/tasks/share/TaskShareDetails.java

@@ -21,11 +21,10 @@
 
 import org.dmfs.android.carrot.bindings.AndroidBindings;
 import org.dmfs.android.carrot.locaters.RawResourceLocator;
+import org.dmfs.jems.single.Single;
 import org.dmfs.tasks.R;
 import org.dmfs.tasks.model.ContentSet;
 import org.dmfs.tasks.model.Model;
-import org.dmfs.tasks.utils.charsequence.LazyCharSequence;
-import org.dmfs.tasks.utils.ondemand.OnDemand;
 
 import au.com.codeka.carrot.CarrotEngine;
 import au.com.codeka.carrot.CarrotException;
@@ -57,37 +56,45 @@
 
 
 /**
- * {@link CharSequence} for sharing task information, uses <code>carrot</code> template engine.
+ * {@link CharSequence} detailing information about the task, used when sharing.
+ * <p>
+ * Implementation uses <code>carrot</code> template engine.
  *
  * @author Gabor Keszthelyi
  */
-public final class ShareTaskText extends LazyCharSequence
+public final class TaskShareDetails implements Single<CharSequence>
 {
-    public ShareTaskText(final ContentSet contentSet, final Model model, final Context context)
+    private final ContentSet mContentSet;
+    private final Model mModel;
+    private final Context mContext;
+
+
+    public TaskShareDetails(ContentSet contentSet, Model model, Context context)
     {
-        super(new OnDemand<CharSequence>()
-        {
-            @Override
-            public CharSequence get()
-            {
-                CarrotEngine engine = new CarrotEngine(new Configuration.Builder().setResourceLocator(new RawResourceLocator.Builder(context)).build());
-                try
-                {
-                    String output = engine.process(String.valueOf(R.raw.sharetask),
-                            new Composite(
-                                    new AndroidBindings(context),
-                                    new SingletonBindings("$task", new TaskBindings(contentSet, model)),
-                                    new SingletonBindings("tformat", new TimeFormatter(context, contentSet))));
-
-                    Log.v("ShareTaskText", output);
-                    return output;
-                }
-                catch (CarrotException e)
-                {
-                    throw new RuntimeException("Failed to process template with carrot", e);
-                }
-            }
-        });
+        mContentSet = contentSet;
+        mModel = model;
+        mContext = context.getApplicationContext();
     }
 
+
+    @Override
+    public CharSequence value()
+    {
+        CarrotEngine engine = new CarrotEngine(new Configuration.Builder().setResourceLocator(new RawResourceLocator.Builder(mContext)).build());
+        try
+        {
+            String output = engine.process(String.valueOf(R.raw.sharetask),
+                    new Composite(
+                            new AndroidBindings(mContext),
+                            new SingletonBindings("$task", new TaskBindings(mContentSet, mModel)),
+                            new SingletonBindings("tformat", new TimeFormatter(mContext, mContentSet))));
+
+            Log.v("TaskShareDetails", output);
+            return output;
+        }
+        catch (CarrotException e)
+        {
+            throw new RuntimeException("Failed to process template with carrot", e);
+        }
+    }
 }

opentasks/src/main/java/org/dmfs/tasks/share/TitleText.java → opentasks/src/main/java/org/dmfs/tasks/share/TaskShareTitle.java

@@ -17,20 +17,30 @@
 
 package org.dmfs.tasks.share;
 
+import org.dmfs.jems.single.Single;
 import org.dmfs.tasks.model.ContentSet;
 import org.dmfs.tasks.model.TaskFieldAdapters;
-import org.dmfs.tasks.utils.charsequence.DelegatingCharSequence;
 
 
 /**
- * {@link TaskText} for simply the title.
+ * {@link Single} for the title of the shared information of a task.
  *
  * @author Gabor Keszthelyi
  */
-public final class TitleText extends DelegatingCharSequence
+public final class TaskShareTitle implements Single<CharSequence>
 {
-    public TitleText(ContentSet contentSet)
+    private final ContentSet mContentSet;
+
+
+    public TaskShareTitle(ContentSet contentSet)
+    {
+        mContentSet = contentSet;
+    }
+
+
+    @Override
+    public CharSequence value()
     {
-        super(TaskFieldAdapters.TITLE.get(contentSet));
+        return TaskFieldAdapters.TITLE.get(mContentSet);
     }
 }