This commit is contained in:
giuseppenuc committed 2015-07-21 09:21:33 +02:00
1 parent c2be9705ac
commit 603962375e
18 files changed
+1659 -1424

No files matched your search

@@ -0,0 +1 @@
../../../../../Pod/Classes/TabBarPickerSubItemsView.h
+1
View File
@@ -0,0 +1 @@
../../../../../Pod/Classes/TabBarPickerSubItemsView.h
+1396 -1384
View File
File diff suppressed because it is too large. Load diff
@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "66A365F03E2E5FD04D4DAC69"
BlueprintIdentifier = "F1DAA46C7CBB0FB9B92A7891"
BuildableName = "TabBarPicker.bundle"
BlueprintName = "Pods-TabBarPicker_Example-TabBarPicker-TabBarPicker"
ReferencedContainer = "container:Pods.xcodeproj">
@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4F73FDE94825965417E35D5A"
BlueprintIdentifier = "FD042F8BAEE7119C1EA51707"
BuildableName = "TabBarPicker.framework"
BlueprintName = "Pods-TabBarPicker_Example-TabBarPicker"
ReferencedContainer = "container:Pods.xcodeproj">
@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "7C0EACB3AF64706AA504E8BE"
BlueprintIdentifier = "AFD4CD498974811C4E61A02F"
BuildableName = "TabBarPicker.bundle"
BlueprintName = "Pods-TabBarPicker_Tests-TabBarPicker-TabBarPicker"
ReferencedContainer = "container:Pods.xcodeproj">
@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "113B2CE1962FE34F95B1D5AD"
BlueprintIdentifier = "B372419045A1236C95998EEE"
BuildableName = "TabBarPicker.framework"
BlueprintName = "Pods-TabBarPicker_Tests-TabBarPicker"
ReferencedContainer = "container:Pods.xcodeproj">
@@ -2,6 +2,7 @@
#import "TabBarItem.h"
#import "TabBarPicker.h"
#import "TabBarPickerSubItemsView.h"
#import "TabBarSubItem.h"
FOUNDATION_EXPORT double TabBarPickerVersionNumber;
@@ -2,6 +2,7 @@
#import "TabBarItem.h"
#import "TabBarPicker.h"
#import "TabBarPickerSubItemsView.h"
#import "TabBarSubItem.h"
FOUNDATION_EXPORT double TabBarPickerVersionNumber;
@@ -59,7 +59,10 @@
[allergen setSelectedImage:[UIImage imageNamed:@"allergen_on"]];
tabbar = [[TabBarPicker alloc] initWithTabBarItems:@[location,calendar,type,price,allergen] forPosition:TabBarPickerPositionBottom];
[tabbar setBackgroundColor:[UIColor whiteColor]];
[tabbar addItem:allergen];
}
return self;
}
@@ -70,17 +73,7 @@
[contentView addSubview:tabbar];
/*[tabbar autoPinEdgesToSuperviewMarginsExcludingEdge:ALEdgeTop];
tabbar ali
[tabbar autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:50 relation:NSLayoutRelationGreaterThanOrEqual];
[tabbar autoPinEdgeToSuperviewEdge:ALEdgeRight withInset:50 relation:NSLayoutRelationGreaterThanOrEqual];
*/
NSLog(@"%f %f",tabbar.frame.size.width,tabbar.frame.size.height);
self.view = contentView;
[self.view setNeedsUpdateConstraints];
}
- (void)viewDidLoad
@@ -89,7 +82,25 @@
//[self.view setBackgroundColor:[UIColor lightGrayColor]];
// Do any additional setup after loading the view, typically from a nib.
[super updateViewConstraints];
}
- (void) viewDidAppear:(BOOL)animated {
TabBarSubItem *subItem1 = [TabBarSubItem tabBarSubItemWithName:@"Peppe"];
TabBarSubItem *subItem2 = [TabBarSubItem tabBarSubItemWithName:@"Peppe1"];
TabBarSubItem *subItem3 = [TabBarSubItem tabBarSubItemWithName:@"Peppe2"];
TabBarSubItem *subItem4 = [TabBarSubItem tabBarSubItemWithName:@"Peppe3"];
TabBarSubItem *subItem5 = [TabBarSubItem tabBarSubItemWithName:@"Peppe4"];
TabBarSubItem *subItem6 = [TabBarSubItem tabBarSubItemWithName:@"Peppe5"];
TabBarSubItem *subItem7 = [TabBarSubItem tabBarSubItemWithName:@"Peppe6"];
TabBarItem *allergen = [[TabBarItem alloc] initWithSubItems:@[subItem1,subItem2,subItem3,subItem4,subItem5,subItem6,subItem7]];
[allergen setItemName:@"Allergen"];
[allergen setImage:[UIImage imageNamed:@"allergen_off"]];
[allergen setSelectedImage:[UIImage imageNamed:@"allergen_on"]];
[tabbar addItem:allergen];
}
- (void)didReceiveMemoryWarning