Amanda/ui features

KDIC/Images.xcassets/Equalizer.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

KDIC/Images.xcassets/PauseButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "PauseButton @1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "PauseButton @2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "PauseButton @3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

KDIC/Images.xcassets/PlayButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "PlayButton @1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "PlayButton @2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "PlayButton.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

KDIC/Launch Screen.storyboard

@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -13,9 +17,9 @@
                         <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>

KDIC/PlayerViewController.swift

@@ -6,17 +6,58 @@ class PlayerViewController: UIViewController {
   @IBOutlet weak var titleLabel: UILabel!
   @IBOutlet weak var subtitleLabel: UILabel!
   @IBOutlet weak var imageView: UIImageView!
-  
+
   @IBAction func togglePlayerButtonWasTapped(_ sender: Any) {
     KDICPlayer.toggle()
   }
+
   override func viewDidLoad() {
     super.viewDidLoad()
+
+    self.imageView.image = UIImage(named: "Equalizer")
+
+    button.setImage(imgShell1, forState:.Normal);
+    button.setImage(coin, forState:.Highlighted);
+
+    button.setBackgroundImage(resizeImageWithAspect(UIImage(data: data!)!,size:button.bounds.size), forState: .Normal);
+    button.contentMode = UIViewContentMode.ScaleAspectFit;
+    button.clipsToBounds = true;
+
   }
+
   override func viewDidAppear(_ animated: Bool) {
     super.viewDidAppear(animated)
     print("About to play")
     KDICPlayer.play()
     print("Playing!")
   }
+
+    func resizeImageWithAspect(image: UIImage,size: CGSize)->UIImage
+    {
+        let oldWidth = image.size.width;
+        let oldHeight = image.size.height;
+
+        let scaleFactor = (oldWidth > oldHeight) ? size.width / oldWidth : size.height / oldHeight;
+
+        let newHeight = oldHeight * scaleFactor;
+        let newWidth = oldWidth * scaleFactor;
+        let newSize = CGSizeMake(newWidth, newHeight);
+
+        if UIScreen.mainScreen().respondsToSelector(#selector(NSDecimalNumberBehaviors.scale)){
+            UIGraphicsBeginImageContextWithOptions(newSize,false,UIScreen.mainScreen().scale);
+        }
+        else
+        {
+            UIGraphicsBeginImageContext(newSize);
+        }
+
+        image.drawInRect(CGRectMake(0, 0, newSize.width, size.height));
+        let newImage = UIGraphicsGetImageFromCurrentImageContext();
+        UIGraphicsEndImageContext();
+
+        return newImage;
+    }
+
+
+
 }

KDICCore/KDICPlayer.swift

@@ -3,25 +3,28 @@ import AVFoundation
 
 private let streamURL = URL(string: "http://kdic.grinnell.edu/stream")!
 
+private(set) var isPlaying = false;
+
 open class KDICPlayer {
   private static var player: AVPlayer = {
     let asset = AVURLAsset(url: streamURL)
     let playerItem = AVPlayerItem(asset: asset)
+    let currentlyPlaying = isPlaying;
     return AVPlayer(playerItem: playerItem)
   }()
 
-  open static var isPlaying = player.rate != 0
-
   open class func play() {
     player.play()
+    isPlaying = true
   }
 
   open class func pause() {
     player.pause()
+    isPlaying = false
   }
 
   open class func toggle() {
-    if isPlaying {
+    if isPlaying == true {
       pause()
     } else {
       play()