Skip to content

Commit

Permalink
add wineview tab
Browse files Browse the repository at this point in the history
adding a my wine view controler
  • Loading branch information
Élèves authored and Élèves committed Oct 25, 2012
1 parent 8418f8b commit de77c39
Show file tree
Hide file tree
Showing 12 changed files with 390 additions and 5 deletions.
Binary file modified .DS_Store
Binary file not shown.
30 changes: 28 additions & 2 deletions Projet.xcodeproj/project.pbxproj
Expand Up @@ -13,6 +13,9 @@
9B2D6BA616244E730038A459 /* DetailListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2D6BA516244E730038A459 /* DetailListViewController.m */; };
9B2D6BA716244FA00038A459 /* DataListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2D6B9916244AF20038A459 /* DataListViewController.m */; };
9B2D6BA816244FAD0038A459 /* CustomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2D6B9716244AF20038A459 /* CustomCell.m */; };
9B499916163936B7000A24DA /* WineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B499915163936B7000A24DA /* WineViewController.m */; };
9B49991C163936EF000A24DA /* bouteille@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B49991B163936EF000A24DA /* bouteille@2x.png */; };
9B49991E16393726000A24DA /* mabout.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B49991D16393726000A24DA /* mabout.png */; };
9BFC82CF16392F70000C1600 /* iCarousel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BFC82CE16392F70000C1600 /* iCarousel.m */; };
9BFC82D516392F7D000C1600 /* LBYouTubePlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BFC82D216392F7D000C1600 /* LBYouTubePlayerController.m */; };
9BFC82D616392F7D000C1600 /* LBYouTubePlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BFC82D416392F7D000C1600 /* LBYouTubePlayerViewController.m */; };
Expand All @@ -22,6 +25,7 @@
9BFC82EC163930CF000C1600 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9BFC82EB163930CF000C1600 /* Default-568h@2x.png */; };
9BFC82EE163930F2000C1600 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BFC82ED163930F2000C1600 /* QuartzCore.framework */; };
9BFC82F016393108000C1600 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BFC82EF16393108000C1600 /* MediaPlayer.framework */; };
9BFC82FA163933F4000C1600 /* bouteille.png in Resources */ = {isa = PBXBuildFile; fileRef = 9BFC82F9163933F4000C1600 /* bouteille.png */; };
E03C9810151A86590004D2FD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E03C980F151A86590004D2FD /* UIKit.framework */; };
E03C9812151A86590004D2FD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E03C9811151A86590004D2FD /* Foundation.framework */; };
E03C9814151A86590004D2FD /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E03C9813151A86590004D2FD /* CoreGraphics.framework */; };
Expand Down Expand Up @@ -55,6 +59,10 @@
9B2D6BA216244E250038A459 /* DetailListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DetailListViewController.xib; sourceTree = "<group>"; };
9B2D6BA416244E4D0038A459 /* DetailListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DetailListViewController.h; sourceTree = "<group>"; };
9B2D6BA516244E730038A459 /* DetailListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DetailListViewController.m; sourceTree = "<group>"; };
9B4999141639369F000A24DA /* WineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WineViewController.h; sourceTree = "<group>"; };
9B499915163936B7000A24DA /* WineViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WineViewController.m; sourceTree = "<group>"; };
9B49991B163936EF000A24DA /* bouteille@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bouteille@2x.png"; sourceTree = "<group>"; };
9B49991D16393726000A24DA /* mabout.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mabout.png; sourceTree = "<group>"; };
9BFC82CD16392F70000C1600 /* iCarousel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iCarousel.h; sourceTree = "<group>"; };
9BFC82CE16392F70000C1600 /* iCarousel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iCarousel.m; sourceTree = "<group>"; };
9BFC82D116392F7D000C1600 /* LBYouTubePlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LBYouTubePlayerController.h; sourceTree = "<group>"; };
Expand All @@ -73,6 +81,7 @@
9BFC82EB163930CF000C1600 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
9BFC82ED163930F2000C1600 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
9BFC82EF16393108000C1600 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
9BFC82F9163933F4000C1600 /* bouteille.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bouteille.png; sourceTree = "<group>"; };
E03C980B151A86590004D2FD /* Projet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Projet.app; sourceTree = BUILT_PRODUCTS_DIR; };
E03C980F151A86590004D2FD /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
E03C9811151A86590004D2FD /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -124,6 +133,7 @@
9BFC82CA16392F44000C1600 /* MSToolTips */ = {
isa = PBXGroup;
children = (
9BFC82F516393310000C1600 /* WineView */,
9BFC82D716392F98000C1600 /* Download */,
9BFC82D016392F7D000C1600 /* LBYouTubePlayerController */,
9BFC82CC16392F70000C1600 /* iCarousel */,
Expand Down Expand Up @@ -186,11 +196,21 @@
path = JSONKit;
sourceTree = "<group>";
};
9BFC82F516393310000C1600 /* WineView */ = {
isa = PBXGroup;
children = (
9B49991D16393726000A24DA /* mabout.png */,
9B49991B163936EF000A24DA /* bouteille@2x.png */,
9B499915163936B7000A24DA /* WineViewController.m */,
9B4999141639369F000A24DA /* WineViewController.h */,
9BFC82F9163933F4000C1600 /* bouteille.png */,
);
name = WineView;
sourceTree = "<group>";
};
E03C9800151A86590004D2FD = {
isa = PBXGroup;
children = (
9BFC82EF16393108000C1600 /* MediaPlayer.framework */,
9BFC82ED163930F2000C1600 /* QuartzCore.framework */,
9BFC82EB163930CF000C1600 /* Default-568h@2x.png */,
9BFC82CA16392F44000C1600 /* MSToolTips */,
E03C9815151A86590004D2FD /* TabBar */,
Expand All @@ -211,6 +231,8 @@
E03C980E151A86590004D2FD /* Frameworks */ = {
isa = PBXGroup;
children = (
9BFC82ED163930F2000C1600 /* QuartzCore.framework */,
9BFC82EF16393108000C1600 /* MediaPlayer.framework */,
E03C980F151A86590004D2FD /* UIKit.framework */,
E03C9811151A86590004D2FD /* Foundation.framework */,
E03C9813151A86590004D2FD /* CoreGraphics.framework */,
Expand Down Expand Up @@ -340,6 +362,9 @@
9BFC82E316393058000C1600 /* CHANGELOG.md in Resources */,
9BFC82E516393058000C1600 /* README.md in Resources */,
9BFC82EC163930CF000C1600 /* Default-568h@2x.png in Resources */,
9BFC82FA163933F4000C1600 /* bouteille.png in Resources */,
9B49991C163936EF000A24DA /* bouteille@2x.png in Resources */,
9B49991E16393726000A24DA /* mabout.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -366,6 +391,7 @@
9BFC82D516392F7D000C1600 /* LBYouTubePlayerController.m in Sources */,
9BFC82D616392F7D000C1600 /* LBYouTubePlayerViewController.m in Sources */,
9BFC82E416393058000C1600 /* JSONKit.m in Sources */,
9B499916163936B7000A24DA /* WineViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file not shown.
17 changes: 14 additions & 3 deletions TabBar/AppDelegate.m
Expand Up @@ -14,6 +14,7 @@
#import "FourthViewController.h"
#import "FifthViewController.h"
#import "SixthViewController.h"
#import "WineViewController.h"

@implementation AppDelegate

Expand All @@ -26,8 +27,18 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

self.tabBarController = [[UITabBarController alloc] init];

FirstViewController *firstViewController = [[FirstViewController alloc] initWithNibName:@"FirstViewController" bundle:nil];
firstViewController.title = @"Vins";
// FirstViewController *firstViewController = [[FirstViewController alloc] initWithNibName:@"FirstViewController" bundle:nil];
// firstViewController.title = @"Vins";

WineViewController *wineVC = [[WineViewController alloc] init];
UITabBarItem *tabBarItem3 = [[UITabBarItem alloc] initWithTitle:@"Wine"
image:nil
tag:2];
wineVC.tabBarItem = tabBarItem3;





UITabBarItem *tabBarItem1 = [[UITabBarItem alloc] initWithTitle:@"List"
image:nil
Expand Down Expand Up @@ -60,7 +71,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
sixthViewController.tabBarItem = tabBarItemSixth;

_tabBarController.viewControllers = [NSArray arrayWithObjects: navController,
firstViewController, navigationController, thirdViewController, fourthViewController, fifthViewController, sixthViewController, nil];
wineVC, navigationController, thirdViewController, fourthViewController, fifthViewController, sixthViewController, nil];

[_tabBarController.tabBar setSelectedImageTintColor:[UIColor grayColor]];

Expand Down
13 changes: 13 additions & 0 deletions TabBar/MyWineViewController.h
@@ -0,0 +1,13 @@
//
// MyWineViewController.h
// Projet
//
// Created by Élèves on 25/10/12.
//
//

#import <UIKit/UIKit.h>

@interface MyWineViewController : UIViewController

@end
38 changes: 38 additions & 0 deletions TabBar/MyWineViewController.m
@@ -0,0 +1,38 @@
//
// MyWineViewController.m
// Projet
//
// Created by Élèves on 25/10/12.
//
//

#import "MyWineViewController.h"

@interface MyWineViewController ()

@end

@implementation MyWineViewController

- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
{
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
if (self) {
// Custom initialization
}
return self;
}

- (void)viewDidLoad
{
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.
}

- (void)didReceiveMemoryWarning
{
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}

@end
137 changes: 137 additions & 0 deletions TabBar/MyWineViewController.xib
@@ -0,0 +1,137 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">12A269</string>
<string key="IBDocument.InterfaceBuilderVersion">2835</string>
<string key="IBDocument.AppKitVersion">1187</string>
<string key="IBDocument.HIToolboxVersion">624.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">1919</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
<string>IBUIView</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</array>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="IBProxyObject" id="372490531">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBProxyObject" id="975951072">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="191373211">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 20}, {320, 548}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</object>
</object>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics">
<string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string>
<object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap">
<bool key="EncodedWithXMLCoder">YES</bool>
<array key="dict.sortedKeys">
<integer value="1"/>
<integer value="3"/>
</array>
<array key="dict.values">
<string>{320, 568}</string>
<string>{568, 320}</string>
</array>
</object>
<string key="IBUITargetRuntime">IBCocoaTouchFramework</string>
<string key="IBUIDisplayName">Retina 4 Full Screen</string>
<int key="IBUIType">2</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="191373211"/>
</object>
<int key="connectionID">3</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
<int key="objectID">0</int>
<array key="object" id="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1</int>
<reference key="object" ref="191373211"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="372490531"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="975951072"/>
<reference key="parent" ref="0"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.CustomClassName">MyWineViewController</string>
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">3</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">MyWineViewController</string>
<string key="superclassName">UIViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MyWineViewController.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<bool key="IBDocument.UseAutolayout">YES</bool>
<string key="IBCocoaTouchPluginVersion">1919</string>
</data>
</archive>
17 changes: 17 additions & 0 deletions WineViewController.h
@@ -0,0 +1,17 @@
//
// WineViewController.h
// MSToolTips
//
// Created by Marian Paul on 02/10/12.
// Copyright (c) 2012 Marian Paul. All rights reserved.
//

#import <UIKit/UIKit.h>
#import "iCarousel.h"

@interface WineViewController : UIViewController <iCarouselDataSource, iCarouselDelegate>
{
iCarousel *_carousel;
UITextView *_textView;
}
@end

0 comments on commit de77c39

Please sign in to comment.