Merge pull request #17 from SEPIA-Framework/dev

v0.18.0 b1

Author: fquirin

Cordova-Plugin-Versions.txt

@@ -1,23 +1,35 @@
-Android (tested October 2018)
+Android (tested April 2019)
 -----------------------------
 cordova version 7.1.0
 cordova platform version [email protected]
-cordova-android-support-gradle-release		version="1.4.4"
-cordova-custom-config    					version="5.0.2"
-cordova-plugin-badge       					version="0.8.7"
-cordova-plugin-cache-clear 					version="1.3.7"
-cordova-plugin-compat	 					version="1.2.0"
-cordova-plugin-device		    			version="2.0.2"
-cordova-plugin-file			      			version="6.0.1"
-cordova-plugin-geolocation		      		version="4.0.1"
-cordova-plugin-inappbrowser		      		version="1.7.1" --- customized
-cordova-plugin-local-notification        	version="0.9.0-beta.2"
-cordova-plugin-nativestorage				version="2.3.2"
-cordova-plugin-splashscreen		      		version="5.0.2"
-cordova-plugin-statusbar	    			version="2.4.2"
-cordova-plugin-tts							version="0.2.3"
-cordova-plugin-whitelist		      		version="1.3.3"
-cordova-universal-links-plugin 				version="1.2.1"
-es6-promise-plugin			  				version="4.2.2"
-org.apache.cordova.speech.speechrecognition		version="0.1.2"	--- customized
-phonegap-plugin-media-stream 				version="1.2.1"
+cordova-plugin-inappbrowser		      			custom version from plugin_mods folder
+org.apache.cordova.speech.speechrecognition		custom version from plugin_mods folder
+
+"dependencies": {
+	"com-darryncampbell-cordova-plugin-intent": "^1.1.6",
+    "cordova-android": "^6.4.0",
+    "cordova-android-support-gradle-release": "^3.0.0",
+    "cordova-custom-config": "^5.1.0",
+    "cordova-plugin-badge": "^0.8.8",
+    "cordova-plugin-ble": "^2.0.1",
+    "cordova-plugin-cache-clear": "^1.3.8",
+    "cordova-plugin-compat": "^1.2.0",
+    "cordova-plugin-device": "^2.0.2",
+    "cordova-plugin-eddystone": "^1.3.0",
+    "cordova-plugin-file": "^6.0.1",
+    "cordova-plugin-geolocation": "^4.0.1",
+    "cordova-plugin-inappbrowser": "^3.0.0",
+    "cordova-plugin-insomnia": "git+https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin.git",
+    "cordova-plugin-local-notification": "^0.9.0-beta.2",
+    "cordova-plugin-nativestorage": "^2.3.2",
+    "cordova-plugin-navigationbar-color": "0.0.8",
+    "cordova-plugin-splashscreen": "^5.0.2",
+    "cordova-plugin-statusbar": "^2.4.2",
+    "cordova-plugin-tts": "^0.2.3",
+    "cordova-plugin-whitelist": "^1.3.3",
+    "cordova-universal-links-plugin": "^1.2.1",
+    "es6-promise-plugin": "^4.2.2",
+    "phonegap-plugin-media-stream": "^1.2.1",
+    "speechrecognition": "file:plugin_mods\\speechrecognition\\org.apache.cordova.speech.speechrecognition",
+    "org.apache.cordova.speech.speechrecognition": "plugin_mods/speechrecognition/org.apache.cordova.speech.speechrecognition"
+}

TEACH-UI.md

@@ -0,0 +1,48 @@
+# SEPIA Teach-UI examples
+
+## Client controls
+
+### Set volume
+```
+Action: <set>
+Function: volume
+Data: {"number":11}
+```
+
+### Call SEPIA Mesh-Node from client
+```
+Action: <on>
+Function: meshNode
+Data: {"url":"http://localhost:20780", "plugin":"RuntimePlugin", "data":{"command":["echo", "test"]}}
+```
+
+### Call CLEXI
+```
+Action: <on>
+Function: clexi
+Data: {"xtension":"clexi-broadcaster", "data":{"text":"Hello", "sender":"Me"}}
+```
+
+## Platform actions (platform_controls)
+
+### Call Android Intent for certain device or browser action
+```
+Device IDs: { "a1": {"type": "androidIntent", "data": {"action": "android.media.action.MEDIA_PLAY_FROM_SEARCH", "extras": {"query": "Paradise City"} }} }
+Browser: { "type": "url", "data": "https://open.spotify.com/track/3YBZIN3rekqsKxbJc9FZko?si=Stqe48xYS52Gim_Lr-JEFg" }
+```
+***Some useful Android intents:***  
+https://developer.android.com/guide/components/intents-common  
+android.settings.VOICE_INPUT_SETTINGS  
+android.media.action.MEDIA_PLAY_FROM_SEARCH  
+
+
+## Mesh node plugin
+
+### Test HelloPlugin with answer
+```
+URL: http://localhost:20780
+Plugin: HelloPlugin
+JSON: {"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.17.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.18.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
@@ -11,10 +11,12 @@
 	<content src="start.html" />
 
 	<preference name="orientation" value="portrait" />
+	<!--<preference name="BackgroundColor" value="0xff000000"/>-->
 
 	<!--plugins-->
 	<preference name="StatusBarOverlaysWebView" value="false" />
-    <preference name="StatusBarBackgroundColor" value="#000" />
+    <preference name="StatusBarBackgroundColor" value="#000000" />
+	<preference name="NavigationBarBackgroundColor" value="#000000" />
 
 	<plugin name="cordova-plugin-whitelist" spec="1" />
 	<access origin="*" />
@@ -24,14 +26,14 @@
     <allow-intent href="sms:*" />
     <allow-intent href="mailto:*" />
     <allow-intent href="geo:*" />
+	<allow-intent href="spotify:*" />
 
-	<!--hooks--><!-- this hooks dont work reliably enough, at least not under windows -->
-	<!--<hook type="before_platform_add" src="hooks/010_install_plugins.js" />-->
-	<!--<hook type="after_platform_add" src="hooks/030_resource_files.js" />-->
+	<!--platforms-->
 
 	<platform name="android">
-		<!--more hooks-->
+		<!--hooks-->
 		<hook type="after_platform_add" src="hooks/add-android-intent-filters.js" />
+		<hook type="after_prepare" src="hooks/add-android-permissions.js"/>
 
 		<!--one main icon-->
 		<icon src="resources/icons/android/icon-ldpi.png" density="ldpi" />         <!-- 32px -->
@@ -61,7 +63,7 @@
     </platform>
 
 	<platform name="ios">
-		<!--more hooks-->
+		<!--hooks-->
 		<hook type="after_platform_add" src="hooks/add-swift-support.js" />
 
 		<!--icons and splash-->
@@ -109,7 +111,7 @@
 	<universal-links>
 		<ios-team-id value="" />
 		<host name="b07z.net" scheme="https">
-			<path url="/dl/sepia/*" event="universalLinkTest"/>
+			<path url="/dl/sepia/*" event="universalLinks"/>
 		</host>
 	</universal-links>
 

create-android-project.sh

@@ -40,6 +40,9 @@ cordova plugin add cordova-android-support-gradle-release
 cordova plugin add phonegap-plugin-media-stream
 cordova plugin add https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin.git
 cordova plugin add cordova-plugin-eddystone
+cordova plugin add cordova-plugin-navigationbar-color
+#NOTE: add before intent plugin if you use: plugin add cordova-plugin-camera
+cordova plugin add com-darryncampbell-cordova-plugin-intent
 #
 # overwrite plugin mods
 sleep 2
@@ -63,6 +66,9 @@ echo "#Replacing icons and theme with launch screen ..."
 cp -r -f "resources/icons/android/notifications/res/" "platforms/android/res/"
 cp -r "resources/themes/android/background_splash.xml" "platforms/android/res/drawable/background_splash.xml"
 cp -r "resources/themes/android/launch_screen.png" "platforms/android/res/drawable/launch_screen.png"
-cp -r "resources/themes/android/styles.xml" "platforms/android/res/values/styles.xml"
+#cp -r "resources/themes/android/styles.xml" "platforms/android/res/values/styles.xml"
+cp -r "resources/themes/android/values/" "platforms/android/res/values/"
+mkdir -p "platforms/android/res/values-v21"
+cp -r "resources/themes/android/values-v21/" "platforms/android/res/values-v21/"
 echo "#DONE"
 echo "If everything worked out fine the next step would be to build the app from the %APP_NAME% folder: cordova build android"

hooks/add-android-permissions.js

@@ -0,0 +1,45 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const fs = require('fs');
+const _ = require('lodash');
+const xml2js = require('xml2js');
+
+// here add/remove permissions you need for Android app
+let permissions = [
+  'com.android.alarm.permission.SET_ALARM'
+];
+
+module.exports = function (context) {
+  const parseString = xml2js.parseString;
+  const builder = new xml2js.Builder();
+  const manifestPath = context.opts.projectRoot + '/platforms/android/AndroidManifest.xml';
+  const androidManifest = fs.readFileSync(manifestPath).toString();
+
+  let manifestRoot,
+    missedPermissions;
+
+  if (androidManifest && permissions.length > 0) {
+    parseString(androidManifest, (err, manifest) => {
+      if (err) return console.error(err);
+
+      manifestRoot = manifest['manifest'];
+
+      if (!manifestRoot['uses-permission']) {
+        manifestRoot['uses-permission'] = [];
+      }
+
+      missedPermissions = _.difference(permissions, _.map(manifestRoot['uses-permission'], `$['android:name']`));
+
+      if (missedPermissions.length > 0) {
+        missedPermissions.forEach(perm => manifestRoot['uses-permission'].push({'$': {'android:name': perm}}));
+
+        fs.writeFileSync(manifestPath, builder.buildObject(manifest));
+
+        console.log(`Added ${missedPermissions.length} permissions:`);
+        missedPermissions.forEach(perm => console.log(` - ${perm}`));
+      }
+    });
+  }
+};