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
9 changed files with 829 additions and 826 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/css/CourierPrimeBold.ttf
+++ b/css/CourierPrimeBold.ttf
--- a/css/CourierPrimeSansRegular.ttf
+++ b/css/CourierPrimeSansRegular.ttf
--- a/css/alba.regular.ttf
+++ b/css/alba.regular.ttf
--- a/css/fabiolo-smallcap-regular.ttf
+++ b/css/fabiolo-smallcap-regular.ttf
--- a/css/style.css
+++ b/css/style.css
@ -1,16 +1,11 @@

@font-face{
-    font-family: courier;
-    src: url('CourierPrimeSansRegular.ttf');
-}
-
-@font-face{
-	font-family: fabiolo;
-	src: url('fabiolo-smallcap-regular.ttf')
+    font-family: roboto;
+    src: url('JetBrainsMono-Bold.ttf');
 }

 .Roboto{
-    font-family: fabiolo;
+    font-family: roboto;
 }

 html, body {
@ -18,7 +13,7 @@ html, body {
    height: 100%;
    margin: 0;
    overflow-y: hidden;
-    font-family: "courier";
+    font-family: "roboto";
    
 }

@ -27,7 +22,7 @@ html, body {
    display: -webkit-flex;
    -webkit-align-items: center;
    width: 100%;
-    height: 100%;
+    height: 100%
 }

 #canvas-layout {
@ -50,6 +45,7 @@ hour&minutes
 */
 #digital-body {
    position: absolute;
+    width: 70%;
    width: 360px;
    height: 360px;
    top: 0px;
@ -57,83 +53,41 @@ hour&minutes
    background-size: 100%;
    background-repeat: no-repeat;
    overflow: hidden;
-  
-}
-
-#str-just-hours {
-	text-transform: full-width;
-    font-size: 600%;
-    font-style: bold;
-    letter-spacing: -2px;
-    float: left;
-    color: white;
-    width: 90px;
-    text-align: right;
 }

 #rec-time {
-  position: relative;
-  display: inline-block;
-  top: 40%;
+  margin: 0;
+  position: absolute;
+  top: 50%;
  left: 50%;
  -ms-transform: translate(-50%, -50%);
  transform: translate(-50%, -50%);
-  z-index: 1;
 }

 #str-hours {
-    font-size: 450%;
+    font-size: 370%;
    font-style: bold;
-    letter-spacing: -10px;
    float: left;
    color: white;
-    width: 80px;
-    text-align: right;
-    transform: translate(-5px, 0);
 }

 #str-console {
-    font-size: 250%;
+    font-size: 370%;
+    font-style: bold;
    float: left;
    color: white;
    visibility: hidden;
-    transform: translate(-6px, 8px);
 }

 #str-minutes {
-    font-size: 450%;
-    letter-spacing: -10px;
+    font-size: 370%;
+    font-style: bold;
    float: left;
    color: white;
-    width: 70px;
-    text-align: left;
-    transform: translate(-15px, 0);
-    
 }

 #str-ampm {
    font-size: 280%;
    color: white;
    padding-top: 20%;
-}
-
-#str-event {
-position: absolute;
-  display: inline-block;
-  top:60%;
-  left: 50%;
-  -ms-transform: translate(-50%, -50%);
-  transform: translate(-50%, -50%);
-  font-size: 175%;
-  color: white;
-  text-align: center;
-  z-index: 2;
-  line-height: 100%;
-  overflow: hidden;
-   text-overflow: ellipsis;
-   display: -webkit-box;
-   -webkit-line-clamp: 2; /* number of lines to show */
-   -webkit-box-orient: vertical;
-}
-	
 }
--- a/index.html
+++ b/index.html
@ -13,14 +13,11 @@
 <body>

    <div id="digital-body">
-      	<div id="str-just-hours"></div>
-    
    	<div id="rec-time">
    	<div id="str-hours"></div>
    	<div id="str-console">:</div>
    	<div id="str-minutes"></div>
    	</div>
-    	<div id="str-event"></div>
    </div>
 	
    <div id="container">
--- 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