Commit 5739ca99 authored by Alex Moore's avatar Alex Moore

working on settings

parent 51e5d3ff
......@@ -11,13 +11,12 @@
784F46F31A83CF7D00EAC872 /* greyx2.png in Resources */ = {isa = PBXBuildFile; fileRef = 784F46F21A83CF7D00EAC872 /* greyx2.png */; };
784F46F61A83D47300EAC872 /* Session.m in Sources */ = {isa = PBXBuildFile; fileRef = 784F46F51A83D47300EAC872 /* Session.m */; };
7866F5EF1A9D1723006CEFEB /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7866F5EE1A9D1723006CEFEB /* AudioToolbox.framework */; };
7866F5F11A9D23B4006CEFEB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7866F5F01A9D23B4006CEFEB /* Main.storyboard */; };
78FD6B0E1A81713A00D48A92 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 78FD6B0D1A81713A00D48A92 /* main.m */; };
78FD6B111A81713A00D48A92 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 78FD6B101A81713A00D48A92 /* AppDelegate.m */; };
78FD6B171A81713A00D48A92 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 78FD6B151A81713A00D48A92 /* Main.storyboard */; };
78FD6B191A81713A00D48A92 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 78FD6B181A81713A00D48A92 /* Images.xcassets */; };
78FD6B1C1A81713A00D48A92 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 78FD6B1A1A81713A00D48A92 /* LaunchScreen.xib */; };
78FD6B281A81713B00D48A92 /* PLUCdraftTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 78FD6B271A81713B00D48A92 /* PLUCdraftTests.m */; };
78FD6B331A8175B000D48A92 /* DummyData.m in Sources */ = {isa = PBXBuildFile; fileRef = 78FD6B321A8175B000D48A92 /* DummyData.m */; };
78FD6B381A817F4500D48A92 /* greencheck.png in Resources */ = {isa = PBXBuildFile; fileRef = 78FD6B371A817F4500D48A92 /* greencheck.png */; };
78FD6B3A1A817F4D00D48A92 /* redx.png in Resources */ = {isa = PBXBuildFile; fileRef = 78FD6B391A817F4D00D48A92 /* redx.png */; };
78FD6B3D1A8185AF00D48A92 /* ScanBookViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 78FD6B3C1A8185AF00D48A92 /* ScanBookViewController.m */; };
......@@ -42,19 +41,17 @@
784F46F41A83D47300EAC872 /* Session.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Session.h; sourceTree = "<group>"; };
784F46F51A83D47300EAC872 /* Session.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Session.m; sourceTree = "<group>"; };
7866F5EE1A9D1723006CEFEB /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
7866F5F01A9D23B4006CEFEB /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
78FD6B081A81713A00D48A92 /* PLUCdraft.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PLUCdraft.app; sourceTree = BUILT_PRODUCTS_DIR; };
78FD6B0C1A81713A00D48A92 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
78FD6B0D1A81713A00D48A92 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
78FD6B0F1A81713A00D48A92 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
78FD6B101A81713A00D48A92 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
78FD6B161A81713A00D48A92 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
78FD6B181A81713A00D48A92 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
78FD6B1B1A81713A00D48A92 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
78FD6B211A81713B00D48A92 /* PLUCdraftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PLUCdraftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
78FD6B261A81713B00D48A92 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
78FD6B271A81713B00D48A92 /* PLUCdraftTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PLUCdraftTests.m; sourceTree = "<group>"; };
78FD6B311A8175B000D48A92 /* DummyData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DummyData.h; sourceTree = "<group>"; };
78FD6B321A8175B000D48A92 /* DummyData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DummyData.m; sourceTree = "<group>"; };
78FD6B371A817F4500D48A92 /* greencheck.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = greencheck.png; sourceTree = "<group>"; };
78FD6B391A817F4D00D48A92 /* redx.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = redx.png; sourceTree = "<group>"; };
78FD6B3B1A8185AF00D48A92 /* ScanBookViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScanBookViewController.h; sourceTree = "<group>"; };
......@@ -108,17 +105,15 @@
78FD6B0A1A81713A00D48A92 /* PLUCdraft */ = {
isa = PBXGroup;
children = (
7866F5F01A9D23B4006CEFEB /* Main.storyboard */,
78FD6B0F1A81713A00D48A92 /* AppDelegate.h */,
78FD6B101A81713A00D48A92 /* AppDelegate.m */,
78FD6B371A817F4500D48A92 /* greencheck.png */,
784F46F01A83CF7700EAC872 /* greycheck2.png */,
784F46F21A83CF7D00EAC872 /* greyx2.png */,
78FD6B391A817F4D00D48A92 /* redx.png */,
78FD6B411A818D3000D48A92 /* SectionTableViewController.h */,
78FD6B421A818D3100D48A92 /* SectionTableViewController.m */,
78FD6B311A8175B000D48A92 /* DummyData.h */,
78FD6B321A8175B000D48A92 /* DummyData.m */,
78FD6B391A817F4D00D48A92 /* redx.png */,
78FD6B151A81713A00D48A92 /* Main.storyboard */,
EF5D7C131A93E7F7005FD90F /* SettingsViewController.h */,
EF5D7C141A93E7F7005FD90F /* SettingsViewController.m */,
784F46F41A83D47300EAC872 /* Session.h */,
......@@ -240,10 +235,10 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
7866F5F11A9D23B4006CEFEB /* Main.storyboard in Resources */,
784F46F11A83CF7700EAC872 /* greycheck2.png in Resources */,
78FD6B381A817F4500D48A92 /* greencheck.png in Resources */,
78FD6B3A1A817F4D00D48A92 /* redx.png in Resources */,
78FD6B171A81713A00D48A92 /* Main.storyboard in Resources */,
78FD6B1C1A81713A00D48A92 /* LaunchScreen.xib in Resources */,
784F46F31A83CF7D00EAC872 /* greyx2.png in Resources */,
78FD6B191A81713A00D48A92 /* Images.xcassets in Resources */,
......@@ -265,7 +260,6 @@
buildActionMask = 2147483647;
files = (
78FD6B461A81929200D48A92 /* LogInViewController.m in Sources */,
78FD6B331A8175B000D48A92 /* DummyData.m in Sources */,
EF5D7C151A93E7F7005FD90F /* SettingsViewController.m in Sources */,
78FD6B3D1A8185AF00D48A92 /* ScanBookViewController.m in Sources */,
78FD6B111A81713A00D48A92 /* AppDelegate.m in Sources */,
......@@ -294,14 +288,6 @@
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
78FD6B151A81713A00D48A92 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
78FD6B161A81713A00D48A92 /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
78FD6B1A1A81713A00D48A92 /* LaunchScreen.xib */ = {
isa = PBXVariantGroup;
children = (
......
......@@ -7,6 +7,7 @@
//
#import "AppDelegate.h"
#import "ScanBookViewController.h"
@interface AppDelegate ()
......@@ -17,6 +18,8 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// Override point for customization after application launch.
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
return YES;
}
......
This diff is collapsed.
......@@ -12,6 +12,8 @@
@interface ScanBookViewController : UIViewController
@property Session *session;
@property (nonatomic) BOOL *vibrate;
@property (nonatomic) BOOL contScan;
@property (nonatomic) int volume;
@end
......@@ -8,6 +8,7 @@
#import "ScanBookViewController.h"
#import "SectionTableViewController.h"
#import <AudioToolbox/AudioToolbox.h>
static int BOOK_ID_LENGTH = 13;
......@@ -31,6 +32,7 @@ static int BOOK_ID_LENGTH = 13;
@synthesize imgCheck;
@synthesize imgX;
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
......@@ -55,7 +57,9 @@ static int BOOK_ID_LENGTH = 13;
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
if([segue.destinationViewController isKindOfClass:[SectionTableViewController class]]) {
// TELL OCI TO END SESSION aka exit out of page
}
}
......@@ -101,16 +105,10 @@ static int BOOK_ID_LENGTH = 13;
if(random < 5) {
//green check
[self changeCheckImage];
if(_vibrate) {
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
}
} else {
//red x
[self changeXImage];
if(_vibrate) {
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
}
}
......
......@@ -11,12 +11,13 @@
@interface SettingsViewController ()
@property (weak, nonatomic) IBOutlet UISwitch *switchContScan;
@property (weak, nonatomic) IBOutlet UISwitch *switchVibrate;
@property (weak, nonatomic) IBOutlet UISwitch *switchSound;
- (IBAction)switchVibrateChange:(id)sender;
- (IBAction)switchContScanChange:(id)sender;
@property BOOL contScan;
@property int volume;
@end
@implementation SettingsViewController
......@@ -32,18 +33,23 @@
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
ScanBookViewController *dest = [segue destinationViewController];
dest.contScan = _contScan;
}
*/
- (IBAction)switchVibrateChange:(id)sender {
ScanBookViewController *view = [[ScanBookViewController alloc] initWithNibName:@"ScanBookViewController" bundle:nil];
view.vibrate = _switchVibrate.on;
- (IBAction)switchContScanChange:(id)sender {
_contScan = _switchContScan.on;
}
@end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment