Upgrade 0.3.0 #1

Merged
giuseppenucifora merged 13 commits from sviluppo into master 2015-08-18 13:36:38 +00:00
49 changed files with 25 additions and 306 deletions
Showing only changes of commit 7822588918 - Show all commits

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"
}
}

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"
}
}

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"
}
}

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"
}
}

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"
}
}

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"
}
}

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"
}
}

Binary file not shown.

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"
}
}

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"
}
}

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"
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

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"
}
}

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"
}
}

View File

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