wear wizard on watch part first working

2017-02-09 14:25:25 +01:00 · 2017-02-09 14:25:25 +01:00 · a2723f60e0
commit a2723f60e0
parent 6737cdf365
9 changed files with 399 additions and 27 deletions
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@ -129,6 +129,14 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
-    </application>
+        <activity
+            android:name=".actions.wizard.WizardActivity"
+            android:label="Wizard">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />

+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
 </manifest>
--- a/wear/src/main/java/info/nightscout/androidaps/actions/ActionsDefinitions.java
+++ b/wear/src/main/java/info/nightscout/androidaps/actions/ActionsDefinitions.java
@ -7,6 +7,7 @@ import info.nightscout.androidaps.ListenerService;
 import info.nightscout.androidaps.NWPreferences;
 import info.nightscout.androidaps.actions.bolus.BolusActivity;
 import info.nightscout.androidaps.actions.bolus.GridActivity;
+import info.nightscout.androidaps.actions.wizard.WizardActivity;

 /**
 * Created by adrian on 08/02/17.
@ -16,13 +17,13 @@ final class ActionsDefinitions {

    private static final String[] ACTION_NAMES = {
            "Temp Target",
-            "Bolus",
+            "Wizard",
            "Settings",
            "Resend Data",
            "Fillpreset 1",
            "Fillpreset 2",
            "Fillpreset 3",
-            "008"};
+            "009"};


    public static void doAction(int position, Context ctx) {
@ -32,7 +33,7 @@ final class ActionsDefinitions {
            case 0:
                break;
            case 1:
-                intent = new Intent(ctx, BolusActivity.class);
+                intent = new Intent(ctx, WizardActivity.class);
                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                ctx.startActivity(intent);
                break;
--- a/wear/src/main/java/info/nightscout/androidaps/actions/bolus/GridActivity.java
+++ b/wear/src/main/java/info/nightscout/androidaps/actions/bolus/GridActivity.java
@ -2,18 +2,14 @@ package info.nightscout.androidaps.actions.bolus;


 import android.app.Activity;
-import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Color;
 import android.os.Bundle;
-import android.support.wearable.activity.WearableActivity;
 import android.support.wearable.view.DotsPageIndicator;
 import android.support.wearable.view.GridPagerAdapter;
 import android.support.wearable.view.GridViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;

 import info.nightscout.androidaps.R;
@ -62,7 +58,7 @@ public class GridActivity extends Activity {

        @Override
        public Object instantiateItem(ViewGroup container, int row, int col) {
-            final View view = LayoutInflater.from(getApplicationContext()).inflate(R.layout.grid_view_pager_item, container, false);
+            final View view = LayoutInflater.from(getApplicationContext()).inflate(R.layout.action_editplusminus_item, container, false);
            final TextView textView = (TextView) view.findViewById(R.id.label);
            textView.setText("label: " + col);
            container.addView(view);
--- a/wear/src/main/java/info/nightscout/androidaps/actions/utils/PlusMinusEditText.java
+++ b/wear/src/main/java/info/nightscout/androidaps/actions/utils/PlusMinusEditText.java
@ -0,0 +1,196 @@
+package info.nightscout.androidaps.actions.utils;
+
+import android.os.Handler;
+import android.os.Message;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.text.NumberFormat;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+
+/**
+ * Created by mike on 28.06.2016.
+ */
+public class PlusMinusEditText implements View.OnKeyListener,
+        View.OnTouchListener, View.OnClickListener {
+
+    Integer editTextID;
+    public TextView editText;
+    ImageView minusImage;
+    ImageView plusImage;
+
+    Double value;
+    Double minValue = 0d;
+    Double maxValue = 1d;
+    Double step = 1d;
+    NumberFormat formater;
+    boolean allowZero = false;
+
+    private Handler mHandler;
+    private ScheduledExecutorService mUpdater;
+
+    private class UpdateCounterTask implements Runnable {
+        private boolean mInc;
+        private int repeated = 0;
+        private int multiplier = 1;
+
+        private final int doubleLimit = 5;
+
+        public UpdateCounterTask(boolean inc) {
+            mInc = inc;
+        }
+
+        public void run() {
+            Message msg = new Message();
+            if (repeated % doubleLimit == 0) multiplier *= 2;
+            repeated++;
+            msg.arg1 = multiplier;
+            msg.arg2 = repeated;
+            if (mInc) {
+                msg.what = MSG_INC;
+            } else {
+                msg.what = MSG_DEC;
+            }
+            mHandler.sendMessage(msg);
+        }
+    }
+
+    private static final int MSG_INC = 0;
+    private static final int MSG_DEC = 1;
+
+    public PlusMinusEditText(View view, int editTextID, int plusID, int minusID, Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero) {
+        editText = (TextView) view.findViewById(editTextID);
+        minusImage = (ImageView) view.findViewById(minusID);
+        plusImage = (ImageView) view.findViewById(plusID);
+
+        this.value = initValue;
+        this.minValue = minValue;
+        this.maxValue = maxValue;
+        this.step = step;
+        this.formater = formater;
+        this.allowZero = allowZero;
+
+        mHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                switch (msg.what) {
+                    case MSG_INC:
+                        inc(msg.arg1);
+                        return;
+                    case MSG_DEC:
+                        dec(msg.arg1);
+                        return;
+                }
+                super.handleMessage(msg);
+            }
+        };
+
+        minusImage.setOnTouchListener(this);
+        minusImage.setOnKeyListener(this);
+        minusImage.setOnClickListener(this);
+        plusImage.setOnTouchListener(this);
+        plusImage.setOnKeyListener(this);
+        plusImage.setOnClickListener(this);
+        updateEditText();
+    }
+
+    public void setValue(Double value) {
+        this.value = value;
+        updateEditText();
+    }
+
+    public Double getValue() {
+        return value;
+    }
+
+    public void setStep(Double step) {
+        this.step = step;
+    }
+
+    private void inc(int multiplier) {
+        value += step * multiplier;
+        if (value > maxValue) {
+            value = maxValue;
+            stopUpdating();
+        }
+        updateEditText();
+    }
+
+    private void dec( int multiplier) {
+        value -= step * multiplier;
+        if (value < minValue) {
+            value = minValue;
+            stopUpdating();
+        }
+        updateEditText();
+    }
+
+    private void updateEditText() {
+        if (value == 0d && !allowZero)
+            editText.setText("");
+        else
+            editText.setText(formater.format(value));
+    }
+
+    private void startUpdating(boolean inc) {
+        if (mUpdater != null) {
+            return;
+        }
+        mUpdater = Executors.newSingleThreadScheduledExecutor();
+        mUpdater.scheduleAtFixedRate(new UpdateCounterTask(inc), 200, 200,
+                TimeUnit.MILLISECONDS);
+    }
+
+    private void stopUpdating() {
+        if (mUpdater != null) {
+            mUpdater.shutdownNow();
+            mUpdater = null;
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (mUpdater == null) {
+            if (v == plusImage) {
+                inc(1);
+            } else {
+                dec(1);
+            }
+        }
+    }
+
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        boolean isKeyOfInterest = keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER;
+        boolean isReleased = event.getAction() == KeyEvent.ACTION_UP;
+        boolean isPressed = event.getAction() == KeyEvent.ACTION_DOWN
+                && event.getAction() != KeyEvent.ACTION_MULTIPLE;
+
+        if (isKeyOfInterest && isReleased) {
+            stopUpdating();
+        } else if (isKeyOfInterest && isPressed) {
+            startUpdating(v == plusImage);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        boolean isReleased = event.getAction() == MotionEvent.ACTION_UP || event.getAction() == MotionEvent.ACTION_CANCEL;
+        boolean isPressed = event.getAction() == MotionEvent.ACTION_DOWN;
+
+        if (isReleased) {
+            stopUpdating();
+        } else if (isPressed) {
+            startUpdating(v == plusImage);
+        }
+        return false;
+    }
+
+}
--- a/wear/src/main/java/info/nightscout/androidaps/actions/utils/SafeParse.java
+++ b/wear/src/main/java/info/nightscout/androidaps/actions/utils/SafeParse.java
@ -0,0 +1,36 @@
+package info.nightscout.androidaps.actions.utils;
+
+/**
+ * Created by mike on 23.06.2016.
+ */
+public class SafeParse {
+    public static Double stringToDouble(String input) {
+        Double result = 0d;
+        input = input.replace(",", ".");
+        try {
+            result = Double.parseDouble(input);
+        } catch (Exception e) {
+        }
+        return result;
+    }
+
+    public static Integer stringToInt(String input) {
+        Integer result = 0;
+        input = input.replace(",", ".");
+        try {
+            result = Integer.parseInt(input);
+        } catch (Exception e) {
+        }
+        return result;
+    }
+
+   public static Long stringToLong(String input) {
+        Long result = 0L;
+        input = input.replace(",", ".");
+        try {
+            result = Long.parseLong(input);
+        } catch (Exception e) {
+        }
+        return result;
+    }
+}
--- a/wear/src/main/java/info/nightscout/androidaps/actions/wizard/WizardActivity.java
+++ b/wear/src/main/java/info/nightscout/androidaps/actions/wizard/WizardActivity.java
@ -0,0 +1,107 @@
+package info.nightscout.androidaps.actions.wizard;
+
+
+import android.app.Activity;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.support.wearable.view.DotsPageIndicator;
+import android.support.wearable.view.GridPagerAdapter;
+import android.support.wearable.view.GridViewPager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.text.DecimalFormat;
+
+import info.nightscout.androidaps.ListenerService;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.actions.utils.PlusMinusEditText;
+import info.nightscout.androidaps.actions.utils.SafeParse;
+
+/**
+ * Created by adrian on 09/02/17.
+ */
+
+
+public class WizardActivity extends Activity {
+
+    PlusMinusEditText editCarbs;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.grid_layout);
+        final Resources res = getResources();
+        final GridViewPager pager = (GridViewPager) findViewById(R.id.pager);
+
+        pager.setAdapter(new MyGridViewPagerAdapter());
+        DotsPageIndicator dotsPageIndicator = (DotsPageIndicator) findViewById(R.id.page_indicator);
+        dotsPageIndicator.setPager(pager);
+    }
+
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        finish();
+    }
+
+
+    private class MyGridViewPagerAdapter extends GridPagerAdapter {
+        @Override
+        public int getColumnCount(int arg0) {
+            return 2;
+        }
+
+        @Override
+        public int getRowCount() {
+            return 1;
+        }
+
+        @Override
+        public Object instantiateItem(ViewGroup container, int row, int col) {
+
+            if(col == 0){
+                final View view = LayoutInflater.from(getApplicationContext()).inflate(R.layout.action_editplusminus_item, container, false);
+                final TextView textView = (TextView) view.findViewById(R.id.label);
+                textView.setText("carbs");
+                editCarbs = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, 0d, 0d, 100d, 1d, new DecimalFormat("0"), false);
+                container.addView(view);
+                return view;
+            } else {
+
+                final View view = LayoutInflater.from(getApplicationContext()).inflate(R.layout.action_send_item, container, false);
+                final ImageView confirmbutton = (ImageView) view.findViewById(R.id.confirmbutton);
+                confirmbutton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+
+                        //TODO: check if it can happen that the fagment is never created that hold data
+                        // (you have to swipe past them anyways - but still)
+
+                        String actionstring = "wizard " + SafeParse.stringToInt(editCarbs.editText.getText().toString());;
+                        ListenerService.initiateAction(WizardActivity.this, actionstring);
+                        finish();
+                    }
+                });
+                container.addView(view);
+                return view;
+            }
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int row, int col, Object view) {
+            //TODO: Handle this to get the data before the view is destroyed?
+            container.removeView((View)view);
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object object) {
+            return view==object;
+        }
+
+
+    }
+}
--- a/wear/src/main/res/layout/action_editplusminus_item.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item.xml
@ -12,7 +12,7 @@
        android:gravity="center">

        <ImageView
-            android:id="@+id/treatments_newtreatment_insulinamount_minus"
+            android:id="@+id/minusbutton"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
@ -27,7 +27,7 @@
            android:layout_height="wrap_content"
            android:layout_gravity="center">
        <EditText
-            android:id="@+id/treatments_newtreatment_insulinamount"
+            android:id="@+id/amountfield"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
@ -49,7 +49,7 @@
            android:gravity="center" />
        </LinearLayout>
        <ImageView
-            android:id="@+id/treatments_newtreatment_insulinamount_plus"
+            android:id="@+id/plusbutton"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
--- a/wear/src/main/res/layout/action_send_item.xml
+++ b/wear/src/main/res/layout/action_send_item.xml
@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center">
+        <ImageView
+            android:id="@+id/confirmbutton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@drawable/circle"
+            android:backgroundTint="#ffffff"
+            android:src="@drawable/ic_confirm"
+            android:tint="#ffffff"
+            android:padding="25sp"
+            android:layout_margin="10sp"/>
+
+
+
+</LinearLayout>
+</RelativeLayout>
--- a/wear/wear.iml
+++ b/wear/wear.iml
@ -43,6 +43,13 @@
      <sourceFolder url="file://$MODULE_DIR$/src/fullDebug/jni" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/fullDebug/rs" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/fullDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/full/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/full/debug" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/res" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/resources" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/assets" type="java-test-resource" />
@ -51,13 +58,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/full/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/full/debug" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/full/res" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/full/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/full/assets" type="java-resource" />
@ -66,14 +66,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/full/jni" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/full/rs" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/full/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFull/res" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFull/resources" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFull/assets" type="java-test-resource" />
@ -82,6 +74,14 @@
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFull/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFull/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFull/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />