Skip to content
This repository has been archived by the owner on Nov 24, 2021. It is now read-only.

Commit

Permalink
use NPOStream version 0.0.6 and created a cleaner layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@hollanderbart
hollanderbart committed Nov 2, 2017
1 parent 4d1c346 commit 307d005
Show file tree
Hide file tree
Showing 48 changed files with 534 additions and 399 deletions.
39 changes: 30 additions & 9 deletions NPO Live.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
511C0F551C06388D00B15BDA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 511C0F521C06388D00B15BDA /* Main.storyboard */; };
511C0F561C06388D00B15BDA /* BigChannelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511C0F531C06388D00B15BDA /* BigChannelCell.swift */; };
511C0F571C06388D00B15BDA /* SmallChannelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511C0F541C06388D00B15BDA /* SmallChannelCell.swift */; };
511C0F5A1C06389D00B15BDA /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511C0F581C06389D00B15BDA /* ViewController.swift */; };
511C0F5A1C06389D00B15BDA /* TVCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511C0F581C06389D00B15BDA /* TVCollection.swift */; };
511C0F5B1C06389D00B15BDA /* PlayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511C0F591C06389D00B15BDA /* PlayerViewController.swift */; };
511C0F5E1C0638A600B15BDA /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511C0F5C1C0638A600B15BDA /* String+Extension.swift */; };
511C0F5F1C0638A600B15BDA /* NSURL+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511C0F5D1C0638A600B15BDA /* NSURL+Extension.swift */; };
Expand All @@ -28,7 +28,7 @@
511C0F521C06388D00B15BDA /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
511C0F531C06388D00B15BDA /* BigChannelCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BigChannelCell.swift; sourceTree = "<group>"; };
511C0F541C06388D00B15BDA /* SmallChannelCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmallChannelCell.swift; sourceTree = "<group>"; };
511C0F581C06389D00B15BDA /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
511C0F581C06389D00B15BDA /* TVCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TVCollection.swift; sourceTree = "<group>"; };
511C0F591C06389D00B15BDA /* PlayerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlayerViewController.swift; sourceTree = "<group>"; };
511C0F5C1C0638A600B15BDA /* String+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = "<group>"; };
511C0F5D1C0638A600B15BDA /* NSURL+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSURL+Extension.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -79,7 +79,7 @@
511C0F4C1C06385900B15BDA /* Control */ = {
isa = PBXGroup;
children = (
511C0F581C06389D00B15BDA /* ViewController.swift */,
511C0F581C06389D00B15BDA /* TVCollection.swift */,
511C0F591C06389D00B15BDA /* PlayerViewController.swift */,
);
name = Control;
Expand Down Expand Up @@ -173,13 +173,13 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0710;
LastUpgradeCheck = 0910;
ORGANIZATIONNAME = "Maurice van Breukelen";
TargetAttributes = {
5123DB851C008A1A00F86B26 = {
CreatedOnToolsVersion = 7.1.1;
DevelopmentTeam = Z8Q4P9RU5D;
LastSwiftMigration = 0830;
LastSwiftMigration = 0910;
};
};
};
Expand Down Expand Up @@ -226,7 +226,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
45CF58D25F30D26B2E8F1576 /* [CP] Copy Pods Resources */ = {
Expand Down Expand Up @@ -267,7 +267,7 @@
buildActionMask = 2147483647;
files = (
511C0F5E1C0638A600B15BDA /* String+Extension.swift in Sources */,
511C0F5A1C06389D00B15BDA /* ViewController.swift in Sources */,
511C0F5A1C06389D00B15BDA /* TVCollection.swift in Sources */,
511C0F5F1C0638A600B15BDA /* NSURL+Extension.swift in Sources */,
511C0F501C06387700B15BDA /* AppDelegate.swift in Sources */,
511C0F571C06388D00B15BDA /* SmallChannelCell.swift in Sources */,
Expand All @@ -288,13 +288,21 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
Expand Down Expand Up @@ -333,13 +341,21 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
Expand All @@ -356,6 +372,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = appletvos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
Expand All @@ -375,10 +392,12 @@
"\"$(PROJECT_DIR)/NPO Live\"",
);
INFOPLIST_FILE = "NPO Live/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "bdh.NPO-Live";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
TVOS_DEPLOYMENT_TARGET = 11.0;
};
name = Debug;
};
Expand All @@ -394,10 +413,12 @@
"\"$(PROJECT_DIR)/NPO Live\"",
);
INFOPLIST_FILE = "NPO Live/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "bdh.NPO-Live";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
TVOS_DEPLOYMENT_TARGET = 11.0;
};
name = Release;
};
Expand Down
8 changes: 4 additions & 4 deletions NPO Live/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@

import UIKit

let gitHubURL = "https://api.github.com/repos/Mauricevb/NPO-Live-Apple-TV-4/releases"
//let gitHubURL = "https://api.github.com/repos/Mauricevb/NPO-Live-Apple-TV-4/releases"

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
checkForNewVersions()
// checkForNewVersions()
return true
}

