Skip to content

Commit

Permalink
Removoing old content & replacing with new
Browse files Browse the repository at this point in the history
  • Loading branch information
kylekellogg committed Nov 8, 2016
1 parent 7456322 commit bfc06d8
Show file tree
Hide file tree
Showing 130 changed files with 4,356 additions and 3,742 deletions.
Binary file added Info-100.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
479 changes: 479 additions & 0 deletions R5ProTestbed.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -0,0 +1,30 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "DC7F46286BABB1E7799F2C699656855D2AE74077",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {

},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"DC7F46286BABB1E7799F2C699656855D2AE74077" : 0,
"15C55C8AB61EA81651E461AB17DC0E083B9C3718" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "6C0F4670-3F5B-4F41-933B-E0E7F0DA8FF3",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"DC7F46286BABB1E7799F2C699656855D2AE74077" : "ios-streaming-testbed\/",
"15C55C8AB61EA81651E461AB17DC0E083B9C3718" : "red5pro-core-streaming-library\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "R5ProTestbed",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "R5ProTestbed.xcodeproj",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/infrared5\/red5pro-core-streaming-library.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "15C55C8AB61EA81651E461AB17DC0E083B9C3718"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/infrared5\/ios-streaming-testbed.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "DC7F46286BABB1E7799F2C699656855D2AE74077"
}
]
}
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "48DFEDA71C21BBC60040B624"
BuildableName = "R5ProTestbed.app"
BlueprintName = "R5ProTestbed"
ReferencedContainer = "container:R5ProTestbed.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "48DFEDA71C21BBC60040B624"
BuildableName = "R5ProTestbed.app"
BlueprintName = "R5ProTestbed"
ReferencedContainer = "container:R5ProTestbed.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "48DFEDA71C21BBC60040B624"
BuildableName = "R5ProTestbed.app"
BlueprintName = "R5ProTestbed"
ReferencedContainer = "container:R5ProTestbed.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "48DFEDA71C21BBC60040B624"
BuildableName = "R5ProTestbed.app"
BlueprintName = "R5ProTestbed"
ReferencedContainer = "container:R5ProTestbed.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
2 changes: 1 addition & 1 deletion Red5ProStreaming/ALToastView/ALToastView.h → R5ProTestbed/ALToastView.h 100644 → 100755
Expand Up @@ -33,4 +33,4 @@

+ (void)toastInView:(UIView *)parentView withText:(NSString *)text;

@end
@end
70 changes: 35 additions & 35 deletions Red5ProStreaming/ALToastView/ALToastView.m → R5ProTestbed/ALToastView.m 100644 → 100755
Expand Up @@ -92,7 +92,7 @@ - (id)initWithText:(NSString *)text {
+ (void)toastInView:(UIView *)parentView withText:(NSString *)text {
// Add new instance to queue
ALToastView *view = [[ALToastView alloc] initWithText:text];

CGFloat lWidth = view.textLabel.frame.size.width;
CGFloat lHeight = view.textLabel.frame.size.height;
CGFloat pWidth = parentView.bounds.size.width;
Expand All @@ -110,7 +110,7 @@ + (void)toastInView:(UIView *)parentView withText:(NSString *)text {
else {
[toasts addObject:view];
}

}


Expand All @@ -119,32 +119,32 @@ + (void)toastInView:(UIView *)parentView withText:(NSString *)text {

- (void)fadeToastOut {
// Fade in parent view
[UIView animateWithDuration:0.3 delay:0 options:UIViewAnimationOptionAllowUserInteraction

animations:^{
self.alpha = 0.f;
[UIView animateWithDuration:0.3 delay:0 options:UIViewAnimationOptionAllowUserInteraction

animations:^{
self.alpha = 0.f;
}
completion:^(BOOL finished){
UIView *parentView = self.superview;
[self removeFromSuperview];

// Remove current view from array
[toasts removeObject:self];
if ([toasts count] == 0) {

toasts = nil;
}
completion:^(BOOL finished){
UIView *parentView = self.superview;
[self removeFromSuperview];

// Remove current view from array
[toasts removeObject:self];
if ([toasts count] == 0) {

toasts = nil;
}
else
[ALToastView nextToastInView:parentView];
}];
else
[ALToastView nextToastInView:parentView];
}];
}


+ (void)nextToastInView:(UIView *)parentView {
if ([toasts count] > 0) {
ALToastView *view = [toasts objectAtIndex:0];
// NSLog(@"Showing toast with text: %@", view.textLabel.text);
ALToastView *view = [toasts objectAtIndex:0];

// NSLog(@"Showing toast with text: %@", view.textLabel.text);

CGFloat lWidth = view.textLabel.frame.size.width;
CGFloat lHeight = view.textLabel.frame.size.height;
Expand All @@ -153,20 +153,20 @@ + (void)nextToastInView:(UIView *)parentView {

// Change toastview frame
view.frame = CGRectMake((pWidth - lWidth - 20) / 2., pHeight - lHeight - 60, lWidth + 20, lHeight + 10);

// Fade into parent view
[parentView addSubview:view];
[UIView animateWithDuration:.5 delay:0 options:UIViewAnimationOptionAllowUserInteraction
animations:^{
view.alpha = 1.0;
[parentView updateConstraints];
[parentView layoutIfNeeded];
} completion:^(BOOL finished){}];
// Start timer for fade out
[view performSelector:@selector(fadeToastOut) withObject:nil afterDelay:kDuration];
}
[UIView animateWithDuration:.5 delay:0 options:UIViewAnimationOptionAllowUserInteraction
animations:^{
view.alpha = 1.0;
[parentView updateConstraints];
[parentView layoutIfNeeded];

} completion:^(BOOL finished){}];

// Start timer for fade out
[view performSelector:@selector(fadeToastOut) withObject:nil afterDelay:kDuration];
}
}

@end
@end
71 changes: 71 additions & 0 deletions R5ProTestbed/AppDelegate.swift
@@ -0,0 +1,71 @@
//
// AppDelegate.swift
// R5ProTestbed
//
// Created by Andy Zupko on 12/16/15.
// Copyright © 2015 Infrared5. All rights reserved.
//

import UIKit

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDelegate {

var window: UIWindow?


func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
// Override point for customization after application launch.




let t = Testbed.sharedInstance

let d = Testbed.dictionary
NSLog((Testbed.testAtIndex(0)?.description)!)
//NSLog(Testbed.sharedInstance.testWithId("publish")!.description)

let splitViewController = self.window!.rootViewController as! UISplitViewController
let navigationController = splitViewController.viewControllers[splitViewController.viewControllers.count-1] as! UINavigationController
navigationController.topViewController!.navigationItem.leftBarButtonItem = splitViewController.displayModeButtonItem()
splitViewController.delegate = self
return true
}

func applicationWillResignActive(application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
}

func applicationDidEnterBackground(application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}

func applicationWillEnterForeground(application: UIApplication) {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
}

func applicationDidBecomeActive(application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}

func applicationWillTerminate(application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}

// MARK: - Split view

func splitViewController(splitViewController: UISplitViewController, collapseSecondaryViewController secondaryViewController:UIViewController, ontoPrimaryViewController primaryViewController:UIViewController) -> Bool {
guard let secondaryAsNavController = secondaryViewController as? UINavigationController else { return false }
guard let topAsDetailController = secondaryAsNavController.topViewController as? DetailViewController else { return false }
if topAsDetailController.detailItem == nil {
// Return true to indicate that we have handled the collapse by doing nothing; the secondary controller will be discarded.
return true
}
return false
}

}

Expand Up @@ -59,6 +59,11 @@
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
}
],
"info" : {
Expand Down
27 changes: 27 additions & 0 deletions R5ProTestbed/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<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"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
</document>

0 comments on commit bfc06d8

Please sign in to comment.