adds TODOs, changes data from strings to numbers and removes icon in weather.JSON

grcoleman · grcoleman · commit 1f04dffdeb3d · 2020-07-14T14:27:16.000-04:00
diff --git a/WebView/app/src/main/assets/main.js b/WebView/app/src/main/assets/main.js
@@ -18,11 +18,13 @@ function sendAndroidMessage() {
      * in the WebViewCompat reference doc, the second parameter, MessagePorts, is optional.
      * Also note that onmessage, addEventListener and removeEventListener are not supported.
      */
+     // TODO: Change message to account for changes in data
 	jsObject.postMessage("The weather in " + `${document.getElementById("title").innerText}` + " today is " +
 	`${document.getElementById("shortDescription").innerText} `);
 }
 
 function getData() {
+    // TODO: Change the path to grab data from new location; Change longDescription and currentTemp to work with changes in data
 	fetch("https://gcoleman799.github.io/Asset-Loader/weather.json").then(function(resp) {
 		return resp.json();
 	}).then(function(data) {
@@ -36,4 +38,6 @@ function getData() {
             + `${data[currentLocation].humidity}.`;
         document.getElementById("icon").src = data[currentLocation].icon;
 	})
-}
+}
+
+// TODO: Create getIcon() function to decide which icon to render.
diff --git a/WebView/sampleData/weather.json b/WebView/sampleData/weather.json
@@ -1,29 +1,26 @@
 {
   "newYork":{
-    "currentTemp":"75°",
-    "highTemp":"83°",
-    "lowTemp":"64°",
-    "chancePrecip":"90%",
-    "humidity":"23%",
+    "currentTemp":75,
+    "highTemp":83,
+    "lowTemp":64,
+    "chancePrecip":90,
+    "humidity":23,
     "description":"Rainy",
-    "icon":"https://gcoleman799.github.io/res/drawable/rain.png"
   },
   "sanFrancisco":{
-    "currentTemp":"70°",
-    "highTemp":"75°",
-    "lowTemp":"61°",
-    "chancePrecip":"0%",
-    "humidity":"2%",
+    "currentTemp":70,
+    "highTemp":75,
+    "lowTemp":61,
+    "chancePrecip":0,
+    "humidity":2,
     "description":"Clear Sky",
-    "icon": "https://gcoleman799.github.io/res/drawable/sunny.png"
   },
   "london":{
-    "currentTemp":"88°",
-    "highTemp":"89°",
-    "lowTemp":"67°",
-    "chancePrecip":"15%",
-    "humidity":"36%",
+    "currentTemp":88,
+    "highTemp":89,
+    "lowTemp":67,
+    "chancePrecip":15,
+    "humidity":36,
     "description":"Partly Cloudy",
-    "icon":"https://gcoleman799.github.io/res/drawable/partly_cloudy.png"
   }
 }
