Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove enum prefixes and lowercase the cases #231

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove enum prefixes and lowercase the cases #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions YouTubePlayer/YouTubePlayer/YouTubePlayer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,43 +9,43 @@
import UIKit
import WebKit

public enum YouTubePlayerState: String {
case Unstarted = "-1"
case Ended = "0"
case Playing = "1"
case Paused = "2"
case Buffering = "3"
case Queued = "4"
public enum PlayerState: String {
case unstarted = "-1"
case ended = "0"
case playing = "1"
case paused = "2"
case buffering = "3"
case queued = "4"
}

public enum YouTubePlayerEvents: String {
case YouTubeIframeAPIReady = "onYouTubeIframeAPIReady"
case Ready = "onReady"
case StateChange = "onStateChange"
case PlaybackQualityChange = "onPlaybackQualityChange"
public enum PlayerEvents: String {
case iframeAPIReady = "onYouTubeIframeAPIReady"
case ready = "onReady"
case stateChange = "onStateChange"
case playbackQualityChange = "onPlaybackQualityChange"
}

public enum YouTubePlaybackQuality: String {
case Small = "small"
case Medium = "medium"
case Large = "large"
case HD720 = "hd720"
case HD1080 = "hd1080"
case HighResolution = "highres"
public enum PlaybackQuality: String {
case small
case medium
case large
case hd720
case hd1080
case highResolution = "highres"
}

public protocol YouTubePlayerDelegate: class {
func playerReady(_ videoPlayer: YouTubePlayerView)
func playerStateChanged(_ videoPlayer: YouTubePlayerView, playerState: YouTubePlayerState)
func playerQualityChanged(_ videoPlayer: YouTubePlayerView, playbackQuality: YouTubePlaybackQuality)
func playerStateChanged(_ videoPlayer: YouTubePlayerView, playerState: PlayerState)
func playerQualityChanged(_ videoPlayer: YouTubePlayerView, playbackQuality: PlaybackQuality)
}

// Make delegate methods optional by providing default implementations
public extension YouTubePlayerDelegate {

func playerReady(_ videoPlayer: YouTubePlayerView) {}
func playerStateChanged(_ videoPlayer: YouTubePlayerView, playerState: YouTubePlayerState) {}
func playerQualityChanged(_ videoPlayer: YouTubePlayerView, playbackQuality: YouTubePlaybackQuality) {}
func playerStateChanged(_ videoPlayer: YouTubePlayerView, playerState: PlayerState) {}
func playerQualityChanged(_ videoPlayer: YouTubePlayerView, playbackQuality: PlaybackQuality) {}

}

Expand Down Expand Up @@ -94,10 +94,10 @@ open class YouTubePlayerView: UIView, WKNavigationDelegate {
fileprivate(set) open var ready = false

/** The current state of the video player */
fileprivate(set) open var playerState = YouTubePlayerState.Unstarted
fileprivate(set) open var playerState = PlayerState.unstarted

/** The current playback quality of the video player */
fileprivate(set) open var playbackQuality = YouTubePlaybackQuality.Small
fileprivate(set) open var playbackQuality = PlaybackQuality.small

/** Used to configure the player */
open var playerVars = YouTubePlayerParameters()
Expand Down Expand Up @@ -322,29 +322,29 @@ open class YouTubePlayerView: UIView, WKNavigationDelegate {
// Grab the last component of the queryString as string
let data: String? = eventURL.queryStringComponents()["data"] as? String

if let host = eventURL.host, let event = YouTubePlayerEvents(rawValue: host) {
if let host = eventURL.host, let event = PlayerEvents(rawValue: host) {

// Check event type and handle accordingly
switch event {
case .YouTubeIframeAPIReady:
case .iframeAPIReady:
ready = true
break

case .Ready:
case .ready:
delegate?.playerReady(self)

break

case .StateChange:
if let newState = YouTubePlayerState(rawValue: data!) {
case .stateChange:
if let newState = PlayerState(rawValue: data!) {
playerState = newState
delegate?.playerStateChanged(self, playerState: newState)
}

break

case .PlaybackQualityChange:
if let newQuality = YouTubePlaybackQuality(rawValue: data!) {
case .playbackQualityChange:
if let newQuality = PlaybackQuality(rawValue: data!) {
playbackQuality = newQuality
delegate?.playerQualityChanged(self, playbackQuality: newQuality)
}
Expand Down
2 changes: 1 addition & 1 deletion YouTubePlayerExample/YouTubePlayerExample/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ViewController: UIViewController {

@IBAction func play(sender: UIButton) {
if playerView.ready {
if playerView.playerState != YouTubePlayerState.Playing {
if playerView.playerState != .playing {
playerView.play()
playButton.setTitle("Pause", for: .normal)
} else {
Expand Down