refactored contacts.app.js, added function to call contact from the watch by triggering intent on phone

apps/contacts/contacts.app.js

@@ -3,11 +3,8 @@
 var Layout = require("Layout");
 
 var wp = require('Storage').readJSON("contacts.json", true) || [];
-// var wp = [];
 
-var key; /* Shared between functions, typically wp name */
+function writeContacts() {
-
-function writeContact() {
   require('Storage').writeJSON("contacts.json", wp);
 }
 
@@ -35,8 +32,8 @@ function mainMenu() {
       menu[e.name] = () => showContact(closureE);
     }
   }
-  menu["Add"] = addCard;
+  menu["Add"] = addContact;
-  menu["Remove"] = removeCard;
+  menu["Remove"] = removeContact;
   g.clear();
   E.showMenu(menu);
 }
@@ -47,14 +44,15 @@ function showContact(i) {
     type:"v",
     c: [
       {type:"txt", font:"10%", pad:1, fillx:1, filly:1, label: i["name"] + "\n" + i["number"]},
-      {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label:"Call", cb:l=>{callNumber(i['number']);}},
+      {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "Call", cb: l => callNumber(i['number'])},
-      {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label:"Back to list", cb:l=>{mainMenu();}}
+      {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "Back to list", cb: mainMenu}
     ],
     lazy:true
   })).render();
 }
 
-function showNumpad(prompt, callback) {
+function showNumpad() {
+  return new Promise((resolve, reject) => {
     let number = ''
     E.showMenu();
     function addDigit(digit) {
@@ -62,10 +60,15 @@ function showNumpad(prompt, callback) {
       Bangle.buzz(20);
       update();
     }
+    function removeDigit() {
+      number = number.slice(0, -1);
+      Bangle.buzz(20);
+      update();
+    }
     function update() {
       g.reset();
       g.clearRect(0,0,g.getWidth(),23);
-    g.setFont("Vector:24").setFontAlign(1,0).drawString(prompt + number, g.getWidth(),12);
+      g.setFont("Vector:24").setFontAlign(1,0).drawString(number, g.getWidth(),12);
     }
     const ds="12%";
     const digitBtn = (digit) => ({type:"btn", font:ds, width:58, label:digit, cb:l=>{addDigit(digit);}});
@@ -77,18 +80,19 @@ function showNumpad(prompt, callback) {
           {type:"h",filly:1, c: [digitBtn("4"), digitBtn("5"), digitBtn("6")]},
           {type:"h",filly:1, c: [digitBtn("7"), digitBtn("8"), digitBtn("9")]},
           {type:"h",filly:1, c: [
-          {type:"btn", font:ds, width:58, label:"C", cb:l=>{key=key.slice(0,-1); update();}},
+            {type:"btn", font:ds, width:58, label:"C", cb: removeDigit},
-          {type:"btn", font:ds, width:58, label:"0", cb:l=>{addDigit("0");}},
+            digitBtn('0'),
-          {type:"btn", font:ds, width:58, id:"OK", label:"OK", cb: callback}
+            {type:"btn", font:ds, width:58, id:"OK", label:"OK", cb: l => resolve(number)}
           ]}
         ]}
       ], lazy:true});
     g.clear();
     numPad.render();
     update();
+  });
 }
 
-function removeCard() {
+function removeContact() {
   var menu = {
     "" : {title : "Select Contact"},
     "< Back" : mainMenu
@@ -106,7 +110,7 @@ function removeCard() {
             {type:"h", c: [
               {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "YES", cb:l=>{
                 wp.splice(card, 1);
-                writeContact();
+                writeContacts();
                 mainMenu();
               }},
               {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: " NO", cb:l=>{mainMenu();}}
@@ -120,37 +124,28 @@ function removeCard() {
   E.showMenu(menu);
 }
 
-function askPosition(callback) {
-  showNumpad("", "", function() {
-    callback(key, "");
-  });
-}
 
-function createContact(lat, name) {
+function addNewContact(name) {
-  wp.push({lat: lat, name: name});
-  print("add -- contacts", wp);
-  writeContact();
-}
-
-function addCardName2(key) {
   g.clear();
-  askPosition(function(lat, lon) {
+  showNumpad().then((number) => {
-      print("position -- ", lat, lon);
+      wp.push({name: name, number: number});
-      createContact(lat, result);
+      writeContacts();
       mainMenu();
-  });
+  })
+
+
+
 }
 
-function addCardName(key) {
+function tryAddContact(name) {
-  result = key;
+  if (wp.filter((e) => e.name === name).length) {
-  if (wp[result] !== undefined) {
     E.showMenu();
     var alreadyExists = new Layout (
       {type:"v", c: [
-      {type:"txt", font:Math.min(15,100/result.length)+"%", pad:1, fillx:1, filly:1, label:result},
+        {type:"txt", font:Math.min(15,100/name.length)+"%", pad:1, fillx:1, filly:1, label:name},
         {type:"txt", font:"12%", pad:1, fillx:1, filly:1, label:"already exists."},
         {type:"h", c: [
-        {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "REPLACE", cb:l=>{ addCardName2(key); }},
+          {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "REPLACE", cb:l=>{ addNewContact(name); }},
           {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "CANCEL", cb:l=>{mainMenu();}}
         ]}
       ], lazy:true});
@@ -158,13 +153,13 @@ function addCardName(key) {
     alreadyExists.render();
      return;
   }
-  addCardName2(key);  
+  addNewContact(name);
 }
 
-function addCard() {
+function addContact() {
-  require("textinput").input({text:""}).then(result => {
+  require("textinput").input({text:""}).then(name => {
-    if (result !== "") {
+    if (name !== "") {
-      addCardName(result);
+      tryAddContact(name);
     } else
       mainMenu();
   });