Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
7c2439b
made portrait only,red border
Nov 8, 2013
046545c
Adding export buttons
spencerlambert Nov 8, 2013
0103c8c
export/unlock initial commit
Nov 9, 2013
17823d1
updating feature unlock
Nov 12, 2013
8e743f4
Timeline recording initial commit
Nov 12, 2013
69eb795
updating feature unlock
Nov 13, 2013
ebf609c
updating feature unlock
Nov 14, 2013
7f5d1d8
Fixing code for Loaderview bug reported by Apple
Nov 14, 2013
d8e6b62
fixed error in feature unlock
Nov 15, 2013
8c6872a
Updating code for timeline Recording
Nov 15, 2013
7c41575
implemented save video to gallery, split view iPad
Nov 16, 2013
d318583
Fixed ipad navigation list sizes
spencerlambert Nov 17, 2013
cd71b44
Adding new buttons and modifications for export feature
spencerlambert Nov 17, 2013
18b7fe6
made the modifications
Nov 19, 2013
365a84f
Changed the file name of the export feature
spencerlambert Nov 19, 2013
4719eb3
Implementing timeline Recording.
Nov 19, 2013
3b189c1
adding modifications
Nov 19, 2013
a439c2e
fixing issues in feature unlock
Nov 19, 2013
9d41259
fixing issues in Stroto Basic
Nov 20, 2013
c91f89e
fixing fg image on top of another fg image stroto Basic
Nov 21, 2013
2384992
Adding logging of json string
Nov 21, 2013
d19977b
Adding story packs with real names, removing others.
spencerlambert Nov 21, 2013
c87d411
Merge remote-tracking branch 'origin/master'
spencerlambert Nov 21, 2013
6244ab3
fixing db file
spencerlambert Nov 21, 2013
94b5caf
Implementing changes in StoryPackViewController for connection bug
Nov 21, 2013
ec4ee2e
Adding improved json calls
spencerlambert Nov 21, 2013
ef61410
Adding APPLE DOWN reply
Nov 21, 2013
b5d11f2
Merge remote-tracking branch 'origin/master'
Nov 21, 2013
b95cde1
fixed stroto basic pages issue, working on storytelling
Nov 22, 2013
f31cfbb
working on issues
Nov 23, 2013
1213fe5
Fixing JSON load for adhoc installs
spencerlambert Nov 23, 2013
4dbffe3
Changing product id for production
spencerlambert Nov 23, 2013
6cf627a
Fixing video title merge
spencerlambert Nov 23, 2013
1943d9d
Adding improvments for all movie upload/export features
spencerlambert Nov 24, 2013
72c8f6b
Fixing aspect of FG PNG images
spencerlambert Nov 24, 2013
8401890
Improving FG Image editing
spencerlambert Nov 24, 2013
78706a9
removing file
spencerlambert Nov 25, 2013
7fe11f3
Small changes to basic
spencerlambert Nov 25, 2013
fc36a2b
Getting basic version ready to submit
spencerlambert Nov 25, 2013
b8f63b1
Updating code for STStageRecorder
Nov 25, 2013
8bcf442
fix for pre-installed story packs
Nov 26, 2013
d47050a
adding three pigs
Nov 26, 2013
5d190e2
pulling price from appstore for export
Nov 26, 2013
8e3bfc7
Updating the app graphic
spencerlambert Nov 27, 2013
061d6c7
Merge remote-tracking branch 'origin/master'
spencerlambert Nov 27, 2013
f03bad5
Change with Do not backup flag for storypacks
Nov 27, 2013
c342aee
Merge remote-tracking branch 'origin/master'
spencerlambert Nov 27, 2013
2d5bec6
update for install crash
Nov 27, 2013
b2425c5
Merge remote-tracking branch 'origin/master'
spencerlambert Nov 27, 2013
acddf22
fix for do not backup
Nov 27, 2013
ed2d0e7
Merge remote-tracking branch 'origin/master'
spencerlambert Nov 27, 2013
d19e579
update for crash test
Nov 28, 2013
6cd8e46
Merge remote-tracking branch 'origin/master'
spencerlambert Nov 28, 2013
fa9df9f
Implementing tmp folder
Nov 28, 2013
4e5c2d2
Some more files with Implementing tmp folder
Nov 28, 2013
9b33923
fix for random crash, added code for price in paid controller
Nov 29, 2013
f04b03c
Merge remote-tracking branch 'origin/master'
spencerlambert Nov 29, 2013
b308f44
Merging code that builds movie in tmp folder
spencerlambert Nov 29, 2013
669a48a
Cleaning out tmp folder on launch and exit
spencerlambert Nov 30, 2013
c8a9cfc
Thumbnail image was just a duplicate of the main image, removed it.
spencerlambert Dec 1, 2013
9c93f46
fix for export
Dec 2, 2013
d248628
updating App
Dec 2, 2013
6b78e7d
disabling save and upload buttons
Dec 3, 2013
f7a3ee4
working on stroto basic
Dec 5, 2013
bd75180
working on stroto basic
Dec 6, 2013
aa45523
working on download, updating strotobasic
Dec 9, 2013
2a0c5ca
Implementing timeline recording
Dec 10, 2013
e66e99e
working on issues, stroto basic download
Dec 10, 2013
1d54547
Changes on STStage
Dec 16, 2013
3f3bc9d
Implementing STStagePlayer
Dec 19, 2013
6926c5f
DB Methods for implementing STStagePlayer
Dec 20, 2013
de1871e
Updated files of STStagePlayer
Dec 30, 2013
062edd8
Implementing Playback
Dec 31, 2013
604f3fb
Implemented playback feature
Jan 3, 2014
860065d
Saving rotate, scale values to db
Jan 8, 2014
9bfce69
Implementing Player Controller
Jan 10, 2014
65f9144
PlayViewController changes
Jan 10, 2014
0e8bd6d
Implemented pan gesture animation
Jan 15, 2014
4b2327c
Implemented pan and pinch gesture animations.
Jan 16, 2014
933e328
Solving issues in playback while rotating and scaling
Jan 17, 2014
50ff8b8
Implemented Done button in player controller
Jan 20, 2014
8b75961
Modifications in playercontroller
Jan 21, 2014
17b07bc
Play/Pause button. slider in Player View Controller & Edit/Record Mor…
Jan 23, 2014
c0190ff
Update in player view in initial scaling and rotation
Jan 28, 2014
4423926
Changes in playback view
Jan 31, 2014
84243cb
Implementing NStimer for slider
Feb 3, 2014
7df8c23
Audio implementation using db
Feb 7, 2014
2b96556
Implementation of STAudioRecorder
Feb 12, 2014
3771338
Implementing New Player View controller
Feb 27, 2014
9b5956b
Selection of frames from timeline for presenting
Feb 28, 2014
d12b1a5
Implemented New playerviewController
Mar 3, 2014
bdd85d8
Implemented Audio playback from timeline
Mar 7, 2014
5e006d4
Fixed issue with DB Locking
Mar 11, 2014
c6ec49c
Gave priority vale for bg images
Mar 14, 2014
e13bda7
Fixed issue with dismissal of fg images
Mar 19, 2014
5f30925
Working with Modifiers
Mar 24, 2014
c528c0d
Implementing Modifiers
Apr 1, 2014
4b3f01c
Implementing Upload video
Apr 3, 2014
003a9b1
Upload feature
Apr 9, 2014
36a6a20
Resolved grey title screen issue with youtube upload
Apr 16, 2014
ee0b418
Changes in STStageExporterFrame
Apr 29, 2014
bb0642a
Changes with youtube video upload
May 9, 2014
8c4e307
Code for Youtube Upload
May 12, 2014
03f2176
Updating code with complete youtube upload
May 13, 2014
219434c
Fix for upload to facebook from video generated from database
Jun 4, 2014
fae3da4
Update README.md
spencerlambert Nov 6, 2015
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
isp_helper
stroto
==========

This stores different projects that ISP Helper is working on.
The stroto app.
8 changes: 7 additions & 1 deletion StoryApp/StoryPackSite/html/index.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<?php
include_once('config/config.php');
include_once('include/functions.php');
include_once('config/db_config.php');

$json_string = file_get_contents('php://input');

//Log data
$sql = "INSERT INTO Log (LogDateTime, IPAddress, JSON) VALUES (NOW(), '".$_SERVER['REMOTE_ADDR']."', '".mysql_escape_string($json_string)."')";
$res = mysql_query($sql, $db_storypack);


$json_data = json_decode($json_string);

if (!isset($json_data->st_request)) {
$error_txt = "no st_request";
include('include/error_reply.php');
}

include_once('config/db_config.php');

switch ($json_data->st_request) {
case "get_free_list":
Expand Down
4 changes: 4 additions & 0 deletions StoryApp/StoryPackSite/html/request/purchase.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
include('include/error_reply.php');
}

if (trim($apple_receipt) == "APPLE DOWN") {
$error_txt = "Apple Server Down";
include('include/error_reply.php');
}

//Save Purchase

Expand Down
6 changes: 6 additions & 0 deletions StoryApp/StoryPackSite/sql/database.sql
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,9 @@ CREATE TABLE `Purchase` (
KEY (`StoryPackID`),
KEY (`PurchaseDate`)
);

CREATE TABLE `Log` (
`LogDateTime` datetime,
`IPAddress` varchar(30),
`JSON` varchar(100)
);
Binary file not shown.
116 changes: 108 additions & 8 deletions StoryApp/iOS/StoryTelling/StoryTelling.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,48 @@
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>CCF74EAA-60C7-410B-955E-AA995DFF8F14</string>
<string>6EC8D052-2F83-4861-AEC0-864C4341EFA3</string>
<key>IDESourceControlProjectName</key>
<string>StoryTelling</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>699C2B5F-CB76-4312-9054-A8BCAACA5C01</key>
<string>ssh://github.com/spencerlambert/isp_helper.git</string>
<key>4A26DFB6-4001-471B-8E25-B404841432BE</key>
<string>https://github.com/vnspencer/StoryTelling.git</string>
<key>D4E0416E-CB9E-474E-9525-0FD76BE3306F</key>
<string>https://github.com/spencerlambert/isp_helper.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>StoryApp/iOS/StoryTelling/StoryTelling.xcodeproj/project.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>699C2B5F-CB76-4312-9054-A8BCAACA5C01</key>
<key>4A26DFB6-4001-471B-8E25-B404841432BE</key>
<string>../..</string>
<key>D4E0416E-CB9E-474E-9525-0FD76BE3306F</key>
<string>../../../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>ssh://github.com/spencerlambert/isp_helper.git</string>
<string>https://github.com/vnspencer/StoryTelling.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>110</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>699C2B5F-CB76-4312-9054-A8BCAACA5C01</string>
<string>D4E0416E-CB9E-474E-9525-0FD76BE3306F</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>699C2B5F-CB76-4312-9054-A8BCAACA5C01</string>
<string>D4E0416E-CB9E-474E-9525-0FD76BE3306F</string>
<key>IDESourceControlWCCName</key>
<string>isp_helper</string>
<string>spence</string>
</dict>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>4A26DFB6-4001-471B-8E25-B404841432BE</string>
<key>IDESourceControlWCCName</key>
<string>StoryTelling</string>
</dict>
</array>
</dict>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "StoryTelling/SlideLeftView.m"
timestampString = "390958836.224978"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "128"
endingLineNumber = "128"
landmarkName = "-startrecordingbtn_clicked"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "STTestViewController.mm"
timestampString = "396508623.509655"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "28"
endingLineNumber = "28"
landmarkName = "-cvMatFromUIImage:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "StoryTelling/STFacebookViewController.m"
timestampString = "423582079.126713"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "439"
endingLineNumber = "439"
landmarkName = "-CompileFilesToMakeMovie"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "StoryTelling/STFacebookViewController.m"
timestampString = "423582086.39852"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "445"
endingLineNumber = "445"
landmarkName = "-CompileFilesToMakeMovie"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "StoryTelling/STFacebookViewController.m"
timestampString = "423582088.542412"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "443"
endingLineNumber = "443"
landmarkName = "-CompileFilesToMakeMovie"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "StoryTelling/STFacebookViewController.m"
timestampString = "423582091.014795"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "455"
endingLineNumber = "455"
landmarkName = "-CompileFilesToMakeMovie"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "StoryTelling/STFacebookViewController.m"
timestampString = "423582092.590608"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "449"
endingLineNumber = "449"
landmarkName = "-CompileFilesToMakeMovie"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
2 changes: 2 additions & 0 deletions StoryApp/iOS/StoryTelling/StoryTelling/AppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
@property (nonatomic,retain) NSMutableArray *backgroundImagesArray;
@property (nonatomic,retain) NSMutableArray *foregroundImagesArray;
@property (nonatomic,retain) NSString *isNewStory;
@property BOOL internetAvailable;

+(CGSize)deviceSize;
-(void)internetAvailableNotifier;

@end
39 changes: 39 additions & 0 deletions StoryApp/iOS/StoryTelling/StoryTelling/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

#import "AppDelegate.h"
#import "Reachability.h"

@implementation AppDelegate
@synthesize backgroundImagesArray;
Expand All @@ -16,9 +17,11 @@ @implementation AppDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
// Override point for customization after application launch.
[self internetAvailableNotifier];
backgroundImagesArray = [[NSMutableArray alloc]init];
foregroundImagesArray = [[NSMutableArray alloc]init];
isNewStory=@"true";
[self clearTmpDirectory];
return YES;
}

Expand Down Expand Up @@ -47,6 +50,15 @@ - (void)applicationDidBecomeActive:(UIApplication *)application
- (void)applicationWillTerminate:(UIApplication *)application
{
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
[self clearTmpDirectory];
}

- (void)clearTmpDirectory
{
NSArray* tmpDirectory = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:NSTemporaryDirectory() error:NULL];
for (NSString *file in tmpDirectory) {
[[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@%@", NSTemporaryDirectory(), file] error:NULL];
}
}

+(CGSize )deviceSize
Expand Down Expand Up @@ -78,4 +90,31 @@ +(CGSize )deviceSize
}
}

-(void)internetAvailableNotifier{
Reachability *internetReachable;

internetReachable = [Reachability reachabilityWithHostname:@"storypacks.stroto.com"];

// Internet is reachable
internetReachable.reachableBlock = ^(Reachability*reach)
{
// Update the UI on the main thread
dispatch_async(dispatch_get_main_queue(), ^{
self.internetAvailable = YES;
});
};

// Internet is not reachable
internetReachable.unreachableBlock = ^(Reachability*reach)
{
// Update the UI on the main thread
dispatch_async(dispatch_get_main_queue(), ^{
self.internetAvailable = NO;
});
};

[internetReachable startNotifier];

}

@end
2 changes: 1 addition & 1 deletion StoryApp/iOS/StoryTelling/StoryTelling/AudioRecorder.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ @implementation AudioRecorder

- (id)init{
startedRecording = NO;
NSString *soundFilePath = [[NSString alloc] initWithFormat:@"%@/%@", [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0], @"sound.caf"];
NSString *soundFilePath = [[NSString alloc] initWithFormat:@"%@/%@", NSTemporaryDirectory(), @"sound.caf"];
NSURL *soundFileURL = [NSURL fileURLWithPath:soundFilePath];
NSDictionary *recordSettings = [NSDictionary
dictionaryWithObjectsAndKeys:
Expand Down
1 change: 1 addition & 0 deletions StoryApp/iOS/StoryTelling/StoryTelling/BottomRight.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- (void)pausecapturingview;
- (void)resumecapturingview;


@end

@interface BottomRight : UIView{
Expand Down
Loading