Work on automation plugin.

- Remove unused imports
- Add icons for actions and triggers

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.java

@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentManager;
 import android.support.v7.widget.LinearLayoutManager;
@@ -13,10 +14,13 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import java.util.HashSet;
 import java.util.List;
 
 import butterknife.BindView;
@@ -88,16 +92,48 @@ public class AutomationFragment extends SubscriberFragment {
         @Override
         public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
             View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.automation_event_item, parent, false);
-            return new ViewHolder(v);
+            return new ViewHolder(v, parent.getContext());
+        }
+
+        private void addImage(@DrawableRes int res, Context context, LinearLayout layout) {
+            ImageView iv = new ImageView(context);
+            iv.setImageResource(res);
+            iv.setLayoutParams(new LinearLayout.LayoutParams(MainApp.dpToPx(24),MainApp.dpToPx(24)));
+            layout.addView(iv);
         }
 
         @Override
         public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
             final AutomationEvent event = mEventList.get(position);
             holder.eventTitle.setText(event.getTitle());
+            holder.iconLayout.removeAllViews();
+
+            // trigger icons
+            HashSet<Integer> triggerIcons = new HashSet<>();
+            TriggerConnector.fillIconSet((TriggerConnector)event.getTrigger(), triggerIcons);
+            for(int res : triggerIcons) {
+                addImage(res, holder.context, holder.iconLayout);
+            }
+
+            // arrow icon
+            ImageView iv = new ImageView(holder.context);
+            iv.setImageResource(R.drawable.ic_arrow_forward_white_24dp);
+            iv.setLayoutParams(new LinearLayout.LayoutParams(MainApp.dpToPx(24),MainApp.dpToPx(24)));
+            iv.setPadding(MainApp.dpToPx(4), 0, MainApp.dpToPx(4), 0);
+            holder.iconLayout.addView(iv);
+
+            // action icons
+            HashSet<Integer> actionIcons = new HashSet<>();
+            for(Action action : event.getActions()) {
+                if (action.icon().isPresent())
+                    actionIcons.add(action.icon().get());
+            }
+            for(int res : actionIcons) {
+                addImage(res, holder.context, holder.iconLayout);
+            }
 
             // TODO: check null
-            holder.eventDescription.setText(event.getTrigger().friendlyDescription());
+            //holder.eventDescription.setText(event.getTrigger().friendlyDescription());
         }
 
         @Override
@@ -106,13 +142,17 @@ public class AutomationFragment extends SubscriberFragment {
         }
 
         static class ViewHolder extends RecyclerView.ViewHolder {
-            TextView eventTitle;
+            final RelativeLayout rootLayout;
-            TextView eventDescription;
+            final LinearLayout iconLayout;
+            final TextView eventTitle;
+            final Context context;
 
-            public ViewHolder(View view) {
+            public ViewHolder(View view, Context context) {
                 super(view);
+                this.context = context;
                 eventTitle = view.findViewById(R.id.viewEventTitle);
-                eventDescription = view.findViewById(R.id.viewEventDescription);
+                rootLayout = view.findViewById(R.id.rootLayout);
+                iconLayout = view.findViewById(R.id.iconLayout);
             }
         }
     }

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.java

@@ -1,10 +1,9 @@
 package info.nightscout.androidaps.plugins.general.automation.actions;
 
-import android.content.Context;
-import android.support.v4.app.FragmentManager;
-import android.view.View;
 import android.widget.LinearLayout;
 
+import com.google.common.base.Optional;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -30,6 +29,8 @@ public abstract class Action {
         return o.toString();
     }
 
+    public abstract Optional<Integer> icon();
+
     public void copy(Action action) { }
 
     /*package*/ Action fromJSON(String data) {

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.java

@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.general.automation.actions;
 
+import com.google.common.base.Optional;
+
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.PumpEnactResult;
@@ -33,4 +35,9 @@ public class ActionLoopDisable extends Action {
                 callback.result(new PumpEnactResult().success(true).comment(R.string.alreadydisabled)).run();
         }
     }
+
+    @Override
+    public Optional<Integer> icon() {
+        return Optional.of(R.drawable.ic_stop_24dp);
+    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.java

@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.general.automation.actions;
 
+import com.google.common.base.Optional;
+
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.PumpEnactResult;
@@ -28,4 +30,9 @@ public class ActionLoopEnable extends Action {
                 callback.result(new PumpEnactResult().success(true).comment(R.string.alreadyenabled)).run();
         }
     }
+
+    @Override
+    public Optional<Integer> icon() {
+        return Optional.of(R.drawable.ic_play_circle_outline_24dp);
+    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.java

@@ -1,10 +1,11 @@
 package info.nightscout.androidaps.plugins.general.automation.actions;
 
+import com.google.common.base.Optional;
+
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.events.EventRefreshOverview;
-import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
@@ -30,4 +31,9 @@ public class ActionLoopResume extends Action {
                 callback.result(new PumpEnactResult().success(true).comment(R.string.notsuspended)).run();
         }
     }
+
+    @Override
+    public Optional<Integer> icon() {
+        return Optional.of(R.drawable.ic_replay_24dp);
+    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.java

@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.general.automation.actions;
 
+import com.google.common.base.Optional;
+
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.PumpEnactResult;
@@ -27,4 +29,9 @@ public class ActionLoopSuspend extends Action {
                 callback.result(new PumpEnactResult().success(true).comment(R.string.alreadysuspended)).run();
         }
     }
+
+    @Override
+    public Optional<Integer> icon() {
+        return Optional.of(R.drawable.ic_pause_circle_outline_24dp);
+    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.java

@@ -1,15 +1,15 @@
 package info.nightscout.androidaps.plugins.general.automation.actions;
 
-import android.support.annotation.StringRes;
 import android.widget.LinearLayout;
 
+import com.google.common.base.Optional;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
@@ -102,4 +102,9 @@ public class ActionStartTempTarget extends Action {
             this.reason = src.reason;
         }
     }
+
+    @Override
+    public Optional<Integer> icon() {
+        return Optional.of(R.drawable.icon_cp_cgm_target);
+    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Element.java

@@ -1,7 +1,5 @@
 package info.nightscout.androidaps.plugins.general.automation.elements;
 
-import android.content.Context;
-import android.view.View;
 import android.widget.LinearLayout;
 
 public class Element {

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.java

@@ -1,9 +1,7 @@
 package info.nightscout.androidaps.plugins.general.automation.elements;
 
-import android.content.Context;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.view.View;
 import android.widget.LinearLayout;
 
 import java.text.DecimalFormat;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.java

@@ -1,7 +1,5 @@
 package info.nightscout.androidaps.plugins.general.automation.elements;
 
-import android.content.Context;
-import android.view.View;
 import android.widget.LinearLayout;
 
 import java.text.DecimalFormat;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java

@@ -8,6 +8,8 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.google.common.base.Optional;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -95,6 +97,8 @@ public abstract class Trigger {
 
     public abstract String friendlyDescription();
 
+    public abstract Optional<Integer> icon();
+
     void notifyAboutRun(long time) {
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java

@@ -13,6 +13,8 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.google.common.base.Optional;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -124,6 +126,11 @@ public class TriggerBg extends Trigger {
             return MainApp.gs(R.string.glucosecompared, MainApp.gs(comparator.getStringRes()), threshold, units);
     }
 
+    @Override
+    public Optional<Integer> icon() {
+        return Optional.of(R.drawable.icon_cp_bgcheck);
+    }
+
     @Override
     public Trigger duplicate() {
         return new TriggerBg(this);

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java

@@ -7,11 +7,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import com.google.common.base.Optional;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 
 import info.nightscout.androidaps.MainApp;
@@ -59,6 +62,19 @@ public class TriggerConnector extends Trigger {
         }
     }
 
+    public static void fillIconSet(TriggerConnector connector, HashSet<Integer> set) {
+        for(Trigger t : connector.list) {
+            if (t instanceof TriggerConnector) {
+                fillIconSet((TriggerConnector) t, set);
+            } else {
+                Optional<Integer> icon = t.icon();
+                if (icon.isPresent()) {
+                    set.add(icon.get());
+                }
+            }
+        }
+    }
+
     protected List<Trigger> list = new ArrayList<>();
     private Type connectorType;
 
@@ -170,6 +186,11 @@ public class TriggerConnector extends Trigger {
         return result.toString();
     }
 
+    @Override
+    public Optional<Integer> icon() {
+        return Optional.absent();
+    }
+
     @Override
     public Trigger duplicate() {
         return null;

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java

@@ -8,6 +8,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 import com.dpro.widgets.WeekdaysPicker;
+import com.google.common.base.Optional;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -230,6 +231,11 @@ public class TriggerTime extends Trigger {
         }
     }
 
+    @Override
+    public Optional<Integer> icon() {
+        return Optional.of(R.drawable.ic_access_alarm_24dp);
+    }
+
     @Override
     void notifyAboutRun(long time) {
         lastRun = time;

app/src/main/res/drawable/ic_access_alarm_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#72a8ff"
+        android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+</vector>

app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
+</vector>

app/src/main/res/drawable/ic_pause_circle_outline_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="@color/ribbonWarning"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M9,16h2L11,8L9,8v8zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM13,16h2L15,8h-2v8z"/>
+</vector>

app/src/main/res/drawable/ic_play_circle_outline_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FF00FF00"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>

app/src/main/res/drawable/ic_replay_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FF00FF00"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M12,5V1L7,6l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6 -6,-2.69 -6,-6H4c0,4.42 3.58,8 8,8s8,-3.58 8,-8 -3.58,-8 -8,-8z"/>
+</vector>

app/src/main/res/drawable/ic_stop_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="@color/ribbonCritical"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M6,6h12v12H6z"/>
+</vector>

app/src/main/res/layout/automation_event_item.xml

@@ -1,26 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rootLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
     android:layout_marginBottom="8dp"
     android:layout_marginEnd="8dp"
     android:layout_marginStart="8dp"
-    android:layout_marginTop="8dp">
+    android:layout_marginTop="8dp"
+    android:padding="8dp"
+    android:background="@color/ribbonDefault">
+
+    <LinearLayout
+        android:id="@+id/iconLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"/>
 
     <TextView
         android:id="@+id/viewEventTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_alignParentLeft="true"
-        app:layout_constraintStart_toStartOf="parent"
+        android:layout_alignParentTop="true"
+        android:layout_toLeftOf="@id/iconLayout"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+</RelativeLayout>
-        android:id="@+id/viewEventDescription"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-</LinearLayout>