func checkForNewVersions() {
// func checkForNewVersions() {
// guard let currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String else { return }
//
// let URL = Foundation.URL(string: gitHubURL)
Expand Down Expand Up @@ -54,5 +54,5 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// })
//
// task.resume()
}
// }
}
4 changes: 4 additions & 0 deletions ...andassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"idiom" : "tv",
"filename" : "bg.jpg",
"scale" : "1x"
},
{
"idiom" : "tv",
"scale" : "2x"
}
],
"info" : {
Expand Down
4 changes: 4 additions & 0 deletions ...ndassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"idiom" : "tv",
"filename" : "npo.png",
"scale" : "1x"
},
{
"idiom" : "tv",
"scale" : "2x"
}
],
"info" : {
Expand Down
4 changes: 4 additions & 0 deletions ...dassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"idiom" : "tv",
"filename" : "orange.png",
"scale" : "1x"
},
{
"idiom" : "tv",
"scale" : "2x"
}
],
"info" : {
Expand Down
4 changes: 4 additions & 0 deletions ...andassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"idiom" : "tv",
"filename" : "bg.png",
"scale" : "1x"
},
{
"idiom" : "tv",
"scale" : "2x"
}
],
"info" : {
Expand Down
4 changes: 4 additions & 0 deletions ...ndassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"idiom" : "tv",
"filename" : "npo.png",
"scale" : "1x"
},
{
"idiom" : "tv",
"scale" : "2x"
}
],
"info" : {
Expand Down
4 changes: 4 additions & 0 deletions ...dassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"idiom" : "tv",
"filename" : "orange.png",
"scale" : "1x"
},
{
"idiom" : "tv",
"scale" : "2x"
}
],
"info" : {
Expand Down
4 changes: 4 additions & 0 deletions ...assets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
{
"idiom" : "tv",
"scale" : "1x"
},
{
"idiom" : "tv",
"scale" : "2x"
}
],
"info" : {
Expand Down
4 changes: 4 additions & 0 deletions ...ts.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"idiom" : "tv",
"filename" : "TopShelfImage.jpg",
"scale" : "1x"
},
{
"idiom" : "tv",
"scale" : "2x"
}
],
"info" : {
Expand Down
7 changes: 7 additions & 0 deletions NPO Live/Assets.xcassets/LaunchImage.launchimage/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"images" : [
{
"orientation" : "landscape",
"idiom" : "tv",
"extent" : "full-screen",
"minimum-system-version" : "11.0",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "tv",
Expand Down
2 changes: 1 addition & 1 deletion NPO Live/Assets.xcassets/NPO 1.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "npo_1.png",
"filename" : "NPO_1.png",
"scale" : "1x"
},
{
Expand Down
Binary file added NPO Live/Assets.xcassets/NPO 1.imageset/NPO_1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed NPO Live/Assets.xcassets/NPO 1.imageset/npo_1.png
View file
Binary file not shown.
Binary file modified NPO Live/Assets.xcassets/NPO 101.imageset/npo_101.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion NPO Live/Assets.xcassets/NPO 2.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "npo_2.png",
"filename" : "NPO_2.png",
"scale" : "1x"
},
{
Expand Down
Binary file added NPO Live/Assets.xcassets/NPO 2.imageset/NPO_2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed NPO Live/Assets.xcassets/NPO 2.imageset/npo_2.png
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion NPO Live/Assets.xcassets/NPO 3.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "npo_3.png",
"filename" : "NPO_3.png",
"scale" : "1x"
},
{
Expand Down
Binary file added NPO Live/Assets.xcassets/NPO 3.imageset/NPO_3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed NPO Live/Assets.xcassets/NPO 3.imageset/npo_3.png
View file
Binary file not shown.
Binary file modified NPO Live/Assets.xcassets/NPO 3FM.imageset/npo_3fm.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified NPO Live/Assets.xcassets/NPO Cultura.imageset/npo_cultura.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified NPO Live/Assets.xcassets/NPO FunX.imageset/npo_funx.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified NPO Live/Assets.xcassets/NPO Nieuws.imageset/npo_nieuws.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified NPO Live/Assets.xcassets/NPO Politiek.imageset/npo_politiek.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified NPO Live/Assets.xcassets/NPO Radio 1.imageset/npo_radio1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified NPO Live/Assets.xcassets/NPO Radio 2.imageset/npo_radio2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified NPO Live/Assets.xcassets/NPO Radio 4.imageset/npo_radio4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified NPO Live/Assets.xcassets/NPO Radio 5.imageset/npo_radio5.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified NPO Live/Assets.xcassets/NPO Radio 6.imageset/npo_radio6.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified NPO Live/Assets.xcassets/NPO Zapp.imageset/npo_zapp.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 307d005

Please sign in to comment.