From a89cd79fdf3911c14d01b25cfe9ea4361e8deb2e Mon Sep 17 00:00:00 2001
From: Trevor Slocum <trevor@rocketnine.space>
Date: Fri, 20 Sep 2019 00:06:15 -0700
Subject: [PATCH] Add peset widgets

---
 .../src/main/AndroidManifest.xml              | 52 +++++++++++++---
 .../MeditationAssistant.java                  |  4 +-
 .../MeditationProvider1.java                  |  5 --
 .../MeditationProvider2.java                  |  5 --
 .../MeditationProvider3.java                  |  5 --
 .../meditationassistant/SettingsActivity.java |  8 +--
 ...rovider.java => WidgetPresetProvider.java} | 11 ++--
 .../WidgetPresetProvider1.java                |  5 ++
 .../WidgetPresetProvider2.java                |  5 ++
 .../WidgetPresetProvider3.java                |  5 ++
 .../WidgetPresetService.java                  | 60 +++++++++++++++++++
 .../WidgetStreakProvider.java                 | 48 +++++++++++++++
 .../WidgetStreakProvider1.java                |  5 ++
 .../WidgetStreakProvider2.java                |  5 ++
 .../WidgetStreakProvider3.java                |  5 ++
 ...tService.java => WidgetStreakService.java} | 23 +++----
 .../src/main/res/layout/widget_preset.xml     | 26 ++++++++
 .../{widget_layout.xml => widget_streak.xml}  |  4 +-
 .../src/main/res/values/strings.xml           |  9 ++-
 .../src/main/res/xml/widget_preset_1.xml      | 13 ++++
 .../src/main/res/xml/widget_preset_2.xml      | 13 ++++
 .../src/main/res/xml/widget_preset_3.xml      | 13 ++++
 .../xml/{widget_1.xml => widget_streak_1.xml} |  2 +-
 .../xml/{widget_2.xml => widget_streak_2.xml} |  2 +-
 .../xml/{widget_3.xml => widget_streak_3.xml} |  2 +-
 25 files changed, 281 insertions(+), 54 deletions(-)
 delete mode 100644 MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider1.java
 delete mode 100644 MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider2.java
 delete mode 100644 MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider3.java
 rename MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/{MeditationProvider.java => WidgetPresetProvider.java} (80%)
 create mode 100644 MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider1.java
 create mode 100644 MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider2.java
 create mode 100644 MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider3.java
 create mode 100644 MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetService.java
 create mode 100644 MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider.java
 create mode 100644 MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider1.java
 create mode 100644 MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider2.java
 create mode 100644 MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider3.java
 rename MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/{WidgetService.java => WidgetStreakService.java} (76%)
 create mode 100644 MeditationAssistant/src/main/res/layout/widget_preset.xml
 rename MeditationAssistant/src/main/res/layout/{widget_layout.xml => widget_streak.xml} (91%)
 create mode 100644 MeditationAssistant/src/main/res/xml/widget_preset_1.xml
 create mode 100644 MeditationAssistant/src/main/res/xml/widget_preset_2.xml
 create mode 100644 MeditationAssistant/src/main/res/xml/widget_preset_3.xml
 rename MeditationAssistant/src/main/res/xml/{widget_1.xml => widget_streak_1.xml} (86%)
 rename MeditationAssistant/src/main/res/xml/{widget_2.xml => widget_streak_2.xml} (87%)
 rename MeditationAssistant/src/main/res/xml/{widget_3.xml => widget_streak_3.xml} (87%)

diff --git a/MeditationAssistant/src/main/AndroidManifest.xml b/MeditationAssistant/src/main/AndroidManifest.xml
index 0663408..fc4d9fe 100644
--- a/MeditationAssistant/src/main/AndroidManifest.xml
+++ b/MeditationAssistant/src/main/AndroidManifest.xml
@@ -53,7 +53,7 @@
         <!-- Widgets -->
         <!--
         <receiver
-            android:name=".MeditationProvider1"
+            android:name=".WidgetStreakProvider1"
             android:label="@string/widget1x1" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -61,7 +61,7 @@
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_1" />
+                android:resource="@xml/widget_streak_1" />
         </receiver>-->
         <activity
             android:name="sh.ftp.rocketninelabs.meditationassistant.MediNETActivity"
@@ -136,28 +136,62 @@
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".MeditationProvider2"
-            android:label="@string/widget2x1">
+            android:name=".WidgetPresetProvider1"
+            android:label="@string/widgetpreset1x1">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_2" />
+                android:resource="@xml/widget_preset_1" />
         </receiver>
         <receiver
-            android:name=".MeditationProvider3"
-            android:label="@string/widget3x1">
+            android:name=".WidgetPresetProvider2"
+            android:label="@string/widgetpreset2x1">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_3" />
+                android:resource="@xml/widget_preset_2" />
         </receiver>
-        <service android:name="sh.ftp.rocketninelabs.meditationassistant.WidgetService"></service>
+        <receiver
+            android:name=".WidgetPresetProvider3"
+            android:label="@string/widgetpreset3x1">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_preset_3" />
+        </receiver>
+        <receiver
+            android:name=".WidgetStreakProvider2"
+            android:label="@string/widgetstreak2x1">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_streak_2" />
+        </receiver>
+        <receiver
+            android:name=".WidgetStreakProvider3"
+            android:label="@string/widgetstreak3x1">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_streak_3" />
+        </receiver>
+        <service android:name="sh.ftp.rocketninelabs.meditationassistant.WidgetPresetService"></service>
+        <service android:name="sh.ftp.rocketninelabs.meditationassistant.WidgetStreakService"></service>
     </application>
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java
index 375e601..faf80e9 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java
@@ -1147,7 +1147,7 @@ public class MeditationAssistant extends Application {
         updateWidgets();
 
         /* Update all widgets */
-        Intent update_widgets = new Intent(getApplicationContext(), MeditationProvider.class);
+        Intent update_widgets = new Intent(getApplicationContext(), WidgetStreakProvider.class);
         update_widgets.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
         sendBroadcast(update_widgets);
     }
@@ -2198,7 +2198,7 @@ public class MeditationAssistant extends Application {
         AppWidgetManager man = AppWidgetManager
                 .getInstance(getApplicationContext());
         /*int[] ids = man.getAppWidgetIds(new ComponentName(
-                getApplicationContext(), MeditationProvider.class));*/
+                getApplicationContext(), WidgetStreakProvider.class));*/
         Intent updateIntent = new Intent();
         updateIntent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
         getApplicationContext().sendBroadcast(updateIntent);
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider1.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider1.java
deleted file mode 100644
index 227619f..0000000
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider1.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package sh.ftp.rocketninelabs.meditationassistant;
-
-public class MeditationProvider1 extends MeditationProvider {
-
-}
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider2.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider2.java
deleted file mode 100644
index 7e597bd..0000000
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider2.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package sh.ftp.rocketninelabs.meditationassistant;
-
-public class MeditationProvider2 extends MeditationProvider {
-
-}
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider3.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider3.java
deleted file mode 100644
index fcc3d5d..0000000
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider3.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package sh.ftp.rocketninelabs.meditationassistant;
-
-public class MeditationProvider3 extends MeditationProvider {
-
-}
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SettingsActivity.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SettingsActivity.java
index 0ddc6bf..34292f9 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SettingsActivity.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SettingsActivity.java
@@ -85,15 +85,15 @@ public class SettingsActivity extends PreferenceActivity {
 
                 return true;
             } else if (preference instanceof ColorPickerPreference) {
-                Intent intent2 = new Intent(getApplicationContext(), MeditationProvider2.class);
+                Intent intent2 = new Intent(getApplicationContext(), WidgetStreakProvider2.class);
                 intent2.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-                int[] ids2 = AppWidgetManager.getInstance(getApplication()).getAppWidgetIds(new ComponentName(getApplication(), MeditationProvider2.class));
+                int[] ids2 = AppWidgetManager.getInstance(getApplication()).getAppWidgetIds(new ComponentName(getApplication(), WidgetStreakProvider2.class));
                 intent2.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids2);
                 sendBroadcast(intent2);
 
-                Intent intent3 = new Intent(getApplicationContext(), MeditationProvider3.class);
+                Intent intent3 = new Intent(getApplicationContext(), WidgetStreakProvider3.class);
                 intent3.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-                int[] ids3 = AppWidgetManager.getInstance(getApplication()).getAppWidgetIds(new ComponentName(getApplication(), MeditationProvider3.class));
+                int[] ids3 = AppWidgetManager.getInstance(getApplication()).getAppWidgetIds(new ComponentName(getApplication(), WidgetStreakProvider3.class));
                 intent3.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids3);
                 sendBroadcast(intent3);
 
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider.java
similarity index 80%
rename from MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider.java
rename to MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider.java
index 4307c66..22a1489 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationProvider.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider.java
@@ -7,7 +7,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-public class MeditationProvider extends AppWidgetProvider {
+public class WidgetPresetProvider extends AppWidgetProvider {
 
     private int[] mergeInts(int[] arg1, int[] arg2) {
         int[] result = new int[arg1.length + arg2.length];
@@ -28,9 +28,10 @@ public class MeditationProvider extends AppWidgetProvider {
 
         if (intent != null && intent.getAction() != null && intent.getAction().equals(AppWidgetManager.ACTION_APPWIDGET_UPDATE)) {
             AppWidgetManager gm = AppWidgetManager.getInstance(context);
-            int[] ids = gm.getAppWidgetIds(new ComponentName(context, MeditationProvider.class));
-            ids = mergeInts(ids, gm.getAppWidgetIds(new ComponentName(context, MeditationProvider2.class)));
-            ids = mergeInts(ids, gm.getAppWidgetIds(new ComponentName(context, MeditationProvider3.class)));
+            int[] ids = gm.getAppWidgetIds(new ComponentName(context, WidgetPresetProvider.class));
+            ids = mergeInts(ids, gm.getAppWidgetIds(new ComponentName(context, WidgetPresetProvider1.class)));
+            ids = mergeInts(ids, gm.getAppWidgetIds(new ComponentName(context, WidgetPresetProvider2.class)));
+            ids = mergeInts(ids, gm.getAppWidgetIds(new ComponentName(context, WidgetPresetProvider3.class)));
 
             onUpdate(context, gm, ids);
         }
@@ -38,7 +39,7 @@ public class MeditationProvider extends AppWidgetProvider {
 
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        Intent intent = new Intent(context, WidgetService.class);
+        Intent intent = new Intent(context, WidgetPresetService.class);
         intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds);
         context.startService(intent);
 
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider1.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider1.java
new file mode 100644
index 0000000..7a19a5e
--- /dev/null
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider1.java
@@ -0,0 +1,5 @@
+package sh.ftp.rocketninelabs.meditationassistant;
+
+public class WidgetPresetProvider1 extends WidgetPresetProvider {
+
+}
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider2.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider2.java
new file mode 100644
index 0000000..d29b368
--- /dev/null
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider2.java
@@ -0,0 +1,5 @@
+package sh.ftp.rocketninelabs.meditationassistant;
+
+public class WidgetPresetProvider2 extends WidgetPresetProvider {
+
+}
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider3.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider3.java
new file mode 100644
index 0000000..888255a
--- /dev/null
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetProvider3.java
@@ -0,0 +1,5 @@
+package sh.ftp.rocketninelabs.meditationassistant;
+
+public class WidgetPresetProvider3 extends WidgetPresetProvider {
+
+}
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetService.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetService.java
new file mode 100644
index 0000000..55b9e50
--- /dev/null
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetPresetService.java
@@ -0,0 +1,60 @@
+package sh.ftp.rocketninelabs.meditationassistant;
+
+import android.app.PendingIntent;
+import android.app.Service;
+import android.appwidget.AppWidgetManager;
+import android.content.Intent;
+import android.os.IBinder;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+public class WidgetPresetService extends Service {
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(this
+                .getApplicationContext());
+        Log.d("MeditationAssistant", "Widget onStartCommand(): " + String.valueOf(intent));
+
+        if (intent == null) {
+            Log.d("MeditationAssistant", "Widget intent was null, exiting...");
+            return START_STICKY;
+        }
+
+        int[] allWidgetIds = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
+        if (allWidgetIds != null && allWidgetIds.length > 0) {
+            for (int widgetId : allWidgetIds) {
+                RemoteViews updateViews = new RemoteViews(this.getPackageName(),
+                        R.layout.widget_preset);
+
+                Log.d("MA", "Update view class " + updateViews.getClass());
+
+                MeditationAssistant ma = (MeditationAssistant) this
+                        .getApplication();
+
+                updateViews.setTextColor(R.id.txtWidgetPresetText, ma.getPrefs().getInt("pref_widgetcolor", -16777216));
+
+                String label = ma.getPrefs().getString("pref_preset_1_label", "");
+                if (label.equals("")) {
+                    label = "Preset";
+                }
+                // TODO: How to identify different preset widgets?
+                updateViews.setTextViewText(R.id.txtWidgetPresetText, label);
+
+                Intent clickintent = new Intent(getApplicationContext(), MainActivity.class);
+                clickintent.setAction("widgetclick");
+                PendingIntent pendingIntent = PendingIntent.getActivity(
+                        getApplicationContext(), 0, clickintent, 0);
+                updateViews.setOnClickPendingIntent(R.id.layWidget, pendingIntent);
+                updateViews.setOnClickPendingIntent(R.id.txtWidgetPresetText, pendingIntent);
+
+                appWidgetManager.updateAppWidget(widgetId, updateViews);
+            }
+        }
+
+        return START_STICKY;
+    }
+}
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider.java
new file mode 100644
index 0000000..bd37fe5
--- /dev/null
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider.java
@@ -0,0 +1,48 @@
+package sh.ftp.rocketninelabs.meditationassistant;
+
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+public class WidgetStreakProvider extends AppWidgetProvider {
+
+    private int[] mergeInts(int[] arg1, int[] arg2) {
+        int[] result = new int[arg1.length + arg2.length];
+        System.arraycopy(arg1, 0, result, 0, arg1.length);
+        System.arraycopy(arg2, 0, result, arg1.length, arg2.length);
+        return result;
+    }
+
+    @Override
+    public void onEnabled(Context context) {
+        Log.d("MeditationAssistant", "Widget onEnabled");
+        super.onEnabled(context);
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        super.onReceive(context, intent);
+
+        if (intent != null && intent.getAction() != null && intent.getAction().equals(AppWidgetManager.ACTION_APPWIDGET_UPDATE)) {
+            AppWidgetManager gm = AppWidgetManager.getInstance(context);
+            int[] ids = gm.getAppWidgetIds(new ComponentName(context, WidgetStreakProvider.class));
+            ids = mergeInts(ids, gm.getAppWidgetIds(new ComponentName(context, WidgetStreakProvider1.class)));
+            ids = mergeInts(ids, gm.getAppWidgetIds(new ComponentName(context, WidgetStreakProvider2.class)));
+            ids = mergeInts(ids, gm.getAppWidgetIds(new ComponentName(context, WidgetStreakProvider3.class)));
+
+            onUpdate(context, gm, ids);
+        }
+    }
+
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        Intent intent = new Intent(context, WidgetStreakService.class);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds);
+        context.startService(intent);
+
+        super.onUpdate(context, appWidgetManager, appWidgetIds);
+    }
+}
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider1.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider1.java
new file mode 100644
index 0000000..7964e45
--- /dev/null
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider1.java
@@ -0,0 +1,5 @@
+package sh.ftp.rocketninelabs.meditationassistant;
+
+public class WidgetStreakProvider1 extends WidgetStreakProvider {
+
+}
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider2.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider2.java
new file mode 100644
index 0000000..3eaf65a
--- /dev/null
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider2.java
@@ -0,0 +1,5 @@
+package sh.ftp.rocketninelabs.meditationassistant;
+
+public class WidgetStreakProvider2 extends WidgetStreakProvider {
+
+}
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider3.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider3.java
new file mode 100644
index 0000000..698f4d4
--- /dev/null
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakProvider3.java
@@ -0,0 +1,5 @@
+package sh.ftp.rocketninelabs.meditationassistant;
+
+public class WidgetStreakProvider3 extends WidgetStreakProvider {
+
+}
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetService.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakService.java
similarity index 76%
rename from MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetService.java
rename to MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakService.java
index 59f08ba..ac9e627 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetService.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/WidgetStreakService.java
@@ -8,7 +8,7 @@ import android.os.IBinder;
 import android.util.Log;
 import android.widget.RemoteViews;
 
-public class WidgetService extends Service {
+public class WidgetStreakService extends Service {
     public IBinder onBind(Intent intent) {
         return null;
     }
@@ -28,28 +28,29 @@ public class WidgetService extends Service {
         if (allWidgetIds != null && allWidgetIds.length > 0) {
             for (int widgetId : allWidgetIds) {
                 RemoteViews updateViews = new RemoteViews(this.getPackageName(),
-                        R.layout.widget_layout);
-                getApplication();
+                        R.layout.widget_streak);
+
+                Log.d("MA", "Update view class " + updateViews.getClass());
 
                 MeditationAssistant ma = (MeditationAssistant) this
                         .getApplication();
 
-                updateViews.setTextColor(R.id.txtWidgetDays, ma.getPrefs().getInt("pref_widgetcolor", -16777216));
-                updateViews.setTextColor(R.id.txtWidgetText, ma.getPrefs().getInt("pref_widgetcolor", -16777216));
+                updateViews.setTextColor(R.id.txtWidgetStreakDays, ma.getPrefs().getInt("pref_widgetcolor", -16777216));
+                updateViews.setTextColor(R.id.txtWidgetStreakText, ma.getPrefs().getInt("pref_widgetcolor", -16777216));
 
                 if (ma.getMeditationStreak().get(0) > 0) {
-                    updateViews.setTextViewText(R.id.txtWidgetDays,
+                    updateViews.setTextViewText(R.id.txtWidgetStreakDays,
                             String.valueOf(ma.getMeditationStreak().get(0)));
                     updateViews.setTextViewText(
-                            R.id.txtWidgetText,
+                            R.id.txtWidgetStreakText,
                             getResources().getQuantityString(
                                     R.plurals.daysOfMeditationWithoutCount,
                                     ma.getMeditationStreak().get(0).intValue())
                     );
                 } else {
-                    updateViews.setTextViewText(R.id.txtWidgetDays,
+                    updateViews.setTextViewText(R.id.txtWidgetStreakDays,
                             getString(R.string.ignore_om));
-                    updateViews.setTextViewText(R.id.txtWidgetText,
+                    updateViews.setTextViewText(R.id.txtWidgetStreakText,
                             getString(R.string.meditateToday));
                 }
 
@@ -58,8 +59,8 @@ public class WidgetService extends Service {
                 PendingIntent pendingIntent = PendingIntent.getActivity(
                         getApplicationContext(), 0, clickintent, 0);
                 updateViews.setOnClickPendingIntent(R.id.layWidget, pendingIntent);
-                updateViews.setOnClickPendingIntent(R.id.txtWidgetDays, pendingIntent);
-                updateViews.setOnClickPendingIntent(R.id.txtWidgetText, pendingIntent);
+                updateViews.setOnClickPendingIntent(R.id.txtWidgetStreakDays, pendingIntent);
+                updateViews.setOnClickPendingIntent(R.id.txtWidgetStreakText, pendingIntent);
 
                 appWidgetManager.updateAppWidget(widgetId, updateViews);
             }
diff --git a/MeditationAssistant/src/main/res/layout/widget_preset.xml b/MeditationAssistant/src/main/res/layout/widget_preset.xml
new file mode 100644
index 0000000..c39843a
--- /dev/null
+++ b/MeditationAssistant/src/main/res/layout/widget_preset.xml
@@ -0,0 +1,26 @@
+<FrameLayout
+    android:id="@+id/layWidget"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clickable="true"
+    android:padding="@dimen/widget_margin">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/txtWidgetPresetText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:clickable="true"
+            android:gravity="right"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="18sp"/>
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/MeditationAssistant/src/main/res/layout/widget_layout.xml b/MeditationAssistant/src/main/res/layout/widget_streak.xml
similarity index 91%
rename from MeditationAssistant/src/main/res/layout/widget_layout.xml
rename to MeditationAssistant/src/main/res/layout/widget_streak.xml
index 683525a..9747d5b 100644
--- a/MeditationAssistant/src/main/res/layout/widget_layout.xml
+++ b/MeditationAssistant/src/main/res/layout/widget_streak.xml
@@ -12,7 +12,7 @@
         android:orientation="horizontal">
 
         <TextView
-            android:id="@+id/txtWidgetDays"
+            android:id="@+id/txtWidgetStreakDays"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -23,7 +23,7 @@
             android:textSize="37sp"/>
 
         <TextView
-            android:id="@+id/txtWidgetText"
+            android:id="@+id/txtWidgetStreakText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/MeditationAssistant/src/main/res/values/strings.xml b/MeditationAssistant/src/main/res/values/strings.xml
index 6e15b31..9055dde 100644
--- a/MeditationAssistant/src/main/res/values/strings.xml
+++ b/MeditationAssistant/src/main/res/values/strings.xml
@@ -280,9 +280,12 @@
 \nThis dialog will not appear again.</string>
     <string name="translateMeditationAssistantText">Are you interested in assisting with translating Meditation Assistant?</string>
     <!-- Widgets -->
-    <string name="widget1x1" tools:ignore="UnusedResources">Meditation Assistant 1x1</string>
-    <string name="widget2x1" tools:ignore="UnusedResources">Meditation Assistant 2x1</string>
-    <string name="widget3x1" tools:ignore="UnusedResources">Meditation Assistant 3x1</string>
+    <string name="widgetpreset1x1" tools:ignore="UnusedResources">Preset 1x1</string>
+    <string name="widgetpreset2x1" tools:ignore="UnusedResources">Preset 2x1</string>
+    <string name="widgetpreset3x1" tools:ignore="UnusedResources">Preset 3x1</string>
+    <string name="widgetstreak1x1" tools:ignore="UnusedResources">Streak 1x1</string>
+    <string name="widgetstreak2x1" tools:ignore="UnusedResources">Streak 2x1</string>
+    <string name="widgetstreak3x1" tools:ignore="UnusedResources">Streak 3x1</string>
     <!-- Meta -->
     <string name="appStoreListingShort">Feature packed meditation session timer and recorder</string>
     <string name="appStoreListingFull">- Automatic device mode while meditating.
diff --git a/MeditationAssistant/src/main/res/xml/widget_preset_1.xml b/MeditationAssistant/src/main/res/xml/widget_preset_1.xml
new file mode 100644
index 0000000..ea16ac9
--- /dev/null
+++ b/MeditationAssistant/src/main/res/xml/widget_preset_1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+                    xmlns:tools="http://schemas.android.com/tools"
+                    android:initialLayout="@layout/widget_preset"
+                    android:minHeight="40dp"
+                    android:minWidth="40dp"
+                    android:resizeMode="horizontal"
+                    android:theme="@style/MeditationDarkTheme"
+                    android:updatePeriodMillis="43200000"
+                    android:widgetCategory="keyguard|home_screen"
+                    tools:ignore="UnusedAttribute">
+
+</appwidget-provider>
\ No newline at end of file
diff --git a/MeditationAssistant/src/main/res/xml/widget_preset_2.xml b/MeditationAssistant/src/main/res/xml/widget_preset_2.xml
new file mode 100644
index 0000000..c3bf6ca
--- /dev/null
+++ b/MeditationAssistant/src/main/res/xml/widget_preset_2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+                    xmlns:tools="http://schemas.android.com/tools"
+                    android:initialLayout="@layout/widget_preset"
+                    android:minHeight="40dp"
+                    android:minWidth="110dp"
+                    android:resizeMode="horizontal"
+                    android:theme="@style/MeditationDarkTheme"
+                    android:updatePeriodMillis="43200000"
+                    android:widgetCategory="keyguard|home_screen"
+                    tools:ignore="UnusedAttribute">
+
+</appwidget-provider>
\ No newline at end of file
diff --git a/MeditationAssistant/src/main/res/xml/widget_preset_3.xml b/MeditationAssistant/src/main/res/xml/widget_preset_3.xml
new file mode 100644
index 0000000..21ec128
--- /dev/null
+++ b/MeditationAssistant/src/main/res/xml/widget_preset_3.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+                    xmlns:tools="http://schemas.android.com/tools"
+                    android:initialLayout="@layout/widget_preset"
+                    android:minHeight="40dp"
+                    android:minWidth="180dp"
+                    android:resizeMode="horizontal"
+                    android:theme="@style/MeditationDarkTheme"
+                    android:updatePeriodMillis="43200000"
+                    android:widgetCategory="keyguard|home_screen"
+                    tools:ignore="UnusedAttribute">
+
+</appwidget-provider>
\ No newline at end of file
diff --git a/MeditationAssistant/src/main/res/xml/widget_1.xml b/MeditationAssistant/src/main/res/xml/widget_streak_1.xml
similarity index 86%
rename from MeditationAssistant/src/main/res/xml/widget_1.xml
rename to MeditationAssistant/src/main/res/xml/widget_streak_1.xml
index f5a0d39..59f67db 100644
--- a/MeditationAssistant/src/main/res/xml/widget_1.xml
+++ b/MeditationAssistant/src/main/res/xml/widget_streak_1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
                     xmlns:tools="http://schemas.android.com/tools"
-                    android:initialLayout="@layout/widget_layout"
+                    android:initialLayout="@layout/widget_streak"
                     android:minHeight="40dp"
                     android:minWidth="40dp"
                     android:resizeMode="horizontal"
diff --git a/MeditationAssistant/src/main/res/xml/widget_2.xml b/MeditationAssistant/src/main/res/xml/widget_streak_2.xml
similarity index 87%
rename from MeditationAssistant/src/main/res/xml/widget_2.xml
rename to MeditationAssistant/src/main/res/xml/widget_streak_2.xml
index 5eea70c..6cecb33 100644
--- a/MeditationAssistant/src/main/res/xml/widget_2.xml
+++ b/MeditationAssistant/src/main/res/xml/widget_streak_2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
                     xmlns:tools="http://schemas.android.com/tools"
-                    android:initialLayout="@layout/widget_layout"
+                    android:initialLayout="@layout/widget_streak"
                     android:minHeight="40dp"
                     android:minWidth="110dp"
                     android:resizeMode="horizontal"
diff --git a/MeditationAssistant/src/main/res/xml/widget_3.xml b/MeditationAssistant/src/main/res/xml/widget_streak_3.xml
similarity index 87%
rename from MeditationAssistant/src/main/res/xml/widget_3.xml
rename to MeditationAssistant/src/main/res/xml/widget_streak_3.xml
index 532cbb9..f558246 100644
--- a/MeditationAssistant/src/main/res/xml/widget_3.xml
+++ b/MeditationAssistant/src/main/res/xml/widget_streak_3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
                     xmlns:tools="http://schemas.android.com/tools"
-                    android:initialLayout="@layout/widget_layout"
+                    android:initialLayout="@layout/widget_streak"
                     android:minHeight="40dp"
                     android:minWidth="180dp"
                     android:resizeMode="horizontal"