Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Andrew D'Abbraccio
PLUC Inventory - Senior Design
Commits
de490a23
Commit
de490a23
authored
Feb 17, 2015
by
Alex Moore
Browse files
started settings page
parent
66329b22
Changes
7
Hide whitespace changes
Inline
Side-by-side
UI-Iteration2/.DS_Store
View file @
de490a23
No preview for this file type
UI-Iteration2/PLUCdraft/.DS_Store
View file @
de490a23
No preview for this file type
UI-Iteration2/PLUCdraft/PLUCdraft.xcodeproj/project.pbxproj
View file @
de490a23
...
...
@@ -22,7 +22,7 @@
78FD6B3D1A8185AF00D48A92
/* ScanBookViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
78FD6B3C1A8185AF00D48A92
/* ScanBookViewController.m */
;
};
78FD6B431A818D3100D48A92
/* SectionTableViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
78FD6B421A818D3100D48A92
/* SectionTableViewController.m */
;
};
78FD6B461A81929200D48A92
/* LogInViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
78FD6B451A81929200D48A92
/* LogInViewController.m */
;
};
78FD6B491A81964A00D48A92
/* Finish
ViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
78FD6B481A81964A00D48A92
/* Finish
ViewController.m */
;
};
EF5D7C151A93E7F7005FD90F
/* Settings
ViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
EF5D7C141A93E7F7005FD90F
/* Settings
ViewController.m */
;
};
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
...
...
@@ -61,8 +61,8 @@
78FD6B421A818D3100D48A92
/* SectionTableViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
SectionTableViewController.m
;
sourceTree
=
"<group>"
;
};
78FD6B441A81929200D48A92
/* LogInViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
LogInViewController.h
;
sourceTree
=
"<group>"
;
};
78FD6B451A81929200D48A92
/* LogInViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
LogInViewController.m
;
sourceTree
=
"<group>"
;
};
78FD6B471A81964A00D48A92
/* Finish
ViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
Finish
ViewController.h
;
sourceTree
=
"<group>"
;
};
78FD6B481A81964A00D48A92
/* Finish
ViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
Finish
ViewController.m
;
sourceTree
=
"<group>"
;
};
EF5D7C131A93E7F7005FD90F
/* Settings
ViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
Settings
ViewController.h
;
sourceTree
=
"<group>"
;
};
EF5D7C141A93E7F7005FD90F
/* Settings
ViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
Settings
ViewController.m
;
sourceTree
=
"<group>"
;
};
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
...
...
@@ -115,10 +115,10 @@
78FD6B321A8175B000D48A92
/* DummyData.m */
,
78FD6B391A817F4D00D48A92
/* redx.png */
,
78FD6B151A81713A00D48A92
/* Main.storyboard */
,
EF5D7C131A93E7F7005FD90F
/* SettingsViewController.h */
,
EF5D7C141A93E7F7005FD90F
/* SettingsViewController.m */
,
784F46F41A83D47300EAC872
/* Session.h */
,
784F46F51A83D47300EAC872
/* Session.m */
,
78FD6B471A81964A00D48A92
/* FinishViewController.h */
,
78FD6B481A81964A00D48A92
/* FinishViewController.m */
,
78FD6B441A81929200D48A92
/* LogInViewController.h */
,
78FD6B451A81929200D48A92
/* LogInViewController.m */
,
78FD6B3B1A8185AF00D48A92
/* ScanBookViewController.h */
,
...
...
@@ -261,8 +261,8 @@
buildActionMask
=
2147483647
;
files
=
(
78FD6B461A81929200D48A92
/* LogInViewController.m in Sources */
,
78FD6B491A81964A00D48A92
/* FinishViewController.m in Sources */
,
78FD6B331A8175B000D48A92
/* DummyData.m in Sources */
,
EF5D7C151A93E7F7005FD90F
/* SettingsViewController.m in Sources */
,
78FD6B3D1A8185AF00D48A92
/* ScanBookViewController.m in Sources */
,
78FD6B111A81713A00D48A92
/* AppDelegate.m in Sources */
,
78FD6B0E1A81713A00D48A92
/* main.m in Sources */
,
...
...
UI-Iteration2/PLUCdraft/PLUCdraft/Base.lproj/Main.storyboard
View file @
de490a23
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version=
"3.0"
toolsVersion=
"6254"
systemVersion=
"1
3F34
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
initialViewController=
"juL-Mo-vpA"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version=
"3.0"
toolsVersion=
"6254"
systemVersion=
"1
4C109
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
initialViewController=
"juL-Mo-vpA"
>
<dependencies>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"6247"
/>
<capability
name=
"Aspect ratio constraints"
minToolsVersion=
"5.1"
/>
...
...
@@ -72,7 +72,13 @@
<constraint
firstItem=
"rFc-Xp-Oik"
firstAttribute=
"leading"
secondItem=
"1dA-Bp-AXg"
secondAttribute=
"trailing"
constant=
"15"
id=
"sb6-K7-nXR"
/>
</constraints>
</view>
<navigationItem
key=
"navigationItem"
title=
"PLUC Inventory Log-In"
id=
"MTF-s9-qJz"
/>
<navigationItem
key=
"navigationItem"
title=
"PLUC Inventory Log-In"
id=
"MTF-s9-qJz"
>
<barButtonItem
key=
"rightBarButtonItem"
title=
"Settings"
id=
"m2O-gM-cFz"
>
<connections>
<segue
destination=
"SAZ-ry-SGT"
kind=
"show"
id=
"Gl6-Gc-2Nm"
/>
</connections>
</barButtonItem>
</navigationItem>
<connections>
<outlet
property=
"txtPassword"
destination=
"u4E-6x-G9M"
id=
"sbx-w0-Hox"
/>
<outlet
property=
"txtUsername"
destination=
"rFc-Xp-Oik"
id=
"Q9Z-xl-cFg"
/>
...
...
@@ -117,6 +123,68 @@
</objects>
<point
key=
"canvasLocation"
x=
"1686"
y=
"128"
/>
</scene>
<!--Settings-->
<scene
sceneID=
"lmw-fN-nDU"
>
<objects>
<viewController
id=
"SAZ-ry-SGT"
customClass=
"SettingsViewController"
sceneMemberID=
"viewController"
>
<layoutGuides>
<viewControllerLayoutGuide
type=
"top"
id=
"3JJ-GO-X0R"
/>
<viewControllerLayoutGuide
type=
"bottom"
id=
"Obq-NZ-uqV"
/>
</layoutGuides>
<view
key=
"view"
contentMode=
"scaleToFill"
id=
"eDN-A7-E2u"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"600"
height=
"600"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
heightSizable=
"YES"
/>
<subviews>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"Option 1"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"NbJ-uH-v6R"
>
<rect
key=
"frame"
x=
"16"
y=
"72"
width=
"67"
height=
"21"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"17"
/>
<color
key=
"textColor"
cocoaTouchSystemColor=
"darkTextColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"Option 3"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"rNU-nl-mOk"
>
<rect
key=
"frame"
x=
"16"
y=
"113"
width=
"67"
height=
"21"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"17"
/>
<color
key=
"textColor"
cocoaTouchSystemColor=
"darkTextColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
<switch
opaque=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"750"
verticalHuggingPriority=
"750"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
on=
"YES"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"6gf-v9-uSr"
>
<rect
key=
"frame"
x=
"535"
y=
"67"
width=
"51"
height=
"31"
/>
</switch>
<switch
opaque=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"750"
verticalHuggingPriority=
"750"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
on=
"YES"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"stA-Qc-JTS"
>
<rect
key=
"frame"
x=
"535"
y=
"108"
width=
"51"
height=
"31"
/>
</switch>
<switch
opaque=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"750"
verticalHuggingPriority=
"750"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
on=
"YES"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"GnR-Rr-KMK"
>
<rect
key=
"frame"
x=
"535"
y=
"150"
width=
"51"
height=
"31"
/>
</switch>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
misplaced=
"YES"
text=
"Option 2"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"ZVc-3t-UOP"
>
<rect
key=
"frame"
x=
"16"
y=
"155"
width=
"67"
height=
"21"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"17"
/>
<color
key=
"textColor"
cocoaTouchSystemColor=
"darkTextColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</subviews>
<color
key=
"backgroundColor"
white=
"1"
alpha=
"1"
colorSpace=
"calibratedWhite"
/>
<constraints>
<constraint
firstItem=
"GnR-Rr-KMK"
firstAttribute=
"trailing"
secondItem=
"eDN-A7-E2u"
secondAttribute=
"trailingMargin"
id=
"1SX-9m-VnT"
/>
<constraint
firstItem=
"NbJ-uH-v6R"
firstAttribute=
"leading"
secondItem=
"eDN-A7-E2u"
secondAttribute=
"leadingMargin"
id=
"BS9-VU-nln"
/>
<constraint
firstItem=
"ZVc-3t-UOP"
firstAttribute=
"leading"
secondItem=
"eDN-A7-E2u"
secondAttribute=
"leadingMargin"
id=
"Eqe-pn-XhW"
/>
<constraint
firstItem=
"rNU-nl-mOk"
firstAttribute=
"top"
secondItem=
"NbJ-uH-v6R"
secondAttribute=
"bottom"
constant=
"20"
id=
"F82-br-JDp"
/>
<constraint
firstItem=
"stA-Qc-JTS"
firstAttribute=
"trailing"
secondItem=
"eDN-A7-E2u"
secondAttribute=
"trailingMargin"
id=
"G5Q-ZB-r1f"
/>
<constraint
firstItem=
"rNU-nl-mOk"
firstAttribute=
"leading"
secondItem=
"eDN-A7-E2u"
secondAttribute=
"leadingMargin"
id=
"I7B-N6-dND"
/>
<constraint
firstItem=
"6gf-v9-uSr"
firstAttribute=
"trailing"
secondItem=
"eDN-A7-E2u"
secondAttribute=
"trailingMargin"
id=
"JDC-aQ-S98"
/>
<constraint
firstItem=
"NbJ-uH-v6R"
firstAttribute=
"top"
secondItem=
"3JJ-GO-X0R"
secondAttribute=
"bottom"
constant=
"8"
id=
"Jyq-ND-PgO"
/>
<constraint
firstItem=
"ZVc-3t-UOP"
firstAttribute=
"top"
secondItem=
"rNU-nl-mOk"
secondAttribute=
"bottom"
constant=
"20"
id=
"Rs2-Iz-3Ga"
/>
<constraint
firstItem=
"GnR-Rr-KMK"
firstAttribute=
"top"
secondItem=
"stA-Qc-JTS"
secondAttribute=
"bottom"
constant=
"11"
id=
"aG3-mb-qov"
/>
<constraint
firstItem=
"6gf-v9-uSr"
firstAttribute=
"top"
secondItem=
"3JJ-GO-X0R"
secondAttribute=
"bottom"
constant=
"3"
id=
"fta-Q9-VpT"
/>
<constraint
firstItem=
"stA-Qc-JTS"
firstAttribute=
"top"
secondItem=
"6gf-v9-uSr"
secondAttribute=
"bottom"
constant=
"10"
id=
"gyq-nq-1pJ"
/>
</constraints>
</view>
<navigationItem
key=
"navigationItem"
title=
"Settings"
id=
"fve-mW-VnO"
/>
</viewController>
<placeholder
placeholderIdentifier=
"IBFirstResponder"
id=
"OaF-GW-TCq"
userLabel=
"First Responder"
sceneMemberID=
"firstResponder"
/>
</objects>
<point
key=
"canvasLocation"
x=
"1686"
y=
"890"
/>
</scene>
<!--Scan Book ID-->
<scene
sceneID=
"Dpu-29-1z1"
>
<objects>
...
...
@@ -177,7 +245,13 @@
<constraint
firstItem=
"H7S-u0-5kF"
firstAttribute=
"trailing"
secondItem=
"STn-V1-lxQ"
secondAttribute=
"trailingMargin"
id=
"vfi-d3-lh3"
/>
</constraints>
</view>
<navigationItem
key=
"navigationItem"
title=
"Scan Book ID"
id=
"3KX-LL-wsG"
/>
<navigationItem
key=
"navigationItem"
title=
"Scan Book ID"
id=
"3KX-LL-wsG"
>
<barButtonItem
key=
"rightBarButtonItem"
title=
"Settings"
id=
"O9j-db-YGv"
>
<connections>
<segue
destination=
"SAZ-ry-SGT"
kind=
"show"
id=
"8gL-Z2-Bwx"
/>
</connections>
</barButtonItem>
</navigationItem>
<connections>
<outlet
property=
"imgCheck"
destination=
"ROA-6e-Pjx"
id=
"aHt-g1-AhY"
/>
<outlet
property=
"imgX"
destination=
"ybW-ia-BeV"
id=
"13c-F3-Ox4"
/>
...
...
@@ -212,4 +286,7 @@
<image
name=
"greycheck2.png"
width=
"300"
height=
"230"
/>
<image
name=
"greyx2.png"
width=
"300"
height=
"300"
/>
</resources>
<inferredMetricsTieBreakers>
<segue
reference=
"Gl6-Gc-2Nm"
/>
</inferredMetricsTieBreakers>
</document>
UI-Iteration2/PLUCdraft/PLUCdraft/LogInViewController.m
View file @
de490a23
...
...
@@ -26,6 +26,7 @@ static NSString *PASSWORD = @"what";
-
(
void
)
viewDidLoad
{
[
super
viewDidLoad
];
// Do any additional setup after loading the view.
[
self
.
view
addGestureRecognizer
:[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
.
view
action
:
@selector
(
endEditing
:)]];
self
.
navigationItem
.
hidesBackButton
=
YES
;
}
...
...
UI-Iteration2/PLUCdraft/PLUCdraft/
Finish
ViewController.h
→
UI-Iteration2/PLUCdraft/PLUCdraft/
Settings
ViewController.h
100755 → 100644
View file @
de490a23
//
//
Finish
ViewController.h
//
Settings
ViewController.h
// PLUCdraft
//
// Created by
Alexander W. Moore
on 2/
3
/15.
// Created by
PLUC SeniorDesign
on 2/
17
/15.
// Copyright (c) 2015 Alexander W. Moore. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface
Finish
ViewController
:
UIViewController
@interface
Settings
ViewController
:
UIViewController
@end
UI-Iteration2/PLUCdraft/PLUCdraft/
Finish
ViewController.m
→
UI-Iteration2/PLUCdraft/PLUCdraft/
Settings
ViewController.m
100755 → 100644
View file @
de490a23
//
//
Finish
ViewController.m
//
Settings
ViewController.m
// PLUCdraft
//
// Created by
Alexander W. Moore
on 2/
3
/15.
// Created by
PLUC SeniorDesign
on 2/
17
/15.
// Copyright (c) 2015 Alexander W. Moore. All rights reserved.
//
#import "
Finish
ViewController.h"
#import "
Settings
ViewController.h"
@interface
Finish
ViewController
()
@interface
Settings
ViewController
()
@end
@implementation
Finish
ViewController
@implementation
Settings
ViewController
-
(
void
)
viewDidLoad
{
[
super
viewDidLoad
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment