aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--iBean/iBean.xcodeproj/project.pbxproj36
-rw-r--r--iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstatebin25626 -> 26695 bytes
-rw-r--r--iBean/iBean/Bean.h2
-rw-r--r--iBean/iBean/Bean.m2
-rw-r--r--iBean/iBean/BeanCollection.h8
-rw-r--r--iBean/iBean/BeanCollection.m8
-rw-r--r--iBean/iBean/BeanCollectionListViewController.h (renamed from iBean/iBean/iBeanListViewController.h)4
-rw-r--r--iBean/iBean/BeanCollectionListViewController.m (renamed from iBean/iBean/iBeanListViewController.m)12
-rw-r--r--iBean/iBean/iBean.xcdatamodeld/iBean.xcdatamodel/contents6
-rw-r--r--iBean/iBean/iPhoneStoryboard.storyboard7
10 files changed, 41 insertions, 44 deletions
diff --git a/iBean/iBean.xcodeproj/project.pbxproj b/iBean/iBean.xcodeproj/project.pbxproj
index 264aee4..d859d0c 100644
--- a/iBean/iBean.xcodeproj/project.pbxproj
+++ b/iBean/iBean.xcodeproj/project.pbxproj
@@ -22,9 +22,9 @@
020C55C41691059800D8224C /* InstaBeanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55C31691059800D8224C /* InstaBeanViewController.m */; };
020C55C716910EAD00D8224C /* InstaBeanConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55C616910EAD00D8224C /* InstaBeanConfiguration.m */; };
020C55CA1691100000D8224C /* AppDelegate+Storage.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55C91691100000D8224C /* AppDelegate+Storage.m */; };
- 020C55DA1695CAD200D8224C /* iBeanListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55D91695CAD200D8224C /* iBeanListViewController.m */; };
- 020C55EF1697970200D8224C /* Bean.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55EE1697970200D8224C /* Bean.m */; };
- 020C55F21697970200D8224C /* BeanCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55F11697970200D8224C /* BeanCollection.m */; };
+ 020C55FA16983E9900D8224C /* BeanCollectionListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55F916983E9900D8224C /* BeanCollectionListViewController.m */; };
+ 020C55FD16983F7400D8224C /* Bean.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55FC16983F7400D8224C /* Bean.m */; };
+ 020C560016983F7400D8224C /* BeanCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55FF16983F7400D8224C /* BeanCollection.m */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -50,12 +50,12 @@
020C55C616910EAD00D8224C /* InstaBeanConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InstaBeanConfiguration.m; sourceTree = "<group>"; };
020C55C81691100000D8224C /* AppDelegate+Storage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+Storage.h"; sourceTree = "<group>"; };
020C55C91691100000D8224C /* AppDelegate+Storage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+Storage.m"; sourceTree = "<group>"; };
- 020C55D81695CAD200D8224C /* iBeanListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iBeanListViewController.h; sourceTree = "<group>"; };
- 020C55D91695CAD200D8224C /* iBeanListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iBeanListViewController.m; sourceTree = "<group>"; };
- 020C55ED1697970200D8224C /* Bean.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Bean.h; sourceTree = "<group>"; };
- 020C55EE1697970200D8224C /* Bean.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Bean.m; sourceTree = "<group>"; };
- 020C55F01697970200D8224C /* BeanCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BeanCollection.h; sourceTree = "<group>"; };
- 020C55F11697970200D8224C /* BeanCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BeanCollection.m; sourceTree = "<group>"; };
+ 020C55F816983E9900D8224C /* BeanCollectionListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BeanCollectionListViewController.h; sourceTree = "<group>"; };
+ 020C55F916983E9900D8224C /* BeanCollectionListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BeanCollectionListViewController.m; sourceTree = "<group>"; };
+ 020C55FB16983F7400D8224C /* Bean.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Bean.h; sourceTree = "<group>"; };
+ 020C55FC16983F7400D8224C /* Bean.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Bean.m; sourceTree = "<group>"; };
+ 020C55FE16983F7400D8224C /* BeanCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BeanCollection.h; sourceTree = "<group>"; };
+ 020C55FF16983F7400D8224C /* BeanCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BeanCollection.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -153,9 +153,9 @@
020C55D31695C2C800D8224C /* iBean */ = {
isa = PBXGroup;
children = (
+ 020C55F816983E9900D8224C /* BeanCollectionListViewController.h */,
+ 020C55F916983E9900D8224C /* BeanCollectionListViewController.m */,
020C55DF169792F800D8224C /* Data */,
- 020C55D81695CAD200D8224C /* iBeanListViewController.h */,
- 020C55D91695CAD200D8224C /* iBeanListViewController.m */,
);
name = iBean;
sourceTree = "<group>";
@@ -163,10 +163,10 @@
020C55DF169792F800D8224C /* Data */ = {
isa = PBXGroup;
children = (
- 020C55F01697970200D8224C /* BeanCollection.h */,
- 020C55F11697970200D8224C /* BeanCollection.m */,
- 020C55ED1697970200D8224C /* Bean.h */,
- 020C55EE1697970200D8224C /* Bean.m */,
+ 020C55FE16983F7400D8224C /* BeanCollection.h */,
+ 020C55FF16983F7400D8224C /* BeanCollection.m */,
+ 020C55FB16983F7400D8224C /* Bean.h */,
+ 020C55FC16983F7400D8224C /* Bean.m */,
);
name = Data;
sourceTree = "<group>";
@@ -243,9 +243,9 @@
020C55C41691059800D8224C /* InstaBeanViewController.m in Sources */,
020C55C716910EAD00D8224C /* InstaBeanConfiguration.m in Sources */,
020C55CA1691100000D8224C /* AppDelegate+Storage.m in Sources */,
- 020C55DA1695CAD200D8224C /* iBeanListViewController.m in Sources */,
- 020C55EF1697970200D8224C /* Bean.m in Sources */,
- 020C55F21697970200D8224C /* BeanCollection.m in Sources */,
+ 020C55FA16983E9900D8224C /* BeanCollectionListViewController.m in Sources */,
+ 020C55FD16983F7400D8224C /* Bean.m in Sources */,
+ 020C560016983F7400D8224C /* BeanCollection.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
index 170f786..3b8c0b6 100644
--- a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/iBean/iBean/Bean.h b/iBean/iBean/Bean.h
index d42a98f..80094b3 100644
--- a/iBean/iBean/Bean.h
+++ b/iBean/iBean/Bean.h
@@ -13,9 +13,9 @@
@interface Bean : NSManagedObject
-@property (nonatomic, retain) NSString * name;
@property (nonatomic, retain) NSNumber * amount;
@property (nonatomic, retain) NSNumber * grindSetting;
+@property (nonatomic, retain) NSString * name;
@property (nonatomic, retain) BeanCollection *beanCollection;
@end
diff --git a/iBean/iBean/Bean.m b/iBean/iBean/Bean.m
index e9b85fa..fbb21b3 100644
--- a/iBean/iBean/Bean.m
+++ b/iBean/iBean/Bean.m
@@ -12,9 +12,9 @@
@implementation Bean
-@dynamic name;
@dynamic amount;
@dynamic grindSetting;
+@dynamic name;
@dynamic beanCollection;
@end
diff --git a/iBean/iBean/BeanCollection.h b/iBean/iBean/BeanCollection.h
index 73f935d..801fa4c 100644
--- a/iBean/iBean/BeanCollection.h
+++ b/iBean/iBean/BeanCollection.h
@@ -13,12 +13,12 @@
@interface BeanCollection : NSManagedObject
-@property (nonatomic, retain) NSString * name;
-@property (nonatomic, retain) NSNumber * extractionTime;
@property (nonatomic, retain) NSDate * created;
-@property (nonatomic, retain) NSNumber * extractionCounter;
-@property (nonatomic, retain) NSString * note;
+@property (nonatomic, retain) NSNumber * extractionCount;
+@property (nonatomic, retain) NSNumber * extractionTime;
@property (nonatomic, retain) NSDate * modified;
+@property (nonatomic, retain) NSString * name;
+@property (nonatomic, retain) NSString * note;
@property (nonatomic, retain) NSSet *beans;
@end
diff --git a/iBean/iBean/BeanCollection.m b/iBean/iBean/BeanCollection.m
index cfeceda..39107ba 100644
--- a/iBean/iBean/BeanCollection.m
+++ b/iBean/iBean/BeanCollection.m
@@ -12,12 +12,12 @@
@implementation BeanCollection
-@dynamic name;
-@dynamic extractionTime;
@dynamic created;
-@dynamic extractionCounter;
-@dynamic note;
+@dynamic extractionCount;
+@dynamic extractionTime;
@dynamic modified;
+@dynamic name;
+@dynamic note;
@dynamic beans;
@end
diff --git a/iBean/iBean/iBeanListViewController.h b/iBean/iBean/BeanCollectionListViewController.h
index f0a76b9..a433417 100644
--- a/iBean/iBean/iBeanListViewController.h
+++ b/iBean/iBean/BeanCollectionListViewController.h
@@ -1,5 +1,5 @@
//
-// iBeanListViewController.h
+// BeanCollectionListViewController.h
// iBean
//
// Created by Eddie Ehlin on 2013-01-03.
@@ -8,7 +8,7 @@
#import <UIKit/UIKit.h>
-@interface iBeanListViewController : UITableViewController
+@interface BeanCollectionListViewController : UITableViewController
@property (nonatomic, strong) NSArray *beanCollections;
diff --git a/iBean/iBean/iBeanListViewController.m b/iBean/iBean/BeanCollectionListViewController.m
index ac97a10..3869497 100644
--- a/iBean/iBean/iBeanListViewController.m
+++ b/iBean/iBean/BeanCollectionListViewController.m
@@ -1,20 +1,20 @@
//
-// iBeanListViewController.m
+// BeanCollectionListViewController.m
// iBean
//
// Created by Eddie Ehlin on 2013-01-03.
// Copyright (c) 2013 Eddie Ehlin. All rights reserved.
//
-#import "iBeanListViewController.h"
+#import "BeanCollectionListViewController.h"
#import "BeanCollection.h"
#import "AppDelegate+Storage.h"
-@interface iBeanListViewController ()
+@interface BeanCollectionListViewController ()
@end
-@implementation iBeanListViewController
+@implementation BeanCollectionListViewController
- (id)initWithStyle:(UITableViewStyle)style
{
@@ -28,7 +28,7 @@
- (void)viewDidLoad
{
[super viewDidLoad];
- NSLog(@"iBeanListViewController view's loaded!");
+ NSLog(@"BeanCollectionListViewController view's loaded!");
// Uncomment the following line to preserve selection between presentations.
@@ -157,7 +157,7 @@
*****************************************************/
- (void) initViewController
{
- NSLog(@"iBeanListViewController - initViewController");
+ NSLog(@"BeanCollectionListViewController - initViewController");
//Load bean collections from core data storage
self.beanCollections = [(AppDelegate*) [[UIApplication sharedApplication] delegate] getBeanCollections];
diff --git a/iBean/iBean/iBean.xcdatamodeld/iBean.xcdatamodel/contents b/iBean/iBean/iBean.xcdatamodeld/iBean.xcdatamodel/contents
index cbceae9..4677f93 100644
--- a/iBean/iBean/iBean.xcdatamodeld/iBean.xcdatamodel/contents
+++ b/iBean/iBean/iBean.xcdatamodeld/iBean.xcdatamodel/contents
@@ -8,7 +8,7 @@
</entity>
<entity name="BeanCollection" representedClassName="BeanCollection" syncable="YES">
<attribute name="created" optional="YES" attributeType="Date" syncable="YES"/>
- <attribute name="extractionCounter" optional="YES" attributeType="Integer 64" defaultValueString="0" syncable="YES"/>
+ <attribute name="extractionCount" optional="YES" attributeType="Integer 64" defaultValueString="0" syncable="YES"/>
<attribute name="extractionTime" optional="YES" attributeType="Double" defaultValueString="0.0" syncable="YES"/>
<attribute name="modified" optional="YES" attributeType="Date" syncable="YES"/>
<attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
@@ -19,8 +19,8 @@
<attribute name="extractionTime" optional="YES" attributeType="Double" defaultValueString="0.0" syncable="YES"/>
</entity>
<elements>
- <element name="InstaBeanConfiguration" positionX="160" positionY="192" width="128" height="60"/>
- <element name="BeanCollection" positionX="160" positionY="192" width="128" height="148"/>
<element name="Bean" positionX="-369" positionY="111" width="128" height="105"/>
+ <element name="BeanCollection" positionX="160" positionY="192" width="128" height="150"/>
+ <element name="InstaBeanConfiguration" positionX="160" positionY="192" width="128" height="60"/>
</elements>
</model> \ No newline at end of file
diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard
index aca958d..cfa726d 100644
--- a/iBean/iBean/iPhoneStoryboard.storyboard
+++ b/iBean/iBean/iPhoneStoryboard.storyboard
@@ -4,10 +4,10 @@
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1930"/>
</dependencies>
<scenes>
- <!--I Bean List View Controller - iBean-->
+ <!--Bean Collection List View Controller - iBean-->
<scene sceneID="SSu-AL-Mw5">
<objects>
- <tableViewController id="agK-tm-pZO" customClass="iBeanListViewController" sceneMemberID="viewController">
+ <tableViewController id="agK-tm-pZO" customClass="BeanCollectionListViewController" sceneMemberID="viewController">
<tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Mma-e7-grn">
<rect key="frame" x="0.0" y="64" width="320" height="455"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -436,9 +436,6 @@
<class className="NSLayoutConstraint" superclassName="NSObject">
<source key="sourceIdentifier" type="project" relativePath="./Classes/NSLayoutConstraint.h"/>
</class>
- <class className="iBeanListViewController" superclassName="UITableViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/iBeanListViewController.h"/>
- </class>
</classes>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 12:24:24 +0000