giuseppenuc/TabBarPicker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade 0.3.0 #1

Merged
giuseppenucifora merged 13 commits from sviluppo into master 2015-08-18 13:36:38 +00:00
Conversation 0 Commits 13 Files Changed 227 +25 -306
49 changed files with 25 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7822588918 - Show all commits

23
Example/Media.xcassets/allergen.imageset/Contents.json vendored
View File

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "allergen.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "allergen@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "allergen@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Example/Media.xcassets/allergen.imageset/allergen.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/allergen.imageset/allergen@2x.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/allergen.imageset/allergen@3x.png vendored
View File

Binary file not shown.

23
Example/Media.xcassets/allergen_highlighted.imageset/Contents.json vendored
View File

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "allergen_highlighted.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "allergen_highlighted@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "allergen_highlighted@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Example/Media.xcassets/allergen_highlighted.imageset/allergen_highlighted.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/allergen_highlighted.imageset/allergen_highlighted@2x.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/allergen_highlighted.imageset/allergen_highlighted@3x.png vendored
View File

Binary file not shown.

23
Example/Media.xcassets/allergen_selected.imageset/Contents.json vendored
View File

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "allergen_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "allergen_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "allergen_selected@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Example/Media.xcassets/allergen_selected.imageset/allergen_selected.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/allergen_selected.imageset/allergen_selected@2x.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/allergen_selected.imageset/allergen_selected@3x.png vendored
View File

Binary file not shown.

23
Example/Media.xcassets/calendar.imageset/Contents.json vendored
View File

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "calendar.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "calendar@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "calendar@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Example/Media.xcassets/calendar.imageset/calendar.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/calendar.imageset/calendar@2x.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/calendar.imageset/calendar@3x.png vendored
View File

Binary file not shown.

23
Example/Media.xcassets/calendar_highlighted.imageset/Contents.json vendored
View File

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "calendar_highlighted.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "calendar_highlighted@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "calendar_highlighted@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Example/Media.xcassets/calendar_highlighted.imageset/calendar_highlighted.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/calendar_highlighted.imageset/calendar_highlighted@2x.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/calendar_highlighted.imageset/calendar_highlighted@3x.png vendored
View File

Binary file not shown.

23
Example/Media.xcassets/calendar_selected.imageset/Contents.json vendored
View File

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "calendar_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "calendar_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "calendar_selected@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Example/Media.xcassets/calendar_selected.imageset/calendar_selected.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/calendar_selected.imageset/calendar_selected@2x.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/calendar_selected.imageset/calendar_selected@3x.png vendored
View File

Binary file not shown.

23
Example/Media.xcassets/price.imageset/Contents.json vendored
View File

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "price.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "price@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "price@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Example/Media.xcassets/price.imageset/price.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/price.imageset/price@2x.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/price.imageset/price@3x.png vendored
View File

Binary file not shown.

23
Example/Media.xcassets/price_highlighted.imageset/Contents.json vendored
View File

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "price_highlighted.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "price_highlighted@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "price_highlighted@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Example/Media.xcassets/price_highlighted.imageset/price_highlighted.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/price_highlighted.imageset/price_highlighted@2x.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/price_highlighted.imageset/price_highlighted@3x.png vendored
View File

Binary file not shown.

23
Example/Media.xcassets/price_selected.imageset/Contents.json vendored
View File

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "price_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "price_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "price_selected@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Example/Media.xcassets/price_selected.imageset/price_selected.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/price_selected.imageset/price_selected@2x.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/price_selected.imageset/price_selected@3x.png vendored
View File

Binary file not shown.

23
Example/Media.xcassets/type.imageset/Contents.json vendored
View File

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "type.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "type@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "type@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Example/Media.xcassets/type.imageset/type.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/type.imageset/type@2x.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/type.imageset/type@3x.png vendored
View File

Binary file not shown.

23
Example/Media.xcassets/type_highlighted.imageset/Contents.json vendored
View File

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "type_highlighted.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "type_highlighted@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "type_highlighted@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Example/Media.xcassets/type_highlighted.imageset/type_highlighted.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/type_highlighted.imageset/type_highlighted@2x.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/type_highlighted.imageset/type_highlighted@3x.png vendored
View File

Binary file not shown.

23
Example/Media.xcassets/type_selected.imageset/Contents.json vendored
View File

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "type_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "type_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "type_selected@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Example/Media.xcassets/type_selected.imageset/type_selected.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/type_selected.imageset/type_selected@2x.png vendored
View File

Binary file not shown.

BIN
Example/Media.xcassets/type_selected.imageset/type_selected@3x.png vendored
View File

Binary file not shown.

55
Example/TabBarPicker/TabBarPickerViewController.m
View File

