Merge pull request #26 from SEPIA-Framework/dev

SEPIA Home v2.5.0 release candidate

Author: fquirin

TEACH-UI.md

@@ -42,7 +42,7 @@ android.media.action.MEDIA_PLAY_FROM_SEARCH
 ```
 URL: http://localhost:20780
 Plugin: HelloPlugin
-JSON: {"name":"Boss"}
+JSON: {"value": {"name":"Boss"} }
 Success: Ok I understood <result_hello>
 Fail: Sorry I could not get a result
 ```

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="org.example.sepia.app.web" version="0.21.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="org.example.sepia.app.web" version="0.22.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>S.E.P.I.A.</name>
     <description>
         Prototype of S.E.P.I.A. framework client

plugin_mods/inappbrowser/android/InAppBrowser.java

@@ -21,6 +21,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.graphics.Color;
 import android.provider.Browser;
 import android.content.res.Resources;
@@ -412,7 +414,7 @@ public String openExternal(String url) {
             intent.putExtra(Browser.EXTRA_APPLICATION_ID, cordova.getActivity().getPackageName());
             this.cordova.getActivity().startActivity(intent);
             return "";
-        // not catching FileUriExposedException explicitly because buildtools<24 doesn't know about it
+            // not catching FileUriExposedException explicitly because buildtools<24 doesn't know about it
         } catch (java.lang.RuntimeException e) {
             LOG.d(LOG_TAG, "InAppBrowser: Error loading url "+url+":"+ e.toString());
             return e.toString();
@@ -593,7 +595,7 @@ public String showWebPage(final String url, HashMap<String, Boolean> features) {
             }
             Boolean wideViewPort = features.get(USER_WIDE_VIEW_PORT);
             if (wideViewPort != null ) {
-		            useWideViewPort = wideViewPort.booleanValue();
+                useWideViewPort = wideViewPort.booleanValue();
             }
         }
 
@@ -608,8 +610,8 @@ public String showWebPage(final String url, HashMap<String, Boolean> features) {
              */
             private int dpToPixels(int dipValue) {
                 int value = (int) TypedValue.applyDimension( TypedValue.COMPLEX_UNIT_DIP,
-                                                            (float) dipValue,
-                                                            cordova.getActivity().getResources().getDisplayMetrics()
+                        (float) dipValue,
+                        cordova.getActivity().getResources().getDisplayMetrics()
                 );
 
                 return value;
@@ -645,7 +647,7 @@ public void run() {
                 int toolbarColor;
                 int blackColor = android.graphics.Color.rgb(0, 0, 0);
                 int accentColor = android.graphics.Color.rgb(190, 255, 26); //android.graphics.Color.rgb(0, 122, 255);
-				if(Build.VERSION.SDK_INT >= 21){
+                if(Build.VERSION.SDK_INT >= 21){
                     /*
                     toolbarColor = cordova.getActivity().getWindow().getStatusBarColor();
 					dialog.getWindow().setStatusBarColor(toolbarColor); 	//TODO: not working
@@ -705,8 +707,8 @@ public void onClick(View v) {
                     edittext.setBackgroundColor(android.graphics.Color.WHITE);
                     edittext.setTextColor(blackColor);
                 }
-				edittext.setTextSize(12);
-				edittext.setPadding(this.dpToPixels(8), this.dpToPixels(4), this.dpToPixels(8), this.dpToPixels(4));
+                edittext.setTextSize(12);
+                edittext.setPadding(this.dpToPixels(8), this.dpToPixels(4), this.dpToPixels(8), this.dpToPixels(4));
                 edittext.setGravity(Gravity.CENTER);
                 edittext.setSingleLine(true);
                 edittext.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
@@ -892,8 +894,8 @@ public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType)
                 WebSettings settings = inAppWebView.getSettings();
                 settings.setJavaScriptEnabled(true);
                 settings.setJavaScriptCanOpenWindowsAutomatically(true);
-				settings.setBuiltInZoomControls(true);
-				settings.setDisplayZoomControls(showZoomControls);
+                settings.setBuiltInZoomControls(true);
+                settings.setDisplayZoomControls(showZoomControls);
                 settings.setPluginState(android.webkit.WebSettings.PluginState.ON);
 
                 settings.setMediaPlaybackRequiresUserGesture(mediaPlaybackRequiresUserGesture);
@@ -1141,7 +1143,24 @@ public InAppBrowserClient(CordovaWebView webView, TextView mEditText) {
         /**
          * Override the URL that should be loaded
          *
-         * This handles a small subset of all the URIs that would be encountered.
+         * New (added in API 24)
+         * For Android 7 and above.
+         *
+         * @param webView
+         * @param request
+         */
+        /*@TargetApi(Build.VERSION_CODES.N)
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView webView, WebResourceRequest request) {
+            //TODO: handle request.getMethod()
+            return shouldOverrideUrlLoading(webView, request.getUrl().toString());
+        }*/
+
+        /**
+         * Override the URL that should be loaded
+         *
+         * Legacy (deprecated in API 24)
+         * For Android 6 and below.
          *
          * @param webView
          * @param url
@@ -1157,7 +1176,7 @@ public boolean shouldOverrideUrlLoading(WebView webView, String url) {
                 } catch (android.content.ActivityNotFoundException e) {
                     LOG.e(LOG_TAG, "Error dialing " + url + ": " + e.toString());
                 }
-            } else if (url.startsWith("geo:") || url.startsWith(WebView.SCHEME_MAILTO) || url.startsWith("market:") || url.startsWith("intent:")) {
+            } else if (url.startsWith("geo:") || url.startsWith(WebView.SCHEME_MAILTO) || url.startsWith("market:")) {
                 try {
                     Intent intent = new Intent(Intent.ACTION_VIEW);
                     intent.setData(Uri.parse(url));
@@ -1166,9 +1185,33 @@ public boolean shouldOverrideUrlLoading(WebView webView, String url) {
                 } catch (android.content.ActivityNotFoundException e) {
                     LOG.e(LOG_TAG, "Error with " + url + ": " + e.toString());
                 }
-            }
+            } else if (url.startsWith("intent:")) {
+                try {
+                    Context context = cordova.getActivity();
+                    Intent intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
+                    if (intent != null) {
+                        PackageManager packageManager = context.getPackageManager();
+                        ResolveInfo info = packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
+                        if (info != null) {
+                            context.startActivity(intent);
+                            return true;
+                        } else {
+                            String fallbackUrl = intent.getStringExtra("browser_fallback_url");
+                            if (fallbackUrl != null && !fallbackUrl.isEmpty()){
+                                inAppWebView.loadUrl(fallbackUrl);
+                                //Alternative: call external browser:
+                                //Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(fallbackUrl));
+                                //context.startActivity(browserIntent);
+                                return true;
+                            }
+                        }
+                    }
+                } catch (Exception e) {
+                    LOG.e(LOG_TAG, "Error with " + url + ": " + e.toString());
+                }
+
             // If sms:5551212?body=This is the message
-            else if (url.startsWith("sms:")) {
+            } else if (url.startsWith("sms:")) {
                 try {
                     Intent intent = new Intent(Intent.ACTION_VIEW);
 

plugin_mods/speechrecognition/org.apache.cordova.speech.speechrecognition/src/android/SpeechRecognition.java

@@ -308,7 +308,7 @@ public void onPartialResults(Bundle partialResults) {
             Log.d(LOG_TAG, "onPartialResults " + partialResults);
             ArrayList<String> transcript = partialResults.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION);
             //float[] confidence = partialResults.getFloatArray(SpeechRecognizer.CONFIDENCE_SCORES);
-            if (transcript.size() > 0) {
+            if (transcript != null && transcript.size() > 0) {
                 Log.d(LOG_TAG, "fire partial result event");
                 firePartialResultEvent(transcript, null);
             } else {
@@ -332,7 +332,7 @@ public void onResults(Bundle results) {
             Log.d(LOG_TAG, "onResults " + results);
             ArrayList<String> transcript = results.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION);
             float[] confidence = results.getFloatArray(SpeechRecognizer.CONFIDENCE_SCORES);
-            if (transcript.size() > 0) {
+            if (transcript != null && transcript.size() > 0) {
                 Log.d(LOG_TAG, "fire recognition event");
                 fireRecognitionEvent(transcript, confidence);
             } else {

www/credits.html

@@ -11,6 +11,8 @@ <h3>Credits</h3>
 			<a href="https://hammerjs.github.io/">Hammer.js</a><br>
 			<a href="https://bitwiseshiftleft.github.io/sjcl/" title="Stanford Javascript Crypto Library">SJCL</a><br>
 			<a href="https://github.com/mattdiamond/Recorderjs">Recorder.js</a><br>
+			<a href="https://github.com/kdavis-mozilla/vad.js">vad.js</a><br>
+			<a href="https://github.com/iconfu/svg-inject">SVGInject</a><br>
 			<p><u>Icons</u></p>
 			<a href="https://material.io/tools/icons">Google Material Design</a><br>
 			<p><u>Sounds</u></p>

www/css/googleMaterialIcons-readme.txt

@@ -1,9 +1,9 @@
 Fonts are not well maintained by Google!
 - Get recent woff2 version from here:	https://fonts.googleapis.com/icon?family=Material+Icons
-- Convert to woff e.g. with an online converter, e.g. (default settings): 	https://transfonter.org/
+- Convert to woff e.g. with an online converter, e.g. (default settings): 	https://transfonter.org/ or https://font-converter.net/
 - View new woff with e.g.:	http://torinak.com/font/lsfont.html or https://opentype.js.org
 - Watch issue: 			https://github.com/google/material-design-icons/issues/786
 
 After update:
-- Get new glyph table via:	https://opentype.js.org/font-inspector.html
+- Get new glyph table (PostScript table) via:	https://opentype.js.org/font-inspector.html
 - Remove broken ones, remove "uni..." and "u..." from entries and add new array to: googleMaterialIcons.js

www/css/googleMaterialIcons.css

@@ -6,7 +6,8 @@
   src: 	local('Material Icons'), 
 		local('MaterialIcons-Regular'),
 		url(googleMaterialIcons-2018-09-19.woff2) format('woff2'),
-		url(googleMaterialIcons-2018-09-19.woff) format('woff');
+    url(googleMaterialIcons-2018-09-19.woff) format('woff');
+  font-display: block;
 }
 
 .material-icons {

www/css/sepiaFW-alwaysOn.css

@@ -40,6 +40,7 @@
 	width: 250px;
 	height: 175px;
 	z-index: 99;
+	cursor: pointer;
 }
 #sepiaFW-alwaysOn-info-box {
 	position: absolute;

www/css/sepiaFW-cards.css

@@ -563,15 +563,22 @@
 	margin: 0 5px 0 5px;
 	text-align: center;
 }
-.sepiaFW-cards-list-body .weatherNowDetails li div img.precipSymbol {
+.sepiaFW-cards-list-body .weatherNowDetails li div img.precipSymbol,
+.sepiaFW-cards-list-body .weatherNowDetails li div object.precipSymbol {
     width: 20px;
     vertical-align: bottom;
 	-webkit-filter: invert(1);
     filter: invert(1);
 	margin-right: 5px;
 }
+.sepiaFW-cards-list-body .weatherNowDetails li div svg.precipSymbol {
+	width: 20px;
+	height: 20px;
+    vertical-align: bottom;
+	margin-right: 5px;
+}
 .sepiaFW-cards-list-body .weatherNowDetails li div span {
-	min-width: 30px;
+	min-width: 40px;
     display: inline-block;
 }
 

www/css/sepiaFW-frames.css

@@ -143,6 +143,7 @@
 }
 .sepiaFW-frames-page .group.fill {
 	flex-wrap: wrap;
+	margin: 8px 0;
 }
 .sepiaFW-frames-page .group.fill label {
 	flex: 0 0 auto;