make pr changes

apps/hardalarm/README.md

@@ -0,0 +1,16 @@
+Hard Alarm
+========
+
+The Hard Alarm will is vibration only alarm clock that will not stop vibrating until you are awake enough to match the random number on the screen.
+
+To set a hard alarm open the app and in the settings screen:
+* 1. Press the top half of the screen add 1 and press the bottom half of the screen to subtract 1.
+* 2. Press the center number itself to save your selection
+* 3. Exit the app or it may not run the alarm. 
+
+When the alarm goes off:
+* 1. Press the top half of the screen add 1 and press the bottom half of the screen to subtract 1.
+* 2. Press the side button to confirm your selection and turn off the alarm
+* 3. You now have the touchscreen option to Snooze the alarm for 10 more minutes or end the alarm.
+
+Made by https://dare.fail

apps/hardalarm/app.js

@@ -8,7 +8,6 @@ var alarms = require("Storage").readJSON("hardalarm.json",1)||[];
     msg : "Eat chocolate",
     last : 0, // last day of the month we alarmed on - so we don't alarm twice in one day!
     rp : true, // repeat
-    as : false, // auto snooze
   }
 ];*/
 
@@ -45,14 +44,12 @@ function editAlarm(alarmIndex) {
   var mins = 0;
   var en = true;
   var repeat = true;
-  var as = false;
   if (!newAlarm) {
     var a = alarms[alarmIndex];
     hrs = 0|a.hr;
     mins = Math.round((a.hr-hrs)*60);
     en = a.on;
     repeat = a.rp;
-    as = a.as;
   }
   const menu = {
     '': { 'title': 'Alarms' },
@@ -72,10 +69,6 @@ function editAlarm(alarmIndex) {
       value: en,
       onchange: v=>repeat=v
     },
-    /*LANG*/'Auto snooze': {
-      value: as,
-      onchange: v=>as=v
-    }
   };
   function getAlarm() {
     var hr = hrs+(mins/60);
@@ -86,7 +79,7 @@ function editAlarm(alarmIndex) {
     // Save alarm
     return {
       on : en, hr : hr,
-      last : day, rp : repeat, as: as
+      last : day, rp : repeat
     };
   }
   menu["> Save"] = function() {

apps/hardalarm/metadata.json

@@ -6,7 +6,6 @@
   "description": "Make sure you wake up! Count to the right number to turn off the alarm",
   "icon": "app.png",
   "tags": "tool,alarm,widget",
-  "type": "clock",
   "supports": ["BANGLEJS", "BANGLEJS2"],
   "storage": [
     {"name":"hardalarm.app.js","url":"app.js"},
@@ -15,5 +14,7 @@
     {"name":"hardalarm.img","url":"app-icon.js","evaluate":true},
     {"name":"hardalarm.wid.js","url":"widget.js"}
   ],
-  "data": [{"name":"hardalarm.json"}]
+  "data": [{"name":"hardalarm.json"}],
+  "screenshots": [{"url":"screenshot.png"},{"url":"screenshot2.png"},{"url":"screenshot3.png"}],
+  "readme": "README.md"
 }

apps/twentyeightbysix/README.md

@@ -0,0 +1,24 @@
+28x6: Twenty-Eight by Six
+========
+
+28x6 is a 28 hour day, 6 day a week clock that syncs up with the ancient 24 hour a day, 7 day a week clock every Monday at 12:01 (midnight) / 28:01 (THE VOID).
+
+The clock includes normal time on the top half of the screen and 28x6 time on the bottom half. Throughout the day are helpful labels of when to eat meals, work, and sleep.
+
+You can swipe right and left to skip ahead and behind an hour at a time for ease of converting your scheduling to normal time.
+
+The new hour names are as follows:
+* 13:00am/13:00 Middle-day Nothingness
+* 14:00am/14:00 Forescoreteen, also known as the Lincoln hour. Many take a Lincoln Lunch at this time.
+* 13:00pm/27:00 Threeteen
+* 14:00pm/28:00 THE VOID
+
+Benefits of the 28x6 Week include:
+* 4 day work week (10 hours a day) instead of 5.
+* 18.5 hours of wakeful time, a solid 8.5 hours of free time per day.
+* 18 hours inbetween work instead of 16
+* Trouble sleeping? You get to stay up an extra 4 hours every day
+* 56 hour weekends beats 48 hour weekends
+* No more Tuesdays.
+
+Made by https://dare.fail

apps/twentyeightbysix/app.js

@@ -12,7 +12,8 @@ const weirdAwakeHours = 19;
 const weirdSleepHours = 9;
 
 const normalDayWidth = HARDWARE_VERSION == 1 ? 24: 28;
-const normalWeekDayHeight = 10;
+const normalWeekDayHeight = HARDWARE_VERSION == 1 ? 10: 11;
+const normalDayBoxHeight = HARDWARE_VERSION == 1 ? 9: 5;
 const normalSleepDayHeight = 28;
 const normalAwakeHours = 15;
 const normalSleepHours = 9;
@@ -73,8 +74,8 @@ function normalTo28HourDate(date) {
   var weirdDate = {
     "dayText": getWeirdDayName(weirdDayOfTheWeek),
     "day": weirdDayOfTheWeek,
-    "hourText": addLeadingZero(hourCount - (weirdDayOfTheWeek * 28)),
-    "hour": hourCount - (weirdDayOfTheWeek * 28),
+    "hourText": addLeadingZero(zeroTo28(hourCount - (weirdDayOfTheWeek * 28))),
+    "hour": zeroTo28(hourCount - (weirdDayOfTheWeek * 28)),
     "minuteText": addLeadingZero(date.getMinutes()),
     "minute": date.getMinutes(),
     "secondText": addLeadingZero(date.getSeconds()),
@@ -82,6 +83,13 @@ function normalTo28HourDate(date) {
   return weirdDate;
 }
 
+function zeroTo28(hour) {
+  if (hour == 0) {
+    return 28;
+  }
+  return hour;
+}
+
 function getWeirdDayName(weirdDayOfTheWeek) {
   if(weirdDayOfTheWeek == 0) {
     return "Monday";
@@ -462,8 +470,8 @@ function getNormalEvent(date) {
 }
 
 function getWeirdEvent(date) {
-  if (date.hour == 0) {
-    return "The Void";
+  if (date.hour == 28) {
+    return "THE VOID";
   }
   else if(date.hour == 8) {
     if(date.minute <= 15) {
@@ -525,8 +533,8 @@ function getWeirdHourLabel(hour){
   }
   else if(hour == 27) {
     return ["", "Threeteen", ""];
-  } else if (hour == 0) {
-    return ["", "The Void", ""];
+  } else if (hour == 28) {
+    return ["", "THE VOID", ""];
   }
   return ["", "", ""];
 }
@@ -607,7 +615,7 @@ function printTime(thisDate, isShowTime) {
 function printBackground() {
   g.setFontAlign(0, 0, 0);
   g.setColor(backgroundColor);
-  g.fillRect(0, normalSleepDayHeight + 9, screenWidth, weirdSleepDayHeight - 9);
+  g.fillRect(0, normalSleepDayHeight + normalDayBoxHeight, screenWidth, weirdSleepDayHeight - 9);
 
   g.setColor(mainTextColor);
   if (HARDWARE_VERSION == 1) {

apps/twentyeightbysix/metadata.json

@@ -5,10 +5,11 @@
   "version":"0.04",
   "description": "A 28 Hour, 6 Day Week Clock. Lines up with a 24 hour, 7 Day Week Clock every Monday.",
   "tags": "clock",
-  "type":"clock",
   "storage": [
     {"name":"twentyeightbysix.app.js","url":"app.js"},
     {"name":"twentyeightbysix.img","url":"app-icon.js","evaluate":true}
   ],
-  "supports": ["BANGLEJS", "BANGLEJS2"]
+  "supports": ["BANGLEJS", "BANGLEJS2"],
+  "screenshots": [{"url":"screenshot.png"},{"url":"screenshot2.png"},{"url":"screenshot3.png"}],
+  "readme": "README.md"
 }