Merge pull request #16 from SEPIA-Framework/dev

update to v0.17.0 see version history for details

Author: fquirin

README.md

@@ -26,8 +26,9 @@ Features of the app are:
 
 ### Quick-start
 
-The latest release version is always online at: https://sepia-framework.github.io/app/index.html  
-The Android app can be installed via the Google Play Store (currently only German): [German Play Store link](https://play.google.com/store/apps/details?id=de.bytemind.sepia.app.web)  
+The latest release version is always **online** at: `https://sepia-framework.github.io/app/index.html` (requires server with SSL)  
+When you've installed **SEPIA-Home** the default link is: `http://[sepia-home-IP]:20721/app/index.html`  
+The Android app can be installed via the **Google Play Store**: [Play Store link](https://play.google.com/store/apps/details?id=de.bytemind.sepia.app.web) (currently only German)  
 
 Note: If you don't operate your own SEPIA server you can still open the app in "demo-mode" (simply skip the log-in) and look around a bit though most of the features will not be active in this mode.  
 More languages for Android and an iOS app are in beta-test phase and will be release "when they are done" :-p  

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="org.example.sepia.app.web" version="0.16.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.17.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

create-android-project.sh

@@ -39,6 +39,7 @@ cordova plugin add cordova-plugin-nativestorage
 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
 #
 # overwrite plugin mods
 sleep 2

create-ios-project-wkwebview.sh

@@ -39,6 +39,7 @@ cordova plugin add cordova-plugin-audioinput
 cordova plugin add plugin_mods/iosbackgroundaudio/nl.kingsquare.cordova.background-audio
 cordova plugin add https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin.git
 cordova plugin add phonegap-plugin-battery-status
+cordova plugin add cordova-plugin-eddystone
 #
 # overwrite plugin mods
 sleep 2

plugin_mods/inappbrowser/android/InAppBrowser.java

@@ -644,7 +644,7 @@ public void run() {
                 //toolbar.setBackgroundColor(android.graphics.Color.rgb(235,235,235));
                 int toolbarColor;
                 int blackColor = android.graphics.Color.rgb(0, 0, 0);
-                int blueColor = android.graphics.Color.rgb(0, 122, 255);
+                int accentColor = android.graphics.Color.rgb(190, 255, 26); //android.graphics.Color.rgb(0, 122, 255);
 				if(Build.VERSION.SDK_INT >= 21){
                     /*
                     toolbarColor = cordova.getActivity().getWindow().getStatusBarColor();
@@ -663,7 +663,7 @@ public void run() {
                 back.setId(Integer.valueOf(2));
                 back.setBackground(null);
                 if (toolbarColor == blackColor)
-                    back.setColorFilter(blueColor);
+                    back.setColorFilter(accentColor);
                 back.setImageDrawable(getDrawableFromMyResources("ic_chevron_left_black_24dp"));
                 back.setScaleType(ImageView.ScaleType.FIT_CENTER);
                 back.setPadding(this.dpToPixels(8), this.dpToPixels(5), this.dpToPixels(8), this.dpToPixels(5));
@@ -682,7 +682,7 @@ public void onClick(View v) {
                 forward.setId(Integer.valueOf(3));
                 forward.setBackground(null);
                 if (toolbarColor == blackColor)
-                    forward.setColorFilter(blueColor);
+                    forward.setColorFilter(accentColor);
                 forward.setImageDrawable(getDrawableFromMyResources("ic_chevron_right_black_24dp"));
                 forward.setScaleType(ImageView.ScaleType.FIT_CENTER);
                 forward.setPadding(this.dpToPixels(8), this.dpToPixels(5), this.dpToPixels(8), this.dpToPixels(5));
@@ -751,12 +751,12 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                 close.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
                 close.setBackground(null);
                 if (toolbarColor == blackColor)
-                    close.setTextColor(blueColor);
+                    close.setTextColor(accentColor);
                 */
                 close.setBackground(null);
                 close.setPadding(this.dpToPixels(8), this.dpToPixels(5), this.dpToPixels(8), this.dpToPixels(5));
                 if (toolbarColor == blackColor)
-                    close.setColorFilter(blueColor);
+                    close.setColorFilter(accentColor);
                 close.setImageDrawable(getDrawableFromMyResources("ic_close_black_24dp"));
                 close.setScaleType(ImageView.ScaleType.FIT_CENTER);
                 close.getAdjustViewBounds();
@@ -777,7 +777,7 @@ public void onClick(View v) {
                 reload.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
                 reload.setBackground(null);
                 if (toolbarColor == blackColor)
-                    reload.setTextColor(blueColor);
+                    reload.setTextColor(accentColor);
                 reload.setPadding(this.dpToPixels(8), this.dpToPixels(5), this.dpToPixels(8), this.dpToPixels(5));
                 //Drawable reloadIcon = activityRes.getDrawable(android.R.drawable.ic_popup_sync);
                 //reload.setImageDrawable(reloadIcon);
@@ -804,7 +804,7 @@ public void onClick(View v) {
                 homeButton.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
                 homeButton.setBackground(null);
                 if (toolbarColor == blackColor)
-                    homeButton.setTextColor(blueColor);
+                    homeButton.setTextColor(accentColor);
                 homeButton.setPadding(this.dpToPixels(8), this.dpToPixels(5), this.dpToPixels(8), this.dpToPixels(5));
 
                 homeButton.setOnClickListener(new View.OnClickListener() {
@@ -822,7 +822,7 @@ public void onClick(View v) {
                 clearAllButton.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
                 clearAllButton.setBackground(null);
                 if (toolbarColor == blackColor)
-                    clearAllButton.setTextColor(blueColor);
+                    clearAllButton.setTextColor(accentColor);
                 clearAllButton.setPadding(this.dpToPixels(8), this.dpToPixels(5), this.dpToPixels(8), this.dpToPixels(5));
 
                 clearAllButton.setOnClickListener(new View.OnClickListener() {
@@ -959,7 +959,7 @@ public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType)
                 contextButton.setId(Integer.valueOf(9));
                 contextButton.setBackground(null);
                 if (toolbarColor == blackColor)
-                    contextButton.setColorFilter(blueColor);
+                    contextButton.setColorFilter(accentColor);
                 contextButton.setImageDrawable(getDrawableFromMyResources("ic_add_black_24dp"));
                 contextButton.setScaleType(ImageView.ScaleType.FIT_CENTER);
                 contextButton.setPadding(this.dpToPixels(8), this.dpToPixels(5), this.dpToPixels(8), this.dpToPixels(5));

win-create-android-project.bat

@@ -37,6 +37,7 @@ cordova plugin add cordova-plugin-nativestorage |more
 cordova plugin add cordova-android-support-gradle-release |more
 cordova plugin add phonegap-plugin-media-stream |more
 cordova plugin add https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin.git |more
+cordova plugin add cordova-plugin-eddystone |more
 REM
 REM overwrite plugin mods
 sleep 2

www/css/sepiaFW-alwaysOn.css

@@ -120,6 +120,11 @@
 	50% {	  top: 48%;	}
 	50.25% {  top: 23%;	}
 }
+@keyframes flicker {
+	0%   { opacity:1; }
+	50%  { opacity:0.33; }
+	100% { opacity:1; }
+}
 
 #sepiaFW-alwaysOn-avatar .avatar-pupil {
     position: absolute;
@@ -159,6 +164,9 @@
 #sepiaFW-alwaysOn-avatar .avatar-mouth.sad {
 	border-radius: 0%;
 }
+#sepiaFW-alwaysOn-avatar .avatar-mouth.speaking {
+	animation: flicker 1.5s infinite;
+}
 
 #sepiaFW-alwaysOn-avatar .avatar-activity {
 	position: absolute;

www/css/sepiaFW-frames.css

@@ -73,4 +73,27 @@
 .sepiaFW-frames-page.dark button {
 	background: #ceff1a !important;
 	color: #000 !important;
+}
+
+.sepiaFW-frames-page .group-container {
+	display: flex; 
+	justify-content: center;
+	flex-wrap: wrap;
+}
+.sepiaFW-frames-page .group {
+	width: 100%; 
+	display: flex; 
+	justify-content: space-between; 
+	align-items: center;
+	margin: 8px;
+}
+.sepiaFW-frames-page .group label {
+	margin: 0 8px;
+}
+.sepiaFW-frames-page .group input {
+	width: auto !important;
+}
+.sepiaFW-frames-page .group .sepiaFW-toggle-btn {
+	border: 1px solid;
+	border-color: inherit;
 }

www/css/sepiaFW-skin-bytemind.css

@@ -44,14 +44,15 @@ html {
 	color: #fff;
 }
 .sepiaFW-notouch-device #sepiaFW-main-window button:hover {
-	background: #fff;
-	color: #262629;
+	background: transparent;
+	color: #44c8be;
 }
 #sepiaFW-assist-btn-area {
 	border-color: #262629;
 }
 #sepiaFW-assist-btn {
 	background: #44c8be !important;
+	color: #fff !important;
 }
 
 #sepiaFW-chat-controls-speech-box > div {
@@ -72,6 +73,9 @@ html {
 	background: #262629;
 	color: #44c8be;
 }
+.sepiaFW-notouch-device #sepiaFW-chat-menu button:hover {
+	background-color: #fff !important;
+}
 #sepiaFW-chat-controls-more-menu button {
 	background: #262629;
 	color: #fff;