@ -40,44 +40,39 @@
[location setSelectedImage:[UIImage imageNamed:@"location_selected"]];
[location setHighlightedImage:[UIImage imageNamed:@"location_highlighted"]];
TabBarPickerSubItemsView *calendarSubView = [[TabBarPickerSubItemsView alloc] initWithType:TabBarPickerSubItemsViewTypeButtons subItems:@[subItem1,subItem2,subItem3,subItem4,subItem5,subItem6,subItem7]];
TabBarPickerSubItemsView *locationSubview1 = [[TabBarPickerSubItemsView alloc] initWithType:TabBarPickerSubItemsViewTypeButtons subItems:@[subItem1,subItem2,subItem3,subItem4,subItem5,subItem6,subItem7] needsLocalization:NO];
TabBarItem *calendar = [[TabBarItem alloc] initWithSubItemView:calendarSubView];
[calendar setItemName:@"Calendar"];
[calendar setImage:[UIImage imageNamed:@"calendar"]];
[calendar setSelectedImage:[UIImage imageNamed:@"calendar_selected"]];
[calendar setHighlightedImage:[UIImage imageNamed:@"calendar_highlighted"]];
TabBarItem *location1 = [[TabBarItem alloc] initWithSubItemView:locationSubview1];
[location1 setItemName:@"Location2"];
[location1 setImage:[UIImage imageNamed:@"location"]];
[location1 setSelectedImage:[UIImage imageNamed:@"location_selected"]];
[location1 setHighlightedImage:[UIImage imageNamed:@"location_highlighted"]];
TabBarPickerSubItemsView *typeSubView = [[TabBarPickerSubItemsView alloc] initWithType:TabBarPickerSubItemsViewTypeButtons subItems:@[subItem1,subItem2,subItem3,subItem4,subItem5,subItem6,subItem7]];
TabBarPickerSubItemsView *locationSubview2 = [[TabBarPickerSubItemsView alloc] initWithType:TabBarPickerSubItemsViewTypeButtons subItems:@[subItem1,subItem2,subItem3,subItem4,subItem5,subItem6,subItem7] needsLocalization:NO];
TabBarItem *type = [[TabBarItem alloc] initWithSubItemView:typeSubView];
[type setItemName:@"Type"];
[type setImage:[UIImage imageNamed:@"type"]];
[type setSelectedImage:[UIImage imageNamed:@"type_selected"]];
[type setHighlightedImage:[UIImage imageNamed:@"type_highlighted"]];
TabBarItem *location2 = [[TabBarItem alloc] initWithSubItemView:locationSubview2];
[location2 setItemName:@"Location3"];
[location2 setImage:[UIImage imageNamed:@"location"]];
[location2 setSelectedImage:[UIImage imageNamed:@"location_selected"]];
[location2 setHighlightedImage:[UIImage imageNamed:@"location_highlighted"]];
TabBarPickerSubItemsView *priceSubView = [[TabBarPickerSubItemsView alloc] initWithType:TabBarPickerSubItemsViewTypeButtons subItems:@[subItem1,subItem2,subItem3,subItem4,subItem5,subItem6,subItem7]];
TabBarPickerSubItemsView *locationSubview3 = [[TabBarPickerSubItemsView alloc] initWithType:TabBarPickerSubItemsViewTypeButtons subItems:@[subItem1,subItem2,subItem3,subItem4,subItem5,subItem6,subItem7] needsLocalization:NO];
TabBarItem *price =[[TabBarItem alloc] initWithSubItemView:priceSubView];
[price setItemName:@"Price"];
[price setImage:[UIImage imageNamed:@"price"]];
[price setSelectedImage:[UIImage imageNamed:@"price_selected"]];
[price setHighlightedImage:[UIImage imageNamed:@"price_highlighted"]];
TabBarItem *location3 = [[TabBarItem alloc] initWithSubItemView:locationSubview3];
[location3 setItemName:@"Location4"];
[location3 setImage:[UIImage imageNamed:@"location"]];
[location3 setSelectedImage:[UIImage imageNamed:@"location_selected"]];
[location3 setHighlightedImage:[UIImage imageNamed:@"location_highlighted"]];
TabBarPickerSubItemsView *allergenSubView = [[TabBarPickerSubItemsView alloc] initWithType:TabBarPickerSubItemsViewTypeButtons subItems:@[subItem1,subItem2,subItem3,subItem4,subItem5,subItem6,subItem7]];
TabBarPickerSubItemsView *locationSubview4 = [[TabBarPickerSubItemsView alloc] initWithType:TabBarPickerSubItemsViewTypeButtons subItems:@[subItem1,subItem2,subItem3,subItem4,subItem5,subItem6,subItem7] needsLocalization:NO];
TabBarItem *allergen = [[TabBarItem alloc] initWithSubItemView:allergenSubView];
[allergen setItemName:@"Allergen"];
[allergen setImage:[UIImage imageNamed:@"allergen"]];
[allergen setSelectedImage:[UIImage imageNamed:@"allergen_selected"]];
[allergen setHighlightedImage:[UIImage imageNamed:@"allergen_highlighted"]];
TabBarItem *location4 = [[TabBarItem alloc] initWithSubItemView:locationSubview4];
[location4 setItemName:@"Location5"];
[location4 setImage:[UIImage imageNamed:@"location"]];
[location4 setSelectedImage:[UIImage imageNamed:@"location_selected"]];
[location4 setHighlightedImage:[UIImage imageNamed:@"location_highlighted"]];
/*TabBarItem *allergen2 = [[TabBarItem alloc] initWithSubItems:@[subItem1,subItem2,subItem3,subItem4,subItem5,subItem6,subItem7]];
[allergen2 setItemName:@"Allergen"];
[allergen2 setImage:[UIImage imageNamed:@"allergen"]];
[allergen2 setSelectedImage:[UIImage imageNamed:@"allergen_selected"]];
*/
tabbar = [[TabBarPicker alloc] initWithTabBarItems:@[location,calendar,type,price,allergen] forPosition:TabBarPickerPositionBottom];
tabbar = [[TabBarPicker alloc] initWithTabBarItems:@[location,location1,location2,location3,location4] forPosition:TabBarPickerPositionBottom];
[tabbar setItemSpacing:0];
[tabbar setBackgroundColor:[UIColor whiteColor]];