Merge branch 'dev' into weather

Merge branch 'dev' of git.maenle.net:raphael/calenderwatch_client into dev
adds weather and location callbacks
2020-10-02 22:43:49 +02:00 · 2020-10-02 22:43:31 +02:00 · 2020-10-02 22:43:18 +02:00 · 2020-10-02 22:42:02 +02:00 · 2020-10-02 22:40:56 +02:00 · 2020-08-15 10:14:46 +02:00
7 changed files with 902 additions and 578 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/JetBrainsMono-Bold.ttf
+++ b/css/JetBrainsMono-Bold.ttf
--- a/css/style.css
+++ b/css/style.css
@ -1,10 +1,23 @@
+
+@font-face{
+    font-family: roboto;
+    src: url('JetBrainsMono-Bold.ttf');
+}
+
+.Roboto{
+    font-family: roboto;
+}
+
 html, body {
    width: 100%;
    height: 100%;
    margin: 0;
    overflow-y: hidden;
+    font-family: "roboto";
+    
 }

+
 #container {
    display: -webkit-flex;
    -webkit-align-items: center;
@ -19,9 +32,62 @@ html, body {
    z-index: 1;
 }

+
 #canvas-content {
    position: absolute;
    width: 100%;
    height: 100%;
    z-index: 2;
+}
+
+/*
+hour&minutes
+*/
+#digital-body {
+    position: absolute;
+    width: 70%;
+    width: 360px;
+    height: 360px;
+    top: 0px;
+    left: 0px;
+    background-size: 100%;
+    background-repeat: no-repeat;
+    overflow: hidden;
+}
+
+#rec-time {
+  margin: 0;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  -ms-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+}
+
+#str-hours {
+    font-size: 370%;
+    font-style: bold;
+    float: left;
+    color: white;
+}
+
+#str-console {
+    font-size: 370%;
+    font-style: bold;
+    float: left;
+    color: white;
+    visibility: hidden;
+}
+
+#str-minutes {
+    font-size: 370%;
+    font-style: bold;
+    float: left;
+    color: white;
+}
+
+#str-ampm {
+    font-size: 280%;
+    color: white;
+    padding-top: 20%;
 }
--- a/index.html
+++ b/index.html
@ -6,14 +6,26 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
    <meta name="description" content="Canvas Watch - Canvas API & Time API" />
    <title>Canvas Watch</title>
+   
    <link rel="stylesheet" type="text/css" href="css/style.css" />
 </head>

 <body>
+
+    <div id="digital-body">
+    	<div id="rec-time">
+    	<div id="str-hours"></div>
+    	<div id="str-console">:</div>
+    	<div id="str-minutes"></div>
+    	</div>
+    </div>
+	
    <div id="container">
        <canvas id="canvas-layout"></canvas>
        <canvas id="canvas-content"></canvas>
    </div>
+    
+
    <script src="js/app.js"></script>
 </body>

--- a/js/app.js
+++ b/js/app.js
--- a/js/jquery-3.5.1.min.js
+++ b/js/jquery-3.5.1.min.js
Author	SHA1	Message	Date
raphael	a26016bcaa	Merge branch 'dev' into weather	2020-10-02 22:43:49 +02:00
raphael	c46e0be089	Merge branch 'dev' of git.maenle.net:raphael/calenderwatch_client into dev	2020-10-02 22:43:31 +02:00
raphael	9f6d5ccc1f	adds weather and location callbacks	2020-10-02 22:43:18 +02:00
raphael	433ddb4a68	adds jqurey, removes ':' when in longitude	2020-10-02 22:42:02 +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
raphael	d972fbb7ca	adds hour indicator	2020-08-15 10:14:46 +02:00
raphael	84687f3c73	updates font	2020-08-13 21:40:31 +02:00
raphael	dfdcc1780a	adds mission overview design	2020-08-13 21:04:08 +02:00