From ee10b26ab92dd2f8a58687391e17f47e450b03bc Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 14 Jul 2020 10:30:20 -0400
Subject: [PATCH 01/50] setup

---
 WebView/app/src/main/AndroidManifest.xml      |  2 +-
 .../samples/webviewdemo/MainActivity.kt       | 12 ++++++++++
 .../app/src/main/res/values-night/colors.xml  | 22 +++++++++++++++++++
 WebView/app/src/main/res/values/styles.xml    |  2 +-
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 WebView/app/src/main/res/values-night/colors.xml

diff --git a/WebView/app/src/main/AndroidManifest.xml b/WebView/app/src/main/AndroidManifest.xml
index ec71c32b..019312dd 100644
--- a/WebView/app/src/main/AndroidManifest.xml
+++ b/WebView/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/Theme.MyApp">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 1b722863..a966afec 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -33,6 +33,7 @@ import androidx.core.content.ContextCompat.startActivity
 import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.WebMessageCompat
 import androidx.webkit.WebSettingsCompat
+import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
 import androidx.webkit.WebViewCompat
@@ -130,6 +131,8 @@ class MainActivity : AppCompatActivity() {
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://gcoleman799.github.io")
 
+
+        // FORCE DARK
         // Check if the system is set to light or dark mode
         val nightModeFlag = resources.configuration.uiMode.and(Configuration.UI_MODE_NIGHT_MASK)
         if (nightModeFlag == Configuration.UI_MODE_NIGHT_YES) {
@@ -142,6 +145,15 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+        // Custom Dark Theme
+        // DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - it never applies automatic darkening and uses web page only darkening.
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
+            WebSettingsCompat.setForceDarkStrategy(
+                binding.webview.settings,
+                DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
+            )
+        }
+
         // Configure asset loader with custom domain
         // * NOTE THAT *:
         // The assets path handler is set with the sub path /Asset-Loader/ here because we are tyring to ensure
diff --git a/WebView/app/src/main/res/values-night/colors.xml b/WebView/app/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..375d5b2d
--- /dev/null
+++ b/WebView/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <color name="colorPrimary">#6200EE</color>
+    <color name="colorPrimaryDark">#3700B3</color>
+    <color name="colorAccent">#03DAC5</color>
+</resources>
\ No newline at end of file
diff --git a/WebView/app/src/main/res/values/styles.xml b/WebView/app/src/main/res/values/styles.xml
index e3b8d403..278ded4e 100644
--- a/WebView/app/src/main/res/values/styles.xml
+++ b/WebView/app/src/main/res/values/styles.xml
@@ -17,7 +17,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.MyApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

From 6973b6bb038564b1f12eff6b49b92f1136e84c3e Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 14 Jul 2020 11:55:36 -0400
Subject: [PATCH 02/50] adds night theme color scheme, adds
 setForceDarkStrategy, adds media query example

---
 WebView/app/src/main/assets/app.css           |  7 +++++--
 .../samples/webviewdemo/MainActivity.kt       | 20 ++++++++++---------
 .../app/src/main/res/values-night/colors.xml  |  4 ++--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/WebView/app/src/main/assets/app.css b/WebView/app/src/main/assets/app.css
index 4964eca5..becdeb06 100644
--- a/WebView/app/src/main/assets/app.css
+++ b/WebView/app/src/main/assets/app.css
@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-body {
-  background-color: light-blue;
+body{
+  background-color: white;
+  @media(prefers-color-scheme:dark){
+    background: black
+  }
 }
 h1 {
   color: white;
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index a966afec..c26e4252 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -24,6 +24,7 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import android.webkit.JavascriptInterface
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
@@ -33,6 +34,8 @@ import androidx.core.content.ContextCompat.startActivity
 import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.WebMessageCompat
 import androidx.webkit.WebSettingsCompat
+import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING
+import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_USER_AGENT_DARKENING_ONLY
 import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
@@ -143,15 +146,14 @@ class MainActivity : AppCompatActivity() {
                     WebSettingsCompat.FORCE_DARK_ON
                 )
             }
-        }
-
-        // Custom Dark Theme
-        // DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - it never applies automatic darkening and uses web page only darkening.
-        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
-            WebSettingsCompat.setForceDarkStrategy(
-                binding.webview.settings,
-                DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
-            )
+            // Use custom Dark Theme
+            if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
+                // DARK_STRATEGY_USER_AGENT_DARKENING_ONLY - it ignores web page theme and always darken web contents automatically.
+                WebSettingsCompat.setForceDarkStrategy(
+                    binding.webview.settings,
+                    DARK_STRATEGY_USER_AGENT_DARKENING_ONLY
+                )
+            }
         }
 
         // Configure asset loader with custom domain
diff --git a/WebView/app/src/main/res/values-night/colors.xml b/WebView/app/src/main/res/values-night/colors.xml
index 375d5b2d..5c06301b 100644
--- a/WebView/app/src/main/res/values-night/colors.xml
+++ b/WebView/app/src/main/res/values-night/colors.xml
@@ -16,7 +16,7 @@
   -->
 
 <resources>
-    <color name="colorPrimary">#6200EE</color>
-    <color name="colorPrimaryDark">#3700B3</color>
+    <color name="colorPrimary">#3700B3</color>
+    <color name="colorPrimaryDark">#BB86FC</color>
     <color name="colorAccent">#03DAC5</color>
 </resources>
\ No newline at end of file

From efcf673fd0928a52323612797ca0020befad4927 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 14 Jul 2020 10:30:20 -0400
Subject: [PATCH 03/50] setup

---
 WebView/app/src/main/AndroidManifest.xml      |  2 +-
 .../samples/webviewdemo/MainActivity.kt       | 12 ++++++++++
 .../app/src/main/res/values-night/colors.xml  | 22 +++++++++++++++++++
 WebView/app/src/main/res/values/styles.xml    |  2 +-
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 WebView/app/src/main/res/values-night/colors.xml

diff --git a/WebView/app/src/main/AndroidManifest.xml b/WebView/app/src/main/AndroidManifest.xml
index ec71c32b..019312dd 100644
--- a/WebView/app/src/main/AndroidManifest.xml
+++ b/WebView/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/Theme.MyApp">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 3a5ecaa5..4a56101b 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -33,6 +33,7 @@ import androidx.core.content.ContextCompat.startActivity
 import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.WebMessageCompat
 import androidx.webkit.WebSettingsCompat
+import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
 import androidx.webkit.WebViewCompat
@@ -130,6 +131,8 @@ class MainActivity : AppCompatActivity() {
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://gcoleman799.github.io")
 
+
+        // FORCE DARK
         // Check if the system is set to light or dark mode
         val nightModeFlag = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
         if (nightModeFlag == Configuration.UI_MODE_NIGHT_YES) {
@@ -143,6 +146,15 @@ class MainActivity : AppCompatActivity() {
             // TODO: set darkening strategy and use custom CSS for dark theme
         }
 
+        // Custom Dark Theme
+        // DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - it never applies automatic darkening and uses web page only darkening.
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
+            WebSettingsCompat.setForceDarkStrategy(
+                binding.webview.settings,
+                DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
+            )
+        }
+
         // Configure asset loader with custom domain
         // * NOTE THAT *:
         // The assets path handler is set with the sub path /Asset-Loader/ here because we are tyring to ensure
diff --git a/WebView/app/src/main/res/values-night/colors.xml b/WebView/app/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..375d5b2d
--- /dev/null
+++ b/WebView/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <color name="colorPrimary">#6200EE</color>
+    <color name="colorPrimaryDark">#3700B3</color>
+    <color name="colorAccent">#03DAC5</color>
+</resources>
\ No newline at end of file
diff --git a/WebView/app/src/main/res/values/styles.xml b/WebView/app/src/main/res/values/styles.xml
index e3b8d403..278ded4e 100644
--- a/WebView/app/src/main/res/values/styles.xml
+++ b/WebView/app/src/main/res/values/styles.xml
@@ -17,7 +17,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.MyApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

From d6836d6e38708ec28c41b453c7d0f4665422e02f Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 14 Jul 2020 11:55:36 -0400
Subject: [PATCH 04/50] adds night theme color scheme, adds
 setForceDarkStrategy, adds media query example

---
 WebView/app/src/main/assets/app.css           |  7 +++++--
 .../samples/webviewdemo/MainActivity.kt       | 21 ++++++++++---------
 .../app/src/main/res/values-night/colors.xml  |  4 ++--
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/WebView/app/src/main/assets/app.css b/WebView/app/src/main/assets/app.css
index 4964eca5..fffe5f9a 100644
--- a/WebView/app/src/main/assets/app.css
+++ b/WebView/app/src/main/assets/app.css
@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-body {
-  background-color: light-blue;
+body{
+  background-color: white;
+  @media(prefers-color-scheme:dark){
+    background: blue
+  }
 }
 h1 {
   color: white;
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 4a56101b..1efd5436 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -24,6 +24,7 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import android.webkit.JavascriptInterface
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
@@ -33,6 +34,8 @@ import androidx.core.content.ContextCompat.startActivity
 import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.WebMessageCompat
 import androidx.webkit.WebSettingsCompat
+import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING
+import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_USER_AGENT_DARKENING_ONLY
 import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
@@ -143,16 +146,14 @@ class MainActivity : AppCompatActivity() {
                     WebSettingsCompat.FORCE_DARK_ON
                 )
             }
-            // TODO: set darkening strategy and use custom CSS for dark theme
-        }
-
-        // Custom Dark Theme
-        // DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - it never applies automatic darkening and uses web page only darkening.
-        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
-            WebSettingsCompat.setForceDarkStrategy(
-                binding.webview.settings,
-                DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
-            )
+            // Use custom Dark Theme
+            // DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - it never applies automatic darkening and uses web page only darkening.
+            if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
+                WebSettingsCompat.setForceDarkStrategy(
+                    binding.webview.settings,
+                    DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
+                )
+            }
         }
 
         // Configure asset loader with custom domain
diff --git a/WebView/app/src/main/res/values-night/colors.xml b/WebView/app/src/main/res/values-night/colors.xml
index 375d5b2d..5c06301b 100644
--- a/WebView/app/src/main/res/values-night/colors.xml
+++ b/WebView/app/src/main/res/values-night/colors.xml
@@ -16,7 +16,7 @@
   -->
 
 <resources>
-    <color name="colorPrimary">#6200EE</color>
-    <color name="colorPrimaryDark">#3700B3</color>
+    <color name="colorPrimary">#3700B3</color>
+    <color name="colorPrimaryDark">#BB86FC</color>
     <color name="colorAccent">#03DAC5</color>
 </resources>
\ No newline at end of file

From 761ecf05eacc062e16afd2189b3a324f708f98fd Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 15 Jul 2020 08:42:08 -0400
Subject: [PATCH 05/50] changes path, adds icon choosing logic

---
 WebView/app/src/main/assets/main.js              | 16 +++++++++++++---
 .../android/samples/webviewdemo/MainActivity.kt  | 13 +++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/WebView/app/src/main/assets/main.js b/WebView/app/src/main/assets/main.js
index 74363ec6..3f4472d8 100644
--- a/WebView/app/src/main/assets/main.js
+++ b/WebView/app/src/main/assets/main.js
@@ -25,9 +25,10 @@ function sendAndroidMessage() {
 
 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) {
+   	fetch("https://raw.githubusercontent.com/android/views-widgets-samples/webview/WebView/sampleData/weather.json").then(function(resp) {
 		return resp.json();
 	}).then(function(data) {
+	console.log(data);
 		var form = document.getElementById("location");
 		var currentLocation = form.options[form.selectedIndex].value;
 		document.getElementById("title").innerText = form.options[form.selectedIndex].text;
@@ -36,8 +37,17 @@ function getData() {
         document.getElementById("longDescription").innerText = "Today in " + `${form.options[form.selectedIndex].text}`
             + " there is a " + `${data[currentLocation].chancePrecip}` + " chance of precipitation and the humidity is "
             + `${data[currentLocation].humidity}.`;
-        document.getElementById("icon").src = data[currentLocation].icon;
+        document.getElementById("icon").src = getIcon(data[currentLocation].shortDescription);
 	})
 }
 
-// TODO: Create getIcon() function to decide which icon to render.
\ No newline at end of file
+function getIcon(description){
+    switch(description) {
+        case "Rainy":
+            return "https://gcoleman799.github.io/res/drawable/rain.png";
+        case "Clear Sky":
+            return "https://gcoleman799.github.io/res/drawable/sunny.png";
+        default:
+            return "https://gcoleman799.github.io/res/drawable/partly_cloudy.png";
+    }
+}
\ No newline at end of file
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 3a5ecaa5..33ae04cd 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -144,16 +144,9 @@ class MainActivity : AppCompatActivity() {
         }
 
         // Configure asset loader with custom domain
-        // * NOTE THAT *:
-        // The assets path handler is set with the sub path /Asset-Loader/ here because we are tyring to ensure
-        // that the address loaded with loadUrl("https://gcoleman799.github.io/Asset-Loader/assets/index.html") does
-        // not conflict with a real web address. In this case, if the path were only /assests/ we would need to load
-        // "https://gcoleman799.github.io/assets/index.html" in order to access our local index.html file.
-        // However we cannot guarantee "https://gcoleman799.github.io/assets/index.html" is not a valid web address.
-        // Therefore we must let the AssetLoader know to expect the /Asset-Loader/ sub path as well as the /assets/.
         val assetLoader = WebViewAssetLoader.Builder()
-            .setDomain("gcoleman799.github.io")
-            .addPathHandler("/Asset-Loader/assets/", WebViewAssetLoader.AssetsPathHandler(this))
+            .setDomain("raw.githubusercontent.com")
+            .addPathHandler("/assets/", WebViewAssetLoader.AssetsPathHandler(this))
             .addPathHandler("/res/", WebViewAssetLoader.ResourcesPathHandler(this))
             .build()
 
@@ -182,6 +175,6 @@ class MainActivity : AppCompatActivity() {
         ) { message -> invokeShareIntent(message) }
 
         // Load the content
-        binding.webview.loadUrl("https://gcoleman799.github.io/Asset-Loader/assets/index.html")
+        binding.webview.loadUrl("https://raw.githubusercontent.com/assets/index.html")
     }
 }
\ No newline at end of file

From 6db9c6520d233eec50c6dd370335bc9957893b1a Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 15 Jul 2020 09:03:53 -0400
Subject: [PATCH 06/50] changes initial image path, adds symbos values

---
 WebView/app/src/main/assets/index.html |  2 +-
 WebView/app/src/main/assets/main.js    | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index be2d1cc1..e0f3c9b9 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -27,7 +27,7 @@
       <option value="london">London</option>
     </select>
     <h1 id="title">Location</h1>
-    <img alt="weather" class="icon" id="icon" src="https://gcoleman799.github.io/res/drawable/sunny.png" />
+    <img alt="weather" class="icon" id="icon" src="https://raw.githubusercontent.com/res/drawable/sunny.png" />
     <h2 class="currentTemp" id="currentTemp">Current Temp</h2>
     <h2 class="shortDescription" id="shortDescription">Short Description</h2>
     <p class="longDescription" id="longDescription">Long Description</p>
diff --git a/WebView/app/src/main/assets/main.js b/WebView/app/src/main/assets/main.js
index 3f4472d8..93499daf 100644
--- a/WebView/app/src/main/assets/main.js
+++ b/WebView/app/src/main/assets/main.js
@@ -18,36 +18,34 @@ 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://raw.githubusercontent.com/android/views-widgets-samples/webview/WebView/sampleData/weather.json").then(function(resp) {
+   	fetch("https://raw.githubusercontent.com/gcoleman799/Asset-Loader/master/weather.json").then(function(resp) {
 		return resp.json();
 	}).then(function(data) {
-	console.log(data);
 		var form = document.getElementById("location");
 		var currentLocation = form.options[form.selectedIndex].value;
+		console.log(data[currentLocation].description);
 		document.getElementById("title").innerText = form.options[form.selectedIndex].text;
-        document.getElementById("currentTemp").innerText = data[currentLocation].currentTemp;
+        document.getElementById("currentTemp").innerText = `${data[currentLocation].currentTemp}`+ "\xB0 F";
         document.getElementById("shortDescription").innerText = data[currentLocation].description;
         document.getElementById("longDescription").innerText = "Today in " + `${form.options[form.selectedIndex].text}`
-            + " there is a " + `${data[currentLocation].chancePrecip}` + " chance of precipitation and the humidity is "
-            + `${data[currentLocation].humidity}.`;
-        document.getElementById("icon").src = getIcon(data[currentLocation].shortDescription);
+            + " there is a " + `${data[currentLocation].chancePrecip}` + "% chance of precipitation and the humidity is "
+            + `${data[currentLocation].humidity}` + "%.";
+        document.getElementById("icon").src = getIcon(data[currentLocation].description);
 	})
 }
 
 function getIcon(description){
     switch(description) {
         case "Rainy":
-            return "https://gcoleman799.github.io/res/drawable/rain.png";
+            return "https://raw.githubusercontent.com/res/drawable/rain.png";
         case "Clear Sky":
-            return "https://gcoleman799.github.io/res/drawable/sunny.png";
+            return "https://raw.githubusercontent.com/res/drawable/sunny.png";
         default:
-            return "https://gcoleman799.github.io/res/drawable/partly_cloudy.png";
+            return "https://raw.githubusercontent.com/res/drawable/partly_cloudy.png";
     }
 }
\ No newline at end of file

From 55a9608bfe532868bb4dcc1eda695ff09234c1b6 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 15 Jul 2020 10:21:08 -0400
Subject: [PATCH 07/50] adds meta tag, corrects media query, adds
 setDefaultNightMode

---
 WebView/app/src/main/assets/app.css                   | 11 +++++++----
 WebView/app/src/main/assets/index.html                |  1 +
 .../com/android/samples/webviewdemo/MainActivity.kt   | 10 ++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/WebView/app/src/main/assets/app.css b/WebView/app/src/main/assets/app.css
index fffe5f9a..42cb9170 100644
--- a/WebView/app/src/main/assets/app.css
+++ b/WebView/app/src/main/assets/app.css
@@ -13,11 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-body{
+
+body {
   background-color: white;
-  @media(prefers-color-scheme:dark){
-    background: blue
-  }
+}
+@media (prefers-color-scheme: dark) {
+   body {
+     background: blue;
+   }
 }
 h1 {
   color: white;
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index be2d1cc1..6639b319 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -18,6 +18,7 @@
   <head>
     <link href="app.css" rel="stylesheet">
     <script async src="main.js"></script>
+    <meta name="color-scheme" content="dark light">
   </head>
   <body onload="getData()">
     <label for="location">Choose a location:</label>
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 1efd5436..21d8e13c 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -24,19 +24,18 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.util.Log
 import android.webkit.JavascriptInterface
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 import androidx.core.content.ContextCompat.startActivity
 import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.WebMessageCompat
 import androidx.webkit.WebSettingsCompat
 import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING
-import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_USER_AGENT_DARKENING_ONLY
-import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
 import androidx.webkit.WebViewCompat
@@ -134,6 +133,8 @@ class MainActivity : AppCompatActivity() {
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://gcoleman799.github.io")
 
+        // App level dark theme
+        AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_FOLLOW_SYSTEM)
 
         // FORCE DARK
         // Check if the system is set to light or dark mode
@@ -151,11 +152,12 @@ class MainActivity : AppCompatActivity() {
             if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
                 WebSettingsCompat.setForceDarkStrategy(
                     binding.webview.settings,
-                    DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
+                    DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING
                 )
             }
         }
 
+
         // Configure asset loader with custom domain
         // * NOTE THAT *:
         // The assets path handler is set with the sub path /Asset-Loader/ here because we are tyring to ensure

From 3e2c0094c0030decb9effb289d5590402088e021 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 15 Jul 2020 15:58:34 -0400
Subject: [PATCH 08/50] adds media query

---
 WebView/app/src/main/assets/app.css           | 43 ++++++++++++-------
 .../samples/webviewdemo/MainActivity.kt       |  4 --
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/WebView/app/src/main/assets/app.css b/WebView/app/src/main/assets/app.css
index 42cb9170..f4a386f6 100644
--- a/WebView/app/src/main/assets/app.css
+++ b/WebView/app/src/main/assets/app.css
@@ -14,20 +14,34 @@
  * limitations under the License.
  */
 
-body {
-  background-color: white;
-}
+/* Dark Theme */
 @media (prefers-color-scheme: dark) {
-   body {
-     background: blue;
+  body {
+     background: #121212;
+  }
+   h1 {
+     color: white;
+   }
+   h2 {
+     color: white;
    }
 }
-h1 {
-  color: white;
-  text-align: center;
+
+/* Light Theme */
+@media (prefers-color-scheme: light) {
+  body {
+    background-color: white;
+  }
+  h1 {
+    color: black;
+  }
+  h2 {
+    color: grey;
+  }
 }
-h2 {
-  color: grey;
+
+/* Layout */
+h1, h2 {
   text-align: center;
 }
 p {
@@ -43,13 +57,13 @@ img {
   padding: 5px;
 }
 .button {
+  color: black;
+  background-color:#03DAC6;
   font-family: verdana;
-  background-color:#44c767;
   border-radius:8px;
-  border:1px solid #18ab29;
+  border:1px solid #03DAC6;
   display:inline-block;
   cursor:pointer;
-  color:#ffffff;
   font-size:18px;
   padding:16px 31px;
   text-decoration:none;
@@ -57,9 +71,6 @@ img {
   margin-left: 27%;
   margin-top: 5%;
 }
-.button:hover {
-  background-color:#42b007;
-}
 .button:active {
   position:relative;
   top:1px;
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 21d8e13c..2eb07d4d 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -133,9 +133,6 @@ class MainActivity : AppCompatActivity() {
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://gcoleman799.github.io")
 
-        // App level dark theme
-        AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_FOLLOW_SYSTEM)
-
         // FORCE DARK
         // Check if the system is set to light or dark mode
         val nightModeFlag = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
@@ -157,7 +154,6 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-
         // Configure asset loader with custom domain
         // * NOTE THAT *:
         // The assets path handler is set with the sub path /Asset-Loader/ here because we are tyring to ensure

From d70a861fb5414154f8abcd73afb90958cd8a61c2 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 15 Jul 2020 08:42:08 -0400
Subject: [PATCH 09/50] changes path, adds icon choosing logic

---
 WebView/app/src/main/assets/main.js              | 16 +++++++++++++---
 .../android/samples/webviewdemo/MainActivity.kt  | 13 +++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/WebView/app/src/main/assets/main.js b/WebView/app/src/main/assets/main.js
index 74363ec6..3f4472d8 100644
--- a/WebView/app/src/main/assets/main.js
+++ b/WebView/app/src/main/assets/main.js
@@ -25,9 +25,10 @@ function sendAndroidMessage() {
 
 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) {
+   	fetch("https://raw.githubusercontent.com/android/views-widgets-samples/webview/WebView/sampleData/weather.json").then(function(resp) {
 		return resp.json();
 	}).then(function(data) {
+	console.log(data);
 		var form = document.getElementById("location");
 		var currentLocation = form.options[form.selectedIndex].value;
 		document.getElementById("title").innerText = form.options[form.selectedIndex].text;
@@ -36,8 +37,17 @@ function getData() {
         document.getElementById("longDescription").innerText = "Today in " + `${form.options[form.selectedIndex].text}`
             + " there is a " + `${data[currentLocation].chancePrecip}` + " chance of precipitation and the humidity is "
             + `${data[currentLocation].humidity}.`;
-        document.getElementById("icon").src = data[currentLocation].icon;
+        document.getElementById("icon").src = getIcon(data[currentLocation].shortDescription);
 	})
 }
 
-// TODO: Create getIcon() function to decide which icon to render.
\ No newline at end of file
+function getIcon(description){
+    switch(description) {
+        case "Rainy":
+            return "https://gcoleman799.github.io/res/drawable/rain.png";
+        case "Clear Sky":
+            return "https://gcoleman799.github.io/res/drawable/sunny.png";
+        default:
+            return "https://gcoleman799.github.io/res/drawable/partly_cloudy.png";
+    }
+}
\ No newline at end of file
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 3a5ecaa5..33ae04cd 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -144,16 +144,9 @@ class MainActivity : AppCompatActivity() {
         }
 
         // Configure asset loader with custom domain
-        // * NOTE THAT *:
-        // The assets path handler is set with the sub path /Asset-Loader/ here because we are tyring to ensure
-        // that the address loaded with loadUrl("https://gcoleman799.github.io/Asset-Loader/assets/index.html") does
-        // not conflict with a real web address. In this case, if the path were only /assests/ we would need to load
-        // "https://gcoleman799.github.io/assets/index.html" in order to access our local index.html file.
-        // However we cannot guarantee "https://gcoleman799.github.io/assets/index.html" is not a valid web address.
-        // Therefore we must let the AssetLoader know to expect the /Asset-Loader/ sub path as well as the /assets/.
         val assetLoader = WebViewAssetLoader.Builder()
-            .setDomain("gcoleman799.github.io")
-            .addPathHandler("/Asset-Loader/assets/", WebViewAssetLoader.AssetsPathHandler(this))
+            .setDomain("raw.githubusercontent.com")
+            .addPathHandler("/assets/", WebViewAssetLoader.AssetsPathHandler(this))
             .addPathHandler("/res/", WebViewAssetLoader.ResourcesPathHandler(this))
             .build()
 
@@ -182,6 +175,6 @@ class MainActivity : AppCompatActivity() {
         ) { message -> invokeShareIntent(message) }
 
         // Load the content
-        binding.webview.loadUrl("https://gcoleman799.github.io/Asset-Loader/assets/index.html")
+        binding.webview.loadUrl("https://raw.githubusercontent.com/assets/index.html")
     }
 }
\ No newline at end of file

From 47f53afca064082c0f1fb8c11c5efee865b6ba96 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 15 Jul 2020 09:03:53 -0400
Subject: [PATCH 10/50] changes initial image path, adds symbos values

---
 WebView/app/src/main/assets/index.html |  2 +-
 WebView/app/src/main/assets/main.js    | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index be2d1cc1..e0f3c9b9 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -27,7 +27,7 @@
       <option value="london">London</option>
     </select>
     <h1 id="title">Location</h1>
-    <img alt="weather" class="icon" id="icon" src="https://gcoleman799.github.io/res/drawable/sunny.png" />
+    <img alt="weather" class="icon" id="icon" src="https://raw.githubusercontent.com/res/drawable/sunny.png" />
     <h2 class="currentTemp" id="currentTemp">Current Temp</h2>
     <h2 class="shortDescription" id="shortDescription">Short Description</h2>
     <p class="longDescription" id="longDescription">Long Description</p>
diff --git a/WebView/app/src/main/assets/main.js b/WebView/app/src/main/assets/main.js
index 3f4472d8..93499daf 100644
--- a/WebView/app/src/main/assets/main.js
+++ b/WebView/app/src/main/assets/main.js
@@ -18,36 +18,34 @@ 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://raw.githubusercontent.com/android/views-widgets-samples/webview/WebView/sampleData/weather.json").then(function(resp) {
+   	fetch("https://raw.githubusercontent.com/gcoleman799/Asset-Loader/master/weather.json").then(function(resp) {
 		return resp.json();
 	}).then(function(data) {
-	console.log(data);
 		var form = document.getElementById("location");
 		var currentLocation = form.options[form.selectedIndex].value;
+		console.log(data[currentLocation].description);
 		document.getElementById("title").innerText = form.options[form.selectedIndex].text;
-        document.getElementById("currentTemp").innerText = data[currentLocation].currentTemp;
+        document.getElementById("currentTemp").innerText = `${data[currentLocation].currentTemp}`+ "\xB0 F";
         document.getElementById("shortDescription").innerText = data[currentLocation].description;
         document.getElementById("longDescription").innerText = "Today in " + `${form.options[form.selectedIndex].text}`
-            + " there is a " + `${data[currentLocation].chancePrecip}` + " chance of precipitation and the humidity is "
-            + `${data[currentLocation].humidity}.`;
-        document.getElementById("icon").src = getIcon(data[currentLocation].shortDescription);
+            + " there is a " + `${data[currentLocation].chancePrecip}` + "% chance of precipitation and the humidity is "
+            + `${data[currentLocation].humidity}` + "%.";
+        document.getElementById("icon").src = getIcon(data[currentLocation].description);
 	})
 }
 
 function getIcon(description){
     switch(description) {
         case "Rainy":
-            return "https://gcoleman799.github.io/res/drawable/rain.png";
+            return "https://raw.githubusercontent.com/res/drawable/rain.png";
         case "Clear Sky":
-            return "https://gcoleman799.github.io/res/drawable/sunny.png";
+            return "https://raw.githubusercontent.com/res/drawable/sunny.png";
         default:
-            return "https://gcoleman799.github.io/res/drawable/partly_cloudy.png";
+            return "https://raw.githubusercontent.com/res/drawable/partly_cloudy.png";
     }
 }
\ No newline at end of file

From f429a263e4e9b7fb9ef873910d39e4d1044d212e Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Thu, 16 Jul 2020 10:02:25 -0400
Subject: [PATCH 11/50] changes fetch to correct path

---
 WebView/app/src/main/assets/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebView/app/src/main/assets/main.js b/WebView/app/src/main/assets/main.js
index 93499daf..f926349e 100644
--- a/WebView/app/src/main/assets/main.js
+++ b/WebView/app/src/main/assets/main.js
@@ -23,7 +23,7 @@ function sendAndroidMessage() {
 }
 
 function getData() {
-   	fetch("https://raw.githubusercontent.com/gcoleman799/Asset-Loader/master/weather.json").then(function(resp) {
+   	fetch("https://raw.githubusercontent.com/android/views-widgets-samples/webview/WebView/sampleData/weather.json").then(function(resp) {
 		return resp.json();
 	}).then(function(data) {
 		var form = document.getElementById("location");

From f0b47b9e38b05579841f2b914c97729bb4f02ace Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Mon, 20 Jul 2020 09:59:45 -0400
Subject: [PATCH 12/50] changes background color, adds clarification on
 ForceDarkStrategy

---
 WebView/app/src/main/assets/app.css                |  2 +-
 .../android/samples/webviewdemo/MainActivity.kt    | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/WebView/app/src/main/assets/app.css b/WebView/app/src/main/assets/app.css
index f4a386f6..8877921a 100644
--- a/WebView/app/src/main/assets/app.css
+++ b/WebView/app/src/main/assets/app.css
@@ -17,7 +17,7 @@
 /* Dark Theme */
 @media (prefers-color-scheme: dark) {
   body {
-     background: #121212;
+     background: #383838;
   }
    h1 {
      color: white;
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 2eb07d4d..f4064e06 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -144,8 +144,18 @@ class MainActivity : AppCompatActivity() {
                     WebSettingsCompat.FORCE_DARK_ON
                 )
             }
-            // Use custom Dark Theme
-            // DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - it never applies automatic darkening and uses web page only darkening.
+
+            /* Set how WebView content should be darkened. There are three options for how to darken
+             * a WebView.
+             * PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING- checks for the "color-scheme" <meta> tag.
+             * If present, it uses media queries. If absent, it applies user-agent (automatic) darkening
+             * DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - uses media queries always, even if there's
+             * no "color-scheme" <meta> tag present.
+             * DARK_STRATEGY_USER_AGENT_DARKENING_ONLY - it ignores web page theme and always applies
+             * user-agent (automatic) darkening.
+             * More information about Force Dark Strategy can be found here:
+             * https://developer.android.com/reference/androidx/webkit/WebSettingsCompat#setForceDarkStrategy(android.webkit.WebSettings,%20int)
+             */
             if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
                 WebSettingsCompat.setForceDarkStrategy(
                     binding.webview.settings,

From 5dc103e48bdb9cade4f3d58b2593c462cddc9ece Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Mon, 20 Jul 2020 10:28:12 -0400
Subject: [PATCH 13/50] add clarifying comments on location of data, change
 path to ensure conflicts are avoided

---
 WebView/app/src/main/assets/main.js                   |  6 ++++++
 .../com/android/samples/webviewdemo/MainActivity.kt   | 11 +++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/WebView/app/src/main/assets/main.js b/WebView/app/src/main/assets/main.js
index f926349e..7fb788f1 100644
--- a/WebView/app/src/main/assets/main.js
+++ b/WebView/app/src/main/assets/main.js
@@ -22,7 +22,9 @@ function sendAndroidMessage() {
 	`${document.getElementById("shortDescription").innerText} `);
 }
 
+
 function getData() {
+    // This JSON files is hosted over the web
    	fetch("https://raw.githubusercontent.com/android/views-widgets-samples/webview/WebView/sampleData/weather.json").then(function(resp) {
 		return resp.json();
 	}).then(function(data) {
@@ -39,6 +41,10 @@ function getData() {
 	})
 }
 
+/* These icons are hosted locally, in the res/drawable folder. However, we can call them using
+ * http(s)://URLs because we have configured AssetLoader in MainActivity. It is desirable to
+ * call access the files in this way because it is compatible with the Same-Origin policy.
+ */
 function getIcon(description){
     switch(description) {
         case "Rainy":
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 33ae04cd..69d632e6 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -144,9 +144,16 @@ class MainActivity : AppCompatActivity() {
         }
 
         // Configure asset loader with custom domain
+        // * NOTE THAT *:
+        // The assets path handler is set with the sub path /views-widgets-samples/ here because we are tyring to ensure
+        // that the address loaded with loadUrl("https://raw.githubusercontent.com/views-widgets-samples/assets/index.html") does
+        // not conflict with a real web address. In this case, if the path were only /assests/ we would need to load
+        // "https://raw.githubusercontent.com/assets/index.html" in order to access our local index.html file.
+        // However we cannot guarantee "https://raw.githubusercontent.com/assets/index.html" is not a valid web address.
+        // Therefore we must let the AssetLoader know to expect the /views-widgets-samples/ sub path as well as the /assets/.
         val assetLoader = WebViewAssetLoader.Builder()
             .setDomain("raw.githubusercontent.com")
-            .addPathHandler("/assets/", WebViewAssetLoader.AssetsPathHandler(this))
+            .addPathHandler("/views-widgets-samples/assets/", WebViewAssetLoader.AssetsPathHandler(this))
             .addPathHandler("/res/", WebViewAssetLoader.ResourcesPathHandler(this))
             .build()
 
@@ -175,6 +182,6 @@ class MainActivity : AppCompatActivity() {
         ) { message -> invokeShareIntent(message) }
 
         // Load the content
-        binding.webview.loadUrl("https://raw.githubusercontent.com/assets/index.html")
+        binding.webview.loadUrl("https://raw.githubusercontent.com/views-widgets-samples/assets/index.html")
     }
 }
\ No newline at end of file

From 2c773f8c0ea88447674e3c3f3f94d074cf0cab12 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 21 Jul 2020 10:25:03 -0400
Subject: [PATCH 14/50] adds testing outline and dependencies

---
 WebView/app/build.gradle                      |  7 ++
 .../webviewdemo/ExampleInstrumentedTest.kt    | 64 ++++++++++++++++---
 WebView/app/src/main/assets/index.html        |  2 +-
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/WebView/app/build.gradle b/WebView/app/build.gradle
index 195ddbe2..6c1081ec 100644
--- a/WebView/app/build.gradle
+++ b/WebView/app/build.gradle
@@ -65,4 +65,11 @@ dependencies {
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-web:3.1.0'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
+    androidTestImplementation 'androidx.test:rules:1.1.1'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+
+
 }
diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
index d595a6ab..18a1b5b6 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
@@ -15,14 +15,19 @@
  */
 
 package com.android.samples.webviewdemo
-
-import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
+import androidx.test.espresso.web.sugar.Web.onWebView
+import androidx.test.espresso.web.webdriver.DriverAtoms.findElement
+import androidx.test.espresso.web.webdriver.DriverAtoms.getText
+import androidx.test.espresso.web.webdriver.DriverAtoms.webClick
+import androidx.test.espresso.web.webdriver.Locator
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.rule.ActivityTestRule
+import org.hamcrest.CoreMatchers.containsString
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -31,10 +36,53 @@ import org.junit.Assert.*
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
+
+    @Rule @JvmField
+    val activityRule = ActivityTestRule(MainActivity::class.java)
+
+     fun afterActivityLaunched() {
+//         Technically we do not need to do this - MainActivity has javascript turned on.
+//         Other WebViews in your app may have javascript turned off, however since the only way
+//         to automate WebViews is through javascript, it must be enabled.
+        onWebView().forceJavascriptEnabled()
+    }
+
+
+    @Test
+    fun webViewTest() {
+
+        activityRule.getActivity()
+
+
+        onWebView()
+            .withElement(findElement(Locator.ID, "title"))
+            .check(webMatches(getText(), containsString("New York")))
+//            .perform(webClick())
+//            .withElement(findElement(Locator.TAG_NAME, "h1"))
+//            .check(webMatches(getText(), containsString("Apple")))
+
+
+    }
+
+
+// Test for calling postMessage
     @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.android.samples.webviewdemo", appContext.packageName)
+    fun callPostMessage() {
+        onWebView()
+                // Click on the share button
+            .withElement(findElement(Locator.ID, "share")) // similar to onView(withId(...))
+            .perform(webClick()) // Similar to perform(click())
+
+            // check that an intent was created
+
+            // verify that the data send to post message looks correct
+
+            //.get()
+            //.value
+
+
+            // Similar to check(matches(...))
+            //.check(webMatches(executeScript)
+
     }
 }
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index be2d1cc1..dd514993 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -31,6 +31,6 @@ <h1 id="title">Location</h1>
     <h2 class="currentTemp" id="currentTemp">Current Temp</h2>
     <h2 class="shortDescription" id="shortDescription">Short Description</h2>
     <p class="longDescription" id="longDescription">Long Description</p>
-    <button class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
+    <button id="share" class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
   </body>
 </html>
\ No newline at end of file

From 403446fbdc5639af17c3966f673919fc1b1b56db Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 21 Jul 2020 10:32:23 -0400
Subject: [PATCH 15/50] changes res path, fixes comment in main.js

---
 WebView/app/src/main/assets/main.js                    | 10 +++++-----
 .../com/android/samples/webviewdemo/MainActivity.kt    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WebView/app/src/main/assets/main.js b/WebView/app/src/main/assets/main.js
index 7fb788f1..c3634999 100644
--- a/WebView/app/src/main/assets/main.js
+++ b/WebView/app/src/main/assets/main.js
@@ -42,16 +42,16 @@ function getData() {
 }
 
 /* These icons are hosted locally, in the res/drawable folder. However, we can call them using
- * http(s)://URLs because we have configured AssetLoader in MainActivity. It is desirable to
- * call access the files in this way because it is compatible with the Same-Origin policy.
+ * http(s):// URLs because we have configured AssetLoader in MainActivity. It is desirable to
+ * access the files in this way because it is compatible with the Same-Origin policy.
  */
 function getIcon(description){
     switch(description) {
         case "Rainy":
-            return "https://raw.githubusercontent.com/res/drawable/rain.png";
+            return "https://raw.githubusercontent.com/views-widgets-samples/res/drawable/rain.png";
         case "Clear Sky":
-            return "https://raw.githubusercontent.com/res/drawable/sunny.png";
+            return "https://raw.githubusercontent.com/views-widgets-samples/res/drawable/sunny.png";
         default:
-            return "https://raw.githubusercontent.com/res/drawable/partly_cloudy.png";
+            return "https://raw.githubusercontent.com/views-widgets-samples/res/drawable/partly_cloudy.png";
     }
 }
\ No newline at end of file
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 69d632e6..91dd115c 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -154,7 +154,7 @@ class MainActivity : AppCompatActivity() {
         val assetLoader = WebViewAssetLoader.Builder()
             .setDomain("raw.githubusercontent.com")
             .addPathHandler("/views-widgets-samples/assets/", WebViewAssetLoader.AssetsPathHandler(this))
-            .addPathHandler("/res/", WebViewAssetLoader.ResourcesPathHandler(this))
+            .addPathHandler("/views-widgets-samples/res/", WebViewAssetLoader.ResourcesPathHandler(this))
             .build()
 
         // Set clients

From 77ff7e09a39c8348d9265be0c1893f078c4ad9d7 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 21 Jul 2020 12:31:45 -0400
Subject: [PATCH 16/50] adds tests for createJsObject and drop down menu

---
 .../webviewdemo/ExampleInstrumentedTest.kt    | 66 ++++++++-----------
 WebView/app/src/main/assets/index.html        |  4 +-
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
index 18a1b5b6..fd22be61 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
@@ -16,6 +16,8 @@
 
 package com.android.samples.webviewdemo
 import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
+import androidx.test.espresso.web.model.Atoms.castOrDie
+import androidx.test.espresso.web.model.Atoms.script
 import androidx.test.espresso.web.sugar.Web.onWebView
 import androidx.test.espresso.web.webdriver.DriverAtoms.findElement
 import androidx.test.espresso.web.webdriver.DriverAtoms.getText
@@ -23,12 +25,12 @@ import androidx.test.espresso.web.webdriver.DriverAtoms.webClick
 import androidx.test.espresso.web.webdriver.Locator
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
+import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.containsString
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -38,51 +40,37 @@ import org.junit.runner.RunWith
 class ExampleInstrumentedTest {
 
     @Rule @JvmField
-    val activityRule = ActivityTestRule(MainActivity::class.java)
-
-     fun afterActivityLaunched() {
-//         Technically we do not need to do this - MainActivity has javascript turned on.
-//         Other WebViews in your app may have javascript turned off, however since the only way
-//         to automate WebViews is through javascript, it must be enabled.
+    val mainActivityRule = ActivityTestRule(MainActivity::class.java)
+    fun afterActivityLaunched() {
+      // Technically we do not need to do this - MainActivity has javascript turned on.
+      // Other WebViews in your app may have javascript turned off, however since the only way
+      // to automate WebViews is through javascript, it must be enabled.
         onWebView().forceJavascriptEnabled()
     }
 
-
+    // Test to check that the drop down menu behaves as expected
     @Test
-    fun webViewTest() {
-
-        activityRule.getActivity()
-
-
+    fun dropDownMenu_SanFran() {
+        mainActivityRule.getActivity()
         onWebView()
+            .withElement(findElement(Locator.ID, "location"))
+            .perform(webClick()) // Similar to perform(click())
+            .withElement(findElement(Locator.ID, "SF"))
+            .perform(webClick()) // Similar to perform(click())
             .withElement(findElement(Locator.ID, "title"))
-            .check(webMatches(getText(), containsString("New York")))
-//            .perform(webClick())
-//            .withElement(findElement(Locator.TAG_NAME, "h1"))
-//            .check(webMatches(getText(), containsString("Apple")))
-
-
+            .check(webMatches(getText(), containsString("San Francisco")))
     }
 
-
-// Test for calling postMessage
+    // Test for checking createJsObject
     @Test
-    fun callPostMessage() {
-        onWebView()
-                // Click on the share button
-            .withElement(findElement(Locator.ID, "share")) // similar to onView(withId(...))
-            .perform(webClick()) // Similar to perform(click())
-
-            // check that an intent was created
-
-            // verify that the data send to post message looks correct
-
-            //.get()
-            //.value
-
-
-            // Similar to check(matches(...))
-            //.check(webMatches(executeScript)
-
+    fun jsObjectIsInjectedAndContainsPostMessage() {
+    mainActivityRule.getActivity()
+    onWebView()
+        .check(
+            webMatches(
+                script("return jsObject && jsObject.postMessage != null;", castOrDie(Boolean::class.javaObjectType)),
+                `is`(true)
+            )
+        )
     }
-}
+}
\ No newline at end of file
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index dd514993..5a647caa 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -23,7 +23,7 @@
     <label for="location">Choose a location:</label>
     <select name="location" id="location" onchange="getData()">
       <option value="newYork">New York</option>
-      <option value="sanFrancisco">San Francisco</option>
+      <option id= "SF" value="sanFrancisco">San Francisco</option>
       <option value="london">London</option>
     </select>
     <h1 id="title">Location</h1>
@@ -31,6 +31,6 @@ <h1 id="title">Location</h1>
     <h2 class="currentTemp" id="currentTemp">Current Temp</h2>
     <h2 class="shortDescription" id="shortDescription">Short Description</h2>
     <p class="longDescription" id="longDescription">Long Description</p>
-    <button id="share" class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
+    <button class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
   </body>
 </html>
\ No newline at end of file

From 7185787a3491df208a88c748ed3619d17f123c4d Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 21 Jul 2020 15:20:52 -0400
Subject: [PATCH 17/50] add description to tests,add ids to menu

---
 .../android/samples/webviewdemo/ExampleInstrumentedTest.kt    | 4 +---
 WebView/app/src/main/assets/index.html                        | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
index fd22be61..7f853f89 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
@@ -32,9 +32,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 /**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
+ * Launch, interact, and verify conditions in an activity that has a WebView instance.
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index 5a647caa..2ec474c9 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -22,9 +22,9 @@
   <body onload="getData()">
     <label for="location">Choose a location:</label>
     <select name="location" id="location" onchange="getData()">
-      <option value="newYork">New York</option>
+      <option id= "NYC" value="newYork">New York</option>
       <option id= "SF" value="sanFrancisco">San Francisco</option>
-      <option value="london">London</option>
+      <option id= "LDN" value="london">London</option>
     </select>
     <h1 id="title">Location</h1>
     <img alt="weather" class="icon" id="icon" src="https://gcoleman799.github.io/res/drawable/sunny.png" />

From 61c895e3680b55acf216a59926ed0249f7cfb7ae Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 22 Jul 2020 09:12:09 -0400
Subject: [PATCH 18/50] splits light and dark themes into seperate files, adds
 logic to check if dark more is supported

---
 WebView/app/src/main/assets/dark.css          | 12 ++++++++
 WebView/app/src/main/assets/index.html        | 19 +++++++++++-
 WebView/app/src/main/assets/light.css         |  8 +++++
 .../src/main/assets/{app.css => style.css}    | 29 +------------------
 4 files changed, 39 insertions(+), 29 deletions(-)
 create mode 100644 WebView/app/src/main/assets/dark.css
 create mode 100644 WebView/app/src/main/assets/light.css
 rename WebView/app/src/main/assets/{app.css => style.css} (82%)

diff --git a/WebView/app/src/main/assets/dark.css b/WebView/app/src/main/assets/dark.css
new file mode 100644
index 00000000..ebf18f23
--- /dev/null
+++ b/WebView/app/src/main/assets/dark.css
@@ -0,0 +1,12 @@
+/* Dark Theme */
+@media (prefers-color-scheme: dark) {
+  body {
+     background: #383838;
+  }
+   h1 {
+     color: white;
+   }
+   h2 {
+     color: white;
+   }
+}
\ No newline at end of file
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index 6639b319..e785ff98 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -16,9 +16,26 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link href="app.css" rel="stylesheet">
     <script async src="main.js"></script>
     <meta name="color-scheme" content="dark light">
+    <script>
+      // If dark mode is not supported then load light.css
+      if (window.matchMedia('(prefers-color-scheme: dark)').media === 'not all') {
+      document.head.insertAdjacentHTML(
+        'beforeend',
+        '<link rel="stylesheet" href="light.css" onload="document.documentElement.style.display = \'\'">'
+       );
+     }
+    </script>
+    <!--
+      If dark mode is supported, conditionally either load the light or the dark stylesheet. If
+      `prefers-color-scheme` is not supported the media query is unknown and the files are loaded
+       with `lowest` priority.
+    -->
+    <link rel="stylesheet" href="dark.css" media="(prefers-color-scheme: dark)">
+    <link rel="stylesheet" href="light.css" media="(prefers-color-scheme: light)">
+    <!-- The main stylesheet with generic rules used universally -->
+    <link rel="stylesheet" href="style.css">
   </head>
   <body onload="getData()">
     <label for="location">Choose a location:</label>
diff --git a/WebView/app/src/main/assets/light.css b/WebView/app/src/main/assets/light.css
new file mode 100644
index 00000000..fa63453a
--- /dev/null
+++ b/WebView/app/src/main/assets/light.css
@@ -0,0 +1,8 @@
+/* Light Theme */
+body {
+   background-color: white;
+}
+h1, h2 {
+  text-align: center;
+  color: black;
+}
diff --git a/WebView/app/src/main/assets/app.css b/WebView/app/src/main/assets/style.css
similarity index 82%
rename from WebView/app/src/main/assets/app.css
rename to WebView/app/src/main/assets/style.css
index 8877921a..85f27d56 100644
--- a/WebView/app/src/main/assets/app.css
+++ b/WebView/app/src/main/assets/style.css
@@ -13,36 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/* Dark Theme */
-@media (prefers-color-scheme: dark) {
-  body {
-     background: #383838;
-  }
-   h1 {
-     color: white;
-   }
-   h2 {
-     color: white;
-   }
-}
-
-/* Light Theme */
-@media (prefers-color-scheme: light) {
-  body {
-    background-color: white;
-  }
-  h1 {
-    color: black;
-  }
-  h2 {
-    color: grey;
-  }
-}
-
-/* Layout */
 h1, h2 {
   text-align: center;
+  color: black;
 }
 p {
   font-family: verdana;

From 66b3c49fcb481fa8ccd16eed9a4ba78648174473 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 22 Jul 2020 09:16:00 -0400
Subject: [PATCH 19/50] removes static text color setting from style.css

---
 WebView/app/src/main/assets/style.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WebView/app/src/main/assets/style.css b/WebView/app/src/main/assets/style.css
index 85f27d56..60aef2b6 100644
--- a/WebView/app/src/main/assets/style.css
+++ b/WebView/app/src/main/assets/style.css
@@ -15,7 +15,6 @@
  */
 h1, h2 {
   text-align: center;
-  color: black;
 }
 p {
   font-family: verdana;

From 4323afe37eb508a67eb132456f1801306abb8912 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 21 Jul 2020 10:25:03 -0400
Subject: [PATCH 20/50] adds testing outline and dependencies

---
 WebView/app/build.gradle                      |  7 ++
 .../webviewdemo/ExampleInstrumentedTest.kt    | 64 ++++++++++++++++---
 WebView/app/src/main/assets/index.html        |  2 +-
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/WebView/app/build.gradle b/WebView/app/build.gradle
index 195ddbe2..6c1081ec 100644
--- a/WebView/app/build.gradle
+++ b/WebView/app/build.gradle
@@ -65,4 +65,11 @@ dependencies {
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-web:3.1.0'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
+    androidTestImplementation 'androidx.test:rules:1.1.1'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+
+
 }
diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
index d595a6ab..18a1b5b6 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
@@ -15,14 +15,19 @@
  */
 
 package com.android.samples.webviewdemo
-
-import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
+import androidx.test.espresso.web.sugar.Web.onWebView
+import androidx.test.espresso.web.webdriver.DriverAtoms.findElement
+import androidx.test.espresso.web.webdriver.DriverAtoms.getText
+import androidx.test.espresso.web.webdriver.DriverAtoms.webClick
+import androidx.test.espresso.web.webdriver.Locator
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.rule.ActivityTestRule
+import org.hamcrest.CoreMatchers.containsString
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -31,10 +36,53 @@ import org.junit.Assert.*
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
+
+    @Rule @JvmField
+    val activityRule = ActivityTestRule(MainActivity::class.java)
+
+     fun afterActivityLaunched() {
+//         Technically we do not need to do this - MainActivity has javascript turned on.
+//         Other WebViews in your app may have javascript turned off, however since the only way
+//         to automate WebViews is through javascript, it must be enabled.
+        onWebView().forceJavascriptEnabled()
+    }
+
+
+    @Test
+    fun webViewTest() {
+
+        activityRule.getActivity()
+
+
+        onWebView()
+            .withElement(findElement(Locator.ID, "title"))
+            .check(webMatches(getText(), containsString("New York")))
+//            .perform(webClick())
+//            .withElement(findElement(Locator.TAG_NAME, "h1"))
+//            .check(webMatches(getText(), containsString("Apple")))
+
+
+    }
+
+
+// Test for calling postMessage
     @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.android.samples.webviewdemo", appContext.packageName)
+    fun callPostMessage() {
+        onWebView()
+                // Click on the share button
+            .withElement(findElement(Locator.ID, "share")) // similar to onView(withId(...))
+            .perform(webClick()) // Similar to perform(click())
+
+            // check that an intent was created
+
+            // verify that the data send to post message looks correct
+
+            //.get()
+            //.value
+
+
+            // Similar to check(matches(...))
+            //.check(webMatches(executeScript)
+
     }
 }
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index e0f3c9b9..b59f0a02 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -31,6 +31,6 @@ <h1 id="title">Location</h1>
     <h2 class="currentTemp" id="currentTemp">Current Temp</h2>
     <h2 class="shortDescription" id="shortDescription">Short Description</h2>
     <p class="longDescription" id="longDescription">Long Description</p>
-    <button class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
+    <button id="share" class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
   </body>
 </html>
\ No newline at end of file

From aa3df0961c211d403df4b46a104a92068783822c Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 21 Jul 2020 12:31:45 -0400
Subject: [PATCH 21/50] adds tests for createJsObject and drop down menu

---
 .../webviewdemo/ExampleInstrumentedTest.kt    | 66 ++++++++-----------
 WebView/app/src/main/assets/index.html        |  4 +-
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
index 18a1b5b6..fd22be61 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
@@ -16,6 +16,8 @@
 
 package com.android.samples.webviewdemo
 import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
+import androidx.test.espresso.web.model.Atoms.castOrDie
+import androidx.test.espresso.web.model.Atoms.script
 import androidx.test.espresso.web.sugar.Web.onWebView
 import androidx.test.espresso.web.webdriver.DriverAtoms.findElement
 import androidx.test.espresso.web.webdriver.DriverAtoms.getText
@@ -23,12 +25,12 @@ import androidx.test.espresso.web.webdriver.DriverAtoms.webClick
 import androidx.test.espresso.web.webdriver.Locator
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
+import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.containsString
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -38,51 +40,37 @@ import org.junit.runner.RunWith
 class ExampleInstrumentedTest {
 
     @Rule @JvmField
-    val activityRule = ActivityTestRule(MainActivity::class.java)
-
-     fun afterActivityLaunched() {
-//         Technically we do not need to do this - MainActivity has javascript turned on.
-//         Other WebViews in your app may have javascript turned off, however since the only way
-//         to automate WebViews is through javascript, it must be enabled.
+    val mainActivityRule = ActivityTestRule(MainActivity::class.java)
+    fun afterActivityLaunched() {
+      // Technically we do not need to do this - MainActivity has javascript turned on.
+      // Other WebViews in your app may have javascript turned off, however since the only way
+      // to automate WebViews is through javascript, it must be enabled.
         onWebView().forceJavascriptEnabled()
     }
 
-
+    // Test to check that the drop down menu behaves as expected
     @Test
-    fun webViewTest() {
-
-        activityRule.getActivity()
-
-
+    fun dropDownMenu_SanFran() {
+        mainActivityRule.getActivity()
         onWebView()
+            .withElement(findElement(Locator.ID, "location"))
+            .perform(webClick()) // Similar to perform(click())
+            .withElement(findElement(Locator.ID, "SF"))
+            .perform(webClick()) // Similar to perform(click())
             .withElement(findElement(Locator.ID, "title"))
-            .check(webMatches(getText(), containsString("New York")))
-//            .perform(webClick())
-//            .withElement(findElement(Locator.TAG_NAME, "h1"))
-//            .check(webMatches(getText(), containsString("Apple")))
-
-
+            .check(webMatches(getText(), containsString("San Francisco")))
     }
 
-
-// Test for calling postMessage
+    // Test for checking createJsObject
     @Test
-    fun callPostMessage() {
-        onWebView()
-                // Click on the share button
-            .withElement(findElement(Locator.ID, "share")) // similar to onView(withId(...))
-            .perform(webClick()) // Similar to perform(click())
-
-            // check that an intent was created
-
-            // verify that the data send to post message looks correct
-
-            //.get()
-            //.value
-
-
-            // Similar to check(matches(...))
-            //.check(webMatches(executeScript)
-
+    fun jsObjectIsInjectedAndContainsPostMessage() {
+    mainActivityRule.getActivity()
+    onWebView()
+        .check(
+            webMatches(
+                script("return jsObject && jsObject.postMessage != null;", castOrDie(Boolean::class.javaObjectType)),
+                `is`(true)
+            )
+        )
     }
-}
+}
\ No newline at end of file
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index b59f0a02..7cd67265 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -23,7 +23,7 @@
     <label for="location">Choose a location:</label>
     <select name="location" id="location" onchange="getData()">
       <option value="newYork">New York</option>
-      <option value="sanFrancisco">San Francisco</option>
+      <option id= "SF" value="sanFrancisco">San Francisco</option>
       <option value="london">London</option>
     </select>
     <h1 id="title">Location</h1>
@@ -31,6 +31,6 @@ <h1 id="title">Location</h1>
     <h2 class="currentTemp" id="currentTemp">Current Temp</h2>
     <h2 class="shortDescription" id="shortDescription">Short Description</h2>
     <p class="longDescription" id="longDescription">Long Description</p>
-    <button id="share" class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
+    <button class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
   </body>
 </html>
\ No newline at end of file

From 6d218b7bc49807a6f34a90162b9300b65d420a92 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 21 Jul 2020 15:20:52 -0400
Subject: [PATCH 22/50] add description to tests,add ids to menu

---
 .../android/samples/webviewdemo/ExampleInstrumentedTest.kt    | 4 +---
 WebView/app/src/main/assets/index.html                        | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
index fd22be61..7f853f89 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
@@ -32,9 +32,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 /**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
+ * Launch, interact, and verify conditions in an activity that has a WebView instance.
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index 7cd67265..8ad31c3a 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -22,9 +22,9 @@
   <body onload="getData()">
     <label for="location">Choose a location:</label>
     <select name="location" id="location" onchange="getData()">
-      <option value="newYork">New York</option>
+      <option id= "NYC" value="newYork">New York</option>
       <option id= "SF" value="sanFrancisco">San Francisco</option>
-      <option value="london">London</option>
+      <option id= "LDN" value="london">London</option>
     </select>
     <h1 id="title">Location</h1>
     <img alt="weather" class="icon" id="icon" src="https://raw.githubusercontent.com/res/drawable/sunny.png" />

From f2638008b6602a747b6f7b161b01158122d255fb Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 22 Jul 2020 13:33:41 -0400
Subject: [PATCH 23/50] adds set up for unit tests

---
 WebView/app/build.gradle                      |  3 ++
 .../samples/webviewdemo/ExampleUnitTest.kt    | 34 ++++++++++++++-----
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/WebView/app/build.gradle b/WebView/app/build.gradle
index 6c1081ec..d51f1889 100644
--- a/WebView/app/build.gradle
+++ b/WebView/app/build.gradle
@@ -63,6 +63,9 @@ dependencies {
     implementation "com.google.android.material:material:$material_components_version"
 
     testImplementation 'junit:junit:4.13'
+    testImplementation 'androidx.test:core:1.0.0'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
+
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-web:3.1.0'
diff --git a/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt b/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt
index c72b979b..d4125bce 100644
--- a/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt
+++ b/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt
@@ -16,18 +16,36 @@
 
 package com.android.samples.webviewdemo
 
+import org.junit.Assert.assertThat
 import org.junit.Test
-
-import org.junit.Assert.*
+import java.util.Objects
 
 /**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
+ * Tests to ensure that callbacks are behaving as expected
  */
-class ExampleUnitTest {
+
+
+class EmailValidatorTest {
     @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
+    fun testConvertFahrenheitToCelsius() {
+        val actual: Float = ConverterUtil.convertCelsiusToFahrenheit(100)
+        // expected value is 212
+        val expected = 212f
+        // use this method because float is not precise
+       // assertEquals("Conversion from celsius to fahrenheit failed", expected, actual, 0.001)
+    }
+    @Test
+    fun postMessage_CorrectStringFormat_ReturnsTrue() {
+        // create object
+                // what object do we need to create?
+                // we need to create a js object to call postMessage on
+        
+        val jsObject: Objects =
+
+            // create expected return
+        // call post message
+        // check that post message
+
+       // assertEquals("Hi", jsObject.postMessage("Hi"))
     }
 }

From 42111ec1e21666322ba594fd0e6bae91915ee89d Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 14 Jul 2020 10:30:20 -0400
Subject: [PATCH 24/50] setup

---
 WebView/app/src/main/AndroidManifest.xml      |  2 +-
 .../samples/webviewdemo/MainActivity.kt       | 12 ++++++++++
 .../app/src/main/res/values-night/colors.xml  | 22 +++++++++++++++++++
 WebView/app/src/main/res/values/styles.xml    |  2 +-
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 WebView/app/src/main/res/values-night/colors.xml

diff --git a/WebView/app/src/main/AndroidManifest.xml b/WebView/app/src/main/AndroidManifest.xml
index ec71c32b..019312dd 100644
--- a/WebView/app/src/main/AndroidManifest.xml
+++ b/WebView/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/Theme.MyApp">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 91dd115c..0c3f1d5c 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -33,6 +33,7 @@ import androidx.core.content.ContextCompat.startActivity
 import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.WebMessageCompat
 import androidx.webkit.WebSettingsCompat
+import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
 import androidx.webkit.WebViewCompat
@@ -130,6 +131,8 @@ class MainActivity : AppCompatActivity() {
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://gcoleman799.github.io")
 
+
+        // FORCE DARK
         // Check if the system is set to light or dark mode
         val nightModeFlag = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
         if (nightModeFlag == Configuration.UI_MODE_NIGHT_YES) {
@@ -143,6 +146,15 @@ class MainActivity : AppCompatActivity() {
             // TODO: set darkening strategy and use custom CSS for dark theme
         }
 
+        // Custom Dark Theme
+        // DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - it never applies automatic darkening and uses web page only darkening.
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
+            WebSettingsCompat.setForceDarkStrategy(
+                binding.webview.settings,
+                DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
+            )
+        }
+
         // Configure asset loader with custom domain
         // * NOTE THAT *:
         // The assets path handler is set with the sub path /views-widgets-samples/ here because we are tyring to ensure
diff --git a/WebView/app/src/main/res/values-night/colors.xml b/WebView/app/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..375d5b2d
--- /dev/null
+++ b/WebView/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <color name="colorPrimary">#6200EE</color>
+    <color name="colorPrimaryDark">#3700B3</color>
+    <color name="colorAccent">#03DAC5</color>
+</resources>
\ No newline at end of file
diff --git a/WebView/app/src/main/res/values/styles.xml b/WebView/app/src/main/res/values/styles.xml
index e3b8d403..278ded4e 100644
--- a/WebView/app/src/main/res/values/styles.xml
+++ b/WebView/app/src/main/res/values/styles.xml
@@ -17,7 +17,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.MyApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

From d42ded663899292a7d5686d91d1cc2aa50d70ddf Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 14 Jul 2020 11:55:36 -0400
Subject: [PATCH 25/50] adds night theme color scheme, adds
 setForceDarkStrategy, adds media query example

---
 WebView/app/src/main/assets/app.css           |  7 +++++--
 .../samples/webviewdemo/MainActivity.kt       | 21 ++++++++++---------
 .../app/src/main/res/values-night/colors.xml  |  4 ++--
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/WebView/app/src/main/assets/app.css b/WebView/app/src/main/assets/app.css
index 4964eca5..fffe5f9a 100644
--- a/WebView/app/src/main/assets/app.css
+++ b/WebView/app/src/main/assets/app.css
@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-body {
-  background-color: light-blue;
+body{
+  background-color: white;
+  @media(prefers-color-scheme:dark){
+    background: blue
+  }
 }
 h1 {
   color: white;
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 0c3f1d5c..f27fd678 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -24,6 +24,7 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import android.webkit.JavascriptInterface
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
@@ -33,6 +34,8 @@ import androidx.core.content.ContextCompat.startActivity
 import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.WebMessageCompat
 import androidx.webkit.WebSettingsCompat
+import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING
+import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_USER_AGENT_DARKENING_ONLY
 import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
@@ -143,16 +146,14 @@ class MainActivity : AppCompatActivity() {
                     WebSettingsCompat.FORCE_DARK_ON
                 )
             }
-            // TODO: set darkening strategy and use custom CSS for dark theme
-        }
-
-        // Custom Dark Theme
-        // DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - it never applies automatic darkening and uses web page only darkening.
-        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
-            WebSettingsCompat.setForceDarkStrategy(
-                binding.webview.settings,
-                DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
-            )
+            // Use custom Dark Theme
+            // DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - it never applies automatic darkening and uses web page only darkening.
+            if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
+                WebSettingsCompat.setForceDarkStrategy(
+                    binding.webview.settings,
+                    DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
+                )
+            }
         }
 
         // Configure asset loader with custom domain
diff --git a/WebView/app/src/main/res/values-night/colors.xml b/WebView/app/src/main/res/values-night/colors.xml
index 375d5b2d..5c06301b 100644
--- a/WebView/app/src/main/res/values-night/colors.xml
+++ b/WebView/app/src/main/res/values-night/colors.xml
@@ -16,7 +16,7 @@
   -->
 
 <resources>
-    <color name="colorPrimary">#6200EE</color>
-    <color name="colorPrimaryDark">#3700B3</color>
+    <color name="colorPrimary">#3700B3</color>
+    <color name="colorPrimaryDark">#BB86FC</color>
     <color name="colorAccent">#03DAC5</color>
 </resources>
\ No newline at end of file

From 0d4fdf875d98a02df354db10ccc86329e6ad70de Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 14 Jul 2020 10:30:20 -0400
Subject: [PATCH 26/50] setup

---
 .../samples/webviewdemo/MainActivity.kt       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index f27fd678..34d8fd69 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -24,7 +24,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.util.Log
 import android.webkit.JavascriptInterface
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
@@ -35,8 +34,6 @@ import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.WebMessageCompat
 import androidx.webkit.WebSettingsCompat
 import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING
-import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_USER_AGENT_DARKENING_ONLY
-import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
 import androidx.webkit.WebViewCompat
@@ -134,7 +131,6 @@ class MainActivity : AppCompatActivity() {
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://gcoleman799.github.io")
 
-
         // FORCE DARK
         // Check if the system is set to light or dark mode
         val nightModeFlag = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
@@ -146,12 +142,21 @@ class MainActivity : AppCompatActivity() {
                     WebSettingsCompat.FORCE_DARK_ON
                 )
             }
-            // Use custom Dark Theme
-            // DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - it never applies automatic darkening and uses web page only darkening.
+            /* Set how WebView content should be darkened. There are three options for how to darken
+             * a WebView.
+             * PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING- checks for the "color-scheme" <meta> tag.
+             * If present, it uses media queries. If absent, it applies user-agent (automatic) darkening
+             * DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - uses media queries always, even if there's
+             * no "color-scheme" <meta> tag present.
+             * DARK_STRATEGY_USER_AGENT_DARKENING_ONLY - it ignores web page theme and always applies
+             * user-agent (automatic) darkening.
+             * More information about Force Dark Strategy can be found here:
+             * https://developer.android.com/reference/androidx/webkit/WebSettingsCompat#setForceDarkStrategy(android.webkit.WebSettings,%20int)
+             */
             if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
                 WebSettingsCompat.setForceDarkStrategy(
                     binding.webview.settings,
-                    DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
+                    DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING
                 )
             }
         }

From 85d21b8836442ba6591fd88f5b520fe9c1fb6325 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 14 Jul 2020 11:55:36 -0400
Subject: [PATCH 27/50] adds night theme color scheme, adds
 setForceDarkStrategy, adds media query example

---
 WebView/app/src/main/assets/app.css           |  3 -
 .../samples/webviewdemo/MainActivity.kt       | 74 ++++++++++---------
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/WebView/app/src/main/assets/app.css b/WebView/app/src/main/assets/app.css
index fffe5f9a..a64415ea 100644
--- a/WebView/app/src/main/assets/app.css
+++ b/WebView/app/src/main/assets/app.css
@@ -15,9 +15,6 @@
  */
 body{
   background-color: white;
-  @media(prefers-color-scheme:dark){
-    background: blue
-  }
 }
 h1 {
   color: white;
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 34d8fd69..dc702f80 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -159,47 +159,53 @@ class MainActivity : AppCompatActivity() {
                     DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING
                 )
             }
-        }
 
-        // Configure asset loader with custom domain
-        // * NOTE THAT *:
-        // The assets path handler is set with the sub path /views-widgets-samples/ here because we are tyring to ensure
-        // that the address loaded with loadUrl("https://raw.githubusercontent.com/views-widgets-samples/assets/index.html") does
-        // not conflict with a real web address. In this case, if the path were only /assests/ we would need to load
-        // "https://raw.githubusercontent.com/assets/index.html" in order to access our local index.html file.
-        // However we cannot guarantee "https://raw.githubusercontent.com/assets/index.html" is not a valid web address.
-        // Therefore we must let the AssetLoader know to expect the /views-widgets-samples/ sub path as well as the /assets/.
-        val assetLoader = WebViewAssetLoader.Builder()
-            .setDomain("raw.githubusercontent.com")
-            .addPathHandler("/views-widgets-samples/assets/", WebViewAssetLoader.AssetsPathHandler(this))
-            .addPathHandler("/views-widgets-samples/res/", WebViewAssetLoader.ResourcesPathHandler(this))
-            .build()
+            // Configure asset loader with custom domain
+            // * NOTE THAT *:
+            // The assets path handler is set with the sub path /views-widgets-samples/ here because we are tyring to ensure
+            // that the address loaded with loadUrl("https://raw.githubusercontent.com/views-widgets-samples/assets/index.html") does
+            // not conflict with a real web address. In this case, if the path were only /assests/ we would need to load
+            // "https://raw.githubusercontent.com/assets/index.html" in order to access our local index.html file.
+            // However we cannot guarantee "https://raw.githubusercontent.com/assets/index.html" is not a valid web address.
+            // Therefore we must let the AssetLoader know to expect the /views-widgets-samples/ sub path as well as the /assets/.
+            val assetLoader = WebViewAssetLoader.Builder()
+                .setDomain("raw.githubusercontent.com")
+                .addPathHandler(
+                    "/views-widgets-samples/assets/",
+                    WebViewAssetLoader.AssetsPathHandler(this)
+                )
+                .addPathHandler(
+                    "/views-widgets-samples/res/",
+                    WebViewAssetLoader.ResourcesPathHandler(this)
+                )
+                .build()
 
-        // Set clients
-        binding.webview.webViewClient = MyWebViewClient(assetLoader)
+            // Set clients
+            binding.webview.webViewClient = MyWebViewClient(assetLoader)
 
-        // Set Title
-        title = getString(R.string.app_name)
+            // Set Title
+            title = getString(R.string.app_name)
 
-        // Setup debugging; See https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews for reference
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            if (0 != applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE) {
-                WebView.setWebContentsDebuggingEnabled(true)
+            // Setup debugging; See https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews for reference
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                if (0 != applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE) {
+                    WebView.setWebContentsDebuggingEnabled(true)
+                }
             }
-        }
 
-        // Enable Javascript
-        binding.webview.settings.javaScriptEnabled = true
+            // Enable Javascript
+            binding.webview.settings.javaScriptEnabled = true
 
-        // Create a JS object to be injected into frames; Determines if WebMessageListener
-        // or WebAppInterface should be used
-        createJsObject(
-            binding.webview,
-            jsObjName,
-            allowedOriginRules
-        ) { message -> invokeShareIntent(message) }
+            // Create a JS object to be injected into frames; Determines if WebMessageListener
+            // or WebAppInterface should be used
+            createJsObject(
+                binding.webview,
+                jsObjName,
+                allowedOriginRules
+            ) { message -> invokeShareIntent(message) }
 
-        // Load the content
-        binding.webview.loadUrl("https://raw.githubusercontent.com/views-widgets-samples/assets/index.html")
+            // Load the content
+            binding.webview.loadUrl("https://raw.githubusercontent.com/views-widgets-samples/assets/index.html")
+        }
     }
 }
\ No newline at end of file

From 637fec33e32b77275e0291c3fd391598166a9581 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 15 Jul 2020 10:21:08 -0400
Subject: [PATCH 28/50] adds meta tag, corrects media query, adds
 setDefaultNightMode

---
 WebView/app/src/main/assets/app.css                       | 8 +++++++-
 WebView/app/src/main/assets/index.html                    | 1 +
 .../java/com/android/samples/webviewdemo/MainActivity.kt  | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/WebView/app/src/main/assets/app.css b/WebView/app/src/main/assets/app.css
index a64415ea..42cb9170 100644
--- a/WebView/app/src/main/assets/app.css
+++ b/WebView/app/src/main/assets/app.css
@@ -13,9 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-body{
+
+body {
   background-color: white;
 }
+@media (prefers-color-scheme: dark) {
+   body {
+     background: blue;
+   }
+}
 h1 {
   color: white;
   text-align: center;
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index e0f3c9b9..35c45b4d 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -18,6 +18,7 @@
   <head>
     <link href="app.css" rel="stylesheet">
     <script async src="main.js"></script>
+    <meta name="color-scheme" content="dark light">
   </head>
   <body onload="getData()">
     <label for="location">Choose a location:</label>
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index dc702f80..9a763bf9 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -29,6 +29,8 @@ import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 import androidx.core.content.ContextCompat.startActivity
 import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.WebMessageCompat

From 2c8330219b0c3d65a55b97d85e6de356b8de0620 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 15 Jul 2020 15:58:34 -0400
Subject: [PATCH 29/50] adds media query

---
 WebView/app/src/main/assets/app.css           | 43 ++++++++++++-------
 .../samples/webviewdemo/MainActivity.kt       |  2 -
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/WebView/app/src/main/assets/app.css b/WebView/app/src/main/assets/app.css
index 42cb9170..f4a386f6 100644
--- a/WebView/app/src/main/assets/app.css
+++ b/WebView/app/src/main/assets/app.css
@@ -14,20 +14,34 @@
  * limitations under the License.
  */
 
-body {
-  background-color: white;
-}
+/* Dark Theme */
 @media (prefers-color-scheme: dark) {
-   body {
-     background: blue;
+  body {
+     background: #121212;
+  }
+   h1 {
+     color: white;
+   }
+   h2 {
+     color: white;
    }
 }
-h1 {
-  color: white;
-  text-align: center;
+
+/* Light Theme */
+@media (prefers-color-scheme: light) {
+  body {
+    background-color: white;
+  }
+  h1 {
+    color: black;
+  }
+  h2 {
+    color: grey;
+  }
 }
-h2 {
-  color: grey;
+
+/* Layout */
+h1, h2 {
   text-align: center;
 }
 p {
@@ -43,13 +57,13 @@ img {
   padding: 5px;
 }
 .button {
+  color: black;
+  background-color:#03DAC6;
   font-family: verdana;
-  background-color:#44c767;
   border-radius:8px;
-  border:1px solid #18ab29;
+  border:1px solid #03DAC6;
   display:inline-block;
   cursor:pointer;
-  color:#ffffff;
   font-size:18px;
   padding:16px 31px;
   text-decoration:none;
@@ -57,9 +71,6 @@ img {
   margin-left: 27%;
   margin-top: 5%;
 }
-.button:hover {
-  background-color:#42b007;
-}
 .button:active {
   position:relative;
   top:1px;
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 9a763bf9..dc702f80 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -29,8 +29,6 @@ import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 import androidx.core.content.ContextCompat.startActivity
 import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.WebMessageCompat

From 3a9d8facea898d8bc70a031f82c0c862a554bd5f Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Mon, 20 Jul 2020 09:59:45 -0400
Subject: [PATCH 30/50] changes background color, adds clarification on
 ForceDarkStrategy

---
 WebView/app/src/main/assets/app.css                             | 2 +-
 .../main/java/com/android/samples/webviewdemo/MainActivity.kt   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WebView/app/src/main/assets/app.css b/WebView/app/src/main/assets/app.css
index f4a386f6..8877921a 100644
--- a/WebView/app/src/main/assets/app.css
+++ b/WebView/app/src/main/assets/app.css
@@ -17,7 +17,7 @@
 /* Dark Theme */
 @media (prefers-color-scheme: dark) {
   body {
-     background: #121212;
+     background: #383838;
   }
    h1 {
      color: white;
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index dc702f80..9ee4be61 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -142,6 +142,7 @@ class MainActivity : AppCompatActivity() {
                     WebSettingsCompat.FORCE_DARK_ON
                 )
             }
+
             /* Set how WebView content should be darkened. There are three options for how to darken
              * a WebView.
              * PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING- checks for the "color-scheme" <meta> tag.

From f8b0c116c178c85f0eb74eb2515bd86de8a4a2fe Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 22 Jul 2020 09:12:09 -0400
Subject: [PATCH 31/50] splits light and dark themes into seperate files, adds
 logic to check if dark more is supported

---
 WebView/app/src/main/assets/dark.css          | 12 ++++++++
 WebView/app/src/main/assets/index.html        | 19 +++++++++++-
 WebView/app/src/main/assets/light.css         |  8 +++++
 .../src/main/assets/{app.css => style.css}    | 29 +------------------
 4 files changed, 39 insertions(+), 29 deletions(-)
 create mode 100644 WebView/app/src/main/assets/dark.css
 create mode 100644 WebView/app/src/main/assets/light.css
 rename WebView/app/src/main/assets/{app.css => style.css} (82%)

diff --git a/WebView/app/src/main/assets/dark.css b/WebView/app/src/main/assets/dark.css
new file mode 100644
index 00000000..ebf18f23
--- /dev/null
+++ b/WebView/app/src/main/assets/dark.css
@@ -0,0 +1,12 @@
+/* Dark Theme */
+@media (prefers-color-scheme: dark) {
+  body {
+     background: #383838;
+  }
+   h1 {
+     color: white;
+   }
+   h2 {
+     color: white;
+   }
+}
\ No newline at end of file
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index 35c45b4d..c332336b 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -16,9 +16,26 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link href="app.css" rel="stylesheet">
     <script async src="main.js"></script>
     <meta name="color-scheme" content="dark light">
+    <script>
+      // If dark mode is not supported then load light.css
+      if (window.matchMedia('(prefers-color-scheme: dark)').media === 'not all') {
+      document.head.insertAdjacentHTML(
+        'beforeend',
+        '<link rel="stylesheet" href="light.css" onload="document.documentElement.style.display = \'\'">'
+       );
+     }
+    </script>
+    <!--
+      If dark mode is supported, conditionally either load the light or the dark stylesheet. If
+      `prefers-color-scheme` is not supported the media query is unknown and the files are loaded
+       with `lowest` priority.
+    -->
+    <link rel="stylesheet" href="dark.css" media="(prefers-color-scheme: dark)">
+    <link rel="stylesheet" href="light.css" media="(prefers-color-scheme: light)">
+    <!-- The main stylesheet with generic rules used universally -->
+    <link rel="stylesheet" href="style.css">
   </head>
   <body onload="getData()">
     <label for="location">Choose a location:</label>
diff --git a/WebView/app/src/main/assets/light.css b/WebView/app/src/main/assets/light.css
new file mode 100644
index 00000000..fa63453a
--- /dev/null
+++ b/WebView/app/src/main/assets/light.css
@@ -0,0 +1,8 @@
+/* Light Theme */
+body {
+   background-color: white;
+}
+h1, h2 {
+  text-align: center;
+  color: black;
+}
diff --git a/WebView/app/src/main/assets/app.css b/WebView/app/src/main/assets/style.css
similarity index 82%
rename from WebView/app/src/main/assets/app.css
rename to WebView/app/src/main/assets/style.css
index 8877921a..85f27d56 100644
--- a/WebView/app/src/main/assets/app.css
+++ b/WebView/app/src/main/assets/style.css
@@ -13,36 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/* Dark Theme */
-@media (prefers-color-scheme: dark) {
-  body {
-     background: #383838;
-  }
-   h1 {
-     color: white;
-   }
-   h2 {
-     color: white;
-   }
-}
-
-/* Light Theme */
-@media (prefers-color-scheme: light) {
-  body {
-    background-color: white;
-  }
-  h1 {
-    color: black;
-  }
-  h2 {
-    color: grey;
-  }
-}
-
-/* Layout */
 h1, h2 {
   text-align: center;
+  color: black;
 }
 p {
   font-family: verdana;

From be2899c933439f5f8bc15b364d255bb75326fb18 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 22 Jul 2020 09:16:00 -0400
Subject: [PATCH 32/50] removes static text color setting from style.css

---
 WebView/app/src/main/assets/style.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WebView/app/src/main/assets/style.css b/WebView/app/src/main/assets/style.css
index 85f27d56..60aef2b6 100644
--- a/WebView/app/src/main/assets/style.css
+++ b/WebView/app/src/main/assets/style.css
@@ -15,7 +15,6 @@
  */
 h1, h2 {
   text-align: center;
-  color: black;
 }
 p {
   font-family: verdana;

From 7c3b2c12d86c990dd7513dab46b6fafdfeaecf4d Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 22 Jul 2020 14:53:56 -0400
Subject: [PATCH 33/50] add comment about default reloading

---
 WebView/app/src/main/assets/light.css         |  2 +-
 WebView/app/src/main/assets/style.css         |  4 +-
 .../samples/webviewdemo/MainActivity.kt       | 97 ++++++++++---------
 3 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/WebView/app/src/main/assets/light.css b/WebView/app/src/main/assets/light.css
index fa63453a..53ba6b16 100644
--- a/WebView/app/src/main/assets/light.css
+++ b/WebView/app/src/main/assets/light.css
@@ -1,6 +1,6 @@
 /* Light Theme */
 body {
-   background-color: white;
+  background-color: white;
 }
 h1, h2 {
   text-align: center;
diff --git a/WebView/app/src/main/assets/style.css b/WebView/app/src/main/assets/style.css
index 60aef2b6..e3775e29 100644
--- a/WebView/app/src/main/assets/style.css
+++ b/WebView/app/src/main/assets/style.css
@@ -21,8 +21,8 @@ p {
   font-size: 20px;
 }
 label {
-    font-family: verdana;
-    font-size: 20px;
+  font-family: verdana;
+  font-size: 20px;
 }
 img {
   border-radius: 4px;
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 9ee4be61..e6ce4e29 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -131,9 +131,15 @@ class MainActivity : AppCompatActivity() {
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://gcoleman799.github.io")
 
-        // FORCE DARK
-        // Check if the system is set to light or dark mode
+        // Configuring Dark Theme
+        // *NOTE* : The force dark setting is not persistent. You must call the static
+        // method every time your app process is started.
+        // *NOTE* : The change from day<->night mode is a
+        // configuration change so by default the activity will be restarted
+        // (and pickup the new values to apply the theme). Take care when overriding this
+        //  default behavior to ensure this method is still called when changes are made.
         val nightModeFlag = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+        // Check if the system is set to light or dark mode
         if (nightModeFlag == Configuration.UI_MODE_NIGHT_YES) {
             // Switch WebView to dark mode; uses default dark theme
             if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
@@ -160,53 +166,52 @@ class MainActivity : AppCompatActivity() {
                     DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING
                 )
             }
+        }
 
-            // Configure asset loader with custom domain
-            // * NOTE THAT *:
-            // The assets path handler is set with the sub path /views-widgets-samples/ here because we are tyring to ensure
-            // that the address loaded with loadUrl("https://raw.githubusercontent.com/views-widgets-samples/assets/index.html") does
-            // not conflict with a real web address. In this case, if the path were only /assests/ we would need to load
-            // "https://raw.githubusercontent.com/assets/index.html" in order to access our local index.html file.
-            // However we cannot guarantee "https://raw.githubusercontent.com/assets/index.html" is not a valid web address.
-            // Therefore we must let the AssetLoader know to expect the /views-widgets-samples/ sub path as well as the /assets/.
-            val assetLoader = WebViewAssetLoader.Builder()
-                .setDomain("raw.githubusercontent.com")
-                .addPathHandler(
-                    "/views-widgets-samples/assets/",
-                    WebViewAssetLoader.AssetsPathHandler(this)
-                )
-                .addPathHandler(
-                    "/views-widgets-samples/res/",
-                    WebViewAssetLoader.ResourcesPathHandler(this)
-                )
-                .build()
-
-            // Set clients
-            binding.webview.webViewClient = MyWebViewClient(assetLoader)
-
-            // Set Title
-            title = getString(R.string.app_name)
-
-            // Setup debugging; See https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews for reference
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                if (0 != applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE) {
-                    WebView.setWebContentsDebuggingEnabled(true)
-                }
+        // Configure asset loader with custom domain
+        // *NOTE* :
+        // The assets path handler is set with the sub path /views-widgets-samples/ here because we are tyring to ensure
+        // that the address loaded with loadUrl("https://raw.githubusercontent.com/views-widgets-samples/assets/index.html") does
+        // not conflict with a real web address. In this case, if the path were only /assests/ we would need to load
+        // "https://raw.githubusercontent.com/assets/index.html" in order to access our local index.html file.
+        // However we cannot guarantee "https://raw.githubusercontent.com/assets/index.html" is not a valid web address.
+        // Therefore we must let the AssetLoader know to expect the /views-widgets-samples/ sub path as well as the /assets/.
+        val assetLoader = WebViewAssetLoader.Builder()
+            .setDomain("raw.githubusercontent.com")
+            .addPathHandler(
+                "/views-widgets-samples/assets/",
+                WebViewAssetLoader.AssetsPathHandler(this)
+            )
+            .addPathHandler(
+                "/views-widgets-samples/res/",
+                WebViewAssetLoader.ResourcesPathHandler(this)
+            )
+            .build()
+
+        // Set clients
+        binding.webview.webViewClient = MyWebViewClient(assetLoader)
+
+        // Set Title
+        title = getString(R.string.app_name)
+
+        // Setup debugging; See https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews for reference
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            if (0 != applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE) {
+                WebView.setWebContentsDebuggingEnabled(true)
             }
+        }
 
-            // Enable Javascript
-            binding.webview.settings.javaScriptEnabled = true
+        // Enable Javascript
+        binding.webview.settings.javaScriptEnabled = true
 
-            // Create a JS object to be injected into frames; Determines if WebMessageListener
-            // or WebAppInterface should be used
-            createJsObject(
-                binding.webview,
-                jsObjName,
-                allowedOriginRules
-            ) { message -> invokeShareIntent(message) }
+        // Create a JS object to be injected into frames; Determines if WebMessageListener
+        // or WebAppInterface should be used
+        createJsObject(
+            binding.webview,
+            jsObjName,
+            allowedOriginRules
+        ) { message -> invokeShareIntent(message) }
 
-            // Load the content
-            binding.webview.loadUrl("https://raw.githubusercontent.com/views-widgets-samples/assets/index.html")
-        }
-    }
+        // Load the content
+        binding.webview.loadUrl("https://raw.githubusercontent.com/views-widgets-samples/assets/index.html")    }
 }
\ No newline at end of file

From e9e7a72c4b272adc8790fc9e781ed841db1444b2 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Thu, 23 Jul 2020 13:02:34 -0400
Subject: [PATCH 34/50] thread test and callback test outline

---
 WebView/app/build.gradle                      |  1 +
 ...nstrumentedTest.kt => MainActivityTest.kt} | 87 ++++++++++++++++++-
 .../samples/webviewdemo/ExampleUnitTest.kt    | 34 ++------
 3 files changed, 95 insertions(+), 27 deletions(-)
 rename WebView/app/src/androidTest/java/com/android/samples/webviewdemo/{ExampleInstrumentedTest.kt => MainActivityTest.kt} (52%)

diff --git a/WebView/app/build.gradle b/WebView/app/build.gradle
index d51f1889..d75a6808 100644
--- a/WebView/app/build.gradle
+++ b/WebView/app/build.gradle
@@ -73,6 +73,7 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
     androidTestImplementation 'androidx.test:rules:1.1.1'
     androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation "androidx.webkit:webkit:$webkit_version"
 
 
 }
diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
similarity index 52%
rename from WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
rename to WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
index 7f853f89..559e4db1 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
@@ -15,6 +15,10 @@
  */
 
 package com.android.samples.webviewdemo
+import android.content.Context
+import android.os.Looper
+import android.webkit.WebView
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
 import androidx.test.espresso.web.model.Atoms.castOrDie
 import androidx.test.espresso.web.model.Atoms.script
@@ -25,17 +29,24 @@ import androidx.test.espresso.web.webdriver.DriverAtoms.webClick
 import androidx.test.espresso.web.webdriver.Locator
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
+import junit.framework.Assert.assertEquals
+import junit.framework.Assert.assertTrue
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.containsString
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
+
 /**
  * Launch, interact, and verify conditions in an activity that has a WebView instance.
  */
 @RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
+
+
+class MainActivityTest {
+
+    val context = ApplicationProvider.getApplicationContext<Context>()
 
     @Rule @JvmField
     val mainActivityRule = ActivityTestRule(MainActivity::class.java)
@@ -71,4 +82,78 @@ class ExampleInstrumentedTest {
             )
         )
     }
+
+    @Test
+    fun valueInCallback_compareValueInput_returnsTrue(){
+        mainActivityRule.getActivity()
+
+        // Setup
+        val webView = WebView(context)
+        val jsObjName = "jsObject"
+        val allowedOriginRules = setOf<String>("https://example.com")
+
+        // Create HTML
+        val htmlPage = "<!DOCTYPE html><html><body>" + "    <script>" + "        myObject.postMessage('hello');" + "    </script>" + "</body></html>"
+
+        // Create JsObject
+        MainActivity.createJsObject(
+            webView,
+            jsObjName,
+            allowedOriginRules
+        ) { message -> MainActivity.invokeShareIntent(message) }
+
+        //Inject JsObject into Html
+        webView.loadData(htmlPage, "text/html", "UTF-8")
+
+
+        //Call js code to invoke callback (in script tag of htmlPage)
+
+        // evaluate what comes out -> it should be hello
+        // *Note: "response from callback" is a place holder here I am unsure what should be placed there
+        assertEquals("response from callback", "hello")
+
+    }
+
+    @Test
+    // Checks that postMessage runs on the UI thread
+    fun checkingThreadCallbackRunsOn() {
+        mainActivityRule.getActivity()
+
+        // Setup
+        val webView = WebView(context)
+        val jsObjName = "jsObject"
+        val allowedOriginRules = setOf<String>("https://example.com")
+
+        // Create HTML
+        val htmlPage =
+            "<!DOCTYPE html><html><body>" + "    <script>" + "        jsObject.postMessage('hello');" + "    </script>" + "</body></html>"
+
+
+        // Create JsObject
+        MainActivity.createJsObject(
+            webView,
+            jsObjName,
+            allowedOriginRules
+        ) { message -> MainActivity.invokeShareIntent(message) }
+
+
+        // Inject JsObject into Html by loading it in the webview
+        webView.loadData(htmlPage, "text/html", "UTF-8")
+
+
+        // Use coroutine to go onto UI thread here?
+        // Call js code to invoke callback (in script tag of htmlPage)
+
+
+        // check that method is running on the UI thread
+        assertTrue(isUiThread())
+    }
+
+    /**
+     * Returns true if the current thread is the UI thread based on the
+     * Looper.
+     */
+    private fun isUiThread(): Boolean {
+        return Looper.myLooper() == Looper.getMainLooper()
+    }
 }
\ No newline at end of file
diff --git a/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt b/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt
index d4125bce..c72b979b 100644
--- a/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt
+++ b/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt
@@ -16,36 +16,18 @@
 
 package com.android.samples.webviewdemo
 
-import org.junit.Assert.assertThat
 import org.junit.Test
-import java.util.Objects
+
+import org.junit.Assert.*
 
 /**
- * Tests to ensure that callbacks are behaving as expected
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
  */
-
-
-class EmailValidatorTest {
+class ExampleUnitTest {
     @Test
-    fun testConvertFahrenheitToCelsius() {
-        val actual: Float = ConverterUtil.convertCelsiusToFahrenheit(100)
-        // expected value is 212
-        val expected = 212f
-        // use this method because float is not precise
-       // assertEquals("Conversion from celsius to fahrenheit failed", expected, actual, 0.001)
-    }
-    @Test
-    fun postMessage_CorrectStringFormat_ReturnsTrue() {
-        // create object
-                // what object do we need to create?
-                // we need to create a js object to call postMessage on
-        
-        val jsObject: Objects =
-
-            // create expected return
-        // call post message
-        // check that post message
-
-       // assertEquals("Hi", jsObject.postMessage("Hi"))
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
     }
 }

From d7806ed7aac56007fd071a37eb8cea071bdd779c Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Fri, 24 Jul 2020 12:11:59 -0400
Subject: [PATCH 35/50] revert to one css file

---
 WebView/app/src/main/assets/dark.css   | 12 ------------
 WebView/app/src/main/assets/index.html | 17 -----------------
 WebView/app/src/main/assets/light.css  |  8 --------
 WebView/app/src/main/assets/style.css  | 21 +++++++++++++++++++++
 4 files changed, 21 insertions(+), 37 deletions(-)
 delete mode 100644 WebView/app/src/main/assets/dark.css
 delete mode 100644 WebView/app/src/main/assets/light.css

diff --git a/WebView/app/src/main/assets/dark.css b/WebView/app/src/main/assets/dark.css
deleted file mode 100644
index ebf18f23..00000000
--- a/WebView/app/src/main/assets/dark.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Dark Theme */
-@media (prefers-color-scheme: dark) {
-  body {
-     background: #383838;
-  }
-   h1 {
-     color: white;
-   }
-   h2 {
-     color: white;
-   }
-}
\ No newline at end of file
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index c332336b..8b4d0fda 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -18,23 +18,6 @@
   <head>
     <script async src="main.js"></script>
     <meta name="color-scheme" content="dark light">
-    <script>
-      // If dark mode is not supported then load light.css
-      if (window.matchMedia('(prefers-color-scheme: dark)').media === 'not all') {
-      document.head.insertAdjacentHTML(
-        'beforeend',
-        '<link rel="stylesheet" href="light.css" onload="document.documentElement.style.display = \'\'">'
-       );
-     }
-    </script>
-    <!--
-      If dark mode is supported, conditionally either load the light or the dark stylesheet. If
-      `prefers-color-scheme` is not supported the media query is unknown and the files are loaded
-       with `lowest` priority.
-    -->
-    <link rel="stylesheet" href="dark.css" media="(prefers-color-scheme: dark)">
-    <link rel="stylesheet" href="light.css" media="(prefers-color-scheme: light)">
-    <!-- The main stylesheet with generic rules used universally -->
     <link rel="stylesheet" href="style.css">
   </head>
   <body onload="getData()">
diff --git a/WebView/app/src/main/assets/light.css b/WebView/app/src/main/assets/light.css
deleted file mode 100644
index 53ba6b16..00000000
--- a/WebView/app/src/main/assets/light.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Light Theme */
-body {
-  background-color: white;
-}
-h1, h2 {
-  text-align: center;
-  color: black;
-}
diff --git a/WebView/app/src/main/assets/style.css b/WebView/app/src/main/assets/style.css
index e3775e29..a76bb6e0 100644
--- a/WebView/app/src/main/assets/style.css
+++ b/WebView/app/src/main/assets/style.css
@@ -13,8 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+body {
+  background-color: white;
+}
 h1, h2 {
   text-align: center;
+  color: black;
+  text-align: center;
 }
 p {
   font-family: verdana;
@@ -80,4 +85,20 @@ img {
   padding-top: 20%;
   padding-left: 5%;
   padding-right: 5%;
+}
+@media (prefers-color-scheme: dark) {
+  body {
+    background: #383838;
+  }
+  h1 {
+    color: white;
+  }
+  h2 {
+    color: white;
+  }
+  select {
+    color: white;
+    background-color: #1f1f1f;
+    border-color: #121212;
+  }
 }
\ No newline at end of file

From 13d0b17e6a92c6c4dab21643eb4701565f7b98b3 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Fri, 24 Jul 2020 17:25:51 -0400
Subject: [PATCH 36/50] puts createJsObject in seperate file, adds handlers and
 runnables to tests

---
 WebView/app/build.gradle                      |  1 -
 .../samples/webviewdemo/MainActivityTest.kt   | 95 +++++++++----------
 .../samples/webviewdemo/MainActivity.kt       | 61 ------------
 .../samples/webviewdemo/createJsObject.kt     | 72 ++++++++++++++
 4 files changed, 119 insertions(+), 110 deletions(-)
 create mode 100644 WebView/app/src/main/java/com/android/samples/webviewdemo/createJsObject.kt

diff --git a/WebView/app/build.gradle b/WebView/app/build.gradle
index fee62b17..f5e1661c 100644
--- a/WebView/app/build.gradle
+++ b/WebView/app/build.gradle
@@ -73,5 +73,4 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
     androidTestImplementation 'androidx.test:rules:1.1.1'
     androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation "androidx.webkit:webkit:$webkit_version"
 }
\ No newline at end of file
diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
index 559e4db1..004ae9d4 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
@@ -16,6 +16,7 @@
 
 package com.android.samples.webviewdemo
 import android.content.Context
+import android.os.Handler
 import android.os.Looper
 import android.webkit.WebView
 import androidx.test.core.app.ApplicationProvider
@@ -86,67 +87,65 @@ class MainActivityTest {
     @Test
     fun valueInCallback_compareValueInput_returnsTrue(){
         mainActivityRule.getActivity()
-
         // Setup
-        val webView = WebView(context)
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://example.com")
-
-        // Create HTML
-        val htmlPage = "<!DOCTYPE html><html><body>" + "    <script>" + "        myObject.postMessage('hello');" + "    </script>" + "</body></html>"
-
-        // Create JsObject
-        MainActivity.createJsObject(
-            webView,
-            jsObjName,
-            allowedOriginRules
-        ) { message -> MainActivity.invokeShareIntent(message) }
-
-        //Inject JsObject into Html
-        webView.loadData(htmlPage, "text/html", "UTF-8")
-
-
-        //Call js code to invoke callback (in script tag of htmlPage)
-
+        val message = "hello"
+        // Get a handler that can be used to post to the main thread
+        val mainHandler = Handler (Looper.getMainLooper());
+        val myRunnable = Runnable() {
+            val webView = WebView(context)
+            // Create JsObject
+            createJsObject(
+                webView,
+                jsObjName,
+                allowedOriginRules
+            ) { message -> //save message; call .set()
+            }
+            run() {
+                //Inject JsObject into Html
+                webView.loadDataWithBaseURL("https://example.com","<html></html>",
+                    "text/html", "UTF-8","https://example.com")
+                //Call js code to invoke callback
+                webView.evaluateJavascript("${jsObjName}.postMessage(${message})", null)
+            }
+        }
+        mainHandler.post(myRunnable)
         // evaluate what comes out -> it should be hello
-        // *Note: "response from callback" is a place holder here I am unsure what should be placed there
-        assertEquals("response from callback", "hello")
-
+        // *Note: //.get() is a place holder
+        assertEquals("hello"
+            , "//.get()"
+             )
     }
 
     @Test
     // Checks that postMessage runs on the UI thread
     fun checkingThreadCallbackRunsOn() {
         mainActivityRule.getActivity()
-
         // Setup
-        val webView = WebView(context)
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://example.com")
-
-        // Create HTML
-        val htmlPage =
-            "<!DOCTYPE html><html><body>" + "    <script>" + "        jsObject.postMessage('hello');" + "    </script>" + "</body></html>"
-
-
-        // Create JsObject
-        MainActivity.createJsObject(
-            webView,
-            jsObjName,
-            allowedOriginRules
-        ) { message -> MainActivity.invokeShareIntent(message) }
-
-
-        // Inject JsObject into Html by loading it in the webview
-        webView.loadData(htmlPage, "text/html", "UTF-8")
-
-
-        // Use coroutine to go onto UI thread here?
-        // Call js code to invoke callback (in script tag of htmlPage)
-
-
-        // check that method is running on the UI thread
-        assertTrue(isUiThread())
+        val message = "hello"
+        // Get a handler that can be used to post to the main thread
+        val mainHandler = Handler (Looper.getMainLooper())
+        // Start Interacting with webView on UI thread
+        val myRunnable = Runnable() {
+            run() {
+                val webView = WebView(context)
+                // Create JsObject
+                createJsObject(
+                    webView,
+                    jsObjName,
+                    allowedOriginRules
+                ) { message -> assertTrue(isUiThread()) }
+                //Inject JsObject into Html
+                webView.loadDataWithBaseURL("https://example.com","<html></html>",
+                    "text/html", "UTF-8","https://example.com")
+                //Call js code to invoke callback
+                webView.evaluateJavascript("${jsObjName}.postMessage(${message})", null)
+            }
+        }
+        mainHandler.post(myRunnable)
     }
 
     /**
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 91dd115c..efdfb013 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -40,9 +40,6 @@ import androidx.webkit.WebViewFeature
 import com.android.samples.webviewdemo.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
-    // Create a handler that runs on the UI thread
-    private val handler: Handler = Handler(Looper.getMainLooper())
-
     // Creating the custom WebView Client Class
     private class MyWebViewClient(private val assetLoader: WebViewAssetLoader) :
         WebViewClientCompat() {
@@ -54,64 +51,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    /**
-     * Injects a JavaScript object which supports a {@code postMessage()} method.
-     * A feature check is used to determine if the preferred API, WebMessageListener, is supported.
-     * If it is, then WebMessageListener will be used to create a JavaScript object. The object will be
-     * injected into all of the frames that have an origin matching those in {@code allowedOriginRules}.
-     * <p>
-     * If WebMessageListener is not supported then the method will defer to using JavascriptInterface
-     * to create the JavaScript object.
-     * <p>
-     * The {@code postMessage()} methods in the Javascript objects created by WebMessageListener and
-     * JavascriptInterface both make calls to the same callback, {@code onMessageReceived()}.
-     * In this case, the callback invokes native Android sharing.
-     * <p>
-     * The WebMessageListener invokes callbacks on the UI thread by default. However,
-     * JavascriptInterface invokes callbacks on a background thread by default. In order to
-     * guarantee thread safety and that the caller always gets consistent behavior the the callback
-     * should always be called on the UI thread. To change the default behavior of JavascriptInterface,
-     * the callback is wrapped in a handler which will tell it to run on the UI thread instead of the default
-     * background thread it would otherwise be invoked on.
-     * <p>
-     * @param webview the component that WebMessageListener or JavascriptInterface will be added to
-     * @param jsObjName the name that will be given to the Javascript objects created by either
-     *        WebMessageListener or JavascriptInterface
-     * @param allowedOriginRules a set of origins used only by WebMessageListener, if a frame matches an
-     * origin in this set then it will have the JS object injected into it
-     * @param onMessageReceived invoked on UI thread with message passed in from JavaScript postMessage() call
-     */
-    private fun createJsObject(
-        webview: WebView,
-        jsObjName: String,
-        allowedOriginRules: Set<String>,
-        onMessageReceived: (message: String) -> Unit
-    ) {
-        if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)) {
-            WebViewCompat.addWebMessageListener(
-                webview, jsObjName, allowedOriginRules,
-                object : WebViewCompat.WebMessageListener {
-                    override fun onPostMessage(
-                        webview: WebView,
-                        message: WebMessageCompat,
-                        sourceOrigin: Uri,
-                        isMainFrame: Boolean,
-                        replyProxy: JavaScriptReplyProxy
-                    ) {
-                        onMessageReceived(message.data!!)
-                    }
-                })
-        } else {
-            webview.addJavascriptInterface(object {
-                @JavascriptInterface
-                fun postMessage(message: String) {
-                    // Use the handler to invoke method on UI thread
-                    handler.post(Runnable { onMessageReceived(message) })
-                }
-            }, jsObjName)
-        }
-    }
-
     // Invokes native android sharing
     private fun invokeShareIntent(message: String) {
         val sendIntent: Intent = Intent().apply {
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/createJsObject.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/createJsObject.kt
new file mode 100644
index 00000000..42254034
--- /dev/null
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/createJsObject.kt
@@ -0,0 +1,72 @@
+package com.android.samples.webviewdemo
+
+import android.net.Uri
+import android.os.Handler
+import android.os.Looper
+import android.webkit.JavascriptInterface
+import android.webkit.WebView
+import androidx.webkit.JavaScriptReplyProxy
+import androidx.webkit.WebMessageCompat
+import androidx.webkit.WebViewCompat
+import androidx.webkit.WebViewFeature
+
+// Create a handler that runs on the UI thread
+private val handler: Handler = Handler(Looper.getMainLooper())
+
+/**
+ * Injects a JavaScript object which supports a {@code postMessage()} method.
+ * A feature check is used to determine if the preferred API, WebMessageListener, is supported.
+ * If it is, then WebMessageListener will be used to create a JavaScript object. The object will be
+ * injected into all of the frames that have an origin matching those in {@code allowedOriginRules}.
+ * <p>
+ * If WebMessageListener is not supported then the method will defer to using JavascriptInterface
+ * to create the JavaScript object.
+ * <p>
+ * The {@code postMessage()} methods in the Javascript objects created by WebMessageListener and
+ * JavascriptInterface both make calls to the same callback, {@code onMessageReceived()}.
+ * In this case, the callback invokes native Android sharing.
+ * <p>
+ * The WebMessageListener invokes callbacks on the UI thread by default. However,
+ * JavascriptInterface invokes callbacks on a background thread by default. In order to
+ * guarantee thread safety and that the caller always gets consistent behavior the the callback
+ * should always be called on the UI thread. To change the default behavior of JavascriptInterface,
+ * the callback is wrapped in a handler which will tell it to run on the UI thread instead of the default
+ * background thread it would otherwise be invoked on.
+ * <p>
+ * @param webview the component that WebMessageListener or JavascriptInterface will be added to
+ * @param jsObjName the name that will be given to the Javascript objects created by either
+ *        WebMessageListener or JavascriptInterface
+ * @param allowedOriginRules a set of origins used only by WebMessageListener, if a frame matches an
+ * origin in this set then it will have the JS object injected into it
+ * @param onMessageReceived invoked on UI thread with message passed in from JavaScript postMessage() call
+ */
+fun createJsObject(
+    webview: WebView,
+    jsObjName: String,
+    allowedOriginRules: Set<String>,
+    onMessageReceived: (message: String) -> Unit
+) {
+    if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)) {
+        WebViewCompat.addWebMessageListener(
+            webview, jsObjName, allowedOriginRules,
+            object : WebViewCompat.WebMessageListener {
+                override fun onPostMessage(
+                    webview: WebView,
+                    message: WebMessageCompat,
+                    sourceOrigin: Uri,
+                    isMainFrame: Boolean,
+                    replyProxy: JavaScriptReplyProxy
+                ) {
+                    onMessageReceived(message.data!!)
+                }
+            })
+    } else {
+        webview.addJavascriptInterface(object {
+            @JavascriptInterface
+            fun postMessage(message: String) {
+                // Use the handler to invoke method on UI thread
+                handler.post(Runnable { onMessageReceived(message) })
+            }
+        }, jsObjName)
+    }
+}
\ No newline at end of file

From ce6306917675a9f12d2855efaafe57ae1b94e236 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Mon, 27 Jul 2020 09:23:35 -0400
Subject: [PATCH 37/50] converts runable to lambda, fixes message val, fixes
 loadDataWithBaseUrl call

---
 .../samples/webviewdemo/MainActivityTest.kt   | 87 ++++++++++---------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
index 004ae9d4..7891426f 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
@@ -15,6 +15,7 @@
  */
 
 package com.android.samples.webviewdemo
+
 import android.content.Context
 import android.os.Handler
 import android.os.Looper
@@ -49,12 +50,13 @@ class MainActivityTest {
 
     val context = ApplicationProvider.getApplicationContext<Context>()
 
-    @Rule @JvmField
+    @Rule
+    @JvmField
     val mainActivityRule = ActivityTestRule(MainActivity::class.java)
     fun afterActivityLaunched() {
-      // Technically we do not need to do this - MainActivity has javascript turned on.
-      // Other WebViews in your app may have javascript turned off, however since the only way
-      // to automate WebViews is through javascript, it must be enabled.
+        // Technically we do not need to do this - MainActivity has javascript turned on.
+        // Other WebViews in your app may have javascript turned off, however since the only way
+        // to automate WebViews is through javascript, it must be enabled.
         onWebView().forceJavascriptEnabled()
     }
 
@@ -74,63 +76,67 @@ class MainActivityTest {
     // Test for checking createJsObject
     @Test
     fun jsObjectIsInjectedAndContainsPostMessage() {
-    mainActivityRule.getActivity()
-    onWebView()
-        .check(
-            webMatches(
-                script("return jsObject && jsObject.postMessage != null;", castOrDie(Boolean::class.javaObjectType)),
-                `is`(true)
+        mainActivityRule.getActivity()
+        onWebView()
+            .check(
+                webMatches(
+                    script(
+                        "return jsObject && jsObject.postMessage != null;",
+                        castOrDie(Boolean::class.javaObjectType)
+                    ),
+                    `is`(true)
+                )
             )
-        )
     }
 
     @Test
-    fun valueInCallback_compareValueInput_returnsTrue(){
-        mainActivityRule.getActivity()
+    fun valueInCallback_compareValueInput_returnsTrue() {
+        mainActivityRule.activity
         // Setup
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://example.com")
-        val message = "hello"
+        val expectedMessage = "hello"
         // Get a handler that can be used to post to the main thread
-        val mainHandler = Handler (Looper.getMainLooper());
-        val myRunnable = Runnable() {
-            val webView = WebView(context)
-            // Create JsObject
-            createJsObject(
-                webView,
-                jsObjName,
-                allowedOriginRules
-            ) { message -> //save message; call .set()
-            }
-            run() {
+        val mainHandler = Handler(Looper.getMainLooper());
+        mainHandler.post {
+            run {
+                val webView = WebView(context)
+                // Create JsObject
+                createJsObject(
+                    webView,
+                    jsObjName,
+                    allowedOriginRules
+                ) { message -> //save message; call .set()
+                }
                 //Inject JsObject into Html
-                webView.loadDataWithBaseURL("https://example.com","<html></html>",
-                    "text/html", "UTF-8","https://example.com")
+                webView.loadDataWithBaseURL(
+                    "https://example.com", "<html></html>",
+                    "text/html", null, null
+                )
                 //Call js code to invoke callback
-                webView.evaluateJavascript("${jsObjName}.postMessage(${message})", null)
+                webView.evaluateJavascript("${jsObjName}.postMessage(`hello`)", null)
             }
         }
-        mainHandler.post(myRunnable)
         // evaluate what comes out -> it should be hello
         // *Note: //.get() is a place holder
-        assertEquals("hello"
+        assertEquals(
+            expectedMessage
             , "//.get()"
-             )
+        )
     }
 
     @Test
     // Checks that postMessage runs on the UI thread
     fun checkingThreadCallbackRunsOn() {
-        mainActivityRule.getActivity()
+        mainActivityRule.activity
         // Setup
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://example.com")
-        val message = "hello"
         // Get a handler that can be used to post to the main thread
-        val mainHandler = Handler (Looper.getMainLooper())
+        val mainHandler = Handler(Looper.getMainLooper())
         // Start Interacting with webView on UI thread
-        val myRunnable = Runnable() {
-            run() {
+        mainHandler.post {
+            run {
                 val webView = WebView(context)
                 // Create JsObject
                 createJsObject(
@@ -139,13 +145,14 @@ class MainActivityTest {
                     allowedOriginRules
                 ) { message -> assertTrue(isUiThread()) }
                 //Inject JsObject into Html
-                webView.loadDataWithBaseURL("https://example.com","<html></html>",
-                    "text/html", "UTF-8","https://example.com")
+                webView.loadDataWithBaseURL(
+                    "https://example.com", "<html></html>",
+                    "text/html", "UTF-8", null
+                )
                 //Call js code to invoke callback
-                webView.evaluateJavascript("${jsObjName}.postMessage(${message})", null)
+                webView.evaluateJavascript("${jsObjName}.postMessage(`hello`)", null)
             }
         }
-        mainHandler.post(myRunnable)
     }
 
     /**

From fa603566db3365d7d58def58669836c7227024b1 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Mon, 27 Jul 2020 13:24:40 -0400
Subject: [PATCH 38/50] adds coroutines to tests

---
 WebView/app/build.gradle                      |  2 ++
 .../samples/webviewdemo/MainActivityTest.kt   | 23 +++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/WebView/app/build.gradle b/WebView/app/build.gradle
index f5e1661c..48e11376 100644
--- a/WebView/app/build.gradle
+++ b/WebView/app/build.gradle
@@ -73,4 +73,6 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
     androidTestImplementation 'androidx.test:rules:1.1.1'
     androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0"
+
 }
\ No newline at end of file
diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
index 7891426f..847656f9 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
@@ -19,6 +19,7 @@ package com.android.samples.webviewdemo
 import android.content.Context
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import android.webkit.WebView
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
@@ -33,6 +34,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import junit.framework.Assert.assertEquals
 import junit.framework.Assert.assertTrue
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.containsString
 import org.junit.Rule
@@ -90,12 +96,13 @@ class MainActivityTest {
     }
 
     @Test
-    fun valueInCallback_compareValueInput_returnsTrue() {
+    fun valueInCallback_compareValueInput_returnsTrue() = runBlocking() {
         mainActivityRule.activity
         // Setup
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://example.com")
         val expectedMessage = "hello"
+        val callback = async { return@async "hello" }
         // Get a handler that can be used to post to the main thread
         val mainHandler = Handler(Looper.getMainLooper());
         mainHandler.post {
@@ -106,7 +113,7 @@ class MainActivityTest {
                     webView,
                     jsObjName,
                     allowedOriginRules
-                ) { message -> //save message; call .set()
+                ) { message -> callback
                 }
                 //Inject JsObject into Html
                 webView.loadDataWithBaseURL(
@@ -118,20 +125,17 @@ class MainActivityTest {
             }
         }
         // evaluate what comes out -> it should be hello
-        // *Note: //.get() is a place holder
-        assertEquals(
-            expectedMessage
-            , "//.get()"
-        )
+        assertEquals(expectedMessage, callback.await())
     }
 
     @Test
     // Checks that postMessage runs on the UI thread
-    fun checkingThreadCallbackRunsOn() {
+    fun checkingThreadCallbackRunsOn() = runBlocking {
         mainActivityRule.activity
         // Setup
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://example.com")
+        val callback = async { isUiThread() }
         // Get a handler that can be used to post to the main thread
         val mainHandler = Handler(Looper.getMainLooper())
         // Start Interacting with webView on UI thread
@@ -143,7 +147,7 @@ class MainActivityTest {
                     webView,
                     jsObjName,
                     allowedOriginRules
-                ) { message -> assertTrue(isUiThread()) }
+                ) { message -> callback }
                 //Inject JsObject into Html
                 webView.loadDataWithBaseURL(
                     "https://example.com", "<html></html>",
@@ -153,6 +157,7 @@ class MainActivityTest {
                 webView.evaluateJavascript("${jsObjName}.postMessage(`hello`)", null)
             }
         }
+        assertTrue(callback.await())
     }
 
     /**

From b4c6e587cc5fc4bef7df301be5bbca959def407c Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 28 Jul 2020 11:48:48 -0400
Subject: [PATCH 39/50] changes dark theme css formatting

---
 WebView/app/src/main/assets/style.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/WebView/app/src/main/assets/style.css b/WebView/app/src/main/assets/style.css
index a76bb6e0..026ddaea 100644
--- a/WebView/app/src/main/assets/style.css
+++ b/WebView/app/src/main/assets/style.css
@@ -90,10 +90,7 @@ img {
   body {
     background: #383838;
   }
-  h1 {
-    color: white;
-  }
-  h2 {
+  h1, h2 {
     color: white;
   }
   select {

From 77350b72b5ab7c31eedbab8c91f488ce57c34953 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 28 Jul 2020 20:49:26 -0400
Subject: [PATCH 40/50] changes initial image path, gets rid of unncessary
 logging, fixes allowedOriginRules

---
 WebView/app/src/main/assets/index.html                       | 2 +-
 WebView/app/src/main/assets/main.js                          | 1 -
 .../java/com/android/samples/webviewdemo/MainActivity.kt     | 5 +++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index 8b4d0fda..ffb50514 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -28,7 +28,7 @@
       <option value="london">London</option>
     </select>
     <h1 id="title">Location</h1>
-    <img alt="weather" class="icon" id="icon" src="https://raw.githubusercontent.com/res/drawable/sunny.png" />
+    <img alt="weather" class="icon" id="icon" src="https://raw.githubusercontent.com/views-widgets-samples/res/drawable/sunny.png" />
     <h2 class="currentTemp" id="currentTemp">Current Temp</h2>
     <h2 class="shortDescription" id="shortDescription">Short Description</h2>
     <p class="longDescription" id="longDescription">Long Description</p>
diff --git a/WebView/app/src/main/assets/main.js b/WebView/app/src/main/assets/main.js
index c3634999..8b3a62ef 100644
--- a/WebView/app/src/main/assets/main.js
+++ b/WebView/app/src/main/assets/main.js
@@ -30,7 +30,6 @@ function getData() {
 	}).then(function(data) {
 		var form = document.getElementById("location");
 		var currentLocation = form.options[form.selectedIndex].value;
-		console.log(data[currentLocation].description);
 		document.getElementById("title").innerText = form.options[form.selectedIndex].text;
         document.getElementById("currentTemp").innerText = `${data[currentLocation].currentTemp}`+ "\xB0 F";
         document.getElementById("shortDescription").innerText = data[currentLocation].description;
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index f1d1bf55..2694f0c1 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -82,6 +82,7 @@ class MainActivity : AppCompatActivity() {
      * origin in this set then it will have the JS object injected into it
      * @param onMessageReceived invoked on UI thread with message passed in from JavaScript postMessage() call
      */
+
     private fun createJsObject(
         webview: WebView,
         jsObjName: String,
@@ -129,8 +130,8 @@ class MainActivity : AppCompatActivity() {
         val binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
         val jsObjName = "jsObject"
-        val allowedOriginRules = setOf<String>("https://gcoleman799.github.io")
-        
+        val allowedOriginRules = setOf<String>("https://raw.githubusercontent.com")
+
         // Configuring Dark Theme
         // *NOTE* : The force dark setting is not persistent. You must call the static
         // method every time your app process is started.

From 048851db9f8207dca33c33d7a75b6ba7047e4ec2 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 21 Jul 2020 10:25:03 -0400
Subject: [PATCH 41/50] adds testing outline and dependencies

---
 WebView/app/build.gradle                      |  7 ++
 .../webviewdemo/ExampleInstrumentedTest.kt    | 64 ++++++++++++++++---
 WebView/app/src/main/assets/index.html        |  2 +-
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/WebView/app/build.gradle b/WebView/app/build.gradle
index 195ddbe2..6c1081ec 100644
--- a/WebView/app/build.gradle
+++ b/WebView/app/build.gradle
@@ -65,4 +65,11 @@ dependencies {
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-web:3.1.0'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
+    androidTestImplementation 'androidx.test:rules:1.1.1'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+
+
 }
diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
index d595a6ab..18a1b5b6 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
@@ -15,14 +15,19 @@
  */
 
 package com.android.samples.webviewdemo
-
-import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
+import androidx.test.espresso.web.sugar.Web.onWebView
+import androidx.test.espresso.web.webdriver.DriverAtoms.findElement
+import androidx.test.espresso.web.webdriver.DriverAtoms.getText
+import androidx.test.espresso.web.webdriver.DriverAtoms.webClick
+import androidx.test.espresso.web.webdriver.Locator
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.rule.ActivityTestRule
+import org.hamcrest.CoreMatchers.containsString
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -31,10 +36,53 @@ import org.junit.Assert.*
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
+
+    @Rule @JvmField
+    val activityRule = ActivityTestRule(MainActivity::class.java)
+
+     fun afterActivityLaunched() {
+//         Technically we do not need to do this - MainActivity has javascript turned on.
+//         Other WebViews in your app may have javascript turned off, however since the only way
+//         to automate WebViews is through javascript, it must be enabled.
+        onWebView().forceJavascriptEnabled()
+    }
+
+
+    @Test
+    fun webViewTest() {
+
+        activityRule.getActivity()
+
+
+        onWebView()
+            .withElement(findElement(Locator.ID, "title"))
+            .check(webMatches(getText(), containsString("New York")))
+//            .perform(webClick())
+//            .withElement(findElement(Locator.TAG_NAME, "h1"))
+//            .check(webMatches(getText(), containsString("Apple")))
+
+
+    }
+
+
+// Test for calling postMessage
     @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.android.samples.webviewdemo", appContext.packageName)
+    fun callPostMessage() {
+        onWebView()
+                // Click on the share button
+            .withElement(findElement(Locator.ID, "share")) // similar to onView(withId(...))
+            .perform(webClick()) // Similar to perform(click())
+
+            // check that an intent was created
+
+            // verify that the data send to post message looks correct
+
+            //.get()
+            //.value
+
+
+            // Similar to check(matches(...))
+            //.check(webMatches(executeScript)
+
     }
 }
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index ffb50514..0b557d68 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -32,6 +32,6 @@ <h1 id="title">Location</h1>
     <h2 class="currentTemp" id="currentTemp">Current Temp</h2>
     <h2 class="shortDescription" id="shortDescription">Short Description</h2>
     <p class="longDescription" id="longDescription">Long Description</p>
-    <button class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
+    <button id="share" class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
   </body>
 </html>
\ No newline at end of file

From 7f7152e08e076d5e157bcc24535e5e9438ad553f Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 21 Jul 2020 12:31:45 -0400
Subject: [PATCH 42/50] adds tests for createJsObject and drop down menu

---
 .../webviewdemo/ExampleInstrumentedTest.kt    | 66 ++++++++-----------
 WebView/app/src/main/assets/index.html        |  4 +-
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
index 18a1b5b6..fd22be61 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
@@ -16,6 +16,8 @@
 
 package com.android.samples.webviewdemo
 import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
+import androidx.test.espresso.web.model.Atoms.castOrDie
+import androidx.test.espresso.web.model.Atoms.script
 import androidx.test.espresso.web.sugar.Web.onWebView
 import androidx.test.espresso.web.webdriver.DriverAtoms.findElement
 import androidx.test.espresso.web.webdriver.DriverAtoms.getText
@@ -23,12 +25,12 @@ import androidx.test.espresso.web.webdriver.DriverAtoms.webClick
 import androidx.test.espresso.web.webdriver.Locator
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
+import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.containsString
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -38,51 +40,37 @@ import org.junit.runner.RunWith
 class ExampleInstrumentedTest {
 
     @Rule @JvmField
-    val activityRule = ActivityTestRule(MainActivity::class.java)
-
-     fun afterActivityLaunched() {
-//         Technically we do not need to do this - MainActivity has javascript turned on.
-//         Other WebViews in your app may have javascript turned off, however since the only way
-//         to automate WebViews is through javascript, it must be enabled.
+    val mainActivityRule = ActivityTestRule(MainActivity::class.java)
+    fun afterActivityLaunched() {
+      // Technically we do not need to do this - MainActivity has javascript turned on.
+      // Other WebViews in your app may have javascript turned off, however since the only way
+      // to automate WebViews is through javascript, it must be enabled.
         onWebView().forceJavascriptEnabled()
     }
 
-
+    // Test to check that the drop down menu behaves as expected
     @Test
-    fun webViewTest() {
-
-        activityRule.getActivity()
-
-
+    fun dropDownMenu_SanFran() {
+        mainActivityRule.getActivity()
         onWebView()
+            .withElement(findElement(Locator.ID, "location"))
+            .perform(webClick()) // Similar to perform(click())
+            .withElement(findElement(Locator.ID, "SF"))
+            .perform(webClick()) // Similar to perform(click())
             .withElement(findElement(Locator.ID, "title"))
-            .check(webMatches(getText(), containsString("New York")))
-//            .perform(webClick())
-//            .withElement(findElement(Locator.TAG_NAME, "h1"))
-//            .check(webMatches(getText(), containsString("Apple")))
-
-
+            .check(webMatches(getText(), containsString("San Francisco")))
     }
 
-
-// Test for calling postMessage
+    // Test for checking createJsObject
     @Test
-    fun callPostMessage() {
-        onWebView()
-                // Click on the share button
-            .withElement(findElement(Locator.ID, "share")) // similar to onView(withId(...))
-            .perform(webClick()) // Similar to perform(click())
-
-            // check that an intent was created
-
-            // verify that the data send to post message looks correct
-
-            //.get()
-            //.value
-
-
-            // Similar to check(matches(...))
-            //.check(webMatches(executeScript)
-
+    fun jsObjectIsInjectedAndContainsPostMessage() {
+    mainActivityRule.getActivity()
+    onWebView()
+        .check(
+            webMatches(
+                script("return jsObject && jsObject.postMessage != null;", castOrDie(Boolean::class.javaObjectType)),
+                `is`(true)
+            )
+        )
     }
-}
+}
\ No newline at end of file
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index 0b557d68..bb4daa20 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -24,7 +24,7 @@
     <label for="location">Choose a location:</label>
     <select name="location" id="location" onchange="getData()">
       <option value="newYork">New York</option>
-      <option value="sanFrancisco">San Francisco</option>
+      <option id= "SF" value="sanFrancisco">San Francisco</option>
       <option value="london">London</option>
     </select>
     <h1 id="title">Location</h1>
@@ -32,6 +32,6 @@ <h1 id="title">Location</h1>
     <h2 class="currentTemp" id="currentTemp">Current Temp</h2>
     <h2 class="shortDescription" id="shortDescription">Short Description</h2>
     <p class="longDescription" id="longDescription">Long Description</p>
-    <button id="share" class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
+    <button class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
   </body>
 </html>
\ No newline at end of file

From bbc334be7a31bc3f6e38b8897df206bfef2c0861 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 21 Jul 2020 15:20:52 -0400
Subject: [PATCH 43/50] add description to tests,add ids to menu

---
 .../android/samples/webviewdemo/ExampleInstrumentedTest.kt    | 4 +---
 WebView/app/src/main/assets/index.html                        | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
index fd22be61..7f853f89 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
@@ -32,9 +32,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 /**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
+ * Launch, interact, and verify conditions in an activity that has a WebView instance.
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index bb4daa20..365b7076 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -23,9 +23,9 @@
   <body onload="getData()">
     <label for="location">Choose a location:</label>
     <select name="location" id="location" onchange="getData()">
-      <option value="newYork">New York</option>
+      <option id= "NYC" value="newYork">New York</option>
       <option id= "SF" value="sanFrancisco">San Francisco</option>
-      <option value="london">London</option>
+      <option id= "LDN" value="london">London</option>
     </select>
     <h1 id="title">Location</h1>
     <img alt="weather" class="icon" id="icon" src="https://raw.githubusercontent.com/views-widgets-samples/res/drawable/sunny.png" />

From 45284700d6c53bc710d19b956fc62eb3d320afef Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 22 Jul 2020 13:33:41 -0400
Subject: [PATCH 44/50] adds set up for unit tests

---
 WebView/app/build.gradle                      |  3 ++
 .../samples/webviewdemo/ExampleUnitTest.kt    | 34 ++++++++++++++-----
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/WebView/app/build.gradle b/WebView/app/build.gradle
index 6c1081ec..d51f1889 100644
--- a/WebView/app/build.gradle
+++ b/WebView/app/build.gradle
@@ -63,6 +63,9 @@ dependencies {
     implementation "com.google.android.material:material:$material_components_version"
 
     testImplementation 'junit:junit:4.13'
+    testImplementation 'androidx.test:core:1.0.0'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
+
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-web:3.1.0'
diff --git a/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt b/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt
index c72b979b..d4125bce 100644
--- a/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt
+++ b/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt
@@ -16,18 +16,36 @@
 
 package com.android.samples.webviewdemo
 
+import org.junit.Assert.assertThat
 import org.junit.Test
-
-import org.junit.Assert.*
+import java.util.Objects
 
 /**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
+ * Tests to ensure that callbacks are behaving as expected
  */
-class ExampleUnitTest {
+
+
+class EmailValidatorTest {
     @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
+    fun testConvertFahrenheitToCelsius() {
+        val actual: Float = ConverterUtil.convertCelsiusToFahrenheit(100)
+        // expected value is 212
+        val expected = 212f
+        // use this method because float is not precise
+       // assertEquals("Conversion from celsius to fahrenheit failed", expected, actual, 0.001)
+    }
+    @Test
+    fun postMessage_CorrectStringFormat_ReturnsTrue() {
+        // create object
+                // what object do we need to create?
+                // we need to create a js object to call postMessage on
+        
+        val jsObject: Objects =
+
+            // create expected return
+        // call post message
+        // check that post message
+
+       // assertEquals("Hi", jsObject.postMessage("Hi"))
     }
 }

From fa580f45f3e7ae97c20af9a0e081f28384b67336 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Thu, 23 Jul 2020 13:02:34 -0400
Subject: [PATCH 45/50] thread test and callback test outline

---
 WebView/app/build.gradle                      |  1 +
 ...nstrumentedTest.kt => MainActivityTest.kt} | 87 ++++++++++++++++++-
 .../samples/webviewdemo/ExampleUnitTest.kt    | 34 ++------
 3 files changed, 95 insertions(+), 27 deletions(-)
 rename WebView/app/src/androidTest/java/com/android/samples/webviewdemo/{ExampleInstrumentedTest.kt => MainActivityTest.kt} (52%)

diff --git a/WebView/app/build.gradle b/WebView/app/build.gradle
index d51f1889..d75a6808 100644
--- a/WebView/app/build.gradle
+++ b/WebView/app/build.gradle
@@ -73,6 +73,7 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
     androidTestImplementation 'androidx.test:rules:1.1.1'
     androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation "androidx.webkit:webkit:$webkit_version"
 
 
 }
diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
similarity index 52%
rename from WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
rename to WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
index 7f853f89..559e4db1 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/ExampleInstrumentedTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
@@ -15,6 +15,10 @@
  */
 
 package com.android.samples.webviewdemo
+import android.content.Context
+import android.os.Looper
+import android.webkit.WebView
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
 import androidx.test.espresso.web.model.Atoms.castOrDie
 import androidx.test.espresso.web.model.Atoms.script
@@ -25,17 +29,24 @@ import androidx.test.espresso.web.webdriver.DriverAtoms.webClick
 import androidx.test.espresso.web.webdriver.Locator
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
+import junit.framework.Assert.assertEquals
+import junit.framework.Assert.assertTrue
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.containsString
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
+
 /**
  * Launch, interact, and verify conditions in an activity that has a WebView instance.
  */
 @RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
+
+
+class MainActivityTest {
+
+    val context = ApplicationProvider.getApplicationContext<Context>()
 
     @Rule @JvmField
     val mainActivityRule = ActivityTestRule(MainActivity::class.java)
@@ -71,4 +82,78 @@ class ExampleInstrumentedTest {
             )
         )
     }
+
+    @Test
+    fun valueInCallback_compareValueInput_returnsTrue(){
+        mainActivityRule.getActivity()
+
+        // Setup
+        val webView = WebView(context)
+        val jsObjName = "jsObject"
+        val allowedOriginRules = setOf<String>("https://example.com")
+
+        // Create HTML
+        val htmlPage = "<!DOCTYPE html><html><body>" + "    <script>" + "        myObject.postMessage('hello');" + "    </script>" + "</body></html>"
+
+        // Create JsObject
+        MainActivity.createJsObject(
+            webView,
+            jsObjName,
+            allowedOriginRules
+        ) { message -> MainActivity.invokeShareIntent(message) }
+
+        //Inject JsObject into Html
+        webView.loadData(htmlPage, "text/html", "UTF-8")
+
+
+        //Call js code to invoke callback (in script tag of htmlPage)
+
+        // evaluate what comes out -> it should be hello
+        // *Note: "response from callback" is a place holder here I am unsure what should be placed there
+        assertEquals("response from callback", "hello")
+
+    }
+
+    @Test
+    // Checks that postMessage runs on the UI thread
+    fun checkingThreadCallbackRunsOn() {
+        mainActivityRule.getActivity()
+
+        // Setup
+        val webView = WebView(context)
+        val jsObjName = "jsObject"
+        val allowedOriginRules = setOf<String>("https://example.com")
+
+        // Create HTML
+        val htmlPage =
+            "<!DOCTYPE html><html><body>" + "    <script>" + "        jsObject.postMessage('hello');" + "    </script>" + "</body></html>"
+
+
+        // Create JsObject
+        MainActivity.createJsObject(
+            webView,
+            jsObjName,
+            allowedOriginRules
+        ) { message -> MainActivity.invokeShareIntent(message) }
+
+
+        // Inject JsObject into Html by loading it in the webview
+        webView.loadData(htmlPage, "text/html", "UTF-8")
+
+
+        // Use coroutine to go onto UI thread here?
+        // Call js code to invoke callback (in script tag of htmlPage)
+
+
+        // check that method is running on the UI thread
+        assertTrue(isUiThread())
+    }
+
+    /**
+     * Returns true if the current thread is the UI thread based on the
+     * Looper.
+     */
+    private fun isUiThread(): Boolean {
+        return Looper.myLooper() == Looper.getMainLooper()
+    }
 }
\ No newline at end of file
diff --git a/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt b/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt
index d4125bce..c72b979b 100644
--- a/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt
+++ b/WebView/app/src/test/java/com/android/samples/webviewdemo/ExampleUnitTest.kt
@@ -16,36 +16,18 @@
 
 package com.android.samples.webviewdemo
 
-import org.junit.Assert.assertThat
 import org.junit.Test
-import java.util.Objects
+
+import org.junit.Assert.*
 
 /**
- * Tests to ensure that callbacks are behaving as expected
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
  */
-
-
-class EmailValidatorTest {
+class ExampleUnitTest {
     @Test
-    fun testConvertFahrenheitToCelsius() {
-        val actual: Float = ConverterUtil.convertCelsiusToFahrenheit(100)
-        // expected value is 212
-        val expected = 212f
-        // use this method because float is not precise
-       // assertEquals("Conversion from celsius to fahrenheit failed", expected, actual, 0.001)
-    }
-    @Test
-    fun postMessage_CorrectStringFormat_ReturnsTrue() {
-        // create object
-                // what object do we need to create?
-                // we need to create a js object to call postMessage on
-        
-        val jsObject: Objects =
-
-            // create expected return
-        // call post message
-        // check that post message
-
-       // assertEquals("Hi", jsObject.postMessage("Hi"))
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
     }
 }

From 684f2ef8b8501950acf4cce66cedaf82e0301eed Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 21 Jul 2020 10:25:03 -0400
Subject: [PATCH 46/50] adds testing outline and dependencies

---
 WebView/app/build.gradle                      |   3 -
 .../samples/webviewdemo/MainActivityTest.kt   | 135 +++++++++---------
 WebView/app/src/main/assets/index.html        |   2 +-
 .../samples/webviewdemo/createJsObject.kt     |  88 ++++++++++++
 4 files changed, 160 insertions(+), 68 deletions(-)
 create mode 100644 WebView/app/src/main/java/com/android/samples/webviewdemo/createJsObject.kt

diff --git a/WebView/app/build.gradle b/WebView/app/build.gradle
index d75a6808..d61a7154 100644
--- a/WebView/app/build.gradle
+++ b/WebView/app/build.gradle
@@ -73,7 +73,4 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
     androidTestImplementation 'androidx.test:rules:1.1.1'
     androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation "androidx.webkit:webkit:$webkit_version"
-
-
 }
diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
index 559e4db1..e1e1abc0 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
@@ -15,7 +15,9 @@
  */
 
 package com.android.samples.webviewdemo
+
 import android.content.Context
+import android.os.Handler
 import android.os.Looper
 import android.webkit.WebView
 import androidx.test.core.app.ApplicationProvider
@@ -31,13 +33,14 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import junit.framework.Assert.assertEquals
 import junit.framework.Assert.assertTrue
+import kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.containsString
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 /**
  * Launch, interact, and verify conditions in an activity that has a WebView instance.
  */
@@ -48,12 +51,13 @@ class MainActivityTest {
 
     val context = ApplicationProvider.getApplicationContext<Context>()
 
-    @Rule @JvmField
+    @Rule
+    @JvmField
     val mainActivityRule = ActivityTestRule(MainActivity::class.java)
     fun afterActivityLaunched() {
-      // Technically we do not need to do this - MainActivity has javascript turned on.
-      // Other WebViews in your app may have javascript turned off, however since the only way
-      // to automate WebViews is through javascript, it must be enabled.
+        // Technically we do not need to do this - MainActivity has javascript turned on.
+        // Other WebViews in your app may have javascript turned off, however since the only way
+        // to automate WebViews is through javascript, it must be enabled.
         onWebView().forceJavascriptEnabled()
     }
 
@@ -73,80 +77,83 @@ class MainActivityTest {
     // Test for checking createJsObject
     @Test
     fun jsObjectIsInjectedAndContainsPostMessage() {
-    mainActivityRule.getActivity()
-    onWebView()
-        .check(
-            webMatches(
-                script("return jsObject && jsObject.postMessage != null;", castOrDie(Boolean::class.javaObjectType)),
-                `is`(true)
+        mainActivityRule.getActivity()
+        onWebView()
+            .check(
+                webMatches(
+                    script(
+                        "return jsObject && jsObject.postMessage != null;",
+                        castOrDie(Boolean::class.javaObjectType)
+                    ),
+                    `is`(true)
+                )
             )
-        )
     }
 
     @Test
-    fun valueInCallback_compareValueInput_returnsTrue(){
-        mainActivityRule.getActivity()
-
+    fun valueInCallback_compareValueInput_returnsTrue() = runBlocking() {
+        mainActivityRule.activity
         // Setup
-        val webView = WebView(context)
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://example.com")
-
-        // Create HTML
-        val htmlPage = "<!DOCTYPE html><html><body>" + "    <script>" + "        myObject.postMessage('hello');" + "    </script>" + "</body></html>"
-
-        // Create JsObject
-        MainActivity.createJsObject(
-            webView,
-            jsObjName,
-            allowedOriginRules
-        ) { message -> MainActivity.invokeShareIntent(message) }
-
-        //Inject JsObject into Html
-        webView.loadData(htmlPage, "text/html", "UTF-8")
-
-
-        //Call js code to invoke callback (in script tag of htmlPage)
-
+        val expectedMessage = "hello"
+        val callback = async { return@async "hello" }
+        // Get a handler that can be used to post to the main thread
+        val mainHandler = Handler(Looper.getMainLooper());
+        mainHandler.post {
+            run {
+                val webView = WebView(context)
+                // Create JsObject
+                createJsObject(
+                    webView,
+                    jsObjName,
+                    allowedOriginRules
+                ) { message ->
+                    callback
+                }
+                //Inject JsObject into Html
+                webView.loadDataWithBaseURL(
+                    "https://example.com", "<html></html>",
+                    "text/html", null, null
+                )
+                //Call js code to invoke callback
+                webView.evaluateJavascript("${jsObjName}.postMessage(`hello`)", null)
+            }
+        }
         // evaluate what comes out -> it should be hello
-        // *Note: "response from callback" is a place holder here I am unsure what should be placed there
-        assertEquals("response from callback", "hello")
-
+        assertEquals(expectedMessage, callback.await())
     }
 
     @Test
     // Checks that postMessage runs on the UI thread
-    fun checkingThreadCallbackRunsOn() {
-        mainActivityRule.getActivity()
-
+    fun checkingThreadCallbackRunsOn() = runBlocking {
+        mainActivityRule.activity
         // Setup
-        val webView = WebView(context)
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://example.com")
-
-        // Create HTML
-        val htmlPage =
-            "<!DOCTYPE html><html><body>" + "    <script>" + "        jsObject.postMessage('hello');" + "    </script>" + "</body></html>"
-
-
-        // Create JsObject
-        MainActivity.createJsObject(
-            webView,
-            jsObjName,
-            allowedOriginRules
-        ) { message -> MainActivity.invokeShareIntent(message) }
-
-
-        // Inject JsObject into Html by loading it in the webview
-        webView.loadData(htmlPage, "text/html", "UTF-8")
-
-
-        // Use coroutine to go onto UI thread here?
-        // Call js code to invoke callback (in script tag of htmlPage)
-
-
-        // check that method is running on the UI thread
-        assertTrue(isUiThread())
+        val callback = async { isUiThread() }
+        // Get a handler that can be used to post to the main thread
+        val mainHandler = Handler(Looper.getMainLooper())
+        // Start Interacting with webView on UI thread
+        mainHandler.post {
+            run {
+                val webView = WebView(context)
+                // Create JsObject
+                createJsObject(
+                    webView,
+                    jsObjName,
+                    allowedOriginRules
+                ) { message -> callback }
+                //Inject JsObject into Html
+                webView.loadDataWithBaseURL(
+                    "https://example.com", "<html></html>",
+                    "text/html", "UTF-8", null
+                )
+                //Call js code to invoke callback
+                webView.evaluateJavascript("${jsObjName}.postMessage(`hello`)", null)
+            }
+        }
+        assertTrue(callback.await())
     }
 
     /**
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index 365b7076..1bb3266d 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -32,6 +32,6 @@ <h1 id="title">Location</h1>
     <h2 class="currentTemp" id="currentTemp">Current Temp</h2>
     <h2 class="shortDescription" id="shortDescription">Short Description</h2>
     <p class="longDescription" id="longDescription">Long Description</p>
-    <button class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
+    <button id="share" class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
   </body>
 </html>
\ No newline at end of file
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/createJsObject.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/createJsObject.kt
new file mode 100644
index 00000000..2d0896cf
--- /dev/null
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/createJsObject.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.samples.webviewdemo
+
+import android.net.Uri
+import android.os.Handler
+import android.os.Looper
+import android.webkit.JavascriptInterface
+import android.webkit.WebView
+import androidx.webkit.JavaScriptReplyProxy
+import androidx.webkit.WebMessageCompat
+import androidx.webkit.WebViewCompat
+import androidx.webkit.WebViewFeature
+
+// Create a handler that runs on the UI thread
+private val handler: Handler = Handler(Looper.getMainLooper())
+
+/**
+ * Injects a JavaScript object which supports a {@code postMessage()} method.
+ * A feature check is used to determine if the preferred API, WebMessageListener, is supported.
+ * If it is, then WebMessageListener will be used to create a JavaScript object. The object will be
+ * injected into all of the frames that have an origin matching those in {@code allowedOriginRules}.
+ * <p>
+ * If WebMessageListener is not supported then the method will defer to using JavascriptInterface
+ * to create the JavaScript object.
+ * <p>
+ * The {@code postMessage()} methods in the Javascript objects created by WebMessageListener and
+ * JavascriptInterface both make calls to the same callback, {@code onMessageReceived()}.
+ * In this case, the callback invokes native Android sharing.
+ * <p>
+ * The WebMessageListener invokes callbacks on the UI thread by default. However,
+ * JavascriptInterface invokes callbacks on a background thread by default. In order to
+ * guarantee thread safety and that the caller always gets consistent behavior the the callback
+ * should always be called on the UI thread. To change the default behavior of JavascriptInterface,
+ * the callback is wrapped in a handler which will tell it to run on the UI thread instead of the default
+ * background thread it would otherwise be invoked on.
+ * <p>
+ * @param webview the component that WebMessageListener or JavascriptInterface will be added to
+ * @param jsObjName the name that will be given to the Javascript objects created by either
+ *        WebMessageListener or JavascriptInterface
+ * @param allowedOriginRules a set of origins used only by WebMessageListener, if a frame matches an
+ * origin in this set then it will have the JS object injected into it
+ * @param onMessageReceived invoked on UI thread with message passed in from JavaScript postMessage() call
+ */
+fun createJsObject(
+    webview: WebView,
+    jsObjName: String,
+    allowedOriginRules: Set<String>,
+    onMessageReceived: (message: String) -> Unit
+) {
+    if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)) {
+        WebViewCompat.addWebMessageListener(
+            webview, jsObjName, allowedOriginRules,
+            object : WebViewCompat.WebMessageListener {
+                override fun onPostMessage(
+                    webview: WebView,
+                    message: WebMessageCompat,
+                    sourceOrigin: Uri,
+                    isMainFrame: Boolean,
+                    replyProxy: JavaScriptReplyProxy
+                ) {
+                    onMessageReceived(message.data!!)
+                }
+            })
+    } else {
+        webview.addJavascriptInterface(object {
+            @JavascriptInterface
+            fun postMessage(message: String) {
+                // Use the handler to invoke method on UI thread
+                handler.post(Runnable { onMessageReceived(message) })
+            }
+        }, jsObjName)
+    }
+}
\ No newline at end of file

From 016ac017dcbc7822ea116267a066fadc52e50e68 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 21 Jul 2020 12:31:45 -0400
Subject: [PATCH 47/50] adds tests for createJsObject and drop down menu

---
 WebView/app/src/main/assets/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
index 1bb3266d..365b7076 100644
--- a/WebView/app/src/main/assets/index.html
+++ b/WebView/app/src/main/assets/index.html
@@ -32,6 +32,6 @@ <h1 id="title">Location</h1>
     <h2 class="currentTemp" id="currentTemp">Current Temp</h2>
     <h2 class="shortDescription" id="shortDescription">Short Description</h2>
     <p class="longDescription" id="longDescription">Long Description</p>
-    <button id="share" class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
+    <button class="button" onclick="sendAndroidMessage()" type="button" value="Send Message">Share</button>
   </body>
 </html>
\ No newline at end of file

From c9200255a0e5bd6462c42603bab2cd5629f1377c Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Fri, 24 Jul 2020 17:25:51 -0400
Subject: [PATCH 48/50] puts createJsObject in seperate file, adds handlers and
 runnables to tests

---
 WebView/app/build.gradle                      |  2 +-
 .../samples/webviewdemo/MainActivityTest.kt   |  3 +-
 .../samples/webviewdemo/MainActivity.kt       | 69 -------------------
 3 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/WebView/app/build.gradle b/WebView/app/build.gradle
index d61a7154..f5e1661c 100644
--- a/WebView/app/build.gradle
+++ b/WebView/app/build.gradle
@@ -73,4 +73,4 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
     androidTestImplementation 'androidx.test:rules:1.1.1'
     androidTestImplementation 'androidx.test:runner:1.1.0'
-}
+}
\ No newline at end of file
diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
index e1e1abc0..c9e7b251 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
@@ -108,8 +108,7 @@ class MainActivityTest {
                     webView,
                     jsObjName,
                     allowedOriginRules
-                ) { message ->
-                    callback
+                ) { message -> callback
                 }
                 //Inject JsObject into Html
                 webView.loadDataWithBaseURL(
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
index 2694f0c1..4be01258 100644
--- a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
+++ b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -19,31 +19,21 @@ package com.android.samples.webviewdemo
 import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.res.Configuration
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.webkit.JavascriptInterface
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat.startActivity
-import androidx.webkit.JavaScriptReplyProxy
-import androidx.webkit.WebMessageCompat
 import androidx.webkit.WebSettingsCompat
 import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
-import androidx.webkit.WebViewCompat
 import androidx.webkit.WebViewFeature
 import com.android.samples.webviewdemo.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
-    // Create a handler that runs on the UI thread
-    private val handler: Handler = Handler(Looper.getMainLooper())
-
     // Creating the custom WebView Client Class
     private class MyWebViewClient(private val assetLoader: WebViewAssetLoader) :
         WebViewClientCompat() {
@@ -55,65 +45,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    /**
-     * Injects a JavaScript object which supports a {@code postMessage()} method.
-     * A feature check is used to determine if the preferred API, WebMessageListener, is supported.
-     * If it is, then WebMessageListener will be used to create a JavaScript object. The object will be
-     * injected into all of the frames that have an origin matching those in {@code allowedOriginRules}.
-     * <p>
-     * If WebMessageListener is not supported then the method will defer to using JavascriptInterface
-     * to create the JavaScript object.
-     * <p>
-     * The {@code postMessage()} methods in the Javascript objects created by WebMessageListener and
-     * JavascriptInterface both make calls to the same callback, {@code onMessageReceived()}.
-     * In this case, the callback invokes native Android sharing.
-     * <p>
-     * The WebMessageListener invokes callbacks on the UI thread by default. However,
-     * JavascriptInterface invokes callbacks on a background thread by default. In order to
-     * guarantee thread safety and that the caller always gets consistent behavior the the callback
-     * should always be called on the UI thread. To change the default behavior of JavascriptInterface,
-     * the callback is wrapped in a handler which will tell it to run on the UI thread instead of the default
-     * background thread it would otherwise be invoked on.
-     * <p>
-     * @param webview the component that WebMessageListener or JavascriptInterface will be added to
-     * @param jsObjName the name that will be given to the Javascript objects created by either
-     *        WebMessageListener or JavascriptInterface
-     * @param allowedOriginRules a set of origins used only by WebMessageListener, if a frame matches an
-     * origin in this set then it will have the JS object injected into it
-     * @param onMessageReceived invoked on UI thread with message passed in from JavaScript postMessage() call
-     */
-
-    private fun createJsObject(
-        webview: WebView,
-        jsObjName: String,
-        allowedOriginRules: Set<String>,
-        onMessageReceived: (message: String) -> Unit
-    ) {
-        if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)) {
-            WebViewCompat.addWebMessageListener(
-                webview, jsObjName, allowedOriginRules,
-                object : WebViewCompat.WebMessageListener {
-                    override fun onPostMessage(
-                        webview: WebView,
-                        message: WebMessageCompat,
-                        sourceOrigin: Uri,
-                        isMainFrame: Boolean,
-                        replyProxy: JavaScriptReplyProxy
-                    ) {
-                        onMessageReceived(message.data!!)
-                    }
-                })
-        } else {
-            webview.addJavascriptInterface(object {
-                @JavascriptInterface
-                fun postMessage(message: String) {
-                    // Use the handler to invoke method on UI thread
-                    handler.post(Runnable { onMessageReceived(message) })
-                }
-            }, jsObjName)
-        }
-    }
-
     // Invokes native android sharing
     private fun invokeShareIntent(message: String) {
         val sendIntent: Intent = Intent().apply {

From e7bb95353b68b85a7ac1dd2d9801c71fcb059007 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Tue, 28 Jul 2020 19:10:08 -0400
Subject: [PATCH 49/50] uses CompletableDeffered in tests

---
 .../samples/webviewdemo/MainActivityTest.kt   | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
index c9e7b251..e54bbd74 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
@@ -33,6 +33,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import junit.framework.Assert.assertEquals
 import junit.framework.Assert.assertTrue
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.async
 import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.`is`
@@ -97,7 +98,8 @@ class MainActivityTest {
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://example.com")
         val expectedMessage = "hello"
-        val callback = async { return@async "hello" }
+       // val callback = async { return@async "hello" }
+        val callback = CompletableDeferred<String>()
         // Get a handler that can be used to post to the main thread
         val mainHandler = Handler(Looper.getMainLooper());
         mainHandler.post {
@@ -108,7 +110,9 @@ class MainActivityTest {
                     webView,
                     jsObjName,
                     allowedOriginRules
-                ) { message -> callback
+                ) { message ->
+                    // check the value of message
+                    callback.complete(message)
                 }
                 //Inject JsObject into Html
                 webView.loadDataWithBaseURL(
@@ -130,7 +134,7 @@ class MainActivityTest {
         // Setup
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://example.com")
-        val callback = async { isUiThread() }
+        val callback = CompletableDeferred<Looper>()
         // Get a handler that can be used to post to the main thread
         val mainHandler = Handler(Looper.getMainLooper())
         // Start Interacting with webView on UI thread
@@ -142,7 +146,8 @@ class MainActivityTest {
                     webView,
                     jsObjName,
                     allowedOriginRules
-                ) { message -> callback }
+                ) { message -> callback.complete(Looper.myLooper()!!) }
+                // want the callback complete the deferred
                 //Inject JsObject into Html
                 webView.loadDataWithBaseURL(
                     "https://example.com", "<html></html>",
@@ -152,14 +157,6 @@ class MainActivityTest {
                 webView.evaluateJavascript("${jsObjName}.postMessage(`hello`)", null)
             }
         }
-        assertTrue(callback.await())
-    }
-
-    /**
-     * Returns true if the current thread is the UI thread based on the
-     * Looper.
-     */
-    private fun isUiThread(): Boolean {
-        return Looper.myLooper() == Looper.getMainLooper()
+        assertTrue(callback.await() == Looper.getMainLooper())
     }
 }
\ No newline at end of file

From 84cea6b331abddb67703d0886cc1de6e8aaf13a8 Mon Sep 17 00:00:00 2001
From: Grace Coleman <grcoleman@google.com>
Date: Wed, 29 Jul 2020 17:14:35 -0400
Subject: [PATCH 50/50] uses Completable Deferredand run blocking

---
 .../samples/webviewdemo/MainActivityTest.kt   | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
index e54bbd74..188ea609 100644
--- a/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
+++ b/WebView/app/src/androidTest/java/com/android/samples/webviewdemo/MainActivityTest.kt
@@ -30,11 +30,11 @@ import androidx.test.espresso.web.webdriver.DriverAtoms.getText
 import androidx.test.espresso.web.webdriver.DriverAtoms.webClick
 import androidx.test.espresso.web.webdriver.Locator
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
 import androidx.test.rule.ActivityTestRule
 import junit.framework.Assert.assertEquals
 import junit.framework.Assert.assertTrue
 import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.async
 import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.containsString
@@ -46,8 +46,7 @@ import org.junit.runner.RunWith
  * Launch, interact, and verify conditions in an activity that has a WebView instance.
  */
 @RunWith(AndroidJUnit4::class)
-
-
+@LargeTest
 class MainActivityTest {
 
     val context = ApplicationProvider.getApplicationContext<Context>()
@@ -92,16 +91,15 @@ class MainActivityTest {
     }
 
     @Test
-    fun valueInCallback_compareValueInput_returnsTrue() = runBlocking() {
+    fun valueInCallback_compareValueInput_returnsTrue() = runBlocking {
         mainActivityRule.activity
         // Setup
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://example.com")
         val expectedMessage = "hello"
-       // val callback = async { return@async "hello" }
-        val callback = CompletableDeferred<String>()
+        val onMessageReceived = CompletableDeferred<String>()
         // Get a handler that can be used to post to the main thread
-        val mainHandler = Handler(Looper.getMainLooper());
+        val mainHandler = Handler(Looper.getMainLooper())
         mainHandler.post {
             run {
                 val webView = WebView(context)
@@ -110,21 +108,19 @@ class MainActivityTest {
                     webView,
                     jsObjName,
                     allowedOriginRules
-                ) { message ->
-                    // check the value of message
-                    callback.complete(message)
+                ) { message -> onMessageReceived.complete(message)
                 }
-                //Inject JsObject into Html
                 webView.loadDataWithBaseURL(
-                    "https://example.com", "<html></html>",
-                    "text/html", null, null
+                    "https://example.com",
+                    "<html><script>${jsObjName}.postMessage(`${expectedMessage}`)</script></html>",
+                    "text/html",
+                    null,
+                    null
                 )
-                //Call js code to invoke callback
-                webView.evaluateJavascript("${jsObjName}.postMessage(`hello`)", null)
             }
         }
-        // evaluate what comes out -> it should be hello
-        assertEquals(expectedMessage, callback.await())
+            // evaluate what comes out -> it should be hello
+            assertEquals(expectedMessage, onMessageReceived.await())
     }
 
     @Test
@@ -134,7 +130,8 @@ class MainActivityTest {
         // Setup
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://example.com")
-        val callback = CompletableDeferred<Looper>()
+        val expectedMessage = "hello"
+        val onMessageReceived = CompletableDeferred<Looper>()
         // Get a handler that can be used to post to the main thread
         val mainHandler = Handler(Looper.getMainLooper())
         // Start Interacting with webView on UI thread
@@ -146,17 +143,14 @@ class MainActivityTest {
                     webView,
                     jsObjName,
                     allowedOriginRules
-                ) { message -> callback.complete(Looper.myLooper()!!) }
-                // want the callback complete the deferred
+                ) { message -> onMessageReceived.complete(Looper.myLooper()!!) }
                 //Inject JsObject into Html
                 webView.loadDataWithBaseURL(
-                    "https://example.com", "<html></html>",
+                    "https://example.com", "<html><script>${jsObjName}.postMessage(`${expectedMessage}`)</script></html>",
                     "text/html", "UTF-8", null
                 )
-                //Call js code to invoke callback
-                webView.evaluateJavascript("${jsObjName}.postMessage(`hello`)", null)
             }
         }
-        assertTrue(callback.await() == Looper.getMainLooper())
+        assertTrue(onMessageReceived.await() == Looper.getMainLooper())
     }
 }
\ No newline at end of file