diff --git a/apps/contacts/ChangeLog b/apps/contacts/ChangeLog
index a0be5eaf6..5d6abbb74 100644
--- a/apps/contacts/ChangeLog
+++ b/apps/contacts/ChangeLog
@@ -2,3 +2,4 @@
0.02: Minor code improvements
0.03: Minor code improvements
0.04: Allow calling contacts from the app, Refactoring
+0.05: Nicer UI, Refactoring, new icon
\ No newline at end of file
diff --git a/apps/contacts/README.md b/apps/contacts/README.md
index 1bfc99c8e..53503d56b 100644
--- a/apps/contacts/README.md
+++ b/apps/contacts/README.md
@@ -1,6 +1,6 @@
# Contacts
-This app provides a common way to set up the `contacts.json` file.
+View, edit and call contacts on your bangle.js. Calling is done via the bluetooth connection to your android phone.
## Contacts JSON file
@@ -11,12 +11,14 @@ has the following contents:
```
[
{
- "name":"NONE"
+ "name":"First Last",
+ "number":"123456789",
},
{
- "name":"First Last",
- "number":"123456789",
- }
+ "name": "James Bond",
+ "number":"555-007",
+ },
+ ...
]
```
@@ -26,4 +28,12 @@ Clicking on the download icon of `Contents` in the app loader invokes
the contact editor. The editor downloads and displays the current
`contacts.json` file. Clicking the `Edit` button beside an entry
causes the entry to be deleted from the list and displayed in the edit
-boxes. It can be restored - by clicking the `Add` button.
\ No newline at end of file
+boxes. It can be restored - by clicking the `Add` button.
+
+# Icons
+
+Phone icon by Icons8
+
+Delete Button icon by Icons8
+
+Call List icon by Icons8
\ No newline at end of file
diff --git a/apps/contacts/app-icon.js b/apps/contacts/app-icon.js
index 3012be8d8..0333b855a 100644
--- a/apps/contacts/app-icon.js
+++ b/apps/contacts/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwwcBkmSpIC/AVsJCJ+AQaCZBCOeACKGQLKGQBA0ggARPJ4IRsYo0ggR9IoAIGiRiIpEECJsAiACBBYoRGpEAI4JBFI47CBLIRlDHYJrGYQIRCwQICL4MQOgx9GboUSeQ4RFwAFBiSGHCIo4CiVIWZyPICP4RaRIQROgARHdIwICoIIFkDpGBAKqHgGACI0AyVIggIDoEEMQ1ICINJCIj4CfwIREBwUgQYYOCfYoFDJQKDFCIopEO4RoDKAqJHRhAC/ATA="))
+require("heatshrink").decompress(atob("mEwwZC/ABcN23btoCG7ARFBw4CDCP4RegYRQjY1RgE2LMlsHY4RIsBfHLJBxICKxrDCJxHQCK59LBYYRBa59sgzXPCJwLDwACCgENCJewjbaBgEBCJkDLgIRIO4vABIQRN7ARKNYaSELJo4EPpgCHCAjjGYpwRNLIzFPCP4RnZwQRHd4YA/AA4A="))
\ No newline at end of file
diff --git a/apps/contacts/app.png b/apps/contacts/app.png
index 147dcc61a..a1594e7a9 100644
Binary files a/apps/contacts/app.png and b/apps/contacts/app.png differ
diff --git a/apps/contacts/contacts.app.js b/apps/contacts/contacts.app.js
index 34e40927a..bf2f8a455 100644
--- a/apps/contacts/contacts.app.js
+++ b/apps/contacts/contacts.app.js
@@ -1,14 +1,14 @@
-/* contacts.js */
-
var Layout = require("Layout");
-var wp = require('Storage').readJSON("contacts.json", true) || [];
+var contacts = require('Storage').readJSON("contacts.json", true) || [];
function writeContacts() {
- require('Storage').writeJSON("contacts.json", wp);
+ require('Storage').writeJSON("contacts.json", contacts);
}
function callNumber (number) {
+ E.showMessage('Calling ' + number + '...');
+ setTimeout(() => mainMenu(), 2000);
Bluetooth.println(JSON.stringify({
t:"intent",
target:"activity",
@@ -17,35 +17,49 @@ function callNumber (number) {
categories:["android.intent.category.DEFAULT"],
data: 'tel:' + number,
}))
-
}
function mainMenu() {
var menu = {
+ "": {
+ "title": "Contacts",
+ },
"< Back" : Bangle.load
};
- if (!wp.length) {
+ if (!contacts.length) {
menu['No Contacts'] = () => {};
- } else {
- for (const e of wp) {
- const closureE = e;
- menu[e.name] = () => showContact(closureE);
- }
}
- menu["Add"] = addContact;
- menu["Remove"] = removeContact;
+ contacts.forEach((e, idx) => {
+ menu[e.name] = () => showContact(idx)
+ })
+ menu["Add Contact"] = addContact;
g.clear();
E.showMenu(menu);
}
-function showContact(i) {
+function showContact(idx) {
g.clear();
+ var name = contacts[idx].name;
+ let longName = g.setFont("6x8:2").stringWidth(name) >= g.getWidth();
+ var number = contacts[idx].number;
+ let longNumber = g.setFont("6x8:2").stringWidth(number) >= g.getWidth();
(new Layout ({
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: "Back to list", cb: mainMenu}
+ {type: 'h', filly: 3, fillx:1, c: [
+ {type:"btn", font:"6x8", pad:1, fillx:1, filly:1, label: "<- Back to list", cb: mainMenu},
+ {type:"btn", pad:1, fillx:1, filly:3, src: require("heatshrink").decompress(atob("jUawYGDgVJkgQGBAOSBAsJkALBBIoaCDogaCAQYXBgIIFkmAC4IIFyVAgAIGGQUJHwo4FAo2QBwICDNAVAkgCEEAYUFEAQUFE34mRPwgmEcYgmDUg8AgjLGgAA==")),
+ cb: () => (
+ E.showPrompt("Delete Contact '" + name + "'?", )
+ .then((res) => { if (res) { deleteContact(idx) } else { mainMenu() } })
+ )
+ },
+ ]},
+ {type:"txt", font:longName ? "6x8" : "6x8:2", pad:1, fillx:2, filly:3, label: longName ? name.slice(0, name.length/2) + '\n' + name.slice(name.length/2) : name},
+ {type:"txt", font: "6x8:2", pad:1, fillx:2, filly:3, label: longNumber ? number.slice(0, number.length/2) + '\n' + number.slice(number.length/2) : number},
+ {type: 'h', filly: 3, fillx:1, c: [
+ {type:"btn", pad:1, fillx:1, filly:3, src:atob("GBiBAAAAAAAAAAAAAB8AAB+AAB+AAB+AAB+AAA+AAA8AAA4AAAYAAAcAAAMAAAGAAAHB8ADz+AA/+AAf+AAH+AAA+AAAAAAAAAAAAA=="), cb: l => callNumber(number)},
+ ]},
],
lazy:true
})).render();
@@ -80,10 +94,10 @@ function showNumpad() {
{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: removeDigit},
- digitBtn('0'),
- {type:"btn", font:ds, width:58, id:"OK", label:"OK", cb: l => resolve(number)}
- ]}
+ {type:"btn", font:ds, width:58, label:"C", cb: removeDigit},
+ digitBtn('0'),
+ {type:"btn", font:ds, width:58, id:"OK", label:"OK", cb: l => resolve(number)}
+ ]}
]}
], lazy:true});
g.clear();
@@ -92,77 +106,28 @@ function showNumpad() {
});
}
-function removeContact() {
- var menu = {
- "" : {title : "Select Contact"},
- "< Back" : mainMenu
- };
- if (wp.length===0) Object.assign(menu, {"No Contacts":""});
- else {
- wp.forEach((val, card) => {
- const name = wp[card].name;
- menu[name]=()=>{
- E.showMenu();
- var confirmRemove = new Layout (
- {type:"v", c: [
- {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:"Delete"},
- {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:name},
- {type:"h", c: [
- {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "YES", cb:l=>{
- wp.splice(card, 1);
- writeContacts();
- mainMenu();
- }},
- {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: " NO", cb:l=>{mainMenu();}}
- ]}
- ], lazy:true});
- g.clear();
- confirmRemove.render();
- };
- });
- }
- E.showMenu(menu);
-}
-
-
-function addNewContact(name) {
- g.clear();
- showNumpad().then((number) => {
- wp.push({name: name, number: number});
- writeContacts();
- mainMenu();
- })
-
-
-
-}
-
-function tryAddContact(name) {
- if (wp.filter((e) => e.name === name).length) {
- E.showMenu();
- var alreadyExists = new Layout (
- {type:"v", c: [
- {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=>{ addNewContact(name); }},
- {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label: "CANCEL", cb:l=>{mainMenu();}}
- ]}
- ], lazy:true});
- g.clear();
- alreadyExists.render();
- return;
- }
- addNewContact(name);
+function deleteContact(idx) {
+ contacts.splice(idx, 1);
+ writeContacts();
+ mainMenu();
}
function addContact() {
- require("textinput").input({text:""}).then(name => {
- if (name !== "") {
- tryAddContact(name);
- } else
- mainMenu();
- });
+ require("textinput").input({text:""})
+ .then(name => {
+ name = name.trim();
+ if (name !== "") {
+ g.clear();
+ showNumpad().then((number) => {
+ contacts.push({name: name, number: number});
+ writeContacts();
+ mainMenu();
+ })
+ } else {
+ E.showMessage("Invalid name");
+ setTimeout(() => mainMenu(), 1000);
+ }
+ });
}
g.reset();
diff --git a/apps/contacts/interface.html b/apps/contacts/interface.html
index 4a533bff7..00dcd6655 100644
--- a/apps/contacts/interface.html
+++ b/apps/contacts/interface.html
@@ -33,7 +33,7 @@
-
Contacts v.2
+
Contacts
diff --git a/apps/contacts/metadata.json b/apps/contacts/metadata.json
index 50354f74f..384c2aa7d 100644
--- a/apps/contacts/metadata.json
+++ b/apps/contacts/metadata.json
@@ -1,7 +1,7 @@
{ "id": "contacts",
"name": "Contacts",
- "version": "0.04",
- "description": "Provides means of storing user contacts, viewing/editing them on device and from the App loader",
+ "version": "0.05",
+ "description": "View, edit and call contacts on device and from the App loader",
"icon": "app.png",
"tags": "tool",
"supports" : ["BANGLEJS2"],