diff --git a/mobile/app/index.html b/mobile/app/index.html index a96fb5f..ec5c6fc 100644 --- a/mobile/app/index.html +++ b/mobile/app/index.html @@ -9,38 +9,14 @@ - - - - - - - - - {{content-for 'head'}} - - - - - - - - - + {{content-for 'head-footer'}} @@ -60,7 +36,7 @@ {{content-for 'body'}} - + {{content-for 'body-footer'}} diff --git a/mobile/app/pods/components/hue-controls/component.js b/mobile/app/pods/components/hue-controls/component.js index 78a780b..4bc35ea 100644 --- a/mobile/app/pods/components/hue-controls/component.js +++ b/mobile/app/pods/components/hue-controls/component.js @@ -1,11 +1,10 @@ import Ember from 'ember'; -import ENV from 'huegasm/config/environment'; +import ENV from 'huegasm_mobile/config/environment'; const { A, Component, computed, - isEmpty, isNone, run, $ @@ -51,23 +50,6 @@ export default Component.extend({ return tabData; }), - didInsertElement(){ - // here's a weird way to automatically initialize bootstrap tooltips - let observer = new MutationObserver(function(mutations) { - let haveTooltip = !mutations.every(function(mutation) { - return isEmpty(mutation.addedNodes) || isNone(mutation.addedNodes[0].classList) || mutation.addedNodes[0].classList.contains('tooltip'); - }); - - if(haveTooltip) { - run.scheduleOnce('afterRender', function(){ - $('.bootstrap-tooltip').tooltip(); - }); - } - }); - - observer.observe($('#hue-controls')[0], {childList: true, subtree: true}); - }, - init() { this._super(...arguments); @@ -188,7 +170,7 @@ export default Component.extend({ // it's VERY ugly but it works... the jQuery massacre :'( intro.onchange((element) => { - if(element.id === 'music-tab' || element.id === 'playlist' || element.id === 'player-area' || element.id === 'beat-option-row' || element.id === 'beat-option-button-group' || element.id === 'beat-container' || element.id === 'using-mic-audio-tooltip'){ + if(element.id === 'music-tab' || element.id === 'playlist' || element.id === 'player-area' || element.id === 'beat-option-row' || element.id === 'beat-option-button-group' || element.id === 'beat-container'){ $('#music-tab').removeClass('hidden'); $('#lights-tab').addClass('hidden'); $('.navigation-item').eq(0).removeClass('active'); diff --git a/mobile/app/pods/components/light-group/template.hbs b/mobile/app/pods/components/light-group/template.hbs index 2b0361a..880b9e5 100644 --- a/mobile/app/pods/components/light-group/template.hbs +++ b/mobile/app/pods/components/light-group/template.hbs @@ -1,5 +1,5 @@ {{#each lightsList as |light|}} -
+
{{/each}} \ No newline at end of file diff --git a/mobile/app/pods/components/lights-tab/template.hbs b/mobile/app/pods/components/lights-tab/template.hbs index fcd5118..257d93a 100644 --- a/mobile/app/pods/components/lights-tab/template.hbs +++ b/mobile/app/pods/components/lights-tab/template.hbs @@ -1,19 +1,19 @@ {{#paper-list}} {{#paper-item}} {{paper-icon "power-settings-new" class=dimmerOnClass}} -

Power

+

Power

{{paper-switch value=lightsOn onChange=(action (mut lightsOn)) disabled=trial skipProxy=trial label=lightsOnTxt}} {{/paper-item}} {{#paper-item}} {{paper-icon "brightness-4" class=dimmerOnClass}} -

Brightness

+

Brightness

{{paper-slider flex=true min='1' max='254' value=lightsBrightness disabled=brightnessControlDisabled}} {{/paper-item}} {{#paper-item elementId="color-row"}} {{paper-icon "color-lens" class=dimmerOnClass}} -

Color

+

Color

{{/paper-item}}
@@ -26,13 +26,13 @@ {{#paper-item}} {{paper-icon "flare" class=dimmerOnClass}} -

Strobe

+

Strobe

{{paper-switch value=strobeOn onChange=(action (mut strobeOn)) disabled=trial skipProxy=trial label=strobeOnTxt}} {{/paper-item}} {{#paper-item}} {{paper-icon "color-lens" class=dimmerOnClass}} {{paper-icon "loop" id="loop-addition" class=dimmerOnClass}} -

Colorloop

+

Colorloop

{{paper-switch value=colorLoopOn onChange=(action (mut colorLoopOn)) disabled=trial skipProxy=trial label=colorloopOnTxt}} {{/paper-item}} {{/paper-list}} \ No newline at end of file diff --git a/mobile/app/pods/components/music-tab/component.js b/mobile/app/pods/components/music-tab/component.js index c4cf9ef..a3dac8a 100644 --- a/mobile/app/pods/components/music-tab/component.js +++ b/mobile/app/pods/components/music-tab/component.js @@ -391,21 +391,6 @@ export default Component.extend(helperMixin, visualizerMixin, { this.send('dropFiles', event.dataTransfer.files); }); - // control the volume by scrolling up/down - $('#player-area').on('mousewheel', (event)=>{ - if(this.get('playQueueNotEmpty') && !this.get('usingMicAudio')) { - let scrollSize = 5; - - if(event.deltaY < 0) { - scrollSize *= -1; - } - let newVolume = this.get('volume') + scrollSize; - - this.send('volumeChanged', newVolume < 0 ? 0 : newVolume); - event.preventDefault(); - } - }); - // demo tracks if(this.get('firstVisit')){ this.send('handleNewSoundCloudURL', 'https://soundcloud.com/mrsuicidesheep/candyland-speechless-feat-rkcb'); @@ -435,9 +420,6 @@ export default Component.extend(helperMixin, visualizerMixin, { setVisName(name){ this.set('currentVisName', name); }, - hideTooltip(){ - $('.bootstrap-tooltip').tooltip('hide'); - }, gotoSCURL(URL){ // need to pause the music since soundcloud is going to start playing this song anyways if(this.get('playing')){ @@ -447,7 +429,6 @@ export default Component.extend(helperMixin, visualizerMixin, { this.send('gotoURL', URL); }, gotoURL(URL){ - $('.tooltip').remove(); window.open(URL, '_blank'); }, handleNewSoundCloudURL(URL){ @@ -627,9 +608,6 @@ export default Component.extend(helperMixin, visualizerMixin, { removeAudio(index){ this.get('playQueue').removeAt(index); - // need to manually remove the tooltip - $('body .tooltip').remove(); - if(index === this.get('playQueuePointer')) { this.send('goToSong', index, true, true); } diff --git a/mobile/app/pods/components/music-tab/mixins/helpers.js b/mobile/app/pods/components/music-tab/mixins/helpers.js index 24baa45..b970a72 100644 --- a/mobile/app/pods/components/music-tab/mixins/helpers.js +++ b/mobile/app/pods/components/music-tab/mixins/helpers.js @@ -5,7 +5,6 @@ const { observer, computed, isNone, - $, inject, on, A @@ -327,46 +326,12 @@ export default Mixin.create({ this.get('storage').set('huegasm.' + option, this.get(option)); }), - onRepeatChange: on('init', observer('repeat', function () { - let tooltipTxt = 'Repeat all', type = 'repeat'; - - if (this.get(type) === 1) { - tooltipTxt = 'Repeat one'; - } else if (this.get(type) === 2) { - tooltipTxt = 'Repeat off'; - } - - this.changeTooltipText(type, tooltipTxt); - })), - - onUsingMicAudioChange: on('init', observer('usingMicAudio', function(){ - let tooltipTxt = 'Listen to audio through mic', type = 'usingMicAudio'; - - if (this.get(type)) { - tooltipTxt = 'Listen to audio files'; - } - - this.changeTooltipText(type, tooltipTxt); - })), - - onShuffleChange: on('init', observer('shuffle', function () { - let tooltipTxt = 'Shuffle', type = 'shuffle'; - - if (this.get(type)) { - this.get('shufflePlayed').clear(); - tooltipTxt = 'Unshuffle'; - } - - this.changeTooltipText(type, tooltipTxt); - })), - onVolumeMutedChange: on('init', observer('volumeMuted', function() { - let tooltipTxt = 'Mute', type = 'volumeMuted', - volumeMuted = this.get(type), dancer = this.get('dancer'), + let volumeMuted = this.get('volumeMuted'), + dancer = this.get('dancer'), volume=0; if (volumeMuted) { - tooltipTxt = 'Unmute'; volume = 0; } else { volume = this.get('volume')/100; @@ -375,45 +340,8 @@ export default Mixin.create({ if(this.get('playing')){ dancer.setVolume(volume); } - - this.changeTooltipText(type, tooltipTxt); })), - onPrevChange: on('init', observer('timeElapsed', 'playQueueNotEmpty', 'playQueue.[]', function() { - if(this.get('playQueueNotEmpty')){ - let tooltipTxt = 'Previous', type = 'prev'; - - if(this.get('timeElapsed') > 5 || this.get('playQueue').length === 1) { - tooltipTxt = 'Replay'; - } - - this.changeTooltipText(type, tooltipTxt); - } - })), - - onPlayingChange: on('init', observer('playing', function () { - let tooltipTxt = 'Play', type = 'playing'; - - if (this.get(type)) { - tooltipTxt = 'Pause'; - } else if(this.get('timeElapsed') === this.get('timeTotal') && this.get('timeTotal') !== 0){ - tooltipTxt = 'Replay'; - } - - this.changeTooltipText(type, tooltipTxt); - })), - - changeTooltipText(type, text) { - // change the tooltip text if it's already visible - $('#' + type + 'Tooltip + .tooltip .tooltip-inner').html(text); - //change the tooltip text for hover - $('#' + type + 'Tooltip').attr('data-original-title', text); - - if(isNone(this.get(type + 'TooltipTxt'))) { - this.set(type + 'TooltipTxt', text); - } - }, - formatTime(time){ return this.pad(Math.floor(time/60), 2) + ':' + this.pad(time%60, 2); }, diff --git a/mobile/app/pods/components/music-tab/template.hbs b/mobile/app/pods/components/music-tab/template.hbs index 6cbc9fa..6ea07f4 100644 --- a/mobile/app/pods/components/music-tab/template.hbs +++ b/mobile/app/pods/components/music-tab/template.hbs @@ -9,17 +9,13 @@ {{range-slider start=seekPosition min=0 max=100 connect=filledConnect id="seek-slider" on-slide="seekChanged"}} {{#if playQueueNotEmpty}} - {{paper-icon "skip-previous" class="player-control-icon"}}{{/if}}{{paper-icon playingIcon class="player-control-icon"}}{{paper-icon playingIcon class="player-control-icon"}}{{#if playQueueMultiple}}{{paper-icon "skip-next" action="" class="player-control-icon"}}{{paper-icon "skip-next" action="" class="player-control-icon"}}{{/if}}{{paper-icon icon=volumeIcon class=volumeMutedClass}}{{paper-icon icon=volumeIcon class=volumeMutedClass}}{{range-slider start=volume min=0 max=100 connect=filledConnect on-slide="volumeChanged" id="volume-bar" class="hidden-xs"}}
{{timeElapsedTxt}} / {{timeTotalTxt}}
@@ -27,14 +23,14 @@ {{#if scUrl}} - + {{/if}} - + {{paper-icon "remove-red-eye" class="player-control-icon"}} @@ -72,13 +68,13 @@ {{/if}} {{#if usingMicSupported}} - {{paper-icon icon=micIcon class=usingMicAudioClass}} + {{paper-icon icon=micIcon class=usingMicAudioClass}} {{/if}} {{#if usingLocalAudio}} - {{paper-icon "shuffle" class=shuffleClass}} - {{paper-icon repeatIcon class=repeatClass}} - {{paper-icon "clear-all" class="player-control-icon"}} + {{paper-icon "shuffle" class=shuffleClass}} + {{paper-icon repeatIcon class=repeatClass}} + {{paper-icon "clear-all" class="player-control-icon"}} {{/if}}
@@ -123,7 +119,7 @@ {{/if}}
- {{paper-icon "close" classNames="close"}} + {{paper-icon "close" classNames="close"}} {{/each}} @@ -141,14 +137,14 @@
{{#if usingBeatPreferences}} - + {{paper-icon "star" class=dimmerOnClass}} {{/if}}
- + Sensitivity @@ -156,7 +152,7 @@
- + Hue Range @@ -165,7 +161,7 @@ {{#if usingMicAudio}}
- + Mic Boost @@ -174,17 +170,13 @@ {{/if}}
- + {{paper-checkbox value=flashingTransitions onChange=(action (mut flashingTransitions)) label="Flashing Transitions"}} - + {{paper-checkbox value=colorloopMode onChange=(action (mut colorloopMode)) label="Colorloop"}} - - {{!-- - {{#paper-checkbox checked=ambienceMode}}Ambience{{/paper-checkbox}} - --}}
diff --git a/mobile/app/styles/bootstrap.scss b/mobile/app/styles/bootstrap.scss index 6d071e4..db3957c 100644 --- a/mobile/app/styles/bootstrap.scss +++ b/mobile/app/styles/bootstrap.scss @@ -47,7 +47,7 @@ // Components w/ JavaScript //@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/modals"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/popovers"; //@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/carousel"; diff --git a/mobile/app/styles/dimmer.scss b/mobile/app/styles/dimmer.scss index 119e4d1..f388622 100644 --- a/mobile/app/styles/dimmer.scss +++ b/mobile/app/styles/dimmer.scss @@ -81,6 +81,6 @@ body.dimmerOn { cursor: pointer; width: 40px; height: 40px; - background: url(/favicon-96x96.png) center center no-repeat; + background: url(images/huegasm.png) center center no-repeat; background-size: 40px 40px; } diff --git a/mobile/app/styles/hue-controls.scss b/mobile/app/styles/hue-controls.scss index 8198213..2a00f1d 100644 --- a/mobile/app/styles/hue-controls.scss +++ b/mobile/app/styles/hue-controls.scss @@ -5,10 +5,6 @@ } } -.lights-control-tooltip + .tooltip { - left: 0 !important; -} - #color-row { cursor: pointer; } @@ -21,7 +17,7 @@ // preload images #hue-controls:after, md-progress-circular:after { display: none; - content: url(images/colormap.png) url(images/missingArtwork.png) url(images/sc-white.png) url(/favicon-96x96.png) url(images/lights/a19.svg) url(images/lights/a19w.svg) url(images/lights/br30.svg) url(images/lights/br30w.svg) url(images/lights/gu10.svg) url(images/lights/gu10w.svg) url(images/lights/huego.svg) url(images/lights/huegow.svg) url(images/lights/lc_aura.svg) url(images/lights/lc_auraw.svg) url(images/lights/lc_bloom.svg) url(images/lights/lc_bloomw.svg) url(images/lights/lc_iris.svg) url(images/lights/lc_irisw.svg) url(images/lights/lightstrip.svg) url(images/lights/lightstripw.svg) url(images/lights/storylight.svg) url(images/lights/storylightw.svg); + content: url(images/colormap.png) url(images/missingArtwork.png) url(images/sc-white.png) url(images/huegasm.png) url(images/lights/a19.svg) url(images/lights/a19w.svg) url(images/lights/br30.svg) url(images/lights/br30w.svg) url(images/lights/gu10.svg) url(images/lights/gu10w.svg) url(images/lights/huego.svg) url(images/lights/huegow.svg) url(images/lights/lc_aura.svg) url(images/lights/lc_auraw.svg) url(images/lights/lc_bloom.svg) url(images/lights/lc_bloomw.svg) url(images/lights/lc_iris.svg) url(images/lights/lc_irisw.svg) url(images/lights/lightstrip.svg) url(images/lights/lightstripw.svg) url(images/lights/storylight.svg) url(images/lights/storylightw.svg); } #navigation { diff --git a/mobile/app/styles/light-group.scss b/mobile/app/styles/light-group.scss index f9b1256..03da523 100644 --- a/mobile/app/styles/light-group.scss +++ b/mobile/app/styles/light-group.scss @@ -1,10 +1,6 @@ .light-group { margin: 0 auto; text-align: center; - .tooltip.top { - margin-top: 4px; - margin-left: 0; - } div { display: inline-block; } @@ -31,10 +27,6 @@ top: -9px; left: 6px; } - .tooltip.top { - margin-top: 1px; - margin-left: 2px; - } } .light-active { diff --git a/mobile/app/styles/music-tab.scss b/mobile/app/styles/music-tab.scss index 754d7d0..c6d29ac 100644 --- a/mobile/app/styles/music-tab.scss +++ b/mobile/app/styles/music-tab.scss @@ -11,9 +11,6 @@ top: 20%; -webkit-transform: translateY(-20%); transform: translateY(-20%); - .tooltip { - margin-top: 5px !important; - } } #music-tab { @@ -43,12 +40,6 @@ color: white !important; z-index: 20; background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 1)); - .tooltip.top { - margin-top: -17px; - } - .tooltip-arrow { - display: none; - } .play-arrow, .pause, .replay { font-size: 30px; } @@ -228,8 +219,9 @@ } .audio-remove-button { position: absolute; - top: 20px; - right: 5px; + top: 10px; + right: 0; + padding: 10px; } } @@ -241,9 +233,6 @@ .playlist-item:hover { background: darken(white, 10%); - .close { - display: block; - } } #beat-area { @@ -273,9 +262,6 @@ button { margin-top: 0; } - .tooltip { - margin: 0; - } } #player-bottom { @@ -344,7 +330,7 @@ } .display-icon { - background: url(/favicon-96x96.png) center center no-repeat; + background: url(images/huegasm.png) center center no-repeat; background-size: 80px 80px; } @@ -372,12 +358,9 @@ .close { font-size: 18px !important; color: rgb(51, 51, 51); - display: none; - opacity: 1; text-shadow: none; &:hover { color: darken(#333333, 5%) !important; - opacity: 1 } } diff --git a/mobile/bower.json b/mobile/bower.json index 205cf86..bc0a2b4 100644 --- a/mobile/bower.json +++ b/mobile/bower.json @@ -10,7 +10,6 @@ "ember-qunit-notifications": "0.1.0", "hammer.js": "^2.0.8", "intro.js": "^2.1.0", - "jquery-mousewheel": "^3.1.13", "locallyjs": "^0.3.2", "matchMedia": "^0.3.0", "nouislider": "^9.0.0", diff --git a/mobile/config/environment.js b/mobile/config/environment.js index 941cd60..d96978c 100644 --- a/mobile/config/environment.js +++ b/mobile/config/environment.js @@ -2,8 +2,8 @@ module.exports = function(environment) { var ENV = { - modulePrefix: 'huegasm', - podModulePrefix: 'huegasm/pods', + modulePrefix: 'huegasm_mobile', + podModulePrefix: 'huegasm_mobile/pods', environment: environment, rootURL: '/', locationType: 'hash', diff --git a/mobile/ember-cli-build.js b/mobile/ember-cli-build.js index 18c3ef2..c75cf26 100644 --- a/mobile/ember-cli-build.js +++ b/mobile/ember-cli-build.js @@ -13,7 +13,6 @@ module.exports = function(defaults) { app.import('bower_components/intro.js/intro.js'); app.import('bower_components/intro.js/introjs.css'); app.import('bower_components/JavaScript-ID3-Reader/dist/id3-minimized.js'); - app.import('bower_components/jquery-mousewheel/jquery.mousewheel.js'); app.import('bower_components/locallyjs/dist/locally.min.js'); app.import('bower_components/velocity/velocity.js'); diff --git a/mobile/ember-cordova/cordova/config.xml b/mobile/ember-cordova/cordova/config.xml index 45e53ad..0d2daf8 100644 --- a/mobile/ember-cordova/cordova/config.xml +++ b/mobile/ember-cordova/cordova/config.xml @@ -1,26 +1,71 @@ - - - huegasm_mobile - + + + huegasm_mobile + A sample Apache Cordova application that responds to the deviceready event. - + Apache Cordova Team - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/ember-cordova/cordova/res/icon/android/hdpi.png b/mobile/ember-cordova/cordova/res/icon/android/hdpi.png new file mode 100644 index 0000000..5842bfb Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/android/hdpi.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/android/ldpi.png b/mobile/ember-cordova/cordova/res/icon/android/ldpi.png new file mode 100644 index 0000000..81e1fb5 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/android/ldpi.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/android/mdpi.png b/mobile/ember-cordova/cordova/res/icon/android/mdpi.png new file mode 100644 index 0000000..0f45f45 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/android/mdpi.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/android/xhdpi.png b/mobile/ember-cordova/cordova/res/icon/android/xhdpi.png new file mode 100644 index 0000000..a31d558 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/android/xhdpi.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/android/xxhdpi.png b/mobile/ember-cordova/cordova/res/icon/android/xxhdpi.png new file mode 100644 index 0000000..0927262 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/android/xxhdpi.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/android/xxxhdpi.png b/mobile/ember-cordova/cordova/res/icon/android/xxxhdpi.png new file mode 100644 index 0000000..9db9644 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/android/xxxhdpi.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/blackberry/icon-150.png b/mobile/ember-cordova/cordova/res/icon/blackberry/icon-150.png new file mode 100644 index 0000000..ea3578a Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/blackberry/icon-150.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/blackberry/icon-86.png b/mobile/ember-cordova/cordova/res/icon/blackberry/icon-86.png new file mode 100644 index 0000000..2e306df Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/blackberry/icon-86.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-40.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-40.png new file mode 100644 index 0000000..e8aa719 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-40.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-40@2x.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-40@2x.png new file mode 100644 index 0000000..950f07f Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-40@2x.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-40@3x.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-40@3x.png new file mode 100644 index 0000000..7cfb6f6 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-40@3x.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-50.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-50.png new file mode 100644 index 0000000..a2a8c15 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-50.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-50@2x.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-50@2x.png new file mode 100644 index 0000000..62b0ae0 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-50@2x.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-60.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-60.png new file mode 100644 index 0000000..872b8b9 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-60.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-60@2x.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-60@2x.png new file mode 100644 index 0000000..7cfb6f6 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-60@2x.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-60@3x.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-60@3x.png new file mode 100644 index 0000000..40d0281 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-60@3x.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-72.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-72.png new file mode 100644 index 0000000..5842bfb Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-72.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-72@2x.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-72@2x.png new file mode 100644 index 0000000..0927262 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-72@2x.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-76.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-76.png new file mode 100644 index 0000000..c724b28 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-76.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-76@2x.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-76@2x.png new file mode 100644 index 0000000..e6396f3 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-76@2x.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-small.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-small.png new file mode 100644 index 0000000..1acd454 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-small.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-small@2x.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-small@2x.png new file mode 100644 index 0000000..dd849f3 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-small@2x.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon-small@3x.png b/mobile/ember-cordova/cordova/res/icon/ios/icon-small@3x.png new file mode 100644 index 0000000..913b456 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon-small@3x.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon.png b/mobile/ember-cordova/cordova/res/icon/ios/icon.png new file mode 100644 index 0000000..4794713 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/ios/icon@2x.png b/mobile/ember-cordova/cordova/res/icon/ios/icon@2x.png new file mode 100644 index 0000000..2005d37 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/ios/icon@2x.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/windows/Square150x150Logo.png b/mobile/ember-cordova/cordova/res/icon/windows/Square150x150Logo.png new file mode 100644 index 0000000..ea3578a Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/windows/Square150x150Logo.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/windows/Square310x310Logo.png b/mobile/ember-cordova/cordova/res/icon/windows/Square310x310Logo.png new file mode 100644 index 0000000..b806f74 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/windows/Square310x310Logo.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/windows/Square44x44Logo.png b/mobile/ember-cordova/cordova/res/icon/windows/Square44x44Logo.png new file mode 100644 index 0000000..0fcd16d Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/windows/Square44x44Logo.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/windows/Square70x70Logo.png b/mobile/ember-cordova/cordova/res/icon/windows/Square70x70Logo.png new file mode 100644 index 0000000..735a49e Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/windows/Square70x70Logo.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/windows/Square71x71Logo.png b/mobile/ember-cordova/cordova/res/icon/windows/Square71x71Logo.png new file mode 100644 index 0000000..66d2ea9 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/windows/Square71x71Logo.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/windows/StoreLogo.png b/mobile/ember-cordova/cordova/res/icon/windows/StoreLogo.png new file mode 100644 index 0000000..a2a8c15 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/windows/StoreLogo.png differ diff --git a/mobile/ember-cordova/cordova/res/icon/windows/smalllogo.png b/mobile/ember-cordova/cordova/res/icon/windows/smalllogo.png new file mode 100644 index 0000000..feb9a56 Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/windows/smalllogo.png differ diff --git a/mobile/ember-cordova/icon.svg b/mobile/ember-cordova/icon.svg new file mode 100644 index 0000000..50fef1d --- /dev/null +++ b/mobile/ember-cordova/icon.svg @@ -0,0 +1,599 @@ + + + + + + + + + + + + + diff --git a/mobile/public/android-chrome-192x192.png b/mobile/public/android-chrome-192x192.png deleted file mode 100644 index cc9d381..0000000 Binary files a/mobile/public/android-chrome-192x192.png and /dev/null differ diff --git a/mobile/public/android-chrome-512x512.png b/mobile/public/android-chrome-512x512.png deleted file mode 100644 index 13e6e26..0000000 Binary files a/mobile/public/android-chrome-512x512.png and /dev/null differ diff --git a/mobile/public/apple-touch-icon.png b/mobile/public/apple-touch-icon.png deleted file mode 100644 index 20bffdc..0000000 Binary files a/mobile/public/apple-touch-icon.png and /dev/null differ diff --git a/mobile/public/favicon-96x96.png b/mobile/public/assets/images/huegasm.png similarity index 100% rename from mobile/public/favicon-96x96.png rename to mobile/public/assets/images/huegasm.png diff --git a/mobile/public/browserconfig.xml b/mobile/public/browserconfig.xml deleted file mode 100644 index 74bb89a..0000000 --- a/mobile/public/browserconfig.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - #da532c - - - diff --git a/mobile/public/favicon-16x16.png b/mobile/public/favicon-16x16.png deleted file mode 100644 index 9e5a2e4..0000000 Binary files a/mobile/public/favicon-16x16.png and /dev/null differ diff --git a/mobile/public/favicon-32x32.png b/mobile/public/favicon-32x32.png deleted file mode 100644 index 14dbea8..0000000 Binary files a/mobile/public/favicon-32x32.png and /dev/null differ diff --git a/mobile/public/favicon.ico b/mobile/public/favicon.ico deleted file mode 100644 index 0c485bc..0000000 Binary files a/mobile/public/favicon.ico and /dev/null differ diff --git a/mobile/public/humans.txt b/mobile/public/humans.txt index d5c830d..2112c33 100644 --- a/mobile/public/humans.txt +++ b/mobile/public/humans.txt @@ -11,4 +11,4 @@ Olamide Omorodion - business consultation /* SITE */ Last update: 2015 Standards: HTML5, CSS3 -Components: ember, jQuery, bootstrap, font-awesome, intro.js, locallyjs, nouislider, dancer.js, jquery-mousewheel, ember paper, ember notify, JavaScript-ID3-Reader +Components: ember, jQuery, bootstrap, font-awesome, intro.js, locallyjs, nouislider, dancer.js, ember paper, ember notify, JavaScript-ID3-Reader diff --git a/mobile/public/manifest.json b/mobile/public/manifest.json deleted file mode 100644 index e059ba3..0000000 --- a/mobile/public/manifest.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "Huegasm", - "icons": [ - { - "src": "\/android-chrome-192x192.png", - "sizes": "192x192", - "type": "image\/png" - }, - { - "src": "\/android-chrome-512x512.png", - "sizes": "512x512", - "type": "image\/png" - } - ], - "theme_color": "#ffffff", - "display": "standalone" -} diff --git a/mobile/public/mstile-150x150.png b/mobile/public/mstile-150x150.png deleted file mode 100644 index c5e4b22..0000000 Binary files a/mobile/public/mstile-150x150.png and /dev/null differ diff --git a/mobile/public/safari-pinned-tab.svg b/mobile/public/safari-pinned-tab.svg deleted file mode 100644 index 947ed66..0000000 --- a/mobile/public/safari-pinned-tab.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - - - diff --git a/web/app/pods/components/hue-controls/component.js b/web/app/pods/components/hue-controls/component.js index 78a780b..64bbe09 100644 --- a/web/app/pods/components/hue-controls/component.js +++ b/web/app/pods/components/hue-controls/component.js @@ -52,20 +52,22 @@ export default Component.extend({ }), didInsertElement(){ - // here's a weird way to automatically initialize bootstrap tooltips - let observer = new MutationObserver(function(mutations) { - let haveTooltip = !mutations.every(function(mutation) { - return isEmpty(mutation.addedNodes) || isNone(mutation.addedNodes[0].classList) || mutation.addedNodes[0].classList.contains('tooltip'); + if(!window.matchMedia || (window.matchMedia("(min-width: 768px)").matches)){ + // here's a weird way to automatically initialize bootstrap tooltips + let observer = new MutationObserver(function(mutations) { + let haveTooltip = !mutations.every(function(mutation) { + return isEmpty(mutation.addedNodes) || isNone(mutation.addedNodes[0].classList) || mutation.addedNodes[0].classList.contains('tooltip'); + }); + + if(haveTooltip) { + run.scheduleOnce('afterRender', function(){ + $('.bootstrap-tooltip').tooltip(); + }); + } }); - if(haveTooltip) { - run.scheduleOnce('afterRender', function(){ - $('.bootstrap-tooltip').tooltip(); - }); - } - }); - - observer.observe($('#hue-controls')[0], {childList: true, subtree: true}); + observer.observe($('#hue-controls')[0], {childList: true, subtree: true}); + } }, init() { diff --git a/web/app/pods/components/music-tab/template.hbs b/web/app/pods/components/music-tab/template.hbs index 6cbc9fa..4efc861 100644 --- a/web/app/pods/components/music-tab/template.hbs +++ b/web/app/pods/components/music-tab/template.hbs @@ -27,10 +27,7 @@ {{#if scUrl}} - - - - + {{/if}} diff --git a/web/app/styles/dimmer.scss b/web/app/styles/dimmer.scss index 119e4d1..f388622 100644 --- a/web/app/styles/dimmer.scss +++ b/web/app/styles/dimmer.scss @@ -81,6 +81,6 @@ body.dimmerOn { cursor: pointer; width: 40px; height: 40px; - background: url(/favicon-96x96.png) center center no-repeat; + background: url(images/huegasm.png) center center no-repeat; background-size: 40px 40px; } diff --git a/web/app/styles/hue-controls.scss b/web/app/styles/hue-controls.scss index 8198213..fd38e07 100644 --- a/web/app/styles/hue-controls.scss +++ b/web/app/styles/hue-controls.scss @@ -21,7 +21,7 @@ // preload images #hue-controls:after, md-progress-circular:after { display: none; - content: url(images/colormap.png) url(images/missingArtwork.png) url(images/sc-white.png) url(/favicon-96x96.png) url(images/lights/a19.svg) url(images/lights/a19w.svg) url(images/lights/br30.svg) url(images/lights/br30w.svg) url(images/lights/gu10.svg) url(images/lights/gu10w.svg) url(images/lights/huego.svg) url(images/lights/huegow.svg) url(images/lights/lc_aura.svg) url(images/lights/lc_auraw.svg) url(images/lights/lc_bloom.svg) url(images/lights/lc_bloomw.svg) url(images/lights/lc_iris.svg) url(images/lights/lc_irisw.svg) url(images/lights/lightstrip.svg) url(images/lights/lightstripw.svg) url(images/lights/storylight.svg) url(images/lights/storylightw.svg); + content: url(images/colormap.png) url(images/missingArtwork.png) url(images/sc-white.png) url(images/huegasm.png) url(images/lights/a19.svg) url(images/lights/a19w.svg) url(images/lights/br30.svg) url(images/lights/br30w.svg) url(images/lights/gu10.svg) url(images/lights/gu10w.svg) url(images/lights/huego.svg) url(images/lights/huegow.svg) url(images/lights/lc_aura.svg) url(images/lights/lc_auraw.svg) url(images/lights/lc_bloom.svg) url(images/lights/lc_bloomw.svg) url(images/lights/lc_iris.svg) url(images/lights/lc_irisw.svg) url(images/lights/lightstrip.svg) url(images/lights/lightstripw.svg) url(images/lights/storylight.svg) url(images/lights/storylightw.svg); } #navigation { diff --git a/web/app/styles/music-tab.scss b/web/app/styles/music-tab.scss index 754d7d0..2b5854a 100644 --- a/web/app/styles/music-tab.scss +++ b/web/app/styles/music-tab.scss @@ -228,8 +228,9 @@ } .audio-remove-button { position: absolute; - top: 20px; - right: 5px; + top: 10px; + right: 0; + padding: 10px; } } @@ -344,7 +345,7 @@ } .display-icon { - background: url(/favicon-96x96.png) center center no-repeat; + background: url(images/huegasm.png) center center no-repeat; background-size: 80px 80px; } @@ -373,11 +374,9 @@ font-size: 18px !important; color: rgb(51, 51, 51); display: none; - opacity: 1; text-shadow: none; &:hover { color: darken(#333333, 5%) !important; - opacity: 1 } } @@ -400,4 +399,7 @@ .beat-option { text-align: center !important; } + .close { + display: block; + } } diff --git a/web/public/favicon-96x96.png b/web/public/assets/images/huegasm.png similarity index 100% rename from web/public/favicon-96x96.png rename to web/public/assets/images/huegasm.png