Widget for Galaxy Gear S2/3 watchface using Wearable Widgets

app/src/main/AndroidManifest.xml

@@ -356,6 +356,16 @@
                 android:resource="@xml/x_drip_widget_info" />
         </receiver>
 
+        <receiver android:name=".gearWidget">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/gear_widget_info" />
+        </receiver>
+
         <service
             android:name=".WidgetUpdateService"
             android:enabled="true"

app/src/main/java/com/eveningoutpost/dexdrip/Home.java

@@ -338,8 +338,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
         setTheme(R.style.AppThemeToolBarLite); // for toolbar mode
-
-
         Injectors.getHomeShelfComponent().inject(this);
 
         if (!Experience.gotData()) {

app/src/main/java/com/eveningoutpost/dexdrip/Models/BgReading.java

@@ -697,24 +697,29 @@ public static String activeSlopeArrow() {
         return slopeToArrowSymbol(slope);
     }
 
-    public static String slopeToArrowSymbol(double slope) {
+    public static int slopeToArrowIndex(double slope) {
         if (slope <= (-3.5)) {
-            return "\u21ca";// ⇊
+            return 0;// ⇊
         } else if (slope <= (-2)) {
-            return "\u2193"; // ↓
+            return 1; // ↓
         } else if (slope <= (-1)) {
-            return "\u2198"; // ↘
+            return 2; // ↘
         } else if (slope <= (1)) {
-            return "\u2192"; // →
+            return 3; // →
         } else if (slope <= (2)) {
-            return "\u2197"; // ↗
+            return 4; // ↗
         } else if (slope <= (3.5)) {
-            return "\u2191"; // ↑
+            return 5; // ↑
         } else {
-            return "\u21c8"; // ⇈
+            return 6; // ⇈
         }
     }
 
+    public static String slopeToArrowSymbol(double slope) {
+        String[] arrow = { "\u21ca", "\u2193", "\u2198", "\u2192", "\u2197", "\u2191", "\u21c8" };
+        return arrow[slopeToArrowIndex(slope)];
+    }
+
     public String slopeArrow() {
         return slopeToArrowSymbol(this.calculated_value_slope * 60000);
     }

app/src/main/java/com/eveningoutpost/dexdrip/SnoozeActivity.java

@@ -50,9 +50,9 @@ public class SnoozeActivity extends ActivityWithMenu {
 
     static final int infiniteSnoozeValueInMinutes = 5256000;//10 years
     //static final int snoozeValues[] = new int []{5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 75, 90, 105, 120, 150, 180, 240, 300, 360, 420, 480, 540, 600};
-    static final int snoozeValues[] = new int []{ 10, 15, 20, 30, 40, 50, 60, 75, 90, 120, 150, 180, 240, 300, 360, 420, 480, 540, 600};
+    static final int snoozeValues[] = new int []{ 1, 2, 5, 10, 15, 20, 30, 40, 50, 60, 75, 90, 120, 150, 180, 240, 300, 360, 420, 480, 540, 600};
 
-    static int getSnoozeLocatoin(int time) {
+    static int getSnoozeLocation(int time) {
         for (int i=0; i < snoozeValues.length; i++) {
             if(time == snoozeValues[i]) {
                 return i;
@@ -96,9 +96,9 @@ static void SetSnoozePickerValues(NumberPicker picker, boolean above, int defaul
         picker.setDisplayedValues(values);
         picker.setWrapSelectorWheel(false);
         if(default_snooze != 0) {
-            picker.setValue(getSnoozeLocatoin(default_snooze));
+            picker.setValue(getSnoozeLocation(default_snooze));
         } else {
-            picker.setValue(getSnoozeLocatoin(getDefaultSnooze(above)));
+            picker.setValue(getSnoozeLocation(getDefaultSnooze(above)));
         }
     }
 
@@ -226,7 +226,7 @@ public void onClick(View v) {
                 snoozeValue.setMinValue(0);
                 snoozeValue.setDisplayedValues(values);
                 snoozeValue.setWrapSelectorWheel(false);
-                snoozeValue.setValue(getSnoozeLocatoin(60));
+                snoozeValue.setValue(getSnoozeLocation(60));
 
                 b1.setOnClickListener(new View.OnClickListener() {
                     @Override

app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ColorPicker.java

@@ -83,7 +83,7 @@ protected void onDialogClosed(boolean positiveResult) {
 
         // TODO probably should check whether data has actually changed before updating all the graphics
         Home.staticRefreshBGCharts(true);
-        WidgetUpdateService.staticRefreshWidgets();
+        WidgetUpdateService.updateCurrentBgInfo();
         Notifications.staticUpdateNotification();
     }
 

app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Notifications.java

@@ -136,7 +136,7 @@ protected void onHandleIntent(Intent intent) {
                 ActivityRecognizedService.reStartActivityRecogniser(context);
             }
 
-            ReadPerfs(context);
+            ReadPrefs(context);
             unclearReading = notificationSetter(context);
             ArmTimer(context, unclearReading);
             context.startService(new Intent(context, MissedReadingService.class));
@@ -149,7 +149,7 @@ protected void onHandleIntent(Intent intent) {
 
 
 
-    public void ReadPerfs(Context context) {
+    public void ReadPrefs(Context context) {
         mContext = context;
         prefs = PreferenceManager.getDefaultSharedPreferences(context);
         bg_notifications = prefs.getBoolean("bg_notifications", true);
@@ -178,7 +178,7 @@ public void ReadPerfs(Context context) {
 
 // TODO REFACTOR
     private void FileBasedNotifications(Context context) {
-        ReadPerfs(context);
+        ReadPrefs(context);
         Sensor sensor = Sensor.currentSensor();
 
         final BgReading bgReading = BgReading.last();
@@ -302,7 +302,7 @@ boolean trendingToAlertEnd(Context context, Boolean newAlert, AlertType Alert) {
 
     // returns weather unclear bg reading was detected
     private boolean notificationSetter(Context context) {
-        ReadPerfs(context);
+        ReadPrefs(context);
         final long end = System.currentTimeMillis() + (60000 * 5);
         final long start = end - (60000 * 60 * 3) - (60000 * 10);
         BgGraphBuilder bgGraphBuilder = new BgGraphBuilder(context, start, end);
@@ -556,7 +556,7 @@ private Bitmap createWearBitmap(long hours) {
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     public synchronized Notification createOngoingNotification(BgGraphBuilder bgGraphBuilder, Context context) {
         mContext = context;
-        ReadPerfs(mContext);
+        ReadPrefs(mContext);
         Intent intent = new Intent(mContext, Home.class);
         List<BgReading> lastReadings = BgReading.latest(2);
         BgReading lastReading = null;

app/src/main/java/com/eveningoutpost/dexdrip/WidgetUpdateService.java

@@ -15,36 +15,16 @@
 import com.eveningoutpost.dexdrip.Models.UserError.Log;
 
 public class WidgetUpdateService extends Service {
+    static Context context;
     private static final String TAG = "WidgetUpdateService";
-
-    private boolean isRegistered = false;
-
-    public static void staticRefreshWidgets()
-    {
-        try {
-            Context context = xdrip.getAppContext();
-            if (AppWidgetManager.getInstance(context).getAppWidgetIds(new ComponentName(context, xDripWidget.class)).length > 0) {
-                context.startService(new Intent(context, WidgetUpdateService.class));
-            }
-        } catch (Exception e)
-        {
-            Log.e(TAG,"Got exception in staticRefreshWidgets: "+e);
-        }
-    }
+    private static Class widgetClasses[] = { xDripWidget.class, gearWidget.class };
 
     private BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context ctx, Intent intent) {
             final PowerManager.WakeLock wl = JoH.getWakeLock("xdrip-widget-bcast", 20000);
             //Log.d(TAG, "onReceive("+intent.getAction()+")");
-            if (intent.getAction().compareTo(Intent.ACTION_TIME_TICK) == 0) {
-                updateCurrentBgInfo();
-            } else if (intent.getAction().compareTo(Intent.ACTION_SCREEN_ON) == 0) {
-                enableClockTicks();
-                updateCurrentBgInfo();
-            } else if (intent.getAction().compareTo(Intent.ACTION_SCREEN_OFF) == 0) {
-                disableClockTicks();
-            }
+            if (intent.getAction().compareTo(Intent.ACTION_TIME_TICK) == 0) updateCurrentBgInfo();
             JoH.releaseWakeLock(wl);
         }
     };
@@ -55,61 +35,41 @@ public WidgetUpdateService() {}
 
     @Override
     public void onCreate() {
+        context = getApplicationContext();
         super.onCreate();
-        PowerManager pm = (PowerManager) getSystemService(Service.POWER_SERVICE);
-        Log.d(TAG, "onCreate");
-        if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && pm.isInteractive()) ||
-                (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP && pm.isScreenOn()))
-            enableClockTicks();
-        else
-            disableClockTicks();
     }
 
-    private void enableClockTicks() {
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        //Gear widget needs clock ticks all the time to keep time updated in widget
         Log.d(TAG, "enableClockTicks");
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(Intent.ACTION_TIME_TICK);
-        intentFilter.addAction(Intent.ACTION_SCREEN_ON);
-        intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
-        if (isRegistered)
-            unregisterReceiver(broadcastReceiver);
         registerReceiver(broadcastReceiver, intentFilter);
-        isRegistered = true;
-    }
-
-    private void disableClockTicks() {
-        Log.d(TAG, "disableClockTicks");
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(Intent.ACTION_SCREEN_ON);
-        intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
-        if (isRegistered)
-            unregisterReceiver(broadcastReceiver);
-        registerReceiver(broadcastReceiver, intentFilter);
-        isRegistered = true;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
         updateCurrentBgInfo();
         return START_STICKY;
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (broadcastReceiver != null) {
-            unregisterReceiver(broadcastReceiver);
-            isRegistered = false;
-        }
+        unregisterReceiver(broadcastReceiver);
     }
 
-    public void updateCurrentBgInfo() {
-        Log.d(TAG, "Sending update flag to widget");
-        int ids[] = AppWidgetManager.getInstance(getApplication()).getAppWidgetIds(new ComponentName(getApplication(), xDripWidget.class));
-        Log.d(TAG, "Updating " + ids.length + " widgets");
-        Intent intent = new Intent(this,xDripWidget.class);
-        intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,ids);
-        sendBroadcast(intent);
+    public static void updateCurrentBgInfo() {
+        Log.d(TAG, "Sending update flag to widgets");
+        int ids[];
+        Intent intent;
+        //iterate each widget type, get IDs of all instances, update
+        for (Class widgetClass : widgetClasses) {
+            ids = AppWidgetManager.getInstance(context).getAppWidgetIds(new ComponentName(context, widgetClass));
+            if (ids.length > 0) {
+                Log.d(TAG, "Updating " + ids.length + " " + widgetClass.getName() + " instances");
+                intent = new Intent(context, widgetClass);
+                intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+                intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids);
+                context.sendBroadcast(intent);
+            }
+        }
     }
 }