different icon/splash paths, minor things

README.md

@@ -7,9 +7,15 @@ It lives at http://www.huegasm.com
 ## Current priorities
 - create a hybrid app with Cardova
 
-## WTF moments
+## SIGNING
-Cordova disables the volume buttons for some reason. Monkey patching:
+/ember-cordova/platforms/android/release-signing.properties:
-Comment out the webView.setButtonPlumbedToJs lines for volume buttons from its source code before building android.
+storeFile=huegasm.keystore
+storeType=jks
+keyAlias=huegasm
+keyPassword=...
+storePassword=...
+
+keytool -genkey -v -keystore huegasm.keystore -alias huegasm -keyalg RSA -keysize 2048 -validity 10000
 
 ## POSSIBLE FUTURE FEATURES
 - decode the hue color better

mobile/app/pods/components/hue-controls/component.js

@@ -5,7 +5,6 @@ const {
   Component,
   computed,
   isNone,
-  run,
   inject,
   run: { later },
   $
@@ -124,7 +123,7 @@ export default Component.extend({
         this.get('notify').warning({html: '<div class="alert alert-warning" role="alert">Error retrieving data from your lights. Yikes.</div>'});
         this.set('displayFailure', false);
 
-        later(this, function() {
+        later(this, () => {
           this.set('displayFailure', true);
         }, 30000);
       }
@@ -158,9 +157,7 @@ export default Component.extend({
       location.reload();
     },
     startIntro(){
-      let intro = introJs(),
+      let intro = introJs();
-        playerBottom = $('#player-bottom'),
-        beatDetectionAreaArrowIcon = $('#beat-detection-area-arrow-icon');
 
       if(this.get('dimmerOn')) {
         this.send('toggleDimmer');
@@ -241,34 +238,24 @@ export default Component.extend({
         } else {
           $('.navigation-item').eq(0).click();
         }
-
-        if(element.id === 'music-tab' || element.id === 'playlist' || element.id === 'player-area'){
-          playerBottom.hide();
-
-          if(beatDetectionAreaArrowIcon.hasClass('keyboard-arrow-up')){
-            beatDetectionAreaArrowIcon.removeClass('keyboard-arrow-up').addClass('keyboard-arrow-down');
-          }
-        } else if(element.id === 'beat-option-row' || element.id === 'beat-option-button-group' || element.id === 'beat-container'){
-          playerBottom.show();
-
-          if(beatDetectionAreaArrowIcon.hasClass('keyboard-arrow-down')){
-            beatDetectionAreaArrowIcon.removeClass('keyboard-arrow-down').addClass('keyboard-arrow-up');
-          }
-        } else if(element.id === 'dimmer'){
-          $(document).click();
-        }
       });
 
       // skip hidden/missing elements
       intro.onafterchange((element)=>{
         let elem = $(element);
-        if(elem.html() === '<!---->'){
+        if(elem.html() === '<!---->') {
           $('.introjs-nextbutton').click();
         }
 
-        run.later(this, function() {
+        if(element.id === ''){
-          $('.introjs-tooltip').velocity('scroll', { offset: -100 });
+          later(this, () => {
-        }, 500);
+            $('body').velocity('scroll');
+          }, 500);
+        } else {
+          later(this, () => {
+            $('.introjs-tooltip').velocity('scroll', { offset: -100 });
+          }, 500);
+        }
       }).start();
     },
     toggleDimmer(){

mobile/ember-cordova/cordova/config.xml

@@ -1,94 +1,42 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="com.nidratech.huegasm" version="1.2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>Huegasm</name>
+  <name>Huegasm</name>
-    <description>
+  <description>
     Huegasm is a free web application for managing and synchronizing your Philips Hue lights with the beat of your music.
   </description>
-    <author email="philippovegor@gmail.com" href="http://www.egorphilippov.me/">
+  <author email="philippovegor@gmail.com" href="http://www.egorphilippov.me/">
     Egor Philippov
   </author>
-    <content src="index.html" />
+  <content src="index.html"/>
-    <plugin name="cordova-plugin-whitelist" spec="1" />
+  <plugin name="ionic-plugin-keyboard" spec="~2.2.1"/>
-    <plugin name="cordova-plugin-splashscreen" spec="~4.0.0" />
+  <plugin name="cordova-plugin-splashscreen" spec="~4.0.1"/>
-    <plugin name="ionic-plugin-keyboard" spec="~2.2.1" />
+  <access origin="*"/>
-    <access origin="*" />
+  <allow-intent href="http://*/*"/>
-    <allow-intent href="http://*/*" />
+  <allow-intent href="https://*/*"/>
-    <allow-intent href="https://*/*" />
+  <allow-intent href="tel:*"/>
-    <allow-intent href="tel:*" />
+  <allow-intent href="sms:*"/>
-    <allow-intent href="sms:*" />
+  <allow-intent href="mailto:*"/>
-    <allow-intent href="mailto:*" />
+  <allow-intent href="geo:*"/>
-    <allow-intent href="geo:*" />
+  <platform name="android">
-    <platform name="windows">
+    <splash density="port-ldpi" src="res/drawable-port-ldpi/screen.png"/>
-        <icon src="res/icon/windows/StoreLogo.png" target="StoreLogo" />
+    <splash density="land-ldpi" src="res/drawable-land-ldpi/screen.png"/>
-        <icon src="res/icon/windows/smalllogo.png" target="Square30x30Logo" />
+    <splash density="port-mdpi" src="res/drawable-port-mdpi/screen.png"/>
-        <icon src="res/icon/windows/Square44x44Logo.png" target="Square44x44Logo" />
+    <splash density="land-mdpi" src="res/drawable-land-mdpi/screen.png"/>
-        <icon src="res/icon/windows/Square70x70Logo.png" target="Square70x70Logo" />
+    <splash density="port-hdpi" src="res/drawable-port-hdpi/screen.png"/>
-        <icon src="res/icon/windows/Square71x71Logo.png" target="Square71x71Logo" />
+    <splash density="land-hdpi" src="res/drawable-land-hdpi/screen.png"/>
-        <icon src="res/icon/windows/Square150x150Logo.png" target="Square150x150Logo" />
+    <splash density="port-xhdpi" src="res/drawable-port-xhdpi/screen.png"/>
-        <icon src="res/icon/windows/Square310x310Logo.png" target="Square310x310Logo" />
+    <splash density="land-xhdpi" src="res/drawable-land-xhdpi/screen.png"/>
-    </platform>
+    <splash density="port-xxhdpi" src="res/drawable-port-xxhdpi/screen.png"/>
-    <platform name="blackberry">
+    <splash density="land-xxhdpi" src="res/drawable-land-xxhdpi/screen.png"/>
-        <icon src="res/icon/blackberry/icon-86.png" />
+    <splash density="port-xxxhdpi" src="res/drawable-port-xxxhdpi/screen.png"/>
-        <icon src="res/icon/blackberry/icon-150.png" />
+    <splash density="land-xxxhdpi" src="res/drawable-land-xxxhdpi/screen.png"/>
-    </platform>
+    <icon src="res/mipmap-ldpi/icon.png" density="ldpi"/>
-    <platform name="ios">
+    <icon src="res/mipmap-mdpi/icon.png" density="mdpi"/>
-        <allow-intent href="itms:*" />
+    <icon src="res/mipmap-hdpi/icon.png" density="hdpi"/>
-        <allow-intent href="itms-apps:*" />
+    <icon src="res/mipmap-xhdpi/icon.png" density="xhdpi"/>
-        <icon height="40" src="res/icon/ios/icon-40.png" width="40" />
+    <icon src="res/mipmap-xxhdpi/icon.png" density="xxhdpi"/>
-        <icon height="57" src="res/icon/ios/icon.png" width="57" />
+    <icon src="res/mipmap-xxxhdpi/icon.png" density="xxxhdpi"/>
-        <icon height="80" src="res/icon/ios/icon-40@2x.png" width="80" />
+  </platform>
-        <icon height="120" src="res/icon/ios/icon-40@3x.png" width="120" />
+  <engine name="android" spec="~6.0.0"/>
-        <icon height="60" src="res/icon/ios/icon-60.png" width="60" />
+  <preference name="ShowSplashScreenSpinner" value="false"/>
-        <icon height="120" src="res/icon/ios/icon-60@2x.png" width="120" />
-        <icon height="180" src="res/icon/ios/icon-60@3x.png" width="180" />
-        <icon height="114" src="res/icon/ios/icon@2x.png" width="114" />
-        <icon height="29" src="res/icon/ios/icon-small.png" width="29" />
-        <icon height="58" src="res/icon/ios/icon-small@2x.png" width="58" />
-        <icon height="87" src="res/icon/ios/icon-small@3x.png" width="87" />
-        <icon height="152" src="res/icon/ios/icon-76@2x.png" width="152" />
-        <icon height="76" src="res/icon/ios/icon-76.png" width="76" />
-        <icon height="72" src="res/icon/ios/icon-72.png" width="72" />
-        <icon height="144" src="res/icon/ios/icon-72@2x.png" width="144" />
-        <icon height="50" src="res/icon/ios/icon-50.png" width="50" />
-        <icon height="100" src="res/icon/ios/icon-50@2x.png" width="100" />
-        <splash height="960" src="res/screen/ios/640-960.png" width="640" />
-        <splash height="640" src="res/screen/ios/960-640.png" width="960" />
-        <splash height="1136" src="res/screen/ios/640-1136.png" width="640" />
-        <splash height="640" src="res/screen/ios/1136-640.png" width="1136" />
-        <splash height="1334" src="res/screen/ios/750-1334.png" width="750" />
-        <splash height="750" src="res/screen/ios/1334-750.png" width="1334" />
-        <splash height="2208" src="res/screen/ios/1242-2208.png" width="1242" />
-        <splash height="1242" src="res/screen/ios/2208-1242.png" width="2208" />
-        <splash height="1024" src="res/screen/ios/768-1024.png" width="768" />
-        <splash height="768" src="res/screen/ios/1024-768.png" width="1024" />
-        <splash height="2048" src="res/screen/ios/1536-2048.png" width="1536" />
-        <splash height="1536" src="res/screen/ios/2048-1536.png" width="2048" />
-        <splash height="2732" src="res/screen/ios/2048-2732.png" width="2048" />
-        <splash height="2048" src="res/screen/ios/2732-2048.png" width="2732" />
-    </platform>
-    <platform name="android">
-        <allow-intent href="market:*" />
-        <icon density="ldpi" src="res/icon/android/ldpi.png" />
-        <icon density="mdpi" src="res/icon/android/mdpi.png" />
-        <icon density="hdpi" src="res/icon/android/hdpi.png" />
-        <icon density="xhdpi" src="res/icon/android/xhdpi.png" />
-        <icon density="xxhdpi" src="res/icon/android/xxhdpi.png" />
-        <icon density="xxxhdpi" src="res/icon/android/xxxhdpi.png" />
-        <splash density="port-ldpi" src="res/screen/android/port-ldpi.png" />
-        <splash density="land-ldpi" src="res/screen/android/land-ldpi.png" />
-        <splash density="port-mdpi" src="res/screen/android/port-mdpi.png" />
-        <splash density="land-mdpi" src="res/screen/android/land-mdpi.png" />
-        <splash density="port-hdpi" src="res/screen/android/port-hdpi.png" />
-        <splash density="land-hdpi" src="res/screen/android/land-hdpi.png" />
-        <splash density="port-xhdpi" src="res/screen/android/port-xhdpi.png" />
-        <splash density="land-xhdpi" src="res/screen/android/land-xhdpi.png" />
-        <splash density="port-xxhdpi" src="res/screen/android/port-xxhdpi.png" />
-        <splash density="land-xxhdpi" src="res/screen/android/land-xxhdpi.png" />
-        <splash density="port-xxxhdpi" src="res/screen/android/port-xxxhdpi.png" />
-        <splash density="land-xxxhdpi" src="res/screen/android/land-xxxhdpi.png" />
-    </platform>
-    <engine name="android" spec="~5.2.2" />
-    <preference name="ShowSplashScreenSpinner" value="false" />
-    <!--<plugin name="cordova-plugin-background-mode" spec="~0.6.5" />-->
-    <!--<plugin name="de.schchr.cordova.plugin.timers" spec="https://github.com/schchr/cordova-plugin-timers" />-->
 </widget>

web/app/pods/components/hue-controls/component.js

@@ -6,7 +6,7 @@ const {
   computed,
   isEmpty,
   isNone,
-  run: { later },
+  run: { later, scheduleOnce },
   inject,
   $
 } = Ember;
@@ -61,7 +61,7 @@ export default Component.extend({
         });
 
         if(haveTooltip) {
-          run.scheduleOnce('afterRender', function(){
+          scheduleOnce('afterRender', function(){
             $('.bootstrap-tooltip').tooltip();
           });
         }
@@ -227,9 +227,15 @@ export default Component.extend({
           $('.introjs-nextbutton').click();
         }
 
-        later(this, function() {
+        if(element.id === ''){
-          $('.introjs-tooltip').velocity('scroll', { offset: -100 });
+          later(this, () => {
-        }, 500);
+            $('body').velocity('scroll');
+          }, 500);
+        } else {
+          later(this, () => {
+            $('.introjs-tooltip').velocity('scroll', { offset: -100 });
+          }, 500);
+        }
       }).start();
     }
   }