Skip to content

Added option to remove fullscreen- and airplay-button & Added images to assets-folder #20

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

Open
jpunz wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Added option to remove fullscreen- and airplay-button & Added images to assets-folder #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
840248b
Added option to remove fullscreen- and airplay-button
jpunz Jul 5, 2017
9242339
Bugfix: PlayButton is automatically active, even if video isn't playing
jpunz Jul 5, 2017
00eae0a
Fixed deallocation-error
jpunz Jul 7, 2017
462a0d4
Clean when dealloc
jpunz Jul 12, 2017
6a12f5e
Using AVPlayerViewController for fullscreen
jpunz Jul 12, 2017
99f506e
Allow togging fullscreen without button-tap
jpunz Aug 23, 2017
45e0d1b
Bugfix
jpunz Aug 24, 2017
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
61 changes: 5 additions & 56 deletions GUIPlayerView.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,6 @@
792DFFCE1A6BDD0900AA0606 /* UIView+UpdateAutoLayoutConstraints.m in Sources */ = {isa = PBXBuildFile; fileRef = 792DFFCD1A6BDD0900AA0606 /* UIView+UpdateAutoLayoutConstraints.m */; };
798A74631A3B269D00C611E8 /* GUIPlayerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 798A74601A3B269D00C611E8 /* GUIPlayerView.m */; };
798A74641A3B269D00C611E8 /* GUISlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 798A74621A3B269D00C611E8 /* GUISlider.m */; };
798A74721A3B57CD00C611E8 /* gui_expand@1x.png in Resources */ = {isa = PBXBuildFile; fileRef = 798A74661A3B57CD00C611E8 /* gui_expand@1x.png */; };
798A74731A3B57CD00C611E8 /* gui_expand@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 798A74671A3B57CD00C611E8 /* gui_expand@2x.png */; };
798A74741A3B57CD00C611E8 /* gui_expand@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 798A74681A3B57CD00C611E8 /* gui_expand@3x.png */; };
798A74751A3B57CD00C611E8 /* gui_pause@1x.png in Resources */ = {isa = PBXBuildFile; fileRef = 798A74691A3B57CD00C611E8 /* gui_pause@1x.png */; };
798A74761A3B57CD00C611E8 /* gui_pause@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 798A746A1A3B57CD00C611E8 /* gui_pause@2x.png */; };
798A74771A3B57CD00C611E8 /* gui_pause@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 798A746B1A3B57CD00C611E8 /* gui_pause@3x.png */; };
798A74781A3B57CD00C611E8 /* gui_play@1x.png in Resources */ = {isa = PBXBuildFile; fileRef = 798A746C1A3B57CD00C611E8 /* gui_play@1x.png */; };
798A74791A3B57CD00C611E8 /* gui_play@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 798A746D1A3B57CD00C611E8 /* gui_play@2x.png */; };
798A747A1A3B57CD00C611E8 /* gui_play@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 798A746E1A3B57CD00C611E8 /* gui_play@3x.png */; };
798A747B1A3B57CD00C611E8 /* gui_shrink@1x.png in Resources */ = {isa = PBXBuildFile; fileRef = 798A746F1A3B57CD00C611E8 /* gui_shrink@1x.png */; };
798A747C1A3B57CD00C611E8 /* gui_shrink@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 798A74701A3B57CD00C611E8 /* gui_shrink@2x.png */; };
798A747D1A3B57CD00C611E8 /* gui_shrink@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 798A74711A3B57CD00C611E8 /* gui_shrink@3x.png */; };
79B9DF061A37642100EA2C0F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 79B9DF051A37642100EA2C0F /* main.m */; };
79B9DF091A37642100EA2C0F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 79B9DF081A37642100EA2C0F /* AppDelegate.m */; };
79B9DF0C1A37642100EA2C0F /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 79B9DF0B1A37642100EA2C0F /* ViewController.m */; };
Expand All @@ -38,18 +26,6 @@
798A74601A3B269D00C611E8 /* GUIPlayerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GUIPlayerView.m; sourceTree = "<group>"; };
798A74611A3B269D00C611E8 /* GUISlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUISlider.h; sourceTree = "<group>"; };
798A74621A3B269D00C611E8 /* GUISlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GUISlider.m; sourceTree = "<group>"; };
798A74661A3B57CD00C611E8 /* gui_expand@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gui_expand@1x.png"; sourceTree = "<group>"; };
798A74671A3B57CD00C611E8 /* gui_expand@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gui_expand@2x.png"; sourceTree = "<group>"; };
798A74681A3B57CD00C611E8 /* gui_expand@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gui_expand@3x.png"; sourceTree = "<group>"; };
798A74691A3B57CD00C611E8 /* gui_pause@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gui_pause@1x.png"; sourceTree = "<group>"; };
798A746A1A3B57CD00C611E8 /* gui_pause@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gui_pause@2x.png"; sourceTree = "<group>"; };
798A746B1A3B57CD00C611E8 /* gui_pause@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gui_pause@3x.png"; sourceTree = "<group>"; };
798A746C1A3B57CD00C611E8 /* gui_play@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gui_play@1x.png"; sourceTree = "<group>"; };
798A746D1A3B57CD00C611E8 /* gui_play@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gui_play@2x.png"; sourceTree = "<group>"; };
798A746E1A3B57CD00C611E8 /* gui_play@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gui_play@3x.png"; sourceTree = "<group>"; };
798A746F1A3B57CD00C611E8 /* gui_shrink@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gui_shrink@1x.png"; sourceTree = "<group>"; };
798A74701A3B57CD00C611E8 /* gui_shrink@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gui_shrink@2x.png"; sourceTree = "<group>"; };
798A74711A3B57CD00C611E8 /* gui_shrink@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gui_shrink@3x.png"; sourceTree = "<group>"; };
79B9DF001A37642100EA2C0F /* GUIPlayerView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GUIPlayerView.app; sourceTree = BUILT_PRODUCTS_DIR; };
79B9DF041A37642100EA2C0F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
79B9DF051A37642100EA2C0F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -88,25 +64,6 @@
path = Classes;
sourceTree = "<group>";
};
798A74651A3B57CD00C611E8 /* Resources */ = {
isa = PBXGroup;
children = (
798A74661A3B57CD00C611E8 /* gui_expand@1x.png */,
798A74671A3B57CD00C611E8 /* gui_expand@2x.png */,
798A74681A3B57CD00C611E8 /* gui_expand@3x.png */,
798A74691A3B57CD00C611E8 /* gui_pause@1x.png */,
798A746A1A3B57CD00C611E8 /* gui_pause@2x.png */,
798A746B1A3B57CD00C611E8 /* gui_pause@3x.png */,
798A746C1A3B57CD00C611E8 /* gui_play@1x.png */,
798A746D1A3B57CD00C611E8 /* gui_play@2x.png */,
798A746E1A3B57CD00C611E8 /* gui_play@3x.png */,
798A746F1A3B57CD00C611E8 /* gui_shrink@1x.png */,
798A74701A3B57CD00C611E8 /* gui_shrink@2x.png */,
798A74711A3B57CD00C611E8 /* gui_shrink@3x.png */,
);
path = Resources;
sourceTree = "<group>";
};
79B9DEF71A37642100EA2C0F = {
isa = PBXGroup;
children = (
Expand All @@ -132,7 +89,6 @@
79B9DF0A1A37642100EA2C0F /* ViewController.h */,
79B9DF0B1A37642100EA2C0F /* ViewController.m */,
798A745E1A3B269D00C611E8 /* Classes */,
798A74651A3B57CD00C611E8 /* Resources */,
79B9DF0D1A37642100EA2C0F /* Main.storyboard */,
79B9DF121A37642100EA2C0F /* LaunchScreen.xib */,
79B9DF101A37642100EA2C0F /* Images.xcassets */,
Expand Down Expand Up @@ -181,6 +137,7 @@
TargetAttributes = {
79B9DEFF1A37642100EA2C0F = {
CreatedOnToolsVersion = 6.1.1;
DevelopmentTeam = 4QXNTZ5ET3;
};
};
};
Expand All @@ -207,21 +164,9 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
798A747B1A3B57CD00C611E8 /* gui_shrink@1x.png in Resources */,
79B9DF0F1A37642100EA2C0F /* Main.storyboard in Resources */,
798A74791A3B57CD00C611E8 /* gui_play@2x.png in Resources */,
798A74771A3B57CD00C611E8 /* gui_pause@3x.png in Resources */,
79B9DF141A37642100EA2C0F /* LaunchScreen.xib in Resources */,
79B9DF111A37642100EA2C0F /* Images.xcassets in Resources */,
798A74781A3B57CD00C611E8 /* gui_play@1x.png in Resources */,
798A74761A3B57CD00C611E8 /* gui_pause@2x.png in Resources */,
798A747C1A3B57CD00C611E8 /* gui_shrink@2x.png in Resources */,
798A747D1A3B57CD00C611E8 /* gui_shrink@3x.png in Resources */,
798A747A1A3B57CD00C611E8 /* gui_play@3x.png in Resources */,
798A74731A3B57CD00C611E8 /* gui_expand@2x.png in Resources */,
798A74721A3B57CD00C611E8 /* gui_expand@1x.png in Resources */,
798A74751A3B57CD00C611E8 /* gui_pause@1x.png in Resources */,
798A74741A3B57CD00C611E8 /* gui_expand@3x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -343,8 +288,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 4QXNTZ5ET3;
INFOPLIST_FILE = GUIPlayerView/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = at.jpunz.GUIPlayerView;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
Expand All @@ -353,8 +300,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 4QXNTZ5ET3;
INFOPLIST_FILE = GUIPlayerView/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = at.jpunz.GUIPlayerView;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand Down
27 changes: 17 additions & 10 deletions GUIPlayerView/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="5iB-DN-304">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="5iB-DN-304">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--GUIPlayerView-->
Expand All @@ -13,49 +18,51 @@
<viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
<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" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rm3-Hh-FJd">
<rect key="frame" x="187" y="510" width="227" height="70"/>
<rect key="frame" x="74" y="577" width="227" height="70"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SXA-jD-g65">
<rect key="frame" x="123" y="20" width="104" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="15"/>
<state key="normal" title="Remove Player">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="removePlayer:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="gBU-vI-U4n"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nwn-5c-fbu">
<rect key="frame" x="8" y="20" width="75" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="15"/>
<state key="normal" title="Add Player">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="addPlayer:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="O5P-0W-1tc"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="70" id="DGW-hD-M2O"/>
<constraint firstAttribute="width" constant="227" id="VMA-CJ-VDT"/>
</constraints>
</view>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hlD-NS-Ste">
<rect key="frame" x="195" y="304" width="208.5" height="31"/>
<rect key="frame" x="83.5" y="304" width="208.5" height="31"/>
<string key="text">© copyright 2008, Blender Foundation
www.bigbuckbunny.org</string>
<fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="13"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<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"/>
<constraints>
<constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="Rm3-Hh-FJd" secondAttribute="bottom" constant="20" id="79u-zE-Zpo"/>
<constraint firstAttribute="centerX" secondItem="hlD-NS-Ste" secondAttribute="centerX" id="ASB-Jk-F1j"/>
Expand Down
3 changes: 3 additions & 0 deletions GUIPlayerView/Classes/GUIPlayerView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@
@property (assign, nonatomic) NSInteger controllersTimeoutPeriod;
@property (weak, nonatomic) id<GUIPlayerViewDelegate> delegate;

- (instancetype)initWithFrame:(CGRect)frame showFullScreenButton:(BOOL)showFullScreenButton showAirPlayButton:(BOOL)showAirPlayButton;

- (void)prepareAndPlayAutomatically:(BOOL)playAutomatically;
- (void)clean;
- (void)play;
- (void)pause;
- (void)stop;
- (void)toggleFullscreen;

- (BOOL)isPlaying;

Expand Down
Loading