Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
PLUC Inventory - Senior Design
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Andrew D'Abbraccio
PLUC Inventory - Senior Design
Commits
cb05bf88
Commit
cb05bf88
authored
Apr 02, 2015
by
Alex Moore
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed crash from settings page (maybe?)
parent
b4870d5f
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
122 additions
and
91 deletions
+122
-91
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Contents.json
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Contents.json
+12
-6
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png
+0
-0
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png
+0
-0
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
+0
-0
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
+0
-0
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
...WAMI/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
+0
-0
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
...WAMI/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
+0
-0
WAMI/WAMI/LogInViewController.m
WAMI/WAMI/LogInViewController.m
+9
-5
WAMI/WAMI/Main.storyboard
WAMI/WAMI/Main.storyboard
+71
-71
WAMI/WAMI/ScanBookViewController.h
WAMI/WAMI/ScanBookViewController.h
+1
-0
WAMI/WAMI/ScanBookViewController.m
WAMI/WAMI/ScanBookViewController.m
+0
-3
WAMI/WAMI/SectionViewController.m
WAMI/WAMI/SectionViewController.m
+7
-5
WAMI/WAMI/SettingsViewController.m
WAMI/WAMI/SettingsViewController.m
+22
-1
No files found.
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Contents.json
View file @
cb05bf88
{
"images"
:
[
{
"idiom"
:
"iphone"
,
"size"
:
"29x29"
,
"idiom"
:
"iphone"
,
"filename"
:
"Icon-Small@2x.png"
,
"scale"
:
"2x"
},
{
"idiom"
:
"iphone"
,
"size"
:
"29x29"
,
"idiom"
:
"iphone"
,
"filename"
:
"Icon-Small@3x.png"
,
"scale"
:
"3x"
},
{
"idiom"
:
"iphone"
,
"size"
:
"40x40"
,
"idiom"
:
"iphone"
,
"filename"
:
"Icon-40@2x.png"
,
"scale"
:
"2x"
},
{
"idiom"
:
"iphone"
,
"size"
:
"40x40"
,
"idiom"
:
"iphone"
,
"filename"
:
"Icon-40@3x.png"
,
"scale"
:
"3x"
},
{
"idiom"
:
"iphone"
,
"size"
:
"60x60"
,
"idiom"
:
"iphone"
,
"filename"
:
"Icon-60@2x.png"
,
"scale"
:
"2x"
},
{
"idiom"
:
"iphone"
,
"size"
:
"60x60"
,
"idiom"
:
"iphone"
,
"filename"
:
"Icon-60@3x.png"
,
"scale"
:
"3x"
},
{
...
...
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png
0 → 100644
View file @
cb05bf88
14.3 KB
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png
0 → 100644
View file @
cb05bf88
30.9 KB
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
0 → 100644
View file @
cb05bf88
30.9 KB
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
0 → 100644
View file @
cb05bf88
66.8 KB
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
0 → 100644
View file @
cb05bf88
7.82 KB
WAMI/WAMI/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
0 → 100644
View file @
cb05bf88
16.7 KB
WAMI/WAMI/LogInViewController.m
View file @
cb05bf88
...
...
@@ -19,7 +19,10 @@
// Do any additional setup after loading the view.
[
self
.
view
addGestureRecognizer
:[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
.
view
action
:
@selector
(
endEditing
:)]];
self
.
navigationItem
.
hidesBackButton
=
YES
;
}
-
(
void
)
viewDidAppear
:(
BOOL
)
animated
{
[
super
viewDidAppear
:
animated
];
[
self
resetRTI
];
}
...
...
@@ -83,14 +86,15 @@
return
(
UIInterfaceOrientationMaskPortrait
|
UIInterfaceOrientationMaskPortraitUpsideDown
);
}
-
(
IBAction
)
unwindFromSection
:(
UIStoryboardSegue
*
)
sender
{
}
-
(
IBAction
)
unwind
:(
UIStoryboardSegue
*
)
sender
{
//reset UIWebView here
[
self
resetRTI
];
-
(
IBAction
)
unwindFromScan
:(
UIStoryboardSegue
*
)
sender
{
}
-
(
void
)
resetRTI
{
//Reset global uiwebview
GlobalWebController
*
globalWeb
=
[
GlobalWebController
resetInstance
];
...
...
WAMI/WAMI/Main.storyboard
View file @
cb05bf88
This diff is collapsed.
Click to expand it.
WAMI/WAMI/ScanBookViewController.h
View file @
cb05bf88
...
...
@@ -9,6 +9,7 @@
#import <UIKit/UIKit.h>
#import "Session.h"
#import "CaptuvoScannerController.h"
#import "LogInViewController.h"
@interface
ScanBookViewController
:
CaptuvoScannerController
<
UITableViewDataSource
,
UITableViewDelegate
>
...
...
WAMI/WAMI/ScanBookViewController.m
View file @
cb05bf88
...
...
@@ -295,9 +295,6 @@ static int BOOK_ID_LENGTH = 14;
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
...
...
WAMI/WAMI/SectionViewController.m
View file @
cb05bf88
...
...
@@ -265,11 +265,13 @@
-
(
void
)
prepareForSegue
:(
UIStoryboardSegue
*
)
segue
sender
:(
id
)
sender
{
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
NSIndexPath
*
path
=
[
self
.
tableView
indexPathForSelectedRow
];
Session
*
session
=
[[
Session
alloc
]
init
];
session
.
section
=
[
self
.
sections
objectAtIndex
:
path
.
row
];
ScanBookViewController
*
destViewController
=
[
segue
destinationViewController
];
destViewController
.
session
=
session
;
if
([
segue
.
identifier
isEqualToString
:
@"segueToScanning"
])
{
NSIndexPath
*
path
=
[
self
.
tableView
indexPathForSelectedRow
];
Session
*
session
=
[[
Session
alloc
]
init
];
session
.
section
=
[
self
.
sections
objectAtIndex
:
path
.
row
];
ScanBookViewController
*
destViewController
=
[
segue
destinationViewController
];
destViewController
.
session
=
session
;
}
}
...
...
WAMI/WAMI/SettingsViewController.m
View file @
cb05bf88
...
...
@@ -82,7 +82,9 @@
break
;
}
case
BatteryStatusPowerSourceConnected
:
{
self
.
batteryView
.
image
=
[
UIImage
imageNamed
:
@"battery_charging_100.png"
];
ChargeStatus
charge_status
=
[[
Captuvo
sharedCaptuvoDevice
]
getChargeStatus
];
[
self
displayChargeStatusIcon
:
charge_status
];
//self.batteryView.image = [UIImage imageNamed:@"battery_charging_100.png"];
break
;
}
case
BatteryStatusUndefined
:
{
...
...
@@ -92,6 +94,25 @@
}
}
-
(
void
)
displayChargeStatusIcon
:(
ChargeStatus
)
charge_status
{
switch
(
charge_status
)
{
case
ChargeStatusNotCharging
:
self
.
batteryView
.
image
=
[
UIImage
imageNamed
:
@"battery_charging_000.png"
];
break
;
case
ChargeStatusCharging
:
self
.
batteryView
.
image
=
[
UIImage
imageNamed
:
@"battery_charging_060.png"
];
break
;
case
ChargeStatusChargeComplete
:
self
.
batteryView
.
image
=
[
UIImage
imageNamed
:
@"battery_charging_100.png"
];
break
;
case
ChargeStatusUndefined
:
self
.
batteryView
.
image
=
[
UIImage
imageNamed
:
@"laptop_nobattery_klaptopdaemon.png"
];
break
;
default:
break
;
}
}
#pragma mark - Navigation
...
...
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