Yosemite style changes

radiant-player · Oct 16, 2014 · 2ee0561 · 2ee0561
1 parent 4cc1685
commit 2ee0561
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 7 deletions.
diff --git a/radiant-player-mac/AppDelegate.h b/radiant-player-mac/AppDelegate.h
@@ -125,6 +125,7 @@
 - (void) ratingChanged:(NSInteger)rating;
 
 - (id) preferenceForKey:(NSString *)key;
+- (BOOL) isYosemite;
 
 - (void) evaluateJavaScriptFile:(NSString *)name;
 - (void) applyCSSFile:(NSString *)name;

diff --git a/radiant-player-mac/AppDelegate.m b/radiant-player-mac/AppDelegate.m
@@ -79,6 +79,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
              object:nil
              queue:nil
              usingBlock:^(NSNotification *note) {
+                 [webView stringByEvaluatingJavaScriptFromString:@"window.Styles.Callbacks.onEnterFullScreen();"];
                  [self hideToolbar];
              }
          ];
@@ -87,7 +88,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
              addObserverForName:NSWindowWillExitFullScreenNotification
              object:nil
              queue:nil
-             usingBlock:^(NSNotification *note) {
+         usingBlock:^(NSNotification *note) {
+             [webView stringByEvaluatingJavaScriptFromString:@"window.Styles.Callbacks.onExitFullScreen();"];
                  [self showToolbar];
              }
          ];
@@ -766,6 +768,11 @@ - (id)preferenceForKey:(NSString *)key
     else
         return nil;
 }
+
+- (BOOL)isYosemite
+{
+    return floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_9;
+}
 
 - (void) evaluateJavaScriptFile:(NSString *)name
 {
@@ -828,6 +835,9 @@ + (NSString *) webScriptNameForSelector:(SEL)sel
     if (sel == @selector(preferenceForKey:))
         return @"preferenceForKey";
 
+    if (sel == @selector(isYosemite))
+        return @"isYosemite";
+
     return nil;
 }
 
@@ -841,7 +851,8 @@ + (BOOL) isSelectorExcludedFromWebScript:(SEL)sel
         sel == @selector(ratingChanged:) ||
         sel == @selector(moveWindowWithDeltaX:andDeltaY:) ||
         sel == @selector(showLastFmPopover:) ||
-        sel == @selector(preferenceForKey:))
+        sel == @selector(preferenceForKey:) ||
+        sel == @selector(isYosemite))
         return NO;
 
     return YES;

diff --git a/radiant-player-mac/Styles/ApplicationStyle.m b/radiant-player-mac/Styles/ApplicationStyle.m
@@ -63,14 +63,12 @@ + (NSString *)jsNamed:(NSString *)name
 }
 
 + (NSMutableDictionary *)styles
-{    
-    CocoaStyle *cocoa = [[CocoaStyle alloc] init];
+{
     DarkStyle *dark = [[DarkStyle alloc] init];
     DarkFlatStyle *darkFlat = [[DarkFlatStyle alloc] init];
     SpotifyBlackStyle *spotifyBlack = [[SpotifyBlackStyle alloc] init];
 
     NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-    [dictionary setObject:cocoa forKey:[cocoa name]];
     [dictionary setObject:dark forKey:[dark name]];
     [dictionary setObject:darkFlat forKey:[darkFlat name]];
     [dictionary setObject:spotifyBlack forKey:[spotifyBlack name]];
@@ -83,6 +81,11 @@ + (NSMutableDictionary *)styles
         SpotifyBlackVibrantStyle *spotifyBlackVibrant = [[SpotifyBlackVibrantStyle alloc] init];
         [dictionary setObject:spotifyBlackVibrant forKey:[spotifyBlackVibrant name]];
     }
+    else
+    {
+        CocoaStyle *cocoa = [[CocoaStyle alloc] init];
+        [dictionary setObject:cocoa forKey:[cocoa name]];
+    }
 
     return dictionary;
 }

diff --git a/radiant-player-mac/js/styles.js b/radiant-player-mac/js/styles.js
@@ -40,6 +40,11 @@ if (typeof window.Styles === 'undefined') {
                 Styles.appliedStyles[key].parentNode.removeChild(Styles.appliedStyles[key]);
                 delete Styles.appliedStyles[key];
             }
+        },
+
+        Callbacks: {
+            onEnterFullScreen: function() { },
+            onExitFullScreen: function() { }
         }
     };
 }
diff --git a/radiant-player-mac/js/styles/cocoa.js b/radiant-player-mac/js/styles/cocoa.js
@@ -11,6 +11,14 @@ if (typeof window.Styles.Applied === 'undefined') {
     window.Styles.Applied = true;
     window.Styles.Cocoa = true;
 
+    window.Styles.Callbacks.onEnterFullScreen = function() {
+
+    };
+
+    window.Styles.Callbacks.onExitFullScreen = function() {
+
+    };s
+
     // Thumbs up and down styles.
     (function() {
         // Create dummy elements to get the computed styles for these elements.

diff --git a/radiant-player-mac/js/styles/dark-flat.js b/radiant-player-mac/js/styles/dark-flat.js
@@ -11,6 +11,22 @@ if (typeof window.Styles.Applied === 'undefined') {
     window.Styles.Applied = true;
     window.Styles.DarkFlat = true;
 
+    window.Styles.Callbacks.onEnterFullScreen = function() {
+        if (window.GoogleMusicApp.isYosemite()) {
+            var el = document.querySelector('#oneGoogleWrapper > div:first-child > div:first-child > div:nth-child(2)');
+            el.style.setProperty('margin-left', '65px', 'important');
+            el.style.setProperty('margin-right', '65px', 'important');
+        }
+    };
+
+    window.Styles.Callbacks.onExitFullScreen = function() {
+        if (window.GoogleMusicApp.isYosemite()) {
+            var el = document.querySelector('#oneGoogleWrapper > div:first-child > div:first-child > div:nth-child(2)');
+            el.style.setProperty('margin-left', '100px', 'important');
+            el.style.setProperty('margin-right', '30px', 'important');
+        }
+    };
+
     // Thumbs up and down styles.
     var mediaChange = (function(list) {
         (function() {
@@ -43,7 +59,7 @@ if (typeof window.Styles.Applied === 'undefined') {
 
             // Apply a new stylesheet for the new thumbs up and down positions.
             thumbsUpBackY -= 9;
-            thumbsDownBackY -= 7;
+            thumbsDownBackY -= 6;
 
             var thumbsUpPosition = thumbsUpBackX + 'px ' + thumbsUpBackY + 'px';
             var thumbsDownPosition = thumbsDownBackX + 'px ' + thumbsDownBackY + 'px';

diff --git a/radiant-player-mac/js/styles/dark.js b/radiant-player-mac/js/styles/dark.js
@@ -11,6 +11,22 @@ if (typeof window.Styles.Applied === 'undefined') {
     window.Styles.Applied = true;
     window.Styles.Dark = true;
 
+    window.Styles.Callbacks.onEnterFullScreen = function() {
+        if (window.GoogleMusicApp.isYosemite()) {
+            var el = document.querySelector('#oneGoogleWrapper > div:first-child > div:first-child > div:nth-child(2)');
+            el.style.setProperty('margin-left', '65px', 'important');
+            el.style.setProperty('margin-right', '65px', 'important');
+        }
+    };
+
+    window.Styles.Callbacks.onExitFullScreen = function() {
+        if (window.GoogleMusicApp.isYosemite()) {
+            var el = document.querySelector('#oneGoogleWrapper > div:first-child > div:first-child > div:nth-child(2)');
+            el.style.setProperty('margin-left', '100px', 'important');
+            el.style.setProperty('margin-right', '30px', 'important');
+        }
+    };
+
     // Thumbs up and down styles.
     var mediaChange = (function(list) {
         (function() {
@@ -43,7 +59,7 @@ if (typeof window.Styles.Applied === 'undefined') {
 
             // Apply a new stylesheet for the new thumbs up and down positions.
             thumbsUpBackY -= 9;
-            thumbsDownBackY -= 7;
+            thumbsDownBackY -= 6;
 
             var thumbsUpPosition = thumbsUpBackX + 'px ' + thumbsUpBackY + 'px';
             var thumbsDownPosition = thumbsDownBackX + 'px ' + thumbsDownBackY + 'px';

diff --git a/radiant-player-mac/js/styles/spotify-black.js b/radiant-player-mac/js/styles/spotify-black.js
@@ -11,6 +11,22 @@ if (typeof window.Styles.Applied === 'undefined') {
     window.Styles.Applied = true;
     window.Styles.SpotifyBlack = true;
 
+    window.Styles.Callbacks.onEnterFullScreen = function() {
+        if (window.GoogleMusicApp.isYosemite()) {
+            var el = document.querySelector('#oneGoogleWrapper > div:first-child > div:first-child > div:nth-child(2)');
+            el.style.setProperty('margin-left', '65px', 'important');
+            el.style.setProperty('margin-right', '65px', 'important');
+        }
+    };
+
+    window.Styles.Callbacks.onExitFullScreen = function() {
+        if (window.GoogleMusicApp.isYosemite()) {
+            var el = document.querySelector('#oneGoogleWrapper > div:first-child > div:first-child > div:nth-child(2)');
+            el.style.setProperty('margin-left', '100px', 'important');
+            el.style.setProperty('margin-right', '30px', 'important');
+        }
+    };
+
     // Thumbs up and down styles.
     var mediaChange = (function(list) {
         (function() {

diff --git a/radiant-player-mac/js/styles/yosemite.js b/radiant-player-mac/js/styles/yosemite.js
@@ -11,6 +11,22 @@ if (typeof window.Styles.Applied === 'undefined') {
     window.Styles.Applied = true;
     window.Styles.Yosemite = true;
 
+    window.Styles.Callbacks.onEnterFullScreen = function() {
+        if (window.GoogleMusicApp.isYosemite()) {
+            var el = document.querySelector('#oneGoogleWrapper > div:first-child > div:first-child > div:nth-child(2)');
+            el.style.setProperty('margin-left', '30px', 'important');
+            el.style.setProperty('margin-right', '30px', 'important');
+        }
+    };
+
+    window.Styles.Callbacks.onExitFullScreen = function() {
+        if (window.GoogleMusicApp.isYosemite()) {
+            var el = document.querySelector('#oneGoogleWrapper > div:first-child > div:first-child > div:nth-child(2)');
+            el.style.setProperty('margin-left', '100px', 'important');
+            el.style.setProperty('margin-right', '30px', 'important');
+        }
+    };
+
     // Thumbs up and down styles.
     (function() {
         // Create dummy elements to get the computed styles for these elements.