Merge branch 'dev' into weather

adds weather and location callbacks
adds location and weather pulling (only works when location on watch is on and with watch)
2020-10-02 22:43:49 +02:00 · 2020-10-02 22:43:18 +02:00 · 2020-10-02 22:40:56 +02:00
3 changed files with 813 additions and 678 deletions
--- a/calenderwatch_client.wgt
+++ b/calenderwatch_client.wgt
--- a/config.xml
+++ b/config.xml
@@ -14,5 +14,7 @@
    <tizen:privilege name="http://tizen.org/privilege/filesystem.read"/>
    <tizen:privilege name="http://tizen.org/privilege/filesystem.write"/>
    <tizen:privilege name="http://tizen.org/privilege/mediastorage"/>
+    <tizen:privilege name="http://tizen.org/privilege/location"/>
+    
    <tizen:profile name="wearable"/>
 </widget>
--- a/js/app.js
+++ b/js/app.js
Author	SHA1	Message	Date
raphael	a26016bcaa	Merge branch 'dev' into weather	2020-10-02 22:43:49 +02:00
raphael	9f6d5ccc1f	adds weather and location callbacks	2020-10-02 22:43:18 +02:00
raphael	0fb84634e2	adds location and weather pulling (only works when location on watch is on and with watch)	2020-10-02 22:40:56 +02